Merge branch 'master' of github.com:pret/pokefirered into modern_gcc

Browse Source

...

This commit is contained in:

PikalaxALT committed 2020-04-07 11:05:48 -04:00

2 parents 1f113498c9 7693c90e67

commit fedb2f5c0b

276 files changed

+430 -451

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/credits/unk_840C630.pal → graphics/credits/unk_840C630.pal

File renamed without changes.

data/credits/unk_840C650.png → graphics/credits/unk_840C650.png

File renamed without changes.

data/credits/unk_840CA54.bin → graphics/credits/unk_840CA54.bin

File renamed without changes.

data/credits/unk_840CB8C.bin → graphics/credits/unk_840CB8C.bin

File renamed without changes.

data/credits/unk_840D228.bin → graphics/credits/unk_840D228.bin

File renamed without changes.

data/credits/unk_840DC0C.bin → graphics/credits/unk_840DC0C.bin

File renamed without changes.

data/credits/unk_840E158.bin → graphics/credits/unk_840E158.bin

File renamed without changes.

data/credits/unk_840E904.bin → graphics/credits/unk_840E904.bin

File renamed without changes.

data/credits/unk_840F240.bin → graphics/credits/unk_840F240.bin

File renamed without changes.

data/credits/unk_840F944.bin → graphics/credits/unk_840F944.bin

File renamed without changes.

data/credits/unk_8410198.bin → graphics/credits/unk_8410198.bin

File renamed without changes.

data/credits/unk_84105B4.bin → graphics/credits/unk_84105B4.bin

File renamed without changes.

data/credits/unk_8410B20.bin → graphics/credits/unk_8410B20.bin

File renamed without changes.

data/credits/unk_8410B20.png → graphics/credits/unk_8410B20.png

File renamed without changes.

data/credits/unk_8410E10.pal → graphics/credits/unk_8410E10.pal

File renamed without changes.

data/credits/unk_8410E30.png → graphics/credits/unk_8410E30.png

File renamed without changes.

data/credits/unk_8411BF8.pal → graphics/credits/unk_8411BF8.pal

File renamed without changes.

data/credits/unk_8411C18.png → graphics/credits/unk_8411C18.png

File renamed without changes.

data/credits/unk_84129A0.pal → graphics/credits/unk_84129A0.pal

File renamed without changes.

data/credits/unk_84129C0.png → graphics/credits/unk_84129C0.png

File renamed without changes.

data/credits/unk_8413318.pal → graphics/credits/unk_8413318.pal

File renamed without changes.

data/credits/unk_8413338.png → graphics/credits/unk_8413338.png

File renamed without changes.

data/credits/unk_8413854.pal → graphics/credits/unk_8413854.pal

File renamed without changes.

data/credits/unk_8413874.png → graphics/credits/unk_8413874.png

File renamed without changes.

data/credits/unk_8413D98.pal → graphics/credits/unk_8413D98.pal

File renamed without changes.

data/credits/unk_8413DB8.png → graphics/credits/unk_8413DB8.png

File renamed without changes.

data/graphics/fame_checker_bg.pal → graphics/fame_checker/bg.pal

File renamed without changes.

data/graphics/fame_checker_bg.png → graphics/fame_checker/bg.png

File renamed without changes.

data/fame_checker/pal_845e540.pal → graphics/fame_checker/bill.pal

File renamed without changes.

data/fame_checker/img_845dd40.png → graphics/fame_checker/bill.png

File renamed without changes.

data/fame_checker/pal_845d500.pal → graphics/fame_checker/cursor.pal

File renamed without changes.

data/fame_checker/img_845d100.png → graphics/fame_checker/cursor.png

File renamed without changes.

data/fame_checker/pal_845ed60.pal → graphics/fame_checker/daisy.pal

File renamed without changes.

data/fame_checker/img_845e560.png → graphics/fame_checker/daisy.png

File renamed without changes.

