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

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest

Browse Source
This commit is contained in:
GriffinR
2020-08-16 05:59:10 -04:00
parent 2749948eeb 25f45ffa84
commit 65bd2faf94
511 changed files with 17469 additions and 16800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/battle_transitions/frontier_brain.bin → graphics/battle_transitions/frontier_logo.bin
View File

0
graphics/battle_transitions/frontier_brain.png → graphics/battle_transitions/frontier_logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
graphics/battle_transitions/frontier_transition.bin → graphics/battle_transitions/frontier_logo_center.bin
View File

0
graphics/battle_transitions/frontier_transition.png → graphics/battle_transitions/frontier_logo_center.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 448 B

0
graphics/battle_transitions/frontier_transition_circles.png → graphics/battle_transitions/frontier_logo_circles.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 733 B

0
graphics/field_effects/palettes/02.pal → graphics/field_effects/palettes/ash.pal
View File

0
graphics/field_effects/palettes/06.pal → graphics/field_effects/palettes/cut_grass.pal
View File

0
graphics/field_effects/palettes/00.pal → graphics/field_effects/palettes/general_0.pal
View File

0
graphics/field_effects/palettes/01.pal → graphics/field_effects/palettes/general_1.pal
View File

0
graphics/field_effects/palettes/05.pal → graphics/field_effects/palettes/hof_monitor.pal
View File

0
graphics/field_effects/palettes/10.pal → graphics/field_effects/palettes/pokeball.pal
View File

0
graphics/field_effects/palettes/04.pal → graphics/field_effects/palettes/pokeball_glow.pal
View File

0
graphics/unknown/unknown_58E82C.pal → graphics/field_effects/palettes/record_mix_lights.pal
View File

0
graphics/field_effects/palettes/07.pal → graphics/field_effects/palettes/secret_power_cave.pal
View File

0
graphics/field_effects/palettes/08.pal → graphics/field_effects/palettes/secret_power_plant.pal
View File

0
graphics/field_effects/palettes/03.pal → graphics/field_effects/palettes/small_sparkle.pal
View File

0
graphics/field_effects/pics/lavaridge_gym_warp.png → graphics/field_effects/pics/ash_launch.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 406 B

After

Width:  |  Height:  |  Size: 406 B

0
graphics/field_effects/pics/jump_out_of_ash.png → graphics/field_effects/pics/ash_puff.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

0
graphics/field_effects/pics/bike_hop_big_splash.png → graphics/field_effects/pics/jump_big_splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 273 B

0
graphics/field_effects/pics/bike_hop_small_splash.png → graphics/field_effects/pics/jump_small_splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

0
graphics/field_effects/pics/bike_hop_tall_grass.png → graphics/field_effects/pics/jump_tall_grass.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

BIN
graphics/field_effects/pics/record_mix_lights.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 199 B

0
graphics/field_effects/pics/unknown_29.png → graphics/field_effects/pics/sand_pile.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

0
graphics/unknown/858E674/0.png → graphics/field_effects/pics/sand_pillar/0.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

0
graphics/unknown/858E674/1.png → graphics/field_effects/pics/sand_pillar/1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 255 B

0
graphics/unknown/858E674/2.png → graphics/field_effects/pics/sand_pillar/2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

BIN
graphics/field_effects/pics/secret_power_cave.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 356 B

BIN
graphics/field_effects/pics/secret_power_shrub.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 270 B

BIN
graphics/field_effects/pics/secret_power_tree.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 304 B

0
graphics/field_effects/pics/unknown_35.png → graphics/field_effects/pics/small_sparkle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

0
graphics/field_effects/pics/berry_tree_growth_sparkle.png → graphics/field_effects/pics/sparkle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

0
graphics/field_effects/pics/unknown_18.png → graphics/field_effects/pics/unused_grass_2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 344 B

0
graphics/field_effects/pics/unused_grass.png → graphics/field_effects/pics/unused_grass_3.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 389 B

0
graphics/field_effects/pics/unknown_19.png → graphics/field_effects/pics/unused_sand.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 272 B

0
graphics/field_effects/pics/unknown_20.png → graphics/field_effects/pics/water_surfacing.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 319 B

After

Width:  |  Height:  |  Size: 319 B

0
graphics/unknown/unknown_55C1B0.png → graphics/misc/deoxys_rock_fragment_bottom_left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 B

After

Width:  |  Height:  |  Size: 100 B

