dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-factscreen

Browse Source
This commit is contained in:
GriffinR
2020-12-31 00:40:45 -05:00
committed by GitHub
parent 093610b46e 0c74e2097f
commit ec85c01e7c
681 changed files with 30975 additions and 31624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/misc/cable_car_bg.pal → graphics/cable_car/bg.pal
View File

0
graphics/misc/cable_car_bg.png → graphics/cable_car/bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
graphics/misc/cable_car_mountain_map.bin → graphics/cable_car/bg_mountains.bin
View File

0
graphics/misc/cable_car_cord.png → graphics/cable_car/cable.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

0
graphics/misc/cable_car.png → graphics/cable_car/cable_car.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 556 B

After

Width:  |  Height:  |  Size: 556 B

0
graphics/misc/cable_car_door.png → graphics/cable_car/door.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 155 B

After

Width:  |  Height:  |  Size: 155 B

0
graphics/misc/cable_car_mt_chimney_map.bin → graphics/cable_car/ground.bin
View File

0
graphics/misc/cable_car_pylon_stem_map.bin → graphics/cable_car/pylons.bin
View File

0
graphics/misc/cable_car_tree_map.bin → graphics/cable_car/trees.bin
View File

0
graphics/object_events/palettes/30.pal → graphics/object_events/palettes/birth_island_stone.pal
View File

0
graphics/object_events/palettes/08.pal → graphics/object_events/palettes/brendan.pal
View File

0
graphics/object_events/palettes/09.pal → graphics/object_events/palettes/brendan_reflection.pal
View File

0
graphics/object_events/palettes/10.pal → graphics/object_events/palettes/bridge_reflection.pal
View File

0
graphics/object_events/palettes/20.pal → graphics/object_events/palettes/cable_car.pal
View File

0
graphics/object_events/palettes/29.pal → graphics/object_events/palettes/deoxys.pal
View File

0
graphics/object_events/palettes/16.pal → graphics/object_events/palettes/enemy_zigzagoon.pal
View File

0
graphics/object_events/palettes/24.pal → graphics/object_events/palettes/groudon.pal
View File

0
graphics/object_events/palettes/25.pal → graphics/object_events/palettes/groudon_reflection.pal
View File

0
graphics/object_events/palettes/31.pal → graphics/object_events/palettes/ho_oh.pal
View File

0
graphics/object_events/palettes/22.pal → graphics/object_events/palettes/kyogre.pal
View File

0
graphics/object_events/palettes/23.pal → graphics/object_events/palettes/kyogre_reflection.pal
View File

0
graphics/object_events/palettes/32.pal → graphics/object_events/palettes/lugia.pal
View File

0
graphics/object_events/palettes/17.pal → graphics/object_events/palettes/may.pal
View File

0
graphics/object_events/palettes/18.pal → graphics/object_events/palettes/may_reflection.pal
View File

0
graphics/object_events/palettes/19.pal → graphics/object_events/palettes/moving_box.pal
View File

0
graphics/object_events/palettes/00.pal → graphics/object_events/palettes/npc_1.pal
View File

0
graphics/object_events/palettes/04.pal → graphics/object_events/palettes/npc_1_reflection.pal
View File

0
graphics/object_events/palettes/01.pal → graphics/object_events/palettes/npc_2.pal
View File

0
graphics/object_events/palettes/05.pal → graphics/object_events/palettes/npc_2_reflection.pal
View File

0
graphics/object_events/palettes/02.pal → graphics/object_events/palettes/npc_3.pal
View File

0
graphics/object_events/palettes/06.pal → graphics/object_events/palettes/npc_3_reflection.pal
View File

0
graphics/object_events/palettes/03.pal → graphics/object_events/palettes/npc_4.pal
View File

0
graphics/object_events/palettes/07.pal → graphics/object_events/palettes/npc_4_reflection.pal
View File

0
graphics/object_events/palettes/11.pal → graphics/object_events/palettes/player_underwater.pal
View File

0
graphics/object_events/palettes/27.pal → graphics/object_events/palettes/poochyena.pal
View File

