papermario/ver/us/asm/data/battle/star/time_out/794240.data.s
Ethan Roseman 3315d6010f
Splat refactor (#257)
* all non-world rodata migrated

* data disasm

* kinda working

* updated yaml

* bloop

* linker header

* configure 2.0

* bin

* mass rename to remove code_

* pause rename

* battle partner stuff

* whew

* more renames

* more renames

* more renaming

* it builds!

* updates

* remove main prefix

* one more thing

* crc, yay0

* .data, .rodata, .bss

* img

* dead_atan2

* it buildsgit add -A

* split battle/partner/6FAD10

* rm &s on sleepy_sheep syms

* sha1sum ninja rule description

* OK but commented out PaperMarioMapFS and PaperMarioNpcSprites

* uncomment

* fix mapfs

* match func_8003CFB4

* .

* clean up and name npc_iter_no_op

* npc.c

* enable cc warnings

* name npc_find_near

* use singular options.asset_path

* smores

* cc_dsl only when needed

* kinda fix configure for splat refactor2

* ok!

* new msg format

* remove old msg format docs

* slight bug fixes, splat adjustment

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "cfc140bb76"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "cfc140bb76"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "85349befcd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "85349befcd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Update symbol addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "a44631e194"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "a44631e194"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-04-13 16:47:52 +09:00

7 lines
13 KiB
ArmAsm

.include "macro.inc"
.section .data
glabel D_802A1520_794240
.word 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_FadeBackgroundToBlack, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001001F, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x0001002A, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000010, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A8A80, 0x00000043, 0x00000005, SetGoalPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, RunToGoal, 0x00000100, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000241, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc2, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x00002051, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0x00000100, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc2, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000000, 0x00000043, 0x00000002, func_8024E664, 0x00000049, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002041, 0x00000043, 0x00000003, CreateNpc, 0x00000064, 0xFE363C80, 0x00000043, 0x00000001, battle_star_time_out_SetNpcCollision32, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000064, 0x00040000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000064, 0xFFFFFFB5, 0x00000096, 0x00000000, 0x00000043, 0x00000004, SetNpcEffect, 0x00000064, 0x00000000, 0x00000005, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc3, 0xFFFFFFB5, 0x000000A7, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000027, 0x00000002, 0xFE363C80, 0x00000043, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseCamPreset, 0x00000045, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, SetForegroundModelsVisible, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002047, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UseCamPreset, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x00002045, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, battle_star_time_out_UnkStarFunc4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x000002D0, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000064, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000043, 0x00000008, NpcFlyTo, 0x00000064, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000064, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010005, 0x00000043, 0x00000002, PlayerRunToGoal, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000000, 0x00000000, 0x00010002, 0x00000012, 0x00000000, 0x00000043, 0x00000001, battle_star_time_out_UnkBackgroundFunc, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9A80, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000003, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000002, func_802A1494_7941B4, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802A1520_794240, 0x00000025, 0x00000002, 0xFE363C80, 0x001E0001, 0x00000046, 0x00000001, 0x802A1C50, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000064, 0x001E0002, 0x00000008, 0x00000001, 0x00000010, 0x00000043, 0x00000002, UseCamPreset, 0x00000003, 0x00000043, 0x00000002, PlaySound, 0x00000246, 0x00000043, 0x0000000F, PlayEffect, 0x00000062, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xF24A7E80, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000000, 0x00000246, 0x00000008, 0x00000001, 0x000000C8, 0x00000043, 0x00000001, InitTargetIterator, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000006, ItemCheckHit, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ItemDamageEnemy, 0xFE363C80, 0x70000000, 0x80200564, 0x00000000, 0x00000020, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ChooseNextTarget, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_80276EFC, 0x00000046, 0x00000001, 0x802A1E5C, 0x00000046, 0x00000001, 0x802A22AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000