0
graphics/unknown/unknown_55C1D0.png → graphics/misc/deoxys_rock_fragment_bottom_right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 B

After

Width:  |  Height:  |  Size: 91 B

0
graphics/unknown/unknown_55C170.png → graphics/misc/deoxys_rock_fragment_top_left.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 99 B

After

Width:  |  Height:  |  Size: 99 B

0
graphics/unknown/unknown_55C190.png → graphics/misc/deoxys_rock_fragment_top_right.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 B

After

Width:  |  Height:  |  Size: 102 B

0
graphics/misc/big_hof_monitor.png → graphics/misc/hof_monitor_big.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 184 B

After

Width:  |  Height:  |  Size: 184 B

0
graphics/misc/small_hof_monitor.png → graphics/misc/hof_monitor_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 177 B

After

Width:  |  Height:  |  Size: 177 B

0
graphics/misc/birch_ballarrow.png → graphics/misc/pokeball_selection.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 635 B

0
graphics/misc/birch_circle.png → graphics/misc/starter_circle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 349 B

0
graphics/pokenav/862A5D4.pal → graphics/misc/trainer_hill_ereader.pal
View File

0
graphics/unknown/unknown_DD4544.bin → graphics/naming_screen/background.bin
View File

0
graphics/naming_screen/right_pointing_triangle.png → graphics/naming_screen/input_arrow.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 95 B

After

Width:  |  Height:  |  Size: 95 B

0
graphics/naming_screen/0.pal → graphics/naming_screen/keyboard.pal
View File

0
graphics/unknown/unknown_DD46E0.bin → graphics/naming_screen/keyboard_lower.bin
View File

0
graphics/unknown/unknown_DD47A0.bin → graphics/naming_screen/keyboard_symbols.bin
View File

0
graphics/unknown/unknown_DD4620.bin → graphics/naming_screen/keyboard_upper.bin
View File

0
graphics/naming_screen/keyboard_button.png → graphics/naming_screen/page_button.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 B

After

Width:  |  Height:  |  Size: 89 B

0
graphics/naming_screen/pc_icon/0.png → graphics/naming_screen/pc_icon/off.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

0
graphics/naming_screen/pc_icon/1.png → graphics/naming_screen/pc_icon/on.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 203 B

0
graphics/naming_screen/1.pal → graphics/naming_screen/unused.pal
View File

259
graphics/roulette/85B5BFC.pal
View File

@@ -1,259 +0,0 @@
JASC-PAL
0100
256
82 156 49
41 41 41
98 98 115
172 180 197
255 255 255
255 205 41
255 172 0
213 164 65
205 164 82
139 106 65
131 222 189
74 189 156
115 189 148
123 180 172
74 115 115
255 255 0
74 106 156
41 41 41
98 98 115
156 156 164
255 255 255
205 156 205
164 106 164
172 131 164
156 123 156
90 57 106
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
74 106 156
41 41 41
123 123 131
172 180 197
255 255 255
238 238 156
189 180 106
131 90 32
255 131 90
189 106 98
230 222 255
74 189 156
255 255 255
123 180 172
255 255 255
255 255 255
74 106 156
57 57 65
98 98 115
156 156 164
255 255 255
106 205 205
246 98 90
106 156 255
255 255 255
156 255 106
246 230 74
255 230 123
255 255 255
255 255 156
156 255 148
205 156 255
74 106 156
41 41 41
98 98 115
205 205 213
255 255 255
123 238 139
255 172 139
16 156 74
197 164 255
49 106 32
115 197 131
197 139 189
255 82 57
255 238 82
205 180 8
255 205 8
74 106 156
106 139 230
82 115 205
255 255 255
255 255 255
255 205 41
255 172 0
213 164 65
205 164 82
139 106 65
131 222 189
74 189 156
115 189 148
123 180 172
74 115 115
255 255 255
74 106 156
255 246 65
255 255 164
255 246 65
255 255 255
205 156 205
164 106 164
172 131 164
156 123 156
90 57 106
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
65 65 57
74 106 156
172 255 238
222 255 255
148 255 238
255 255 255
255 205 41
255 172 0
213 164 65
205 164 82
139 106 65
131 222 189
74 189 156
115 189 148
123 180 172
74 115 115
65 65 57
74 106 156
255 205 255
255 222 255
255 197 255
255 255 255
205 156 205
164 106 164
172 131 164
156 123 156
90 57 106
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
65 65 57
74 106 156
255 255 255
255 255 255
255 255 255
255 255 255
255 205 41
255 172 0
213 164 65
205 164 82
139 106 65
131 222 189
74 189 156
115 189 148
123 180 172
74 115 115
255 255 255
74 106 156
255 255 255
255 255 255
255 255 255
255 255 255
205 156 205
164 106 164
172 131 164
156 123 156
90 57 106
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
74 106 156
255 246 82
164 255 222
172 180 197
255 255 255
255 246 65
246 205 24
238 197 98
205 172 90
164 131 90
156 246 222
90 213 180
131 222 172
115 189 156
98 148 148
65 65 57
74 106 156
238 189 238
156 148 148
172 180 197
255 255 255
255 205 255
222 156 230
197 156 197
172 139 172
139 106 148
205 205 230
255 255 255
255 255 255
255 255 255
255 255 255
65 65 57
74 106 156
238 230 246
205 205 230
172 180 197
255 255 255
255 255 230
255 255 164
255 255 255
222 255 255
255 246 255
255 222 255
255 255 255
255 255 255
255 255 255
255 255 255
65 65 57
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255