0
graphics/object_events/palettes/12.pal → graphics/object_events/palettes/quinty_plump.pal
View File

0
graphics/object_events/palettes/13.pal → graphics/object_events/palettes/quinty_plump_reflection.pal
View File

0
graphics/object_events/palettes/28.pal → graphics/object_events/palettes/red_leaf.pal
View File

0
graphics/object_events/palettes/33.pal → graphics/object_events/palettes/ruby_sapphire_brendan.pal
View File

0
graphics/object_events/palettes/34.pal → graphics/object_events/palettes/ruby_sapphire_may.pal
View File

0
graphics/object_events/palettes/21.pal → graphics/object_events/palettes/ss_tidal.pal
View File

0
graphics/object_events/palettes/26.pal → graphics/object_events/palettes/submarine_shadow.pal
View File

0
graphics/object_events/palettes/14.pal → graphics/object_events/palettes/truck.pal
View File

0
graphics/object_events/palettes/15.pal → graphics/object_events/palettes/vigoroth.pal
View File

BIN
graphics/picture_frame/frame5_map.bin.rl.bak
View File

Binary file not shown.

0
graphics/pokenav/bg.bin → graphics/pokenav/bg_dots.bin
View File

0
graphics/pokenav/bg.png → graphics/pokenav/bg_dots.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 141 B

0
graphics/pokenav/outline.png → graphics/pokenav/device_outline.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 596 B

After

Width:  |  Height:  |  Size: 596 B

0
graphics/pokenav/outline_map.bin → graphics/pokenav/device_outline_map.bin
View File

BIN
graphics/rayquaza_scene/kyogre.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

0
graphics/rayquaza_scene/clouds.pal → graphics/rayquaza_scene/scene_1/clouds.pal
View File

0
graphics/rayquaza_scene/clouds.png → graphics/rayquaza_scene/scene_1/clouds.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 964 B

After

Width:  |  Height:  |  Size: 964 B

0
graphics/rayquaza_scene/clouds1.bin → graphics/rayquaza_scene/scene_1/clouds1.bin
View File

0
graphics/rayquaza_scene/clouds2.bin → graphics/rayquaza_scene/scene_1/clouds2.bin
View File

0
graphics/rayquaza_scene/clouds3.bin → graphics/rayquaza_scene/scene_1/clouds3.bin
View File

0
graphics/rayquaza_scene/groudon.png → graphics/rayquaza_scene/scene_1/groudon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
graphics/rayquaza_scene/groudon_claw.png → graphics/rayquaza_scene/scene_1/groudon_claw.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 445 B

After

Width:  |  Height:  |  Size: 445 B

0
graphics/rayquaza_scene/groudon_shoulder.png → graphics/rayquaza_scene/scene_1/groudon_shoulder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 259 B

BIN
graphics/rayquaza_scene/scene_1/kyogre.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

0
graphics/rayquaza_scene/kyogre_fin.png → graphics/rayquaza_scene/scene_1/kyogre_dorsal_fin.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

0
graphics/rayquaza_scene/kyogre_shoulder.png → graphics/rayquaza_scene/scene_1/kyogre_pectoral_fin.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

0
graphics/rayquaza_scene/overcast.bin → graphics/rayquaza_scene/scene_2/bg.bin
View File

0
graphics/rayquaza_scene/overcast.png → graphics/rayquaza_scene/scene_2/bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
graphics/rayquaza_scene/rayquaza.bin → graphics/rayquaza_scene/scene_2/rayquaza.bin
View File

0
graphics/rayquaza_scene/rayquaza.png → graphics/rayquaza_scene/scene_2/rayquaza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
graphics/rayquaza_scene/smoke.png → graphics/rayquaza_scene/scene_2/smoke.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 242 B

0
graphics/rayquaza_scene/overcast2.bin → graphics/rayquaza_scene/scene_3/bg.bin
View File

0
graphics/rayquaza_scene/overcast2.pal → graphics/rayquaza_scene/scene_3/bg.pal
View File

0
graphics/rayquaza_scene/overcast2.png → graphics/rayquaza_scene/scene_3/bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
graphics/rayquaza_scene/rayquaza_light.bin → graphics/rayquaza_scene/scene_3/light.bin
View File

