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

Some data migration

Browse Source
This commit is contained in:
Ethan Roseman 2021-01-21 01:14:27 +09:00
parent 78411d2270
commit b8ddf7761a
7 changed files with 54 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
asm/data/world/script_api/7E4D00.data.s Normal file
View File

File diff suppressed because one or more lines are too long

17
asm/nonmatchings/world/script_api/7E0E80/func_80280B44.s generated
View File

@ -1,17 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80280B44
/* 7E19C4 80280B44 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 7E19C8 80280B48 AFBF0010 */ sw $ra, 0x10($sp)
/* 7E19CC 80280B4C 0C03C54E */ jal func_800F1538
/* 7E19D0 80280B50 00000000 */ nop
/* 7E19D4 80280B54 0C03A640 */ jal func_800E9900
/* 7E19D8 80280B58 00000000 */ nop
/* 7E19DC 80280B5C 0C03A631 */ jal func_800E98C4
/* 7E19E0 80280B60 00000000 */ nop
/* 7E19E4 80280B64 0C03A5EE */ jal func_800E97B8
/* 7E19E8 80280B68 00000000 */ nop
/* 7E19EC 80280B6C 8FBF0010 */ lw $ra, 0x10($sp)
/* 7E19F0 80280B70 03E00008 */ jr $ra
/* 7E19F4 80280B74 27BD0018 */ addiu $sp, $sp, 0x18

7
asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s generated
View File

@ -1,6 +1,13 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
glabel jtbl_80286500_7E7380
.word L80281E18_7E2C98, L80281F04_7E2D84, L80282000_7E2E80, L80282104_7E2F84, L80282174_7E2FF4, L80281E80_7E2D00, L80281F74_7E2DF4, L80282074_7E2EF4
.section .text
glabel MakeDoorAdvanced
/* 7E2B2C 80281CAC 27BDFFA8 */ addiu $sp, $sp, -0x58
/* 7E2B30 80281CB0 AFB10034 */ sw $s1, 0x34($sp)

7
src/world/script_api/7E0E80.c
View File

@ -38,7 +38,12 @@ INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280954);
INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280AC4);
INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B44);
void func_80280B44(void) {
func_800F1538();
func_800E9900();
func_800E98C4();
func_800E97B8();
}
INCLUDE_ASM(s32, "world/script_api/7E0E80", func_80280B78);

3
tools/splat.yaml
View File

@ -2653,7 +2653,8 @@ segments:
- [0x7E2AA0, c]
- [0x7E3700, c]
- [0x7E4690, c]
- [0x7e4d00, bin]
- [0x7E4D00, data]
- [0x7E7380, .rodata, world/script_api/7E2AA0]
- name: world/area_mac/machi/
type: code
overlay: True

2
undefined_syms.txt
View File

@ -101,7 +101,7 @@ D_802E91F0 = 0x802E91F0;
D_802E9170 = 0x802E9170;
D_802E9270 = 0x802E9270;
D_802E92B0 = 0x802E92B0;
D_802E99DC = 0x802E99DC;
D_00E32420 = 0x00E32420;
D_00E35670 = 0x00E35670;

76
undefined_syms_auto.txt
View File