data/fame_checker/pal_845dd20.pal → graphics/fame_checker/mr_fuji.pal

File renamed without changes.

data/fame_checker/img_845d520.png → graphics/fame_checker/mr_fuji.png

File renamed without changes.

data/fame_checker/pal_845f580.pal → graphics/fame_checker/prof_oak.pal

File renamed without changes.

data/fame_checker/img_845ed80.png → graphics/fame_checker/prof_oak.png

File renamed without changes.

data/fame_checker/img_845ce00.png → graphics/fame_checker/question_mark.png

File renamed without changes.

data/fame_checker/pal_845f5c0.pal → graphics/fame_checker/silhouette.pal

File renamed without changes.

data/fame_checker/pal_845d0e0.pal → graphics/fame_checker/spinning_pokeball.pal

File renamed without changes.

data/fame_checker/img_845cf00.png → graphics/fame_checker/spinning_pokeball.png

File renamed without changes.

data/fame_checker/tilemap_845c600.bin → graphics/fame_checker/tilemap1.bin

File renamed without changes.

data/graphics/fame_checker_tilemap2.bin → graphics/fame_checker/tilemap2.bin

File renamed without changes.

data/graphics/fame_checker_tilemap3.bin → graphics/fame_checker/tilemap3.bin

File renamed without changes.

data/fame_checker/pal_845f5a0.pal → graphics/fame_checker/unk.pal

File renamed without changes.

data/field_specials/unk_83F5F50.pal → graphics/field_specials/unk_83F5F50.pal

File renamed without changes.

data/field_specials/unk_83F5F70.pal → graphics/field_specials/unk_83F5F70.pal

File renamed without changes.

data/field_specials/unk_83F5F90.pal → graphics/field_specials/unk_83F5F90.pal

File renamed without changes.

data/field_specials/unk_83F5FB0.pal → graphics/field_specials/unk_83F5FB0.pal

File renamed without changes.

data/field_specials/unk_83F5FD0.pal → graphics/field_specials/unk_83F5FD0.pal

File renamed without changes.

data/field_specials/unk_83F5FF0.pal → graphics/field_specials/unk_83F5FF0.pal

File renamed without changes.

data/field_specials/unk_83F6010.pal → graphics/field_specials/unk_83F6010.pal

File renamed without changes.

data/field_specials/unk_83F6030.pal → graphics/field_specials/unk_83F6030.pal

File renamed without changes.

data/field_specials/unk_83F6050.pal → graphics/field_specials/unk_83F6050.pal

File renamed without changes.

data/field_specials/unk_83F6070.pal → graphics/field_specials/unk_83F6070.pal

File renamed without changes.

data/field_specials/unk_83F6090.pal → graphics/field_specials/unk_83F6090.pal

File renamed without changes.

data/field_specials/unk_83F60B0.pal → graphics/field_specials/unk_83F60B0.pal

File renamed without changes.

data/field_specials/unk_83F60D0.pal → graphics/field_specials/unk_83F60D0.pal

File renamed without changes.

data/field_specials/unk_83F60F0.pal → graphics/field_specials/unk_83F60F0.pal

File renamed without changes.

data/field_specials/unk_83F6110.pal → graphics/field_specials/unk_83F6110.pal

File renamed without changes.

data/field_specials/unk_83F6130.pal → graphics/field_specials/unk_83F6130.pal

File renamed without changes.

data/field_specials/unk_83F6150.pal → graphics/field_specials/unk_83F6150.pal

File renamed without changes.

data/field_specials/unk_83F6170.pal → graphics/field_specials/unk_83F6170.pal

File renamed without changes.

data/field_specials/unk_83F6190.pal → graphics/field_specials/unk_83F6190.pal

File renamed without changes.

data/field_specials/unk_83F61B0.pal → graphics/field_specials/unk_83F61B0.pal

File renamed without changes.

data/field_specials/unk_83F61D0.pal → graphics/field_specials/unk_83F61D0.pal

