mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 00:42:34 +01:00
Data improvement
This commit is contained in:
Ethan Roseman
parent
251cc995c5
commit
43f3a6fa5f
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -45,7 +45,7 @@ glabel D_8024EFD8
|
||||
.short 0x0050, 0x0041, 0x0026, 0x001E, 0x000A, 0x0000
|
||||
|
||||
glabel D_8024EFE4
|
||||
.byte 0x01, 0x01, 0x01, 0x01
|
||||
.short 0x0101, 0x0101
|
||||
|
||||
glabel D_8024EFE8
|
||||
.byte 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x11, 0x00, 0x25, 0x00, 0x3C, 0x00, 0x55, 0x00, 0x6E
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -3,7 +3,7 @@
|
||||
.section .data
|
||||
|
||||
glabel D_802BE880_3195D0
|
||||
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0x00000043, 0x00000001, func_802BD300_318050, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
||||
|
||||
glabel D_802BE89C_3195EC
|
||||
.word 0x802BE940, 0x00000043, 0x00000001, func_802BD338_318088, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BD758_3184A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BE4E8_319238, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
.section .data
|
||||
|
||||
glabel D_802BEA90_31B000
|
||||
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD1, 0x48, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0x00000043, 0x00000001, func_802BD148_3196B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
||||
|
||||
glabel D_802BEAAC_31B01C
|
||||
.word 0x802BEBC8, 0x00000043, 0x00000001, func_802BD180_3196F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BD660_319BD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BE8D4_31AE44, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
.section .data
|
||||
|
||||
glabel D_802BFE60_3239B0
|
||||
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD2, 0x9C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0x00000043, 0x00000001, func_802BD29C_320DEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
||||
|
||||
glabel D_802BFE7C_3239CC
|
||||
.word 0x802BFF30, 0x00000043, 0x00000001, func_802BD2D4_320E24, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BE724_322274, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BF4F0_323040, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BFBA0_3236F0
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
.section .data
|
||||
|
||||
glabel D_802BDFE0_324930
|
||||
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x2B, 0xD1, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0x00000043, 0x00000001, func_802BD130_323A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
||||
|
||||
glabel D_802BDFFC_32494C
|
||||
.word 0x802BE0C8, 0x00000043, 0x00000001, func_802BD168_323AB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BD694_323FE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802BDF08_324858, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
@ -177,10 +177,10 @@ glabel D_80077EB8
|
||||
.word 0x800A008A, 0x0032FFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00005FFF, 0x7FFF0000, 0x00013FFF, 0x5FFF0000, 0x00021FFF, 0x3FFF0000, 0x00030000, 0x1FFF0000, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel EnemyNpcHit
|
||||
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x02, 0x80, 0x04, 0x46, 0x00, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x01, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x03, 0x80, 0x04, 0x57, 0x34, 0x00, 0x00, 0x00, 0x07, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x01, 0x80, 0x09, 0x36, 0xDC, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x02, 0x80, 0x04, 0x58, 0xCC, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x36, 0x3C, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x36, 0x3C, 0x8A, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x05, 0x80, 0x2C, 0xDD, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x36, 0x3C, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
||||
|
||||
glabel EnemyNpcDefeat
|
||||
.byte 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x05, 0x80, 0x2C, 0xDD, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x02, 0x80, 0x04, 0x45, 0x7C, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x01, 0xFE, 0x36, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x01, 0x80, 0x04, 0x46, 0x2C, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x02, 0x80, 0x04, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x04, 0x80, 0x04, 0x56, 0x88, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00, 0x02, 0x80, 0x04, 0x43, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|
||||
|
||||
glabel D_80078160
|
||||
.short 0x001C, 0x0028
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -18,8 +18,8 @@ glabel func_802DED60
|
||||
/* 101E84 802DED94 2406000C */ addiu $a2, $zero, 0xc
|
||||
/* 101E88 802DED98 3C060194 */ lui $a2, 0x194
|
||||
/* 101E8C 802DED9C 34C63010 */ ori $a2, $a2, 0x3010
|
||||
/* 101E90 802DEDA0 3C048035 */ lui $a0, %hi(D_8034F800)
|
||||
/* 101E94 802DEDA4 2484F800 */ addiu $a0, $a0, %lo(D_8034F800)
|
||||
/* 101E90 802DEDA0 3C048035 */ lui $a0, %hi(gSpriteHeapPtr)
|
||||
/* 101E94 802DEDA4 2484F800 */ addiu $a0, $a0, %lo(gSpriteHeapPtr)
|
||||
/* 101E98 802DEDA8 8E020000 */ lw $v0, ($s0)
|
||||
/* 101E9C 802DEDAC 02510018 */ mult $s2, $s1
|
||||
/* 101EA0 802DEDB0 3C01802E */ lui $at, %hi(D_802E0C58)
|
||||
|
||||
@ -188,8 +188,8 @@ glabel func_802DF00C
|
||||
/* 102380 802DF290 1440FFF8 */ bnez $v0, .L802DF274
|
||||
/* 102384 802DF294 00000000 */ nop
|
||||
.L802DF298:
|
||||
/* 102388 802DF298 3C048035 */ lui $a0, %hi(D_8034F800)
|
||||
/* 10238C 802DF29C 2484F800 */ addiu $a0, $a0, %lo(D_8034F800)
|
||||
/* 102388 802DF298 3C048035 */ lui $a0, %hi(gSpriteHeapPtr)
|
||||
/* 10238C 802DF29C 2484F800 */ addiu $a0, $a0, %lo(gSpriteHeapPtr)
|
||||
/* 102390 802DF2A0 02C0282D */ daddu $a1, $s6, $zero
|
||||
/* 102394 802DF2A4 0C00A4B1 */ jal _heap_realloc
|
||||
/* 102398 802DF2A8 00C53023 */ subu $a2, $a2, $a1
|
||||
|
||||
@ -14,8 +14,8 @@ glabel func_802DF2D8
|
||||
/* 1023EC 802DF2FC 3C03802E */ lui $v1, %hi(D_802DF524)
|
||||
/* 1023F0 802DF300 8C63F524 */ lw $v1, %lo(D_802DF524)($v1)
|
||||
/* 1023F4 802DF304 00512821 */ addu $a1, $v0, $s1
|
||||
/* 1023F8 802DF308 3C048035 */ lui $a0, %hi(D_8034F800)
|
||||
/* 1023FC 802DF30C 2484F800 */ addiu $a0, $a0, %lo(D_8034F800)
|
||||
/* 1023F8 802DF308 3C048035 */ lui $a0, %hi(gSpriteHeapPtr)
|
||||
/* 1023FC 802DF30C 2484F800 */ addiu $a0, $a0, %lo(gSpriteHeapPtr)
|
||||
/* 102400 802DF310 10600003 */ beqz $v1, .L802DF320
|
||||
/* 102404 802DF314 AFBF0018 */ sw $ra, 0x18($sp)
|
||||
/* 102408 802DF318 3C048030 */ lui $a0, %hi(D_802FB800)
|
||||
|
||||
@ -47,16 +47,16 @@ glabel load_sprite
|
||||
/* 101C9C 802DEBAC 12C00008 */ beqz $s6, .L802DEBD0
|
||||
/* 101CA0 802DEBB0 26450004 */ addiu $a1, $s2, 4
|
||||
/* 101CA4 802DEBB4 8CA50000 */ lw $a1, ($a1)
|
||||
/* 101CA8 802DEBB8 3C048035 */ lui $a0, %hi(D_8034F800)
|
||||
/* 101CAC 802DEBBC 2484F800 */ addiu $a0, $a0, %lo(D_8034F800)
|
||||
/* 101CA8 802DEBB8 3C048035 */ lui $a0, %hi(gSpriteHeapPtr)
|
||||
/* 101CAC 802DEBBC 2484F800 */ addiu $a0, $a0, %lo(gSpriteHeapPtr)
|
||||
/* 101CB0 802DEBC0 0C00A459 */ jal _heap_malloc_tail
|
||||
/* 101CB4 802DEBC4 00000000 */ nop
|
||||
/* 101CB8 802DEBC8 080B7AFA */ j .L802DEBE8
|
||||
/* 101CBC 802DEBCC 0040882D */ daddu $s1, $v0, $zero
|
||||
.L802DEBD0:
|
||||
/* 101CC0 802DEBD0 8CA50000 */ lw $a1, ($a1)
|
||||
/* 101CC4 802DEBD4 3C048035 */ lui $a0, %hi(D_8034F800)
|
||||
/* 101CC8 802DEBD8 2484F800 */ addiu $a0, $a0, %lo(D_8034F800)
|
||||
/* 101CC4 802DEBD4 3C048035 */ lui $a0, %hi(gSpriteHeapPtr)
|
||||
/* 101CC8 802DEBD8 2484F800 */ addiu $a0, $a0, %lo(gSpriteHeapPtr)
|
||||
/* 101CCC 802DEBDC 0C00A41B */ jal _heap_malloc
|
||||
/* 101CD0 802DEBE0 00000000 */ nop
|
||||
/* 101CD4 802DEBE4 0040882D */ daddu $s1, $v0, $zero
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user