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

Work on Pointers (#610)

Browse Source
This commit is contained in:
JoshDuMan 2022-01-08 00:47:52 -05:00 committed by GitHub
parent d684991270
commit 5d5106b39c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 2245 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/script_api/battle.h
View File

@ -311,6 +311,7 @@ ApiStatus func_8026E020(Evt* script, s32 isInitialCall);
ApiStatus GetActionResult(Evt* script, s32 isInitialCall);
ApiStatus SetBattleState(Evt* script, s32 isInitialCall);
ApiStatus func_8027D434(Evt* script, s32 isInitialCall);
ApiStatus func_8026F1A0(Evt* script, s32 isInitialCall);
ApiStatus PlayLoopingSoundAtActor(Evt* script, s32 isInitialCall);
ApiStatus StopLoopingSoundAtActor(Evt* script, s32 isInitialCall);
ApiStatus func_8026ED20(Evt* script, s32 isInitialCall);
@ -350,16 +351,30 @@ extern EvtSource DoFreezeHit;
extern EvtSource DoShrinkHit;
extern EvtSource ForceNextTarget;
extern EvtSource DoNormalHit;
extern EvtSource D_80294AFC;
extern EvtSource D_80294FE4;
extern EvtSource D_80294C68;
extern EvtSource D_80295EC4;
extern EvtSource D_80295744;
extern EvtSource D_8029621C;
extern EvtSource D_802977BC;
extern EvtSource D_80296014;
extern EvtSource D_80297814;
extern EvtSource D_802976E8;
extern EvtSource D_8029C12C;
extern EvtSource DoBurnHit;
extern EvtSource DoShockHit;
extern EvtSource D_80294720;
extern EvtSource DoImmune;
extern EvtSource DoDeath;
extern EvtSource Collapse;
extern EvtSource DoScareAway;
extern EvtSource DoSpinSmashHit;
extern EvtSource D_8029BBB4;
extern EvtSource DoJumpBack;
extern EvtSource DoReturnHome;
extern EvtSource DoRecover;
extern EvtSource D_8029C0A4;
extern EvtSource DoAirLift;
extern EvtSource DoBlowAway;
extern EvtSource Rumble_1;

2
include/variables.h
View File

@ -373,7 +373,7 @@ extern s16 gCurrentCamID;
extern HeapNode gSpriteHeapPtr;
extern s32 D_8029C890[12][5];
extern s32 D_8029C890[10][5];
// Heap?
extern s32 D_8038F800;

51
src/19FAF0.c
View File

@ -33,6 +33,52 @@ INCLUDE_ASM(ApiStatus, "19FAF0", func_80271484, Evt* script, s32 isInitialCall);
ApiStatus func_80271588(Evt* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "19FAF0", func_80271588, Evt* script, s32 isInitialCall);
EvtSource DoSleepHit = {
EVT_CALL(func_80271210)
EVT_RETURN
EVT_END
};
EvtSource DoDizzyHit = {
EVT_CALL(func_80271258)
EVT_RETURN
EVT_END
};
EvtSource DoParalyzeHit = {
EVT_CALL(func_802712A0)
EVT_RETURN
EVT_END
};
EvtSource DoPoisonHit = {
EVT_CALL(func_80271328)
EVT_RETURN
EVT_END
};
EvtSource DoStopHit = {
EVT_CALL(func_802713B0)
EVT_RETURN
EVT_END
};
EvtSource DoFreezeHit = {
EVT_CALL(func_8027143C)
EVT_WAIT_FRAMES(8)
EVT_CALL(func_8027143C)
EVT_WAIT_FRAMES(15)
EVT_CALL(func_80271484)
EVT_RETURN
EVT_END
};
EvtSource DoShrinkHit = {
EVT_CALL(func_80271588)
EVT_RETURN
EVT_END
};
void dispatch_event_player(s32 eventType) {
Actor* player = gBattleStatus.playerActor;
Evt* oldOnHitScript;
@ -44,7 +90,7 @@ void dispatch_event_player(s32 eventType) {
oldOnHitScript = player->onHitScript;
oldOnHitID = player->onHitID;
eventScript = start_script(HandleEvent_Player, 10, 0x20);
eventScript = start_script(&HandleEvent_Player, 10, 0x20);
player->onHitScript = eventScript;
player->onHitID = eventScript->id;
eventScript->owner1.actor = NULL;
@ -70,7 +116,7 @@ void dispatch_event_player_continue_turn(s32 eventType) {
oldOnHitScript = player->onHitScript;
oldOnHitID = player->onHitID;
eventScript = start_script(HandleEvent_Player, 10, 0x20);
eventScript = start_script(&HandleEvent_Player, 10, 0x20);
player->onHitScript = eventScript;
player->onHitID = eventScript->id;
eventScript->owner1.actor = NULL;
@ -84,6 +130,7 @@ INCLUDE_ASM(s32, "19FAF0", calc_player_test_enemy);
INCLUDE_ASM(s32, "19FAF0", calc_player_damage_enemy);
s32 dispatch_damage_event_player(s32, s32, s32);
INCLUDE_ASM(s32, "19FAF0", dispatch_damage_event_player);
s32 dispatch_damage_event_player_0(s32 damageAmount, s32 event) {

2
src/1A5830.c
View File

@ -4,7 +4,7 @@
#include "effects.h"
#include "hud_element.h"
extern s32 D_802946E0[];
s32 D_802946E0[] = { 100, 100, 100, 110, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130 };
s32 dispatch_damage_event_actor_1(Actor* actor, s32 damageAmount, s32 event);
s32 func_80263230(Actor*, Actor*);

2041
src/1AF120.c
View File

File diff suppressed because it is too large Load Diff

54
src/1AF230.c
View File

@ -1,4 +1,13 @@
#include "common.h"
#include "ld_addrs.h"
#include "sprite/npc/battle_goombario.h"
#include "sprite/npc/battle_kooper.h"
#include "sprite/npc/battle_bombette.h"
#include "sprite/npc/battle_parakarry.h"
#include "sprite/npc/battle_watt.h"
#include "sprite/npc/battle_sushie.h"
#include "sprite/npc/battle_lakilester.h"
#include "sprite/npc/battle_bow.h"
typedef struct StarPowerEntry {
/* 0x04 */ void* dmaStart;
@ -7,8 +16,6 @@ typedef struct StarPowerEntry {
/* 0x10 */ Bytecode* init;
} StarPowerEntry; // size = 0x14
extern StarPowerEntry D_8029C7D0[13];
typedef struct StarPowerDesc {
/* 0x00 */ s8 starPoints;
/* 0x01 */ s8 unk_01;
@ -22,6 +29,47 @@ typedef struct StarPowerDesc {
extern StarPowerDesc D_8008F071[];
extern EvtSource battle_star_focus_usePower;
extern EvtSource battle_star_refresh_usePower;
extern EvtSource battle_star_lullaby_usePower;
extern EvtSource battle_star_star_storm_usePower;
extern EvtSource battle_star_chill_out_usePower;
extern EvtSource battle_star_smooch_usePower;
extern EvtSource battle_star_time_out_usePower;
extern EvtSource battle_star_up_and_away_usePower;
extern EvtSource battle_star_star_beam_usePower;
extern EvtSource battle_star_peach_beam_usePower;
extern EvtSource battle_star_peach_focus_usePower;
extern EvtSource battle_star_peach_dash_usePower;
StarPowerEntry D_8029C7D0[] = {
{ battle_star_focus_ROM_START, battle_star_focus_ROM_END, battle_star_focus_VRAM, battle_star_focus_usePower, },
{ battle_star_refresh_ROM_START, battle_star_refresh_ROM_END, battle_star_refresh_VRAM, battle_star_refresh_usePower, },
{ battle_star_lullaby_ROM_START, battle_star_lullaby_ROM_END, battle_star_lullaby_VRAM, battle_star_lullaby_usePower, },
{ battle_star_star_storm_ROM_START, battle_star_star_storm_ROM_END, battle_star_star_storm_VRAM, battle_star_star_storm_usePower, },
{ battle_star_chill_out_ROM_START, battle_star_chill_out_ROM_END, battle_star_chill_out_VRAM, battle_star_chill_out_usePower, },
{ battle_star_smooch_ROM_START, battle_star_smooch_ROM_END, battle_star_smooch_VRAM, battle_star_smooch_usePower, },
{ battle_star_time_out_ROM_START, battle_star_time_out_ROM_END, battle_star_time_out_VRAM, battle_star_time_out_usePower, },
{ battle_star_up_and_away_ROM_START, battle_star_up_and_away_ROM_END, battle_star_up_and_away_VRAM, battle_star_up_and_away_usePower, },
{ battle_star_star_beam_ROM_START, battle_star_star_beam_ROM_END, battle_star_star_beam_VRAM, battle_star_star_beam_usePower, },
{ battle_star_peach_beam_ROM_START, battle_star_peach_beam_ROM_END, battle_star_peach_beam_VRAM, battle_star_peach_beam_usePower, },
{ battle_star_peach_focus_ROM_START, battle_star_peach_focus_ROM_END, battle_star_peach_focus_VRAM, battle_star_peach_focus_usePower, },
{ battle_star_peach_dash_ROM_START, battle_star_peach_dash_ROM_END, battle_star_peach_dash_VRAM, battle_star_peach_dash_usePower, },
};
s32 D_8029C890[10][5] = {
{ 0x1001F, 0x1002C, 0x1002A, 0x10005, 0, }, // Junk? These ID's should be in world_goombario, but don't exist.
{ NPC_ANIM_battle_goombario_default_run, NPC_ANIM_battle_goombario_default_sleep, NPC_ANIM_battle_goombario_default_sleep, NPC_ANIM_battle_goombario_default_run, NPC_ANIM_battle_goombario_default_idle, },
{ NPC_ANIM_battle_kooper_Palette_00_Anim_6, NPC_ANIM_battle_kooper_Palette_00_Anim_1B, NPC_ANIM_battle_kooper_Palette_00_Anim_1B, NPC_ANIM_battle_kooper_Palette_00_Anim_6, NPC_ANIM_battle_kooper_Palette_00_Anim_4, },
{ NPC_ANIM_battle_bombette_Palette_00_Anim_8, NPC_ANIM_battle_bombette_Palette_00_Anim_1D, NPC_ANIM_battle_bombette_Palette_00_Anim_1D, NPC_ANIM_battle_bombette_Palette_00_Anim_8, NPC_ANIM_battle_bombette_Palette_00_Anim_4, },
{ NPC_ANIM_battle_parakarry_Palette_00_Anim_3, NPC_ANIM_battle_parakarry_Palette_00_Anim_18, NPC_ANIM_battle_parakarry_Palette_00_Anim_18, NPC_ANIM_battle_parakarry_Palette_00_Anim_3, NPC_ANIM_battle_parakarry_Palette_00_Anim_1, },
{}, // Goompa
{ NPC_ANIM_battle_watt_Palette_00_Anim_3, NPC_ANIM_battle_watt_Palette_00_Anim_A, NPC_ANIM_battle_watt_Palette_00_Anim_A, NPC_ANIM_battle_watt_Palette_00_Anim_3, NPC_ANIM_battle_parakarry_Palette_00_Anim_1, },
{ NPC_ANIM_battle_sushie_Palette_00_Anim_3, NPC_ANIM_battle_sushie_Palette_00_Anim_13, NPC_ANIM_battle_sushie_Palette_00_Anim_13, NPC_ANIM_battle_sushie_Palette_00_Anim_3, NPC_ANIM_battle_sushie_Palette_00_Anim_1, },
{ NPC_ANIM_battle_lakilester_Palette_00_Anim_3, NPC_ANIM_battle_lakilester_Palette_00_Anim_9, NPC_ANIM_battle_lakilester_Palette_00_Anim_9, NPC_ANIM_battle_lakilester_Palette_00_Anim_3, NPC_ANIM_battle_lakilester_Palette_00_Anim_1, },
{ NPC_ANIM_battle_bow_Palette_00_Anim_3, NPC_ANIM_battle_bow_Palette_00_Anim_13, NPC_ANIM_battle_bow_Palette_00_Anim_13, NPC_ANIM_battle_bow_Palette_00_Anim_3, NPC_ANIM_battle_bow_Palette_00_Anim_1, },
};
ApiStatus LoadStarPowerScript(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
PlayerData* playerData = &gPlayerData;
@ -31,6 +79,6 @@ ApiStatus LoadStarPowerScript(Evt* script, s32 isInitialCall) {
selectedItemID = battleStatus->selectedItemID;
dma_copy((&D_8029C7D0[selectedItemID])->dmaStart, (&D_8029C7D0[selectedItemID])->dmaEnd,
(&D_8029C7D0[selectedItemID])->dmaDest);
script->varTable[0] = (&D_8029C7D0[selectedItemID])->init;
script->varTable[0] = (s32) (&D_8029C7D0[selectedItemID])->init;
return ApiStatus_DONE2;
}

2
src/actor_api.c
View File

@ -2724,7 +2724,7 @@ ApiStatus UseIdleAnimation(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
s32 func_8026F1A0(Evt* script, s32 isInitialCall) {
ApiStatus func_8026F1A0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++);
s32 temp_s0_3 = evt_get_variable(script, *args++);

2
src/battle/area_mac/actor/chan.c
View File

@ -706,7 +706,7 @@ EvtSource N(takeTurn_Chan) = {
EVT_SET_CONST(LW(0), 0x00000001)
EVT_SET_CONST(LW(1), NPC_ANIM_chan_Palette_00_Anim_2)
EVT_SET_CONST(LW(2), NPC_ANIM_chan_Palette_00_Anim_1)
EVT_EXEC_WAIT(0x8029BBB4)
EVT_EXEC_WAIT(D_8029BBB4)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(SetActorVar, -127, 8, 1)
EVT_CALL(SetTargetOffset, -127, 1, 0, 16)

8
src/battle/area_nok/actor/fuzzy.c
View File

@ -161,7 +161,7 @@ EvtSource N(handleEvent_802221FC) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_SET_CONST(LW(0), 0x00000001)
EVT_SET_CONST(LW(1), NPC_ANIM_fuzzy_Palette_00_Anim_3)
EVT_EXEC_WAIT(0x8029C0A4)
EVT_EXEC_WAIT(D_8029C0A4)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6005859375))
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CASE_EQ(38)
@ -251,7 +251,7 @@ EvtSource N(takeTurn_80222860) = {
EVT_SET(LW(1), 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.80078125))
EVT_EXEC_WAIT(0x8029C12C)
EVT_EXEC_WAIT(D_8029C12C)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_fuzzy_Palette_00_Anim_1)
EVT_LABEL(100)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 10, 0)
@ -302,7 +302,7 @@ EvtSource N(takeTurn_80222860) = {
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.80078125))
EVT_EXEC_WAIT(0x8029C12C)
EVT_EXEC_WAIT(D_8029C12C)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(EnableIdleScript, ACTOR_SELF, 1)
@ -435,7 +435,7 @@ EvtSource N(takeTurn_80222860) = {
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.80078125))
EVT_EXEC_WAIT(0x8029C12C)
EVT_EXEC_WAIT(D_8029C12C)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_fuzzy_Palette_00_Anim_1)
EVT_END_CASE_GROUP
EVT_END_SWITCH

30
src/battle/partner/goombario.c
View File

@ -341,56 +341,56 @@ EvtSource N(handleEvent_80239360) = {
EVT_CASE_OR_EQ(10)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_SET_CONST(EVT_VAR(2), 0x9000A)
EVT_EXEC_WAIT(0x802977BC)
EVT_EXEC_WAIT(D_802977BC)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_EXEC_WAIT(0x80296014)
EVT_EXEC_WAIT(D_80296014)
EVT_END_CASE_GROUP
EVT_CASE_OR_EQ(23)
EVT_CASE_OR_EQ(25)
EVT_CALL(PlaySoundAtActor, 256, 8332)
EVT_SET_CONST(EVT_VAR(0), 0x1)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_EXEC_WAIT(0x80297814)
EVT_EXEC_WAIT(D_80297814)
EVT_END_CASE_GROUP
EVT_CASE_EQ(42)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_SET(EVT_VAR(2), 12)
EVT_EXEC_WAIT(0x80294FE4)
EVT_EXEC_WAIT(D_80294FE4)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_EXEC_WAIT(0x80296014)
EVT_EXEC_WAIT(D_80296014)
EVT_CASE_EQ(44)
EVT_SET_CONST(EVT_VAR(1), 0x9000B)
EVT_SET(EVT_VAR(2), 12)
EVT_SET_CONST(EVT_VAR(3), 0x9000C)
EVT_EXEC_WAIT(0x80294C68)
EVT_EXEC_WAIT(D_80294C68)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_EXEC_WAIT(0x80296014)
EVT_EXEC_WAIT(D_80296014)
EVT_CASE_EQ(14)
EVT_SET_CONST(EVT_VAR(1), 0x9000B)
EVT_SET_CONST(EVT_VAR(2), 0x9000C)
EVT_EXEC_WAIT(0x8029621C)
EVT_EXEC_WAIT(D_8029621C)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_EXEC_WAIT(0x80296014)
EVT_EXEC_WAIT(D_80296014)
EVT_CASE_EQ(47)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_SET(EVT_VAR(2), 12)
EVT_EXEC_WAIT(0x80295744)
EVT_EXEC_WAIT(D_80295744)
EVT_CASE_EQ(51)
EVT_CALL(battle_partner_goombario_StopGlowing)
EVT_SET_CONST(EVT_VAR(1), 0x9000A)
EVT_EXEC_WAIT(0x80296014)
EVT_EXEC_WAIT(D_80296014)
EVT_CASE_EQ(52)
EVT_SET_CONST(EVT_VAR(0), 0x1)
EVT_SET_CONST(EVT_VAR(1), 0x90001)
EVT_SET_CONST(EVT_VAR(2), 0x90003)
EVT_SET(EVT_VAR(3), 0)
EVT_EXEC_WAIT(0x80295EC4)
EVT_EXEC_WAIT(D_80295EC4)
EVT_CASE_OR_EQ(24)
EVT_CASE_OR_EQ(26)
EVT_CALL(PlaySoundAtActor, 256, 8332)
EVT_SET_CONST(EVT_VAR(0), 0x1)
EVT_SET_CONST(EVT_VAR(1), 0x9000E)
EVT_EXEC_WAIT(0x80297814)
EVT_EXEC_WAIT(D_80297814)
EVT_WAIT_FRAMES(10)
EVT_END_CASE_GROUP
EVT_CASE_DEFAULT
@ -423,7 +423,7 @@ EvtSource N(80239784) = {
EVT_SET_CONST(EVT_VAR(1), 0x90010)
EVT_SET_CONST(EVT_VAR(2), 0x90011)
EVT_SET_CONST(EVT_VAR(3), 0x90001)
EVT_EXEC_WAIT(0x80294720)
EVT_EXEC_WAIT(D_80294720)
EVT_RETURN
EVT_END
};
@ -468,7 +468,7 @@ EvtSource N(8023993C) = {
EvtSource N(8023994C) = {
EVT_SET_CONST(EVT_VAR(0), 0x1)
EVT_SET_CONST(EVT_VAR(1), 0x90003)
EVT_EXEC_WAIT(0x80294AFC)
EVT_EXEC_WAIT(D_80294AFC)
EVT_RETURN
EVT_END
};

25
tools/disasm_script.py
View File

@ -86,7 +86,6 @@ def round_fixed(f: float) -> float:
"""
return f
def find_symbol_in_overlay(symbol_map, overlay_rom_addr, symbol_ram_addr):
if not symbol_ram_addr in symbol_map:
return None
@ -994,6 +993,7 @@ if __name__ == "__main__":
parser.add_argument("-end", "-e", "--e", type=lambda x: int(x, 16), default=0, dest="end", required=False, help="End offset to stop dissassembling from.\nOnly used as a way to find valid scripts.")
parser.add_argument("-vram", "-v", "--v", type=lambda x: int(x, 16), default=0, dest="vram", required=False, help="VRAM start will be tracked and used for the script output name")
parser.add_argument("-si", "--si", action="store_true", default=False, dest="si", required=False, help="Force si script output")
parser.add_argument("-blob", "--b", action="store_true", default=False, dest="blob", required=False, help="If there is a blob of scripts.")
args = parser.parse_args()
vram_base = args.vram
get_constants()
@ -1063,20 +1063,33 @@ if __name__ == "__main__":
with open(args.file, "rb") as f:
f.seek(offset)
script = ScriptDisassembler(f, args.offset, {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED)
loffset = args.offset
looping = 1
while looping:
try:
script = ScriptDisassembler(f, loffset, {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED)
if args.si:
print(ScriptDisassembler(f, args.offset, {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED).disassemble(), end="")
print(ScriptDisassembler(f, loffset, {}, 0x978DE0, INCLUDES_NEEDED, INCLUDED).disassemble(), end="")
else:
try:
script_text = script.disassemble()
print(f"EvtSource read from 0x{script.start_pos:X} to 0x{script.end_pos:X} "
f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)")
# print(f"EvtSource read from 0x{script.start_pos:X} to 0x{script.end_pos:X} "
# f"(0x{script.end_pos - script.start_pos:X} bytes, {script.instructions} instructions)")
print()
print(script_text, end="")
except UnsupportedScript:
f.seek(offset)
print(ScriptDisassembler(f).disassemble(), end="")
break
except:
break
loffset = script.end_pos
looping = args.blob
try:
loffset = _script_lib[loffset - info[0] + info[2]][0][1]
except:
pass

132
ver/us/asm/data/1AF2D0.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_dig/6DE670.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_flo/5B3370.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_isk_part_1/4E3350.data.s
View File

File diff suppressed because one or more lines are too long

4
ver/us/asm/data/battle/area_jan/573EE0.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_kzn/58D100.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_mim/4F7FA0.data.s
View File

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_omo3/558190.data.s
View File

File diff suppressed because one or more lines are too long

6
ver/us/asm/data/battle/area_tik/5EE550.data.s
View File

File diff suppressed because one or more lines are too long

6
ver/us/asm/data/battle/partner/6F0B30.data.s
View File

@ -21,16 +21,16 @@ dlabel D_8023818C_6F0CBC
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023819C_6F0CCC
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000046, 0x00000001, DoNormalHit, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000002, PlaySound, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000046, 0x00000001, DoImmune, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0003, 0x00000025, 0x00000002, 0xFE363C83, 0x009D0001, 0x00000046, 0x00000001, 0x80294FE4, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C80, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C83, 0x009D0003, 0x00000025, 0x00000002, 0xFE363C84, 0x009D0001, 0x00000046, 0x00000001, 0x80294C68, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C80, 0x00000000, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000046, 0x00000001, DoNormalHit, 0x00000016, 0x00000001, 0x00000033, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0001, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0003, 0x00000046, 0x00000001, 0x80295EC4, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000046, 0x00000001, DoNormalHit, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000002, PlaySound, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000046, 0x00000001, DoImmune, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0003, 0x00000025, 0x00000002, 0xFE363C83, 0x009D0001, 0x00000046, 0x00000001, D_80294FE4, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C80, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0007, 0x00000025, 0x00000002, 0xFE363C83, 0x009D0003, 0x00000025, 0x00000002, 0xFE363C84, 0x009D0001, 0x00000046, 0x00000001, D_80294C68, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C80, 0x00000000, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0007, 0x00000046, 0x00000001, DoNormalHit, 0x00000016, 0x00000001, 0x00000033, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0001, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0003, 0x00000046, 0x00000001, D_80295EC4, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802383F4_6F0F24
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8023859C_6F10CC, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80238488_6F0FB8, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802384D4_6F1004, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_80238510_6F1040, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238488_6F0FB8
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0009, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0002, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0009, 0x00000025, 0x00000002, 0xFE363C82, 0x009D0002, 0x00000046, 0x00000001, D_80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802384D4_6F1004
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x009D0003, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238510_6F1040
.word 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x009D0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x009D0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/battle/partner/6F62B0.data.s
View File

@ -21,16 +21,16 @@ dlabel D_802385D0_6F6450
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802385E0_6F6460
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0011, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, 0x80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0012, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000025, 0x00000002, 0xFE363C83, 0x000A0013, 0x00000046, 0x00000001, 0x80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0012, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0013, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0004, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0006, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000046, 0x00000001, 0x80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0010, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000A000F, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0011, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, D_80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000046, 0x00000001, D_80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0012, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000025, 0x00000002, 0xFE363C83, 0x000A0013, 0x00000046, 0x00000001, D_80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0012, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0013, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000046, 0x00000001, D_80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0011, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0004, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0006, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000046, 0x00000001, D_80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0010, 0x00000046, 0x00000001, D_80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000A000F, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238974_6F67F4
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80238D84_6F6C04, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80238B7C_6F69FC, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80238A20_6F68A0, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80238A7C_6F68FC, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_80238AB8_6F6938, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238A20_6F68A0
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0016, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0005, 0x00000025, 0x00000002, 0xFE363C83, 0x000A0004, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0016, 0x00000025, 0x00000002, 0xFE363C82, 0x000A0005, 0x00000025, 0x00000002, 0xFE363C83, 0x000A0004, 0x00000046, 0x00000001, D_80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238A7C_6F68FC
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0006, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000A0006, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238AB8_6F6938
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000A0006, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000A0004, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/battle/partner/6FB350.data.s
View File

File diff suppressed because one or more lines are too long

6
ver/us/asm/data/battle/partner/701590.data.s
View File

@ -21,13 +21,13 @@ dlabel D_802399B0_701730
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802399C0_701740
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000C000D, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, 0x80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000F, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000025, 0x00000002, 0xFE363C83, 0x000C0010, 0x00000046, 0x00000001, 0x80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, 0x80296014, 0x0000001D, 0x00000001, 0x0000000E, 0x0000001D, 0x00000001, 0x0000000F, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000F, 0x00000025, 0x00000002, 0xFE363C82, 0x000C0010, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C81, 0x000C0002, 0x00000025, 0x00000002, 0xFE363C82, 0x000C0003, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000046, 0x00000001, 0x80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000C, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000C000B, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000C000D, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, D_80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000046, 0x00000001, D_80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000F, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000025, 0x00000002, 0xFE363C83, 0x000C0010, 0x00000046, 0x00000001, D_80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, D_80296014, 0x0000001D, 0x00000001, 0x0000000E, 0x0000001D, 0x00000001, 0x0000000F, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000F, 0x00000025, 0x00000002, 0xFE363C82, 0x000C0010, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000046, 0x00000001, D_80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000D, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C81, 0x000C0002, 0x00000025, 0x00000002, 0xFE363C82, 0x000C0003, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000046, 0x00000001, D_80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C000C, 0x00000046, 0x00000001, D_80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000C000B, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239D68_701AE8
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_8023A054_701DD4, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80239E70_701BF0, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80239E14_701B94, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_8023A064_701DE4, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_8023A0A0_701E20, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239E14_701B94
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C0013, 0x00000025, 0x00000002, 0xFE363C82, 0x000C0002, 0x00000025, 0x00000002, 0xFE363C83, 0x000C0001, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C0013, 0x00000025, 0x00000002, 0xFE363C82, 0x000C0002, 0x00000025, 0x00000002, 0xFE363C83, 0x000C0001, 0x00000046, 0x00000001, D_80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239E70_701BF0
.word 0x00000043, 0x00000002, func_802694A4, 0x00000001, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000001, LoadStarPowerScript, 0x00000046, 0x00000001, 0xFE363C80, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, GetMenuSelection, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000095, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000002, 0x00000046, 0x00000001, D_8023A4D4_702254, 0x00000016, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000003, 0x00000046, 0x00000001, D_8023A4D4_702254, 0x00000016, 0x00000001, 0x00000097, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000046, 0x00000001, D_8023A4D4_702254, 0x00000016, 0x00000001, 0x00000098, 0x00000043, 0x00000003, SetBattleFlagBits, 0x00004000, 0x00000000, 0x00000046, 0x00000001, D_8023AA64_7027E4, 0x00000016, 0x00000001, 0x00000099, 0x00000046, 0x00000001, D_8023AF7C_702CFC, 0x00000016, 0x00000001, 0x0000009A, 0x00000046, 0x00000001, D_8023B6FC_70347C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -36,7 +36,7 @@ dlabel D_8023A054_701DD4
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A064_701DE4
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000C0003, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A0A0_701E20
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000C0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000C0002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/battle/partner/704A80.data.s
View File

@ -21,16 +21,16 @@ dlabel D_80239138_704C28
.word 0x0000004B, 0x00000001, 0x00000063, 0x00000043, 0x00000001, func_80238000_703AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239160_704C50
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000001, func_802383D4_703EC4, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000C, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80297814, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000025, 0x00000002, 0xFE363C83, 0x000E000E, 0x00000046, 0x00000001, 0x80294C68, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000E, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, 0x80295EC4, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000016, 0x00000001, 0x0000003E, 0x00000043, 0x00000001, func_80238370_703E60, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0013, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000040, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000016, 0x00000001, 0x00000041, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000001, func_802383D4_703EC4, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000C, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, D_80297814, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000025, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, D_80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000025, 0x00000002, 0xFE363C83, 0x000E000E, 0x00000046, 0x00000001, D_80294C68, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000E000E, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000046, 0x00000001, D_80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000E000C, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, D_80295EC4, 0x00000043, 0x00000001, func_802383C0_703EB0, 0x00000016, 0x00000001, 0x0000003E, 0x00000043, 0x00000001, func_80238370_703E60, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0013, 0x00000046, 0x00000001, D_80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000040, 0x00000043, 0x00000001, func_802383F8_703EE8, 0x00000016, 0x00000001, 0x00000041, 0x00000043, 0x00000001, func_802383E4_703ED4, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239578_705068
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802397CC_7052BC, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_8023960C_7050FC, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_80239684_705174, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_802396DC_7051CC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023960C_7050FC
.word 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0008, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0002, 0x00000025, 0x00000002, 0xFE363C83, 0x000E0001, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0008, 0x00000025, 0x00000002, 0xFE363C82, 0x000E0002, 0x00000025, 0x00000002, 0xFE363C83, 0x000E0001, 0x00000046, 0x00000001, D_80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239684_705174
.word 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000E0003, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802396DC_7051CC
.word 0x00000043, 0x00000001, func_802383E4_703ED4, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000E0001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_80238408_703EF8, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

4
ver/us/asm/data/battle/partner/708B70.data.s
View File

@ -21,7 +21,7 @@ dlabel D_80239070_708D10
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239080_708D20
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000F000D, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, 0x80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000025, 0x00000002, 0xFE363C83, 0x000F000F, 0x00000046, 0x00000001, 0x80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000E, 0x00000025, 0x00000002, 0xFE363C82, 0x000F000F, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000F0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000046, 0x00000001, 0x80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F0014, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000025, 0x00000002, 0xFE363C82, 0x000F000D, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, D_80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, D_80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000025, 0x00000002, 0xFE363C83, 0x000F000F, 0x00000046, 0x00000001, D_80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000E, 0x00000025, 0x00000002, 0xFE363C82, 0x000F000F, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, D_80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000F000D, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000F0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000046, 0x00000001, D_80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F0014, 0x00000046, 0x00000001, D_80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802393EC_70908C
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_802395CC_70926C, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_80239480_709120, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802394CC_70916C, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_80239508_7091A8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -30,7 +30,7 @@ dlabel D_80239480_709120
.word 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000F0011, 0x00000008, 0x00000001, 0x00000024, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000F0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802394CC_70916C
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000F0003, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80239508_7091A8
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000F0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000F0001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/battle/partner/70DED0.data.s
View File

@ -24,16 +24,16 @@ dlabel D_8023A380_70E090
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A390_70E0A0
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000025, 0x00000002, 0xFE363C82, 0x0010000A, 0x00000046, 0x00000001, 0x802976E8, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, 0x80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000025, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000025, 0x00000002, 0xFE363C83, 0x0010000D, 0x00000046, 0x00000001, 0x80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000C, 0x00000025, 0x00000002, 0xFE363C82, 0x0010000D, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00100002, 0x00000025, 0x00000002, 0xFE363C82, 0x00100003, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000046, 0x00000001, 0x80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0010001A, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000025, 0x00000002, 0xFE363C82, 0x0010000A, 0x00000046, 0x00000001, D_802976E8, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, D_80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000025, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, D_80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000025, 0x00000002, 0xFE363C83, 0x0010000D, 0x00000046, 0x00000001, D_80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000C, 0x00000025, 0x00000002, 0xFE363C82, 0x0010000D, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000046, 0x00000001, D_80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x0010000A, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00100002, 0x00000025, 0x00000002, 0xFE363C82, 0x00100003, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000046, 0x00000001, D_80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0010001A, 0x00000046, 0x00000001, D_80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A6FC_70E40C
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8023A8EC_70E5FC, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_8023A790_70E4A0, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_8023A7EC_70E4FC, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_8023A828_70E538, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A790_70E4A0
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00100007, 0x00000025, 0x00000002, 0xFE363C82, 0x00100002, 0x00000025, 0x00000002, 0xFE363C83, 0x00100002, 0x00000046, 0x00000001, 0x80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00100007, 0x00000025, 0x00000002, 0xFE363C82, 0x00100002, 0x00000025, 0x00000002, 0xFE363C83, 0x00100002, 0x00000046, 0x00000001, D_80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A7EC_70E4FC
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00100003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00100003, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023A828_70E538
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00100003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x00100002, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

4
ver/us/asm/data/battle/partner/7111F0.data.s
View File

@ -21,7 +21,7 @@ dlabel D_802384A0_711390
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802384B0_7113A0
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000025, 0x00000002, 0xFE363C82, 0x000D0015, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, 0x80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, 0x80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000046, 0x00000001, 0x80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0016, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C83, 0x000D0017, 0x00000046, 0x00000001, 0x80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0016, 0x00000025, 0x00000002, 0xFE363C82, 0x000D0017, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000046, 0x00000001, 0x80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, 0x80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000D0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, 0x80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D001B, 0x00000046, 0x00000001, 0x80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000001, CloseActionCommandInfo, 0x00000043, 0x00000003, GetLastEvent, 0x00000100, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000025, 0x00000002, 0xFE363C82, 0x000D0015, 0x00000046, 0x00000001, D_802977BC, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, D_80296014, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, D_80297814, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000002A, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000046, 0x00000001, D_80294FE4, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002C, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0016, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C83, 0x000D0017, 0x00000046, 0x00000001, D_80294C68, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0016, 0x00000025, 0x00000002, 0xFE363C82, 0x000D0017, 0x00000046, 0x00000001, D_8029621C, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000E, 0x00000046, 0x00000001, D_80295744, 0x00000016, 0x00000001, 0x00000033, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0015, 0x00000046, 0x00000001, D_80296014, 0x00000016, 0x00000001, 0x00000034, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0001, 0x00000025, 0x00000002, 0xFE363C82, 0x000D0003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000046, 0x00000001, D_80295EC4, 0x0000001D, 0x00000001, 0x00000018, 0x0000001D, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, PlaySoundAtActor, 0x00000100, 0x0000208C, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D001B, 0x00000046, 0x00000001, D_80297814, 0x00000008, 0x00000001, 0x0000000A, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8023881C_71170C
.word 0x00000043, 0x00000002, GetBattlePhase, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_80238A5C_71194C, 0x00000016, 0x00000001, 0x00000005, 0x00000046, 0x00000001, D_802388B0_7117A0, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, D_802388FC_7117EC, 0x00000016, 0x00000001, 0x00000007, 0x00000046, 0x00000001, D_80238938_711828, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -30,7 +30,7 @@ dlabel D_802388B0_7117A0
.word 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000D0011, 0x00000008, 0x00000001, 0x00000024, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000D0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802388FC_7117EC
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0003, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x000D0003, 0x00000046, 0x00000001, D_80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80238938_711828
.word 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000000, 0x00000043, 0x00000002, SetGoalToHome, 0x00000100, 0x00000043, 0x00000003, SetActorSpeed, 0x00000100, 0xF24A9280, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000D0003, 0x00000043, 0x00000003, SetActorYaw, 0x00000100, 0x00000000, 0x00000043, 0x00000003, RunToGoal, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0x00000100, 0xFFFFFFFF, 0x000D0001, 0x00000043, 0x00000003, UseIdleAnimation, 0x00000100, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000

4
ver/us/asm/data/battle/partner/714DC0.data.s
View File

@ -30,10 +30,10 @@ 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
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200005, 0x00000025, 0x00000002, 0xFE363C82, 0x00200005, 0x00000046, 0x00000001, D_80294720, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802385A4_715294
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200008, 0x00000046, 0x00000001, 0x80294AFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
.word 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00200008, 0x00000046, 0x00000001, D_80294AFC, 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

4
ver/us/splat.yaml
View File

@ -1039,6 +1039,10 @@ segments:
- [0x1AF5C0, .data, 1776B0]
- [0x1AF8A0, .data, 190B20]
- [0x1B21E0, data, 1AF2D0] # begins with image?
- [0x1C2EC0, .data, 19FAF0]
- [0x1C2FC0, .data, 1A5830]
- [0x1C3000, .data, 1AF120]
- [0x1CB0B0, .data, 1AF230]
- [0x1CB240, .rodata, 16c8e0]
- [0x1CB368, .rodata, 16F740]
- [0x1CB4E0, .rodata, 1776B0]