falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

world_goombaria

This commit is contained in:
Ethan Roseman 2020-10-18 20:04:18 -04:00
parent 37856b1b54
commit b71a05cd97
11 changed files with 54 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
asm/nonmatchings/code_324F10/func_802BD100_324F10.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD100_324F10
/* 324F10 802BD100 24020018 */ addiu $v0, $zero, 0x18
/* 324F14 802BD104 A48200A8 */ sh $v0, 0xa8($a0)
/* 324F18 802BD108 24020014 */ addiu $v0, $zero, 0x14
/* 324F1C 802BD10C 03E00008 */ jr $ra
/* 324F20 802BD110 A48200A6 */ sh $v0, 0xa6($a0)

19
asm/nonmatchings/code_324F10/func_802BD114_324F10.s
View File

@ -1,19 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD114_324F10
/* 324F24 802BD114 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 324F28 802BD118 AFBF0014 */ sw $ra, 0x14($sp)
/* 324F2C 802BD11C AFB00010 */ sw $s0, 0x10($sp)
/* 324F30 802BD120 10A00003 */ beqz $a1, .L802BD130
/* 324F34 802BD124 8C90014C */ lw $s0, 0x14c($a0)
/* 324F38 802BD128 0C03BB31 */ jal func_800EECC4
/* 324F3C 802BD12C 0200202D */ daddu $a0, $s0, $zero
.L802BD130:
/* 324F40 802BD130 0C03BB3A */ jal func_800EECE8
/* 324F44 802BD134 0200202D */ daddu $a0, $s0, $zero
/* 324F48 802BD138 8FBF0014 */ lw $ra, 0x14($sp)
/* 324F4C 802BD13C 8FB00010 */ lw $s0, 0x10($sp)
/* 324F50 802BD140 0002102B */ sltu $v0, $zero, $v0
/* 324F54 802BD144 03E00008 */ jr $ra
/* 324F58 802BD148 27BD0018 */ addiu $sp, $sp, 0x18

29
asm/nonmatchings/code_324F10/func_802BD14C_324F10.s
View File

@ -1,29 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD14C_324F10
/* 324F5C 802BD14C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 324F60 802BD150 AFB10014 */ sw $s1, 0x14($sp)
/* 324F64 802BD154 3C118011 */ lui $s1, %hi(gPlayerData)
/* 324F68 802BD158 2631F290 */ addiu $s1, $s1, %lo(gPlayerData)
/* 324F6C 802BD15C AFBF0018 */ sw $ra, 0x18($sp)
/* 324F70 802BD160 AFB00010 */ sw $s0, 0x10($sp)
/* 324F74 802BD164 8C90014C */ lw $s0, 0x14c($a0)
/* 324F78 802BD168 10A00003 */ beqz $a1, .L802BD178
/* 324F7C 802BD16C 0200202D */ daddu $a0, $s0, $zero
/* 324F80 802BD170 0C03AE2A */ jal enable_partner_walking
/* 324F84 802BD174 24050001 */ addiu $a1, $zero, 1
.L802BD178:
/* 324F88 802BD178 0C03AE8F */ jal func_800EBA3C
/* 324F8C 802BD17C 0200202D */ daddu $a0, $s0, $zero
/* 324F90 802BD180 0C03AED0 */ jal func_800EBB40
/* 324F94 802BD184 0200202D */ daddu $a0, $s0, $zero
/* 324F98 802BD188 8E22031C */ lw $v0, 0x31c($s1)
/* 324F9C 802BD18C 24420001 */ addiu $v0, $v0, 1
/* 324FA0 802BD190 AE22031C */ sw $v0, 0x31c($s1)
/* 324FA4 802BD194 8FBF0018 */ lw $ra, 0x18($sp)
/* 324FA8 802BD198 8FB10014 */ lw $s1, 0x14($sp)
/* 324FAC 802BD19C 8FB00010 */ lw $s0, 0x10($sp)
/* 324FB0 802BD1A0 0000102D */ daddu $v0, $zero, $zero
/* 324FB4 802BD1A4 03E00008 */ jr $ra
/* 324FB8 802BD1A8 27BD0020 */ addiu $sp, $sp, 0x20

6
asm/nonmatchings/code_324F10/func_802BD1AC_324F10.s
View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD1AC_324F10
/* 324FBC 802BD1AC 03E00008 */ jr $ra
/* 324FC0 802BD1B0 24020002 */ addiu $v0, $zero, 2

20
asm/nonmatchings/code_324F10/func_802BD1B4.s
View File

