mirror of
https://github.com/pmret/papermario.git
synced 2024-09-20 08:21:48 +02:00
1c64f15db1
* Make a 224 functions show up in the elf * fix up appendGfx_model (as an example) * Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only * Decompile even more misc battle map funcs (#531) * decompile misc battle map funcs * fix warnings * Decompile misc battle map funcs (#528) * . * . * resolve issues * Update fx_api.c * Update fx_api.c * Make a 224 functions show up in the elf * fix up appendGfx_model (as an example) * Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only * Fix merge issue Co-authored-by: Ethan Roseman <ethteck@gmail.com> Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
46 lines
8.8 KiB
ArmAsm
46 lines
8.8 KiB
ArmAsm
.include "macro.inc"
|
|
|
|
.section .data
|
|
|
|
dlabel D_802380D0_714DC0
|
|
.word 0x00000001, 0x00200008, 0x00000012, 0x00200000, 0x00000000
|
|
|
|
dlabel D_802380E4_714DD4
|
|
.word 0x00000001, 0x00000000, 0x00000000
|
|
|
|
dlabel D_802380F0_714DE0
|
|
.word 0x00000001, 0x00000064, 0x00000002, 0x00000064, 0x00000006, 0x00000064, 0x00000009, 0x00000064, 0x00000007, 0x00000064, 0x00000004, 0x00000064, 0x00000003, 0x00000064, 0x0000000B, 0x00000064, 0x00000005, 0x00000064, 0x0000000A, 0x00000064, 0x00000008, 0x00000064, 0x0000001F, 0x00000000, 0x00000020, 0x00000000, 0x00000025, 0x00000000, 0x00000022, 0x00000000, 0x00000024, 0x00000000, 0x00000023, 0x00000000, 0x00000021, 0x00000000, 0x00000026, 0x00000000, 0x00000027, 0x00000000, 0x00000029, 0x00000000, 0x00000000
|
|
|
|
dlabel D_8023819C_714E8C
|
|
.word 0x00000000, 0x01000000, 0x000000FF, D_802380D0_714DC0, D_802380E4_714DD4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00400000, 0x00770063, 0x00010000, D_8023819C_714E8C, D_802381E8_714ED8, D_802380F0_714DE0, 0x00000000, 0x00045000, 0x14140000, 0xF61E0D1F
|
|
|
|
dlabel D_802381E8_714ED8
|
|
.word 0x00000043, 0x00000003, BindTakeTurn, 0xFFFFFF81, D_802384C4_7151B4, 0x00000043, 0x00000003, BindIdle, 0xFFFFFF81, D_802382FC_714FEC, 0x00000043, 0x00000003, BindHandleEvent, 0xFFFFFF81, D_80238338_715028, 0x00000043, 0x00000003, BindNextTurn, 0xFFFFFF81, D_80238694_715384, 0x00000043, 0x00000001, func_80238000_714CF0, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00200000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, D_802380E4_714DD4, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000009, 0x00000043, 0x00000008, ModifyActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_802382F8_714FE8
|
|
.word 0x00000000
|
|
|
|
dlabel D_802382FC_714FEC
|
|
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80238028_714D18, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_80238338_715028
|
|
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C0005, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200020, 0x00000046, 0x00000001, DoNormalHit, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0002, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000C0005, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200008, 0x00000046, 0x00000001, DoImmune, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x000A0002, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_802384C4_7151B4
|
|
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802386A4_715394, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80238558_715248, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802385A4_715294, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_802385E0_7152D0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_80238558_715248
|
|
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200005, 0x00000025, 0x00000002, 0xFE363C82, 0x00200005, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_802385A4_715294
|
|
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200008, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_802385E0_7152D0
|
|
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00200008, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00200001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_80238694_715384
|
|
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
|
|
|
|
dlabel D_802386A4_715394
|
|
.word 0x00000043, 0x00000003, EnableIdleScript, 0x00000100, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000100, 0x00000001, 0x0000207F, 0x000002AA, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000034, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000001, InitTargetIterator, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00200008, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000100, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000000, 0xFFFFFFF6, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00200001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000034, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x0020000E, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000005, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetActorSounds, 0x00000100, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x000003E2, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000034, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFD8, 0x0000000F, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000014, 0xFFFFFFEC, 0x00000006, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C8F, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000003, EnableActorBlur, 0x00000100, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000207E, 0x00000043, 0x00000002, SetGoalToTarget, 0x00000100, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00200008, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C8F, 0x0000000D, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000043, 0x00000007, PartnerDamageEnemy, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000012, 0x00000000, 0x00000043, 0x00000007, PartnerDamageEnemy, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0xFE363C8F, 0x00000030, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000003, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000005, AddGoalPos, 0x00000100, 0x00000096, 0x00000064, 0x00000000, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x0000000F, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableActorBlur, 0x00000100, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetActorVar, 0x00000200, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0x00000100, 0x00000001, 0x0000207F, 0x000002AA, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00200008, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000005, FlyToGoal, 0x00000100, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000003, EnableIdleScript, 0x00000100, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
|