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

match some functions in kmr_20/8EBE50.c (#742)

Browse Source 
* Update 8EBE50.c

* removed asm source files

* whupz

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Jake Kallos 2022-08-06 19:53:10 -07:00 committed by GitHub
parent 1ce49b1ba9
commit b04187c149
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/world/area_kmr/kmr_20/8EBE50.c
View File

@ -1,16 +1,21 @@
#include "kmr_20.h" #include "kmr_20.h"
extern s32 D_8025B2A8;
#include "world/common/atomic/Pipe.inc.c" #include "world/common/atomic/Pipe.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240310_8EC130); ApiStatus func_80240310_8EC130(Evt* script, s32 isInitialCall) {
set_map_transition_effect(4);
return ApiStatus_DONE2;
}
ApiStatus func_80240330_8EC150(Evt* script, s32 isInitialCall) { ApiStatus func_80240330_8EC150(Evt* script, s32 isInitialCall) {
au_ambience_set_volume(0, 1000, 0x3F); au_ambience_set_volume(0, 1000, 63);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
ApiStatus func_80240358_8EC178(Evt* script, s32 isInitialCall) { ApiStatus func_80240358_8EC178(Evt* script, s32 isInitialCall) {
au_ambience_set_volume(0, 1000, 0x7F); au_ambience_set_volume(0, 1000, 127);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -22,7 +27,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406BC_8EC4DC);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406C8_8EC4E8); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406C8_8EC4E8);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B20_8EC940); ApiStatus func_80240B20_8EC940(Evt* script, s32 isInitialCall) {
free_generic_entity(D_8025B2A8);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B48_8EC968); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B48_8EC968);

12
ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240310_8EC130.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240310_8EC130
/* 8EC130 80240310 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8EC134 80240314 AFBF0010 */ sw $ra, 0x10($sp)
/* 8EC138 80240318 0C04E0A8 */ jal set_map_transition_effect
/* 8EC13C 8024031C 24040004 */ addiu $a0, $zero, 4
/* 8EC140 80240320 8FBF0010 */ lw $ra, 0x10($sp)
/* 8EC144 80240324 24020002 */ addiu $v0, $zero, 2
/* 8EC148 80240328 03E00008 */ jr $ra
/* 8EC14C 8024032C 27BD0018 */ addiu $sp, $sp, 0x18

14
ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s
View File

@ -1,14 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240B20_8EC940
/* 8EC940 80240B20 3C048026 */ lui $a0, %hi(D_8025B2A8)
/* 8EC944 80240B24 8C84B2A8 */ lw $a0, %lo(D_8025B2A8)($a0)
/* 8EC948 80240B28 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 8EC94C 80240B2C AFBF0010 */ sw $ra, 0x10($sp)
/* 8EC950 80240B30 0C048D70 */ jal free_generic_entity
/* 8EC954 80240B34 00000000 */ nop
/* 8EC958 80240B38 8FBF0010 */ lw $ra, 0x10($sp)
/* 8EC95C 80240B3C 24020002 */ addiu $v0, $zero, 2
/* 8EC960 80240B40 03E00008 */ jr $ra
/* 8EC964 80240B44 27BD0018 */ addiu $sp, $sp, 0x18