pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

curtains

Browse Source
This commit is contained in:
Ethan Roseman 2020-09-27 14:13:50 -04:00
parent 82b3662064
commit 164c6e76d3
10 changed files with 40 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
asm/nonmatchings/code_6e40_len_500/initialize_curtains.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel initialize_curtains
/* 6E40 8002BA40 3C014000 */ lui $at, 0x4000
/* 6E44 8002BA44 44810000 */ mtc1 $at, $f0
/* 6E48 8002BA48 3C01800A */ lui $at, 0x800a
/* 6E4C 8002BA4C AC20BAA0 */ sw $zero, -0x4560($at)
/* 6E50 8002BA50 3C01800A */ lui $at, 0x800a
/* 6E54 8002BA54 AC20BA98 */ sw $zero, -0x4568($at)
/* 6E58 8002BA58 3C01800A */ lui $at, 0x800a
/* 6E5C 8002BA5C AC20BA9C */ sw $zero, -0x4564($at)
/* 6E60 8002BA60 3C01800A */ lui $at, 0x800a
/* 6E64 8002BA64 E420BA90 */ swc1 $f0, -0x4570($at)
/* 6E68 8002BA68 3C01800A */ lui $at, 0x800a
/* 6E6C 8002BA6C E420BA94 */ swc1 $f0, -0x456c($at)
/* 6E70 8002BA70 03E00008 */ jr $ra
/* 6E74 8002BA74 00000000 */ nop

8
asm/nonmatchings/code_6e40_len_500/set_curtain_draw_callback.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel set_curtain_draw_callback
/* 7304 8002BF04 3C01800A */ lui $at, 0x800a
/* 7308 8002BF08 AC24BAA0 */ sw $a0, -0x4560($at)
/* 730C 8002BF0C 03E00008 */ jr $ra
/* 7310 8002BF10 00000000 */ nop

11
asm/nonmatchings/code_6e40_len_500/set_curtain_fade.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel set_curtain_fade
/* 7324 8002BF24 3C01800A */ lui $at, 0x800a
/* 7328 8002BF28 E42CBA9C */ swc1 $f12, -0x4564($at)
/* 732C 8002BF2C 3C01800A */ lui $at, 0x800a
/* 7330 8002BF30 E42CBA98 */ swc1 $f12, -0x4568($at)
/* 7334 8002BF34 03E00008 */ jr $ra
/* 7338 8002BF38 00000000 */ nop
/* 733C 8002BF3C 00000000 */ nop

8
asm/nonmatchings/code_6e40_len_500/set_curtain_fade_goal.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel set_curtain_fade_goal
/* 7314 8002BF14 3C01800A */ lui $at, 0x800a
/* 7318 8002BF18 E42CBA9C */ swc1 $f12, -0x4564($at)
/* 731C 8002BF1C 03E00008 */ jr $ra
/* 7320 8002BF20 00000000 */ nop

10
asm/nonmatchings/code_6e40_len_500/set_curtain_scale.s
View File

@ -1,10 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel set_curtain_scale
/* 72EC 8002BEEC 3C01800A */ lui $at, 0x800a
/* 72F0 8002BEF0 E42CBA94 */ swc1 $f12, -0x456c($at)
/* 72F4 8002BEF4 3C01800A */ lui $at, 0x800a
/* 72F8 8002BEF8 E42CBA90 */ swc1 $f12, -0x4570($at)
/* 72FC 8002BEFC 03E00008 */ jr $ra
/* 7300 8002BF00 00000000 */ nop

8
asm/nonmatchings/code_6e40_len_500/set_curtain_scale_goal.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel set_curtain_scale_goal
/* 72DC 8002BEDC 3C01800A */ lui $at, 0x800a
/* 72E0 8002BEE0 E42CBA94 */ swc1 $f12, -0x456c($at)
/* 72E4 8002BEE4 03E00008 */ jr $ra
/* 72E8 8002BEE8 00000000 */ nop

7
include/variables.h
View File

@ -94,6 +94,13 @@ extern s16 D_800A0944;
extern s32 gGameState;
extern s32 D_8009A650[1];
// curtains
extern f32 D_8009BA90;
extern f32 D_8009BA94; // curtain scale goal
extern f32 D_8009BA98;
extern f32 D_8009BA9C; // curtain fade goal
extern s32 D_8009BAA0; // curtain draw callback
extern s16 gCurrentDoorSoundsSet;
extern UNK_TYPE D_800E92D8;

30
src/code_6e40_len_500.c
View File

@ -1,18 +1,36 @@
#include "common.h"
INCLUDE_ASM(s32, "code_6e40_len_500", initialize_curtains)
void initialize_curtains(void) {
D_8009BAA0 = 0;
D_8009BA90 = 2.0f;
D_8009BA94 = 2.0f;
D_8009BA98 = 0;
D_8009BA9C = 0;
}
void update_curtains(void) {
}
INCLUDE_ASM(s32, "code_6e40_len_500", render_curtains);
INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_scale_goal);
void set_curtain_scale_goal(f32 arg0) {
D_8009BA94 = arg0;
}
INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_scale);
void set_curtain_scale(f32 arg0) {
D_8009BA94 = arg0;
D_8009BA90 = arg0;
}
INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_draw_callback);
void set_curtain_draw_callback(s32 arg0) {
D_8009BAA0 = arg0;
}
INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_fade_goal);
void set_curtain_fade_goal(f32 arg0) {
D_8009BA9C = arg0;
}
INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_fade);
void set_curtain_fade(f32 arg0) {
D_8009BA9C = arg0;
D_8009BA98 = arg0;
}

2
tools/asm_sizes.py
View File

@ -1,3 +1,5 @@
#! /usr/bin/python3
import glob
import os
import re

7
undefined_syms.txt
View File

@ -50,6 +50,13 @@ D_800959D4 = 0x800959D4;
D_8009A5D8 = 0x8009A5D8;
gGameState = 0x8009A600;
D_8009A650 = 0x8009A650;
D_8009BA90 = 0x8009BA90;
D_8009BA94 = 0x8009BA94;
D_8009BA98 = 0x8009BA98;
D_8009BA9C = 0x8009BA9C;
D_8009BAA0 = 0x8009BAA0;
D_800A0900 = 0x800A0900;
gCurrentEncounter = 0x800B0F10;
gCameras = 0x800B1D80;