0
graphics/rayquaza_scene/rayquaza_light.png → graphics/rayquaza_scene/scene_3/light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 534 B

0
graphics/rayquaza_scene/rayquaza_fly1.png → graphics/rayquaza_scene/scene_3/rayquaza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 815 B

0
graphics/rayquaza_scene/rayquaza_tail.png → graphics/rayquaza_scene/scene_3/rayquaza_tail.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 264 B

0
graphics/rayquaza_scene/chase_bg.bin → graphics/rayquaza_scene/scene_4/bg.bin
View File

0
graphics/rayquaza_scene/chase.pal → graphics/rayquaza_scene/scene_4/bg.pal
View File

0
graphics/rayquaza_scene/chase_bg.png → graphics/rayquaza_scene/scene_4/bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

0
graphics/rayquaza_scene/rayquaza_chase2.bin → graphics/rayquaza_scene/scene_4/orbs.bin
View File

0
graphics/rayquaza_scene/rayquaza_chase.bin → graphics/rayquaza_scene/scene_4/rayquaza.bin
View File

0
graphics/rayquaza_scene/rayquaza_chase.png → graphics/rayquaza_scene/scene_4/rayquaza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
graphics/rayquaza_scene/chase_streaks.bin → graphics/rayquaza_scene/scene_4/streaks.bin
View File

0
graphics/rayquaza_scene/chase_streaks.png → graphics/rayquaza_scene/scene_4/streaks.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 279 B

0
graphics/rayquaza_scene/hush_ring.bin → graphics/rayquaza_scene/scene_5/bg.bin
View File

0
graphics/rayquaza_scene/hush_bg.pal → graphics/rayquaza_scene/scene_5/bg.pal
View File

0
graphics/rayquaza_scene/groudon_left.png → graphics/rayquaza_scene/scene_5/groudon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
graphics/rayquaza_scene/groudon_tail.png → graphics/rayquaza_scene/scene_5/groudon_tail.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 B

After

Width:  |  Height:  |  Size: 168 B

0
graphics/rayquaza_scene/kyogre_right.png → graphics/rayquaza_scene/scene_5/kyogre.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

0
graphics/rayquaza_scene/splash.png → graphics/rayquaza_scene/scene_5/kyogre_splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

0
graphics/rayquaza_scene/hush_bg.bin → graphics/rayquaza_scene/scene_5/light.bin
View File

0
graphics/rayquaza_scene/hush_bg.png → graphics/rayquaza_scene/scene_5/light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 339 B

0
graphics/rayquaza_scene/rayquaza_hover.png → graphics/rayquaza_scene/scene_5/rayquaza.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
graphics/rayquaza_scene/rayquaza_flyin.png → graphics/rayquaza_scene/scene_5/rayquaza_tail.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 391 B

0
graphics/rayquaza_scene/hush_ring_map.bin → graphics/rayquaza_scene/scene_5/ring.bin
View File

0
graphics/rayquaza_scene/hush_ring.png → graphics/rayquaza_scene/scene_5/ring.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 385 B

0
graphics/trainers/front_pics/cool_trainer_f_front_pic.png → graphics/trainers/front_pics/cooltrainer_f_front_pic.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 681 B

After

Width:  |  Height:  |  Size: 681 B

0
graphics/trainers/front_pics/cool_trainer_m_front_pic.png → graphics/trainers/front_pics/cooltrainer_m_front_pic.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 627 B

After

Width:  |  Height:  |  Size: 627 B

0
graphics/trainers/palettes/cool_trainer_f.pal → graphics/trainers/palettes/cooltrainer_f.pal
View File

0
graphics/trainers/palettes/cool_trainer_m.pal → graphics/trainers/palettes/cooltrainer_m.pal
View File

0
graphics/interface/wallclock.png → graphics/wallclock/clock.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
graphics/interface/wallclock1.bin → graphics/wallclock/clock_start.bin
View File

0
graphics/interface/wallclock2.bin → graphics/wallclock/clock_view.bin
View File

Some files were not shown because too many files have changed in this diff Show More