@ -699,7 +699,6 @@ D_8015130C = 0x8015130C;
D_8015130E = 0x8015130E;
D_80151310 = 0x80151310;
D_80151314 = 0x80151314;
gEntityModelCount = 0x80151318;
D_8015131C = 0x8015131C;
D_80151324 = 0x80151324;
D_80151328 = 0x80151328;
@ -772,9 +771,6 @@ D_80153AA8 = 0x80153AA8;
D_80153AE8 = 0x80153AE8;
D_80153B28 = 0x80153B28;
D_80153B68 = 0x80153B68;
gWorldEntityModelList = 0x80153B70;
gBattleEntityModelList = 0x80153F70;
gCurrentEntityModelList = 0x80154370;
D_80154374 = 0x80154374;
D_80154378 = 0x80154378;
D_8015437C = 0x8015437C;
@ -2739,16 +2735,6 @@ D_80282EE9 = 0x80282EE9;
D_80282EEA = 0x80282EEA;
D_80283238 = 0x80283238;
D_80283370 = 0x80283370;
D_80283E80 = 0x80283E80;
D_80283EB0 = 0x80283EB0;
D_80283EE0 = 0x80283EE0;
D_80283F2C = 0x80283F2C;
D_80283F58 = 0x80283F58;
D_80284034 = 0x80284034;
D_802847D4 = 0x802847D4;
D_80284F80 = 0x80284F80;
D_80285640 = 0x80285640;
D_80285674 = 0x80285674;
D_80286520 = 0x80286520;
D_80286524 = 0x80286524;
D_80286528 = 0x80286528;
@ -3456,14 +3442,6 @@ D_802E0C70 = 0x802E0C70;
D_802E98BC = 0x802E98BC;
D_802E98E0 = 0x802E98E0;
D_802E9904 = 0x802E9904;
D_802E99DC = 0x802E99DC;
D_802E9C8C = 0x802E9C8C;
D_802E9CB0 = 0x802E9CB0;
D_802E9CD4 = 0x802E9CD4;
D_802E9CF8 = 0x802E9CF8;
D_802E9D1C = 0x802E9D1C;
D_802E9D40 = 0x802E9D40;
D_802E9D64 = 0x802E9D64;
D_802E9E54 = 0x802E9E54;
D_802E9E80 = 0x802E9E80;
D_802EA07C = 0x802EA07C;
@ -3491,55 +3469,6 @@ D_802EACC8 = 0x802EACC8;
D_802EAD7C = 0x802EAD7C;
D_802EAE7C = 0x802EAE7C;
D_802EAFDC = 0x802EAFDC;
D_802EB000 = 0x802EB000;
D_802EB008 = 0x802EB008;
D_802EB010 = 0x802EB010;
D_802EB028 = 0x802EB028;
D_802EB030 = 0x802EB030;
D_802EB038 = 0x802EB038;
D_802EB040 = 0x802EB040;
D_802EB048 = 0x802EB048;
D_802EB050 = 0x802EB050;
D_802EB058 = 0x802EB058;
D_802EB060 = 0x802EB060;
D_802EB068 = 0x802EB068;
D_802EB070 = 0x802EB070;
D_802EB088 = 0x802EB088;
D_802EB090 = 0x802EB090;
D_802EB098 = 0x802EB098;
D_802EB0A0 = 0x802EB0A0;
D_802EB0A8 = 0x802EB0A8;
D_802EB0B0 = 0x802EB0B0;
D_802EB0B8 = 0x802EB0B8;
D_802EB0C0 = 0x802EB0C0;
D_802EB0D8 = 0x802EB0D8;
D_802EB0E0 = 0x802EB0E0;
D_802EB0E8 = 0x802EB0E8;
D_802EB0F0 = 0x802EB0F0;
D_802EB0F8 = 0x802EB0F8;
D_802EB100 = 0x802EB100;
D_802EB108 = 0x802EB108;
D_802EB110 = 0x802EB110;
D_802EB118 = 0x802EB118;
D_802EB120 = 0x802EB120;
D_802EB128 = 0x802EB128;
D_802EB130 = 0x802EB130;
D_802EB138 = 0x802EB138;
D_802EB140 = 0x802EB140;
D_802EB148 = 0x802EB148;
D_802EB150 = 0x802EB150;
D_802EB158 = 0x802EB158;
D_802EB160 = 0x802EB160;
D_802EB198 = 0x802EB198;
D_802EB1D0 = 0x802EB1D0;
D_802EB1D8 = 0x802EB1D8;
D_802EB1E0 = 0x802EB1E0;
D_802EB1E8 = 0x802EB1E8;
D_802EB1F0 = 0x802EB1F0;
D_802EB1F8 = 0x802EB1F8;
D_802EB200 = 0x802EB200;
D_802EB208 = 0x802EB208;
D_802EB210 = 0x802EB210;
D_802EB270 = 0x802EB270;
D_802EB278 = 0x802EB278;
D_802EB290 = 0x802EB290;
@ -4626,6 +4555,7 @@ gBadgeMenuSelectedItemID = 0x80270380;
gBadgeMenuTargetScrollPos = 0x80270390;
gBattleDynamicEntityList = 0x801543E0;
gBattleEntityList = 0x801513F8;
gBattleEntityModelList = 0x80153F70;
gBattleMapFlags = 0x802DBD34;
gBattleMapVars = 0x802DBCE8;
gBattleMeshAnimationList = 0x802DADB0;
@ -4645,6 +4575,7 @@ gCurrentDoorSoundsSet = 0x80151340;
gCurrentDynamicEntityListPtr = 0x80154420;
gCurrentEncounter = 0x800B0F10;
gCurrentEntityListPtr = 0x80151470;
gCurrentEntityModelList = 0x80154370;
gCurrentMeshAnimationListPtr = 0x802DAE30;
gCurrentModelListPtr = 0x801512CC;
gCurrentModelSpecialDlsPtr = 0x801512E8;
@ -4660,6 +4591,7 @@ gCurtainFadeGoal = 0x8009BA9C;
gCurtainScale = 0x8009BA90;
gCurtainScaleGoal = 0x8009BA94;
gDisplayContext = 0x8009A674;
gEntityModelCount = 0x80151318;
gGameState = 0x8009A600;
gGameStatusPtr = 0x8007419C;
gItemMenuCurrentPage = 0x802704C8;
@ -4720,6 +4652,7 @@ gUIPanels = 0x80159D50;
gUIStatus = 0x8010EF58;
gWorldDynamicEntityList = 0x801543A0;
gWorldEntityList = 0x80151380;
gWorldEntityModelList = 0x80153B70;
gWorldMapFlags = 0x802DBC70;
gWorldMapVars = 0x802DBCA8;
gWorldMeshAnimationList = 0x802DADF0;
@ -5018,7 +4951,6 @@ jtbl_802628A0_823120 = 0x802628A0;
jtbl_80263438_C20CB8 = 0x80263438;
jtbl_80263488_C20D08 = 0x80263488;
jtbl_80263520_C20DA0 = 0x80263520;
jtbl_80286500_7E7380 = 0x80286500;
jtbl_802A25A0_72DB50 = 0x802A25A0;
jtbl_802A2DB0_7330B0 = 0x802A2DB0;
jtbl_802A3790_799750 = 0x802A3790;