mirror of
https://github.com/pmret/papermario.git
synced 2024-09-19 16:01:48 +02:00
a37f30dc94
* wip changes for modern gcc * more * wip * blah * Define explicit size for symbol * Clean up evt_handle_exec1 * wip * . * fixes & VLA macro * VLA innit * wipz * Fix potential UB * meowp * meowp2 * fixies * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "e1f0b17917" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "e1f0b17917" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "aa416e4" * fixules * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "3ba3277e57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "3ba3277e57" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "aa416e4" * more shiftability + symbols work * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "02879e52a7" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "02879e52a7" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "aa416e4" * more * revert bss changes for now, new heaps overlay for aligning stuff to 0x1000 (not sure how necessary that is, so maybe will revert later on) * 'fixing' jp shift build * more * more syms * more progress * more * ididid * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "de54da38f5" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "de54da38f5" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "aa416e4" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "a27dc436a6" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "a27dc436a6" git-subrepo: version: "0.4.5" origin: "https://github.com/ingydotnet/git-subrepo" commit: "aa416e4" * blah * stuff's broken, but at least it's maybe cleaner * modern gcc back * revert * shifting all overlays - works so far * progs * another * modern gcc flag, re-enabled all ifdef shift stuff * fixies * progress * fixes, matching build * heaps3 overlay and some symbol names * changies * PR comments & cleanup
120 lines
5.0 KiB
C
120 lines
5.0 KiB
C
#include "common.h"
|
|
|
|
s32 D_802EB5C0[] = {
|
|
0x0000D178, 0x0000ED78, 0x00010978, 0x00012578, 0x00014178, 0x00015D78, 0x00017978, 0x00019578, 0x0001B178, 0x0001CD78, 0x0001E978, 0x00020578
|
|
};
|
|
|
|
s32 D_802EB5F0[] = {
|
|
0x0000EB78, 0x00010778, 0x00012378, 0x00013F78, 0x00015B78, 0x00017778, 0x00019378, 0x0001AF78, 0x0001CB78, 0x0001E778, 0x00020378, 0x00021F78
|
|
};
|
|
|
|
struct_D_802EB620 D_802EB620[] = {
|
|
{
|
|
.unk_00 = 0x11,
|
|
.unk_04 = 0x12,
|
|
.unk_08 = 0
|
|
},
|
|
{
|
|
.unk_00 = 0x17,
|
|
.unk_04 = 0x18,
|
|
.unk_08 = -50
|
|
},
|
|
{
|
|
.unk_00 = 0x1B,
|
|
.unk_04 = 0x1B,
|
|
.unk_08 = 0
|
|
},
|
|
};
|
|
|
|
s16 D_802EB644[] = {
|
|
0, -4, -4, -4,
|
|
-4, 0, -4, -4,
|
|
-4, 0, 0, 0,
|
|
0, -4, -4, 0,
|
|
0, 0, 0, 0,
|
|
0, 0
|
|
};
|
|
|
|
#include "ui/msg/bubble_left.png.inc.c"
|
|
#include "ui/msg/bubble_mid.png.inc.c"
|
|
#include "ui/msg/bubble_right.png.inc.c"
|
|
#include "ui/msg/arrow.png.inc.c"
|
|
#include "ui/msg/frame_part_0.png.inc.c"
|
|
#include "ui/msg/frame_part_1.png.inc.c"
|
|
#include "ui/msg/frame_part_2.png.inc.c"
|
|
#include "ui/msg/frame_part_3.png.inc.c"
|
|
#include "ui/msg/frame_part_4.png.inc.c"
|
|
#include "ui/msg/frame_part_5.png.inc.c"
|
|
#include "ui/msg/frame_part_6.png.inc.c"
|
|
#include "ui/msg/frame_part_7.png.inc.c"
|
|
#include "ui/msg/frame_part_8.png.inc.c"
|
|
#include "ui/msg/frame_part_9.png.inc.c"
|
|
#include "ui/msg/frame_part_A.png.inc.c"
|
|
#include "ui/msg/frame_part_B.png.inc.c"
|
|
#include "ui/msg/frame_part_C.png.inc.c"
|
|
#include "ui/msg/frame_part_D.png.inc.c"
|
|
#include "ui/msg/frame_part_E.png.inc.c"
|
|
#include "ui/msg/frame_part_F.png.inc.c"
|
|
#include "ui/msg/frame_part_10.png.inc.c"
|
|
#include "ui/msg/frame_part_11.png.inc.c"
|
|
#include "ui/msg/frame_part_12.png.inc.c"
|
|
#include "ui/msg/frame_part_13.png.inc.c"
|
|
#include "ui/msg/frame_part_14.png.inc.c"
|
|
#include "ui/msg/frame_part_15.png.inc.c"
|
|
#include "ui/msg/frame_part_16.png.inc.c"
|
|
#include "ui/msg/frame_part_17.png.inc.c"
|
|
#include "ui/msg/frame_part_18.png.inc.c"
|
|
#include "ui/msg/frame_part_19.png.inc.c"
|
|
#include "ui/msg/frame_part_1A.png.inc.c"
|
|
#include "ui/msg/frame_part_1B.png.inc.c"
|
|
#include "ui/msg/frame_part_1C.png.inc.c"
|
|
#include "ui/msg/frame_part_1D.png.inc.c"
|
|
#include "ui/msg/frame_part_1E.png.inc.c"
|
|
#include "ui/msg/frame_part_1F.png.inc.c"
|
|
|
|
// TODO: make assets
|
|
unsigned char ui_msg_palettes[16][32] = {
|
|
{115,158,255,255,247,187,231,57,222,245,198,47,156,229,123,221,189,239,222,247,156,229,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,231,59,222,249,214,183,206,117,181,175,140,101,107,93,173,109,206,117,140,101,99,27,0,1,0,1,0,1,0,1,},
|
|
{115,158,255,255,246,245,246,113,245,171,204,229,172,97,131,155,197,173,230,181,164,163,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,255,255,214,189,198,63,181,191,156,245,140,107,115,161,181,177,214,185,148,169,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,255,255,247,179,247,169,247,95,206,29,165,29,123,219,198,43,231,51,165,35,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,231,57,246,159,139,79,171,207,180,85,213,89,171,209,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1,},
|
|
{115,158,231,57,246,159,188,81,168,63,180,85,213,89,168,63,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1,},
|
|
{115,158,231,57,246,159,131,13,168,63,180,19,213,89,168,63,168,63,168,63,168,63,168,63,168,63,122,3,65,1,0,1,},
|
|
{115,158,255,255,247,187,231,57,222,245,198,47,156,229,123,221,189,239,222,247,156,229,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,66,15,132,29,181,171,214,179,181,171,123,221,66,15,66,15,66,15,66,15,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,255,255,247,57,238,247,230,115,197,107,172,97,131,155,197,173,230,181,164,163,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,255,255,231,61,214,187,206,121,173,113,140,107,115,161,181,177,214,185,148,169,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,255,255,247,183,239,115,231,45,198,39,165,31,123,219,198,43,231,51,165,35,115,157,0,1,0,1,0,1,0,1,},
|
|
{115,158,231,57,230,29,147,143,188,21,196,79,213,87,171,209,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1,},
|
|
{115,158,231,57,230,29,172,83,172,19,196,79,213,87,163,141,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1,},
|
|
{115,158,231,57,230,29,155,75,168,63,196,79,205,23,168,63,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1,},
|
|
};
|
|
|
|
#include "ui/msg/sign_corner_topleft.png.inc.c"
|
|
#include "ui/msg/sign_corner_topright.png.inc.c"
|
|
#include "ui/msg/sign_corner_bottomleft.png.inc.c"
|
|
#include "ui/msg/sign_corner_bottomright.png.inc.c"
|
|
#include "ui/msg/lamppost_corner_bottomright.png.inc.c"
|
|
#include "ui/msg/sign_side_top.png.inc.c"
|
|
#include "ui/msg/sign_side_left.png.inc.c"
|
|
#include "ui/msg/sign_side_right.png.inc.c"
|
|
#include "ui/msg/sign_side_bottom.png.inc.c"
|
|
#include "ui/msg/sign_fill.png.inc.c"
|
|
#include "ui/msg/sign_corner_topleft.pal.inc.c"
|
|
#include "ui/msg/lamppost_corner_bottomright.pal.inc.c"
|
|
#include "ui/msg/background.png.inc.c"
|
|
#include "ui/msg/rewind_arrow.png.inc.c"
|
|
#include "ui/msg/rewind_arrow.pal.inc.c"
|
|
#include "ui/msg/star.png.inc.c"
|
|
#include "ui/msg/star_silhouette.png.inc.c"
|
|
|
|
BSS IMG_BIN D_802ED970[0xF60];
|
|
BSS IMG_BIN D_802EE8D0[0x5100];
|
|
BSS IMG_BIN D_802F39D0[0xB88];
|
|
BSS char MSG_unused[8];
|
|
BSS PAL_BIN D_802F4560[80][8];
|
|
|
|
MATCHING_BSS(0x6DA0);
|