@ -1,20 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD1B4
/* 324FC4 802BD1B4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 324FC8 802BD1B8 AFBF0014 */ sw $ra, 0x14($sp)
/* 324FCC 802BD1BC AFB00010 */ sw $s0, 0x10($sp)
/* 324FD0 802BD1C0 10A00003 */ beqz $a1, .L802BD1D0
/* 324FD4 802BD1C4 8C90014C */ lw $s0, 0x14c($a0)
/* 324FD8 802BD1C8 0C03BA65 */ jal func_800EE994
/* 324FDC 802BD1CC 0200202D */ daddu $a0, $s0, $zero
.L802BD1D0:
/* 324FE0 802BD1D0 0C03BA6E */ jal func_800EE9B8
/* 324FE4 802BD1D4 0200202D */ daddu $a0, $s0, $zero
/* 324FE8 802BD1D8 8FBF0014 */ lw $ra, 0x14($sp)
/* 324FEC 802BD1DC 8FB00010 */ lw $s0, 0x10($sp)
/* 324FF0 802BD1E0 0002102B */ sltu $v0, $zero, $v0
/* 324FF4 802BD1E4 03E00008 */ jr $ra
/* 324FF8 802BD1E8 27BD0018 */ addiu $sp, $sp, 0x18
/* 324FFC 802BD1EC 00000000 */ nop

5
include/functions.h
View File

@ -62,7 +62,10 @@ s32 func_800555E4(s32);
s32 osGetId();
// Partner
void enable_partner_flying(Npc* partner, s32 isFlying);
void func_800EBA3C(Npc* partner);
void func_800EBB40(Npc* partner);
void enable_partner_walking(Npc* partner, s32 val);
void enable_partner_flying(Npc* partner, s32 val);
void update_player_move_history(Npc* partner);
void func_800ED5D0(Npc* partner);

11
src/code_324F10.c
View File

@ -1,11 +0,0 @@
#include "common.h"
INCLUDE_ASM(s32, "code_324F10", func_802BD100_324F10);
INCLUDE_ASM(s32, "code_324F10", func_802BD114_324F10);
INCLUDE_ASM(s32, "code_324F10", func_802BD14C_324F10);
INCLUDE_ASM(s32, "code_324F10", func_802BD1AC_324F10);
INCLUDE_ASM(s32, "code_324F10", func_802BD1B4);

8
src/code_838b0_len_5900.c
View File

@ -57,15 +57,15 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", partner_suspend_ability_script);
INCLUDE_ASM(s32, "code_838b0_len_5900", partner_resume_ability_script);
INCLUDE_ASM(s32, "code_838b0_len_5900", enable_partner_walking);
INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_walking, Npc* partner, s32 val);
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBA3C);
INCLUDE_ASM(void, "code_838b0_len_5900", func_800EBA3C, Npc* partner);
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBB40);
INCLUDE_ASM(void, "code_838b0_len_5900", func_800EBB40, Npc* partner);
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBC74);
INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_flying, Npc* partner, s32 isFlying);
INCLUDE_ASM(void, "code_838b0_len_5900", enable_partner_flying, Npc* partner, s32 val);
INCLUDE_ASM(void, "code_838b0_len_5900", update_player_move_history, Npc* partner);

44
src/world_goombaria.c Normal file
View File

@ -0,0 +1,44 @@
#include "common.h"
void func_802BD100_324F10(Npc* npc) {
npc->collisionHeight = 24;
npc->collisionRadius = 20;
}
ApiStatus func_802BD114_324F10(ScriptInstance* script, s32 isInitialCall) {
s32 ownerID = script->ownerID;
if (isInitialCall) {
func_800EECC4(ownerID);
}
return func_800EECE8(ownerID) != 0;
}
ApiStatus func_802BD14C_324F10(ScriptInstance* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;
s32 ownerID = script->ownerID;
if (isInitialCall) {
enable_partner_walking(ownerID, TRUE);
}
func_800EBA3C(ownerID);
func_800EBB40(ownerID);
playerData->unk_2F4[PartnerId_GOOMBARIA]++;
return ApiStatus_BLOCK;
}
ApiStatus func_802BD1AC_324F10(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
ApiStatus func_802BD1B4(ScriptInstance* script, s32 isInitialCall) {
s32 ownerID = script->ownerID;
if (isInitialCall) {
func_800EE994(ownerID);
}
return func_800EE9B8(ownerID) != 0;
}

2
src/world_twink.c
View File

@ -25,7 +25,7 @@ ApiStatus func_802BD148_325070(ScriptInstance* script, s32 isInitialCall) {
update_player_move_history(ownerID);
func_800ED5D0(ownerID);
playerData->unk_2F4[11]++;
playerData->unk_2F4[PartnerId_TWINK]++;
return ApiStatus_BLOCK;
}

2
tools/splat.yaml
View File

@ -407,7 +407,7 @@ segments:
start: 0x324f10
vram: 0x802BD100
files:
- [0x324f10, "c"]
- [0x324f10, "c", "world_goombaria"]
- [0x325000, "bin"]
- name: code
type: code