0
graphics/roulette/85B5DFC.bin → graphics/roulette/grid.bin
View File

0
graphics/roulette/poke_icons.png → graphics/roulette/grid_icons.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 409 B

0
graphics/roulette/85B65D0.pal → graphics/roulette/unused_1.pal
View File

0
graphics/roulette/85B65F0.pal → graphics/roulette/unused_2.pal
View File

0
graphics/roulette/85B6610.pal → graphics/roulette/unused_3.pal
View File

0
graphics/roulette/85B6630.pal → graphics/roulette/unused_4.pal
View File

0
graphics/roulette/wheel_map.bin → graphics/roulette/wheel.bin
View File

BIN
graphics/slot_machine/reel_time.png → graphics/slot_machine/digital_display.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
graphics/slot_machine/85A843E.pal → graphics/slot_machine/flashing_lights_inside.pal
View File

0
graphics/slot_machine/85A845E.pal → graphics/slot_machine/flashing_lights_middle.pal
View File

0
graphics/slot_machine/85A847E.pal → graphics/slot_machine/flashing_lights_outside.pal
View File

0
graphics/slot_machine/slots_layout.bin → graphics/slot_machine/info_box.bin
View File

0
graphics/slot_machine/85A84B0.pal → graphics/slot_machine/pokeball_shining_0.pal
View File

0
graphics/slot_machine/85A84D0.pal → graphics/slot_machine/pokeball_shining_1.pal
View File

0
graphics/slot_machine/85A84F0.pal → graphics/slot_machine/pokeball_shining_2.pal
View File

0
graphics/unknown/unknown_DD19F8.bin → graphics/slot_machine/reel_background.bin
View File

BIN
graphics/slot_machine/reel_pikachu.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

0
graphics/unknown/unknown_DD1A18.png → graphics/slot_machine/reel_time_number_gap.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 131 B

0
graphics/slot_machine/85A96E0.bin → graphics/slot_machine/reel_time_window.bin
View File

19
graphics/slot_machine/spr6.pal
View File

@@ -1,19 +0,0 @@
JASC-PAL
0100
16
98 98 90
255 189 16
131 0 0
197 65 16
197 65 16
197 65 16
197 65 16
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
0 0 0

BIN
graphics/unknown/858E588/0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 145 B

BIN
graphics/unknown/858E588/1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 149 B

BIN
graphics/unknown/858E588/2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 138 B

BIN
graphics/unknown/858E588/3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 133 B

BIN
graphics/unknown/858E588/4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 114 B

BIN
graphics/unknown/858E5B0/0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 89 B

BIN
graphics/unknown/858E5B0/1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 109 B

BIN
graphics/unknown/858E5B0/2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 119 B

BIN
graphics/unknown/858E5B0/3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 123 B

BIN
graphics/unknown/858E5B0/4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 129 B

BIN
graphics/unknown/858E5B0/5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 126 B

BIN
graphics/unknown/858E5D8/0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 87 B

BIN
graphics/unknown/858E5D8/1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 116 B

BIN
graphics/unknown/858E5D8/2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 131 B

BIN
graphics/unknown/858E5D8/3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 115 B

BIN
graphics/unknown/858E5D8/4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 92 B

BIN
graphics/unknown/858E84C/0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 103 B

BIN
graphics/unknown/858E84C/1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 107 B

BIN
graphics/unknown/858E84C/2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 107 B