File renamed without changes.

data/field_specials/unk_83F6206.pal → graphics/field_specials/unk_83F6206.pal

File renamed without changes.

data/field_specials/unk_83F6226.pal → graphics/field_specials/unk_83F6226.pal

File renamed without changes.

data/field_specials/unk_83F6246.pal → graphics/field_specials/unk_83F6246.pal

File renamed without changes.

data/field_specials/unk_83F6266.pal → graphics/field_specials/unk_83F6266.pal

File renamed without changes.

data/field_specials/unk_83F6286.pal → graphics/field_specials/unk_83F6286.pal

File renamed without changes.

data/field_specials/unk_83F62A6.pal → graphics/field_specials/unk_83F62A6.pal

File renamed without changes.

data/field_specials/unk_83F62C6.pal → graphics/field_specials/unk_83F62C6.pal

File renamed without changes.

data/field_specials/unk_83F62E6.pal → graphics/field_specials/unk_83F62E6.pal

File renamed without changes.

data/field_specials/unk_83F6306.pal → graphics/field_specials/unk_83F6306.pal

File renamed without changes.

data/field_specials/unk_83F6326.pal → graphics/field_specials/unk_83F6326.pal

File renamed without changes.

data/field_specials/unk_83F6346.pal → graphics/field_specials/unk_83F6346.pal

File renamed without changes.

data/graphics/fonts/down_arrow.png → graphics/fonts/down_arrow.png

File renamed without changes.

data/graphics/fonts/down_arrow_2.png → graphics/fonts/down_arrow_2.png

File renamed without changes.

data/graphics/fonts/down_arrow_3.png → graphics/fonts/down_arrow_3.png

File renamed without changes.

data/graphics/fonts/down_arrow_4.png → graphics/fonts/down_arrow_4.png

File renamed without changes.

data/graphics/fonts/down_arrow_RS.png → graphics/fonts/down_arrow_RS.png

File renamed without changes.

data/graphics/fonts/down_arrow_RS_2.png → graphics/fonts/down_arrow_RS_2.png

File renamed without changes.

data/graphics/fonts/font0_jap.png → graphics/fonts/font0_jap.png

File renamed without changes.

data/graphics/fonts/font0_latin.png → graphics/fonts/font0_latin.png

File renamed without changes.

data/graphics/fonts/font1_jap.png → graphics/fonts/font1_jap.png

File renamed without changes.

data/graphics/fonts/font1_latin.png → graphics/fonts/font1_latin.png

File renamed without changes.

data/graphics/fonts/font2_jap.png → graphics/fonts/font2_jap.png

File renamed without changes.

data/graphics/fonts/font2_latin.png → graphics/fonts/font2_latin.png

File renamed without changes.

data/graphics/fonts/font4_jap.png → graphics/fonts/font4_jap.png

File renamed without changes.

data/graphics/fonts/font4_latin.png → graphics/fonts/font4_latin.png

File renamed without changes.

data/graphics/fonts/font5_jap.png → graphics/fonts/font5_jap.png

File renamed without changes.

data/graphics/fonts/font5_latin.png → graphics/fonts/font5_latin.png

File renamed without changes.

data/graphics/fonts/font6_braille.png → graphics/fonts/font6_braille.png

File renamed without changes.

data/graphics/fonts/font9_jap.png → graphics/fonts/font9_jap.png

File renamed without changes.

data/graphics/fonts/keypad_icons.png → graphics/fonts/keypad_icons.png

File renamed without changes.

data/bag/bag_window_pal.pal → graphics/item_menu/bag_window_pal.pal

File renamed without changes.

data/itemfinder/spr_tiles.png → graphics/itemfinder/spr_tiles.png

File renamed without changes.

data/graphics/unk_847a348.png → graphics/link_games/unk_847a348.png

File renamed without changes.

Loaded 100 of 276 files, more files were not shown because too many files have changed in this diff. Show more