diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-04-19 21:55:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 23:55:40 -0500 |
| commit | f65dee5a143bd543c74c010d7252eb76893ee243 (patch) | |
| tree | d343e826c63f8b501d37873c3c7bc1f010819deb /src/code_800C9CC.c | |
| parent | d316d1e359c7672277a9cf644acd4e40170f5968 (diff) | |
Wonder mail and some boss dialogues (#36)
* more wonder mail and main menu work
* Lots of things.. doc'ing, decomping, and other things
* continue decomping boss scenes
* up to Suicune
* up to Mewtwo dialogue
* up to Raquaza
* fix spelling error on Rayquaza and decomp a few more
* up to groudon
* divide > shift
Diffstat (limited to 'src/code_800C9CC.c')
| -rw-r--r-- | src/code_800C9CC.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/code_800C9CC.c b/src/code_800C9CC.c index 99aa827..2b0c8dd 100644 --- a/src/code_800C9CC.c +++ b/src/code_800C9CC.c @@ -5,7 +5,7 @@ extern u16 gRawKeyInput; extern u8 gUnknown_202D6B8; extern u8 gUnknown_202D6B9; -extern u16 gUnknown_202D7FA; +extern u16 gBldAlpha; extern u8 gUnknown_202D7FE; extern struct BGControlStruct gBG0Control; @@ -53,10 +53,6 @@ void ReadKeyInput(struct Inputs *r0) void sub_800CC44(s32 r0, s32 r1) { - u32 preload1; - u8 preload2; - u8 preload3; - if(r0 < 0) { r0 = 0; @@ -82,13 +78,7 @@ void sub_800CC44(s32 r0, s32 r1) gUnknown_202D6B8 = r0; gUnknown_202D6B9 = r1; - // Forcing the correct loads - preload1 = gUnknown_202D7FA; - preload2 = gUnknown_202D6B8; - preload3 = gUnknown_202D6B9; - - gUnknown_202D7FA = (gUnknown_202D6B9 << 8) | gUnknown_202D6B8; - + gBldAlpha = BLDALPHA_BLEND1(gUnknown_202D6B8, gUnknown_202D6B9); } void SetBG0RegOffsets(s32 xoffset, s32 yoffset) |