From 7ec965bd24e363381d19139bd15f44093112815b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Jul 2019 22:21:10 -0400 Subject: [PATCH] Port diploma data to C --- baserom.ips | Bin 2351950 -> 2347251 bytes data/data_83FECCC.s | 18 ------- graphics/diploma/unk_84147C0.png | Bin 0 -> 2863 bytes graphics/diploma/unk_84154E8.bin | Bin 0 -> 4096 bytes graphics/diploma/unk_8415954.pal | 35 ++++++++++++++ include/strings.h | 7 +++ ld_script.txt | 1 + src/diploma.c | 79 +++++++++++++++++++++---------- 8 files changed, 98 insertions(+), 42 deletions(-) create mode 100644 graphics/diploma/unk_84147C0.png create mode 100644 graphics/diploma/unk_84154E8.bin create mode 100644 graphics/diploma/unk_8415954.pal diff --git a/baserom.ips b/baserom.ips index de64cf2e6940dc8ad28550bb7273104b0b5c8f35..b378e7da4476ac49d2f43078beaf6b6466062bcb 100644 GIT binary patch delta 140 zcmWN=yA6V10EN-~JbVHoq9XVJox}~SnSw9@#Z9DR26r%F14~O5u_t~fIp0rbey`3n zGO}dLk*kTOnrW_umh$AkgJiH;_303(b?;?vd(W|2G31&NH;lREj(a9NFlELgPdxL& MoCUA_Slu4=AH~i-J^%m! delta 4713 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 Jtub@w{{pyt|GNMH diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index d16de696f..9a65920f7 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -345,24 +345,6 @@ gUnknown_8414588:: @ 8414588 gUnknown_84145BC:: @ 84145BC .incbin "baserom.gba", 0x4145BC, 0x204 -gUnknown_84147C0:: @ 84147C0 - .incbin "baserom.gba", 0x4147C0, 0xD28 - -gUnknown_84154E8:: @ 84154E8 - .incbin "baserom.gba", 0x4154E8, 0x46C - -gUnknown_8415954:: @ 8415954 - .incbin "baserom.gba", 0x415954, 0xB0 - -gUnknown_8415A04:: @ 8415A04 - .incbin "baserom.gba", 0x415A04, 0x4 - -gUnknown_8415A08:: @ 8415A08 - .incbin "baserom.gba", 0x415A08, 0x8 - -gUnknown_8415A10:: @ 8415A10 - .incbin "baserom.gba", 0x415A10, 0x10 - @ strings .section .rodata.841EE44 diff --git a/graphics/diploma/unk_84147C0.png b/graphics/diploma/unk_84147C0.png new file mode 100644 index 0000000000000000000000000000000000000000..ac6e113f8fce3f92731d0c7748c49cb73b2e6165 GIT binary patch literal 2863 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 N002ovPDHLkV1fpYCB*;$ literal 0 HcmV?d00001 diff --git a/graphics/diploma/unk_84154E8.bin b/graphics/diploma/unk_84154E8.bin new file mode 100644 index 0000000000000000000000000000000000000000..38c32e5b220e8d66b43bbcd9920e1a8fca7eda70 GIT binary patch literal 4096 zcmeH{X{-}v7)Bp;ltBv~WzZrO6$KGR+z{L#Dw}$1*c3IbfVg5So4c(FxUxtK?ycBD z0z&JCpn^eV^%uCYxS${^0Yr@oMum%Zn%k!4&TX59U(lJnzh=&NW}a{6i72WXc^xOF znBg^Q94Bf-3}udllJd##I4PwJzu|M7q>;$-0R?4Na0ZP)mJcah0c|R5gsT3`{_U;& z-_-&w)O%&`MPdGL=uOSlTbif&dRy<5wMOCof2hS;qNQ4<3jX4AGKMvMfpj3N|Q5p6#8rRn|{|H+M%8LvjqQ=rs-u(RH5Jg zf4