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

ItemChoice_SaveSelected + hos funcs (#854)

Browse Source 
* cleanup

* a bunch of ItemChoice_SaveSelected

* the last few

* a bit more

* some position -> pos

* warnings

* 2 snibblets

* 2 snibblets

* one more

* weird

* mo

* more hos_05

* hos5

* 3 mo

* comment

* cleen
This commit is contained in:
Ethan Roseman 2022-11-09 21:00:56 -05:00 committed by GitHub
parent b9502a1ac4
commit a880543beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
200 changed files with 1817 additions and 3661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/common_structs.h
View File

@ -136,7 +136,7 @@ typedef struct CamPosSettings {
/* 0x04 */ f32 boomLength; /* 0x04 */ f32 boomLength;
/* 0x08 */ f32 boomPitch; /* 0x08 */ f32 boomPitch;
/* 0x0C */ f32 viewPitch; /* 0x0C */ f32 viewPitch;
/* 0x10 */ Vec3f position; /* 0x10 */ Vec3f pos;
} CamPosSettings; // size = 0x1C } CamPosSettings; // size = 0x1C
typedef struct DmaTable { typedef struct DmaTable {
@ -378,7 +378,7 @@ typedef struct Trigger {
/* 0x04 */ s32 varIndex; /* 0x04 */ s32 varIndex;
/* 0x08 */ union { /* 0x08 */ union {
s32 colliderID; s32 colliderID;
Vec4f* position; Vec4f* pos;
} location; } location;
/* 0x0C */ s32 (*onActivateFunc)(struct Trigger*); /* 0x0C */ s32 (*onActivateFunc)(struct Trigger*);
/* 0x10 */ EvtScript* onTriggerEvt; /* 0x10 */ EvtScript* onTriggerEvt;
@ -468,7 +468,7 @@ typedef struct Evt {
/* 0x154 */ f32 frameCounter; /* 0x154 */ f32 frameCounter;
/* 0x158 */ s32 unk_158; /* 0x158 */ s32 unk_158;
/* 0x15C */ Bytecode* ptrFirstLine; /* 0x15C */ Bytecode* ptrFirstLine;
/* 0x160 */ Bytecode* ptrSavedPosition; /* 0x160 */ Bytecode* ptrSavedPos;
/* 0x164 */ Bytecode* ptrCurrentLine; /* 0x164 */ Bytecode* ptrCurrentLine;
} Evt; // size = 0x168 } Evt; // size = 0x168
@ -2431,7 +2431,7 @@ typedef struct CreditsEntry {
typedef struct CreditsLine { typedef struct CreditsLine {
/* 0x00 */ u8* message; /* 0x00 */ u8* message;
/* 0x04 */ s32 unk__04; /* 0x04 */ char unk_04[0x4];
/* 0x08 */ s32 time; /* 0x08 */ s32 time;
/* 0x0C */ s32 state; /* 0x0C */ s32 state;
/* 0x10 */ s32 palette; /* 0x10 */ s32 palette;
@ -2439,23 +2439,14 @@ typedef struct CreditsLine {
/* 0x18 */ s32 appearMode; /* 0x18 */ s32 appearMode;
/* 0x1C */ s32 appearTime; /* 0x1C */ s32 appearTime;
/* 0x20 */ s32 perCharDelayIn; /* 0x20 */ s32 perCharDelayIn;
/* 0x24 */ s32 unk__24; /* 0x24 */ char unk_24[0x10];
/* 0x28 */ s32 unk__28;
/* 0x2C */ s32 unk__2C;
/* 0x30 */ s32 unk__30;
/* 0x34 */ s32 holdMode; /* 0x34 */ s32 holdMode;
/* 0x38 */ s32 holdTime; /* 0x38 */ s32 holdTime;
/* 0x3C */ s32 unk__3C; /* 0x3C */ char unk_3C[0x10];
/* 0x40 */ s32 unk__40;
/* 0x44 */ s32 unk__44;
/* 0x48 */ s32 unk__48;
/* 0x4C */ s32 vanishMode; /* 0x4C */ s32 vanishMode;
/* 0x50 */ s32 vanishTime; /* 0x50 */ s32 vanishTime;
/* 0x54 */ s32 perCharDelayOut; /* 0x54 */ s32 perCharDelayOut;
/* 0x58 */ s32 unk__58; /* 0x58 */ char unk_58[0x10];
/* 0x5C */ s32 unk__5C;
/* 0x60 */ s32 unk__60;
/* 0x64 */ s32 unk__64;
/* 0x68 */ s32 posX; /* 0x68 */ s32 posX;
/* 0x6C */ s32 posY; /* 0x6C */ s32 posY;
/* 0x70 */ s16 flags; /* 0x70 */ s16 flags;

1
include/enums.h
View File

@ -594,6 +594,7 @@ enum SoundIDs {
SOUND_AA = 0x000000AA, SOUND_AA = 0x000000AA,
SOUND_AB = 0x000000AB, SOUND_AB = 0x000000AB,
SOUND_AC = 0x000000AC, SOUND_AC = 0x000000AC,
SOUND_B0 = 0x000000B0,
SOUND_B1 = 0x000000B1, SOUND_B1 = 0x000000B1,
SOUND_B2 = 0x000000B2, SOUND_B2 = 0x000000B2,
SOUND_B4 = 0x000000B4, SOUND_B4 = 0x000000B4,

2
src/181810.c
View File

@ -489,7 +489,7 @@ ApiStatus ApplyShrinkFromOwner(Evt* script, s32 isInitialCall) {
amt /= 2; amt /= 2;
} }
evt_set_variable(script, *args, amt); evt_set_variable(script, *args++, amt);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

24
src/B0E0.c
View File

@ -957,9 +957,9 @@ void update_camera_zone_interp(Camera* camera) {
boomYawDiff = settingDiff; boomYawDiff = settingDiff;
} }
deltaX = camera->oldCameraSettings.position.x - camera->newCameraSettings.position.x; deltaX = camera->oldCameraSettings.pos.x - camera->newCameraSettings.pos.x;
deltaY = camera->oldCameraSettings.position.y - camera->newCameraSettings.position.y; deltaY = camera->oldCameraSettings.pos.y - camera->newCameraSettings.pos.y;
deltaZ = camera->oldCameraSettings.position.z - camera->newCameraSettings.position.z; deltaZ = camera->oldCameraSettings.pos.z - camera->newCameraSettings.pos.z;
settingDiff = SQ(deltaX); settingDiff = SQ(deltaX);
settingDiff += SQ(deltaY); settingDiff += SQ(deltaY);
settingDiff += SQ(deltaZ); settingDiff += SQ(deltaZ);
@ -1011,9 +1011,9 @@ void update_camera_zone_interp(Camera* camera) {
blendedCamSettings.boomLength = (camera->oldCameraSettings.boomLength * interpAlphaInv) + (camera->newCameraSettings.boomLength * interpAlpha); blendedCamSettings.boomLength = (camera->oldCameraSettings.boomLength * interpAlphaInv) + (camera->newCameraSettings.boomLength * interpAlpha);
blendedCamSettings.boomPitch = (camera->oldCameraSettings.boomPitch * interpAlphaInv) + (camera->newCameraSettings.boomPitch * interpAlpha); blendedCamSettings.boomPitch = (camera->oldCameraSettings.boomPitch * interpAlphaInv) + (camera->newCameraSettings.boomPitch * interpAlpha);
blendedCamSettings.viewPitch = (camera->oldCameraSettings.viewPitch * interpAlphaInv) + (camera->newCameraSettings.viewPitch * interpAlpha); blendedCamSettings.viewPitch = (camera->oldCameraSettings.viewPitch * interpAlphaInv) + (camera->newCameraSettings.viewPitch * interpAlpha);
blendedCamSettings.position.x = (camera->oldCameraSettings.position.x * interpAlphaInv) + (camera->newCameraSettings.position.x * interpAlpha); blendedCamSettings.pos.x = (camera->oldCameraSettings.pos.x * interpAlphaInv) + (camera->newCameraSettings.pos.x * interpAlpha);
blendedCamSettings.position.y = (camera->oldCameraSettings.position.y * interpAlphaInv) + (camera->newCameraSettings.position.y * interpAlpha); blendedCamSettings.pos.y = (camera->oldCameraSettings.pos.y * interpAlphaInv) + (camera->newCameraSettings.pos.y * interpAlpha);
blendedCamSettings.position.z = (camera->oldCameraSettings.position.z * interpAlphaInv) + (camera->newCameraSettings.position.z * interpAlpha); blendedCamSettings.pos.z = (camera->oldCameraSettings.pos.z * interpAlphaInv) + (camera->newCameraSettings.pos.z * interpAlpha);
blendedCamSettings.boomLength *= camera->zoomPercent; blendedCamSettings.boomLength *= camera->zoomPercent;
blendedCamSettings.boomLength *= 0.01; blendedCamSettings.boomLength *= 0.01;
@ -1025,21 +1025,21 @@ void update_camera_zone_interp(Camera* camera) {
sinViewPitch = sin_deg(blendedCamSettings.boomPitch + D_800A08DC); sinViewPitch = sin_deg(blendedCamSettings.boomPitch + D_800A08DC);
if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) {
camera->lookAt_eye.y = blendedCamSettings.position.y + (blendedCamSettings.boomLength * sinViewPitch); camera->lookAt_eye.y = blendedCamSettings.pos.y + (blendedCamSettings.boomLength * sinViewPitch);
} }
camera->lookAt_eye.x = blendedCamSettings.position.x - (temp_f26 * blendedCamSettings.boomLength * cosViewPitch); camera->lookAt_eye.x = blendedCamSettings.pos.x - (temp_f26 * blendedCamSettings.boomLength * cosViewPitch);
camera->lookAt_eye.z = blendedCamSettings.position.z - (temp_f24_2 * blendedCamSettings.boomLength * cosViewPitch); camera->lookAt_eye.z = blendedCamSettings.pos.z - (temp_f24_2 * blendedCamSettings.boomLength * cosViewPitch);
cosViewPitch = cos_deg(-blendedCamSettings.viewPitch); cosViewPitch = cos_deg(-blendedCamSettings.viewPitch);
sinViewPitch = sin_deg(-blendedCamSettings.viewPitch); sinViewPitch = sin_deg(-blendedCamSettings.viewPitch);
if (camera->lookAt_eye.x == blendedCamSettings.position.x && camera->lookAt_eye.z == blendedCamSettings.position.z) { if (camera->lookAt_eye.x == blendedCamSettings.pos.x && camera->lookAt_eye.z == blendedCamSettings.pos.z) {
dist = 0.0f; dist = 0.0f;
} else { } else {
dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, blendedCamSettings.position.x, blendedCamSettings.position.z); dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, blendedCamSettings.pos.x, blendedCamSettings.pos.z);
} }
temp_f8_2 = blendedCamSettings.position.y - camera->lookAt_eye.y; temp_f8_2 = blendedCamSettings.pos.y - camera->lookAt_eye.y;
if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) {
camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinViewPitch) + (temp_f8_2 * cosViewPitch)); camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinViewPitch) + (temp_f8_2 * cosViewPitch));
} }

2
src/actor_api.c
View File

@ -2480,7 +2480,7 @@ INCLUDE_ASM(s32, "actor_api", func_8026E558);
ApiStatus GetTargetListLength(Evt* script) { ApiStatus GetTargetListLength(Evt* script) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args, get_actor(script->owner1.actorID)->targetListLength); evt_set_variable(script, *args++, get_actor(script->owner1.actorID)->targetListLength);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/common/CalculateArcsinDeg.inc.c
View File

@ -65,10 +65,10 @@ ApiStatus N(CalculateArcsinDeg)(Evt* script, s32 isInitialCall) {
y2 -= y1; y2 -= y1;
if (x2 == 0 && y2 == 0) { if (x2 == 0 && y2 == 0) {
evt_set_variable(script, *args, outVar); evt_set_variable(script, *args++, outVar);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} else { } else {
evt_set_variable(script, *args, N(ArcsinDeg)(x2, y2) - 90); evt_set_variable(script, *args++, N(ArcsinDeg)(x2, y2) - 90);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
} }

4
src/encounter_api.c
View File

@ -624,7 +624,7 @@ ApiStatus SetSelfVar(Evt* script, s32 isInitialCall) {
ApiStatus GetSelfVar(Evt* script, s32 isInitialCall) { ApiStatus GetSelfVar(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args, script->owner1.enemy->varTable[evt_get_variable(script, *args++)]); evt_set_variable(script, *args++, script->owner1.enemy->varTable[evt_get_variable(script, *args++)]);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -755,7 +755,7 @@ ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
Enemy* owner = script->owner1.enemy; Enemy* owner = script->owner1.enemy;
evt_set_variable(script, *args, owner->animList[evt_get_variable(script, *args++)]); evt_set_variable(script, *args++, owner->animList[evt_get_variable(script, *args++)]);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/evt/evt.c
View File

@ -1333,7 +1333,7 @@ s32 evt_handle_print_debug_var(Evt* script) {
} }
ApiStatus func_802C739C(Evt* script) { ApiStatus func_802C739C(Evt* script) {
script->ptrSavedPosition = (Bytecode*)*script->ptrReadPos; script->ptrSavedPos = (Bytecode*)*script->ptrReadPos;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/evt/f8f60_len_1560.c
View File

@ -537,7 +537,7 @@ ApiStatus SetGameMode(Evt* script, s32 isInitialCall) {
ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) { ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args, clamp_angle(evt_get_variable(script, *args))); evt_set_variable(script, *args++, clamp_angle(evt_get_variable(script, *args)));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -545,7 +545,7 @@ ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) {
ApiStatus ClampAngleFloat(Evt* script, s32 isInitialCall) { ApiStatus ClampAngleFloat(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
evt_set_float_variable(script, *args, clamp_angle(evt_get_float_variable(script, *args))); evt_set_float_variable(script, *args++, clamp_angle(evt_get_float_variable(script, *args)));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/evt/player_api.c
View File

@ -617,7 +617,7 @@ ApiStatus IsPlayerOnValidFloor(Evt* script, s32 isInitialCall) {
if (gCollisionStatus.currentFloor >= 0) { if (gCollisionStatus.currentFloor >= 0) {
result = (func_802D23F8() != 0); result = (func_802D23F8() != 0);
} }
evt_set_variable(script, *args, result); evt_set_variable(script, *args++, result);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

8
src/evt/script_list.c
View File

@ -266,7 +266,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) {
newScript->loopDepth = -1; newScript->loopDepth = -1;
newScript->switchDepth = -1; newScript->switchDepth = -1;
newScript->groupFlags = ~EVT_GROUP_10; newScript->groupFlags = ~EVT_GROUP_10;
newScript->ptrSavedPosition = NULL; newScript->ptrSavedPos = NULL;
newScript->frameCounter = 0.0f; newScript->frameCounter = 0.0f;
newScript->unk_158 = 0; newScript->unk_158 = 0;
newScript->timeScale = gGlobalTimeSpace; newScript->timeScale = gGlobalTimeSpace;
@ -338,7 +338,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g
newScript->loopDepth = -1; newScript->loopDepth = -1;
newScript->switchDepth = -1; newScript->switchDepth = -1;
newScript->groupFlags = groupFlags; newScript->groupFlags = groupFlags;
newScript->ptrSavedPosition = 0; newScript->ptrSavedPos = 0;
newScript->frameCounter = 0.0f; newScript->frameCounter = 0.0f;
newScript->unk_158 = 0; newScript->unk_158 = 0;
newScript->timeScale = gGlobalTimeSpace; newScript->timeScale = gGlobalTimeSpace;
@ -407,7 +407,7 @@ Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState)
child->loopDepth = -1; child->loopDepth = -1;
child->switchDepth = -1; child->switchDepth = -1;
child->groupFlags = parentScript->groupFlags; child->groupFlags = parentScript->groupFlags;
child->ptrSavedPosition = NULL; child->ptrSavedPos = NULL;
child->array = parentScript->array; child->array = parentScript->array;
child->flagArray = parentScript->flagArray; child->flagArray = parentScript->flagArray;
child->timeScale = gGlobalTimeSpace; child->timeScale = gGlobalTimeSpace;
@ -475,7 +475,7 @@ Evt* func_802C39F8(Evt* parentScript, Bytecode* nextLine, s32 newState) {
child->loopDepth = -1; child->loopDepth = -1;
child->switchDepth = -1; child->switchDepth = -1;
child->groupFlags = parentScript->groupFlags; child->groupFlags = parentScript->groupFlags;
child->ptrSavedPosition = NULL; child->ptrSavedPos = NULL;
child->array = parentScript->array; child->array = parentScript->array;
child->flagArray = parentScript->flagArray; child->flagArray = parentScript->flagArray;
child->timeScale = gGlobalTimeSpace; child->timeScale = gGlobalTimeSpace;

2
src/trigger.c
View File

@ -192,7 +192,7 @@ void update_triggers(void) {
continue; continue;
} }
triggerPos = listTrigger->location.position; triggerPos = listTrigger->location.pos;
dist = dist3D(triggerPos->x, triggerPos->y, triggerPos->z, dist = dist3D(triggerPos->x, triggerPos->y, triggerPos->z,
collisionStatus->bombetteExplosionPos.x, collisionStatus->bombetteExplosionPos.y, collisionStatus->bombetteExplosionPos.x, collisionStatus->bombetteExplosionPos.y,
collisionStatus->bombetteExplosionPos.z); collisionStatus->bombetteExplosionPos.z);

2
src/world/area_hos/hos_04/A274B0.c
View File

@ -4,7 +4,7 @@
extern f32 D_80241B54_A28A24; extern f32 D_80241B54_A28A24;
extern f32 D_80241B74_A28A44; extern f32 D_80241B74_A28A44;
extern f32 D_80241B7C_A28A4C; extern f32 D_80241B7C_A28A4C;
extern s32 D_80241B80_A28A50; extern u16* D_80241B80_A28A50;
extern s32 D_80241B84_A28A54; extern s32 D_80241B84_A28A54;
extern s32 D_80241B88_A28A58; extern s32 D_80241B88_A28A58;
extern f32 D_80243370; extern f32 D_80243370;

740
src/world/area_hos/hos_05/A2AAC0.c
View File

@ -1,7 +1,99 @@
#include "hos_05.h" #include "hos_05.h"
#include "model.h" #include "model.h"
#include "effects.h"
#include "nu/nusys.h"
#include "ld_addrs.h"
typedef struct UnkHosStruct {
/* 0x00 */ s32 unk_00; // entity ID
/* 0x04 */ IMG_PTR unk_04;
/* 0x08 */ PAL_PTR unk_08;
/* 0x0C */ IMG_PTR unk_0C;
/* 0x10 */ PAL_PTR unk_10;
/* 0x14 */ char unk_14[0x4];
/* 0x18 */ IMG_PTR unk_18;
/* 0x1C */ IMG_PTR unk_1C;
/* 0x20 */ PAL_PTR unk_20;
/* 0x24 */ char unk_24[0x18];
/* 0x3C */ s16 unk_3C;
/* 0x3E */ s16 unk_3E;
/* 0x40 */ s16 unk_40;
/* 0x42 */ s16 unk_42;
/* 0x44 */ u16 unk_44; // x
/* 0x46 */ u16 unk_46; // y
/* 0x48 */ s16 unk_48; // x
/* 0x4A */ s16 unk_4A; // y
/* 0x4C */ char unk_4C[0xC];
/* 0x58 */ s16 unk_58; // bool
/* 0x5A */ s16 unk_5A;
/* 0x5C */ s16 unk_5C; // alpha
/* 0x60 */ char unk_6E[0x2];
} UnkHosStruct; // size = 0x60
extern f32 D_8024987C_A33ABC;
extern f32 D_802498A8_A33AE8;
extern s32 D_80249900_A33B40;
extern f32 D_80249904_A33B44;
extern s32 D_80249908_A33B48;
extern f32 D_8024990C_A33B4C;
extern s32 D_80249910_A33B50;
extern s16 D_80249914_A33B54[];
extern s16 D_80249934_A33B74[];
extern s32 D_8024995C_A33B9C;
extern s16 D_80249960_A33BA0[];
extern f32 D_80249980_A33BC0;
extern s32 D_80249984_A33BC4;
extern s16 D_80249988_A33BC8[];
extern s16 D_802499A8_A33BE8[][2];
extern s32 D_80249A48_A33C88;
extern s16 D_80249A4C_A33C8C[];
extern f32 D_80249A6C_A33CAC;
extern s32 D_80249A70_A33CB0;
extern f32 D_80249A74_A33CB4;
extern s32 D_80249A78_A33CB8;
extern s32 D_80249A7C_A33CBC;
extern s32 D_80249A80_A33CC0;
extern f32 D_80249A84_A33CC4;
extern f32 D_80249A88_A33CC8;
extern f32 D_80249A8C_A33CCC;
extern s32 D_80249A90_A33CD0;
extern f32 D_80249A94_A33CD4;
extern f32 D_80249A98_A33CD8;
extern f32 D_80249A9C_A33CDC;
extern f32 D_80249AA0_A33CE0;
extern s32 D_80249AA4_A33CE4;
extern f32 D_8024A9C8_A34C08;
extern s32 D_8024A9CC_A34C0C;
extern UnkHosStruct* D_8024AA20_A34C60;
extern Gfx D_8024AA28_A34C68[]; extern Gfx D_8024AA28_A34C68[];
extern u32 D_8024AAB0_A34CF0;
extern s32 D_8024AAB4_A34CF4; // func_802440D0_A2E310 can be matched once this is migrated
extern s32 D_8024AAB8_A34CF8;
extern u32 D_8024AABC_A34CFC;
extern s32 D_8024AAC0_A34D00[];
extern s32 D_8024AAD6_A34D14[];
extern u8 D_8024AB3C_A34D7C[];
extern u8 D_8024AC7B_A34EBB;
extern u16 D_8024AC7C_A34EBC[];
extern u16 D_8024AC9C_A34EDC[];
extern s32 D_8024ACB8_A34EF8;
extern f32 D_8024AEC4_A35104;
extern f32 D_8024AEC8_A35108;
// BSS?
extern f32 D_8024F2C8;
extern f32 D_8024F2CC;
extern f32 D_8024F2D8;
extern f32 D_8024F2DC;
extern f32 D_8024F2E0;
extern f32 D_8024F2E4;
extern f32 D_8024F2E8;
extern f32 D_8024F2EC;
extern f32 D_8024F2F0_C0CB70;
extern f32 D_8024F2F4;
extern f32 D_8024F2F8;
extern f32 D_8024F374;
extern f32 D_8024F378;
ApiStatus func_80240880_A2AAC0(Evt* script, s32 isInitialCall) { ApiStatus func_80240880_A2AAC0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
@ -119,47 +211,399 @@ void func_80241044_A2B284(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32* arg4) {
} }
} }
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802410E4_A2B324); void func_802410E4_A2B324(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5) {
f32 var_f12_2;
if (arg3 > arg4) {
arg3 = arg4;
}
switch (arg0) {
case 1:
var_f12_2 = sin_deg((arg3 / arg4) * 90.0f);
break;
case 2:
if (arg3 < 30.0f) {
var_f12_2 = 0.0f;
} else {
var_f12_2 = sin_deg((((arg3 - 30.0f) / (arg4 - 30.0f)) * 90.0f) + -90.0f) + 1.0f;
}
break;
case 3:
var_f12_2 = (sin_deg(((arg3 / arg4) * 180.0f) - 90.0f) + 1.0f) * 0.5;
break;
case 4:
var_f12_2 = sin_deg(((arg3 / arg4) * 90.0f) - 90.0f) + 1.0f;
break;
default:
var_f12_2 = arg3 / arg4;
break;
}
*arg5 = arg1 + ((arg2 - arg1) * var_f12_2);
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241274_A2B4B4); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241274_A2B4B4);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024146C_A2B6AC); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024146C_A2B6AC);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802416BC_A2B8FC); ApiStatus func_802416BC_A2B8FC(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241850_A2BA90); if (isInitialCall) {
camera->flags |= CAMERA_FLAGS_SHAKING;
}
guTranslateF(camera->viewMtxShaking,
D_80249904_A33B44 * sin_deg(D_80249900_A33B40 * 486),
D_80249904_A33B44 * cos_deg(D_80249900_A33B40 * 254),
0.0f
);
D_80249900_A33B40++;
D_80249904_A33B44 += (12.0f - D_80249904_A33B44) * 0.2;
if (D_80249900_A33B40 > 20) {
guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f);
camera->flags &= ~CAMERA_FLAGS_SHAKING;
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802419F4_A2BC34); ApiStatus func_80241850_A2BA90(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
Matrix4f sp18;
f32 x, y;
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241B40_A2BD80); if (isInitialCall) {
camera->flags |= CAMERA_FLAGS_SHAKING;
}
x = D_8024990C_A33B4C * sin_deg(D_80249908_A33B48 * 486);
y = D_8024990C_A33B4C * cos_deg(D_80249908_A33B48 * 254);
guTranslateF(camera->viewMtxShaking, x, y, 0.0f);
guTranslateF(camera->viewMtxShaking, x, y, 0.0f);
guRotateF(sp18, 20.0f, 0.0f, 0.0f, 1.0f);
guMtxCatF(sp18, camera->viewMtxShaking, camera->viewMtxShaking);
camera->panActive = TRUE;
if (D_80249908_A33B48 >= 10) {
guRotateF(camera->viewMtxShaking, 20.0f, 0.0f, 0.0f, 1.0f);
return ApiStatus_DONE1;
}
D_80249908_A33B48++;
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241C54_A2BE94); ApiStatus func_802419F4_A2BC34(Evt* script, s32 isInitialCall) {
Npc* npc7 = resolve_npc(script, 7);
Npc* npc8 = resolve_npc(script, 8);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D08_A2BF48); if (isInitialCall) {
npc7->pos.x = -64.0f;
npc7->pos.y = 400.0f;
npc7->pos.z = 85.0f;
npc8->pos.x = -64.0f;
npc8->pos.y = 400.0f;
npc8->pos.z = 85.0f;
npc7->colliderPos.x = npc7->pos.x;
npc8->colliderPos.x = npc8->pos.x;
npc7->colliderPos.z = npc7->pos.z;
npc8->colliderPos.z = npc8->pos.z;
D_8024F2C8 = 400.0f;
}
if (D_80249910_A33B50 < 20) {
npc7->pos.y = D_80249934_A33B74[D_80249910_A33B50];
} else {
npc7->pos.y += D_80249914_A33B54[((D_80249910_A33B50 - 20) & 30) / 2] * 0.1f;
}
npc8->pos.y = npc7->pos.y;
npc7->colliderPos.y = npc7->pos.y;
npc8->colliderPos.y = npc8->pos.y;
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D7C_A2BFBC); D_80249910_A33B50++;
if (D_80249910_A33B50 < 2000) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241F54_A2C194); ApiStatus func_80241B40_A2BD80(Evt* script, s32 isInitialCall) {
Npc* npc7 = resolve_npc(script, 7);
Npc* npc8 = resolve_npc(script, 8);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", update_heroes_start_turn_A2C264); if (isInitialCall) {
npc7->pos.x = -64.0f;
npc7->pos.y = 135.0f;
npc7->pos.z = 85.0f;
npc8->pos.x = -64.0f;
npc8->pos.y = 135.0f;
npc8->pos.z = 85.0f;
npc7->colliderPos.x = npc7->pos.x;
npc8->colliderPos.x = npc8->pos.x;
npc7->colliderPos.z = npc7->pos.z;
npc8->colliderPos.z = npc8->pos.z;
D_8024F2CC = 135.0f;
}
npc7->pos.y += D_80249960_A33BA0[((u32) (D_8024995C_A33B9C - 20) & 30) / 2] * 0.1f;
npc8->pos.y = npc7->pos.y;
npc7->colliderPos.y = npc7->pos.y;
npc8->colliderPos.y = npc8->pos.y;
D_8024995C_A33B9C++;
if (D_8024995C_A33B9C < 2000) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802421E0_A2C420); ApiStatus func_80241C54_A2BE94(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802422A0_A2C4E0); func_80241044_A2B284(30.0f, 15.0f, D_80249980_A33BC0, 1.0f, &D_80249980_A33BC0);
func_80240D54_A2AF94(0, D_80249980_A33BC0);
camera->panActive = TRUE;
if (D_80249980_A33BC0 == 15.0f) {
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802423D4_A2C614); ApiStatus func_80241D08_A2BF48(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802425A0_A2C7E0); if (isInitialCall) {
camera->flags &= ~CAMERA_FLAGS_SHAKING;
}
guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242704_A2C944); ApiStatus func_80241D7C_A2BFBC(Evt* script, s32 isInitialCall) {
Npc* npc = resolve_npc(script, 9);
if (isInitialCall) {
npc->pos.x = -145.0f;
npc->pos.z = 114.0f;
npc->yaw = 270.0f;
npc->colliderPos.x = npc->pos.x;
npc->colliderPos.z = npc->pos.z;
}
if (D_80249984_A33BC4 == 30) {
npc->yaw = 90.0f;
}
if (D_80249984_A33BC4 < 40) {
npc->pos.x = D_802499A8_A33BE8[D_80249984_A33BC4][0] - 145;
npc->pos.y = (((D_802499A8_A33BE8[D_80249984_A33BC4][1] - 135) * 200) / 225) + 147;
if (D_80249984_A33BC4 < 20) {
npc->pos.z = 114.0f - (D_80249984_A33BC4 * 30.0f) / 20.0f;
} else {
npc->pos.z = 84.0f;
}
npc->colliderPos.x = npc->pos.x;
npc->colliderPos.z = npc->pos.z;
} else {
npc->pos.y += D_80249988_A33BC8[((D_80249984_A33BC4 - 40) & 30) / 2] * 0.1f;
}
npc->colliderPos.y = npc->pos.y;
D_80249984_A33BC4++;
if (D_80249984_A33BC4 < 2000) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
ApiStatus func_80241F54_A2C194(Evt* script, s32 isInitialCall) {
Npc* npc = resolve_npc(script, 9);
if (isInitialCall) {
npc->pos.x = -145.0f;
npc->pos.z = 84.0f;
npc->colliderPos.x = npc->pos.x;
npc->colliderPos.z = npc->pos.z;
npc->yaw = 90.0f;
npc->pos.y = 147.0f;
}
npc->pos.y += D_80249A4C_A33C8C[((D_80249A48_A33C88 - 40) & 30) / 2] * 0.1f;
npc->colliderPos.y = npc->pos.y;
D_80249A48_A33C88++;
if (D_80249A48_A33C88 < 2000) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
ApiStatus func_80242024_A2C264(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
func_802410E4_A2B324(0, 121.6f, 90.0f, D_80249A70_A33CB0, 40.0f, &D_80249A6C_A33CAC);
camera->panActive = TRUE;
camera->controlSettings.boomLength = D_80249A6C_A33CAC;
if ((D_80249A70_A33CB0 == ((D_80249A70_A33CB0 / 5) * 5)) && (D_80249A6C_A33CAC != 90.0f)) {
f32 temp_f4 = resolve_npc(script, 7)->pos.y - 150.0f;
fx_fire_breath(
1, script->varTable[0],
script->varTable[1] + temp_f4,
script->varTable[2],
script->varTable[3] - 5,
script->varTable[4] + temp_f4,
script->varTable[5] - 30, 0, 5, 20
);
}
D_80249A70_A33CB0++;
if (D_80249A70_A33CB0 <= 40) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
ApiStatus func_802421E0_A2C420(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
func_802410E4_A2B324(4, 90.0f, 474.7f, D_80249A78_A33CB8, 20.0f, &D_80249A74_A33CB4);
camera->panActive = TRUE;
camera->controlSettings.boomLength = D_80249A74_A33CB4;
D_80249A78_A33CB8++;
if (D_80249A78_A33CB8 < 21) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
ApiStatus func_802422A0_A2C4E0(Evt* script, s32 isInitialCall) {
Npc* npc7 = resolve_npc(script, 7);
Npc* npc8 = resolve_npc(script, 8);
if (isInitialCall) {
D_8024F2D8 = npc7->pos.x;
D_8024F2DC = npc7->pos.z;
}
func_802410E4_A2B324(3, D_8024F2D8, 0.0f, D_80249A7C_A33CBC, 40.0f, &npc7->pos.x);
func_802410E4_A2B324(3, D_8024F2DC, 0.0f, D_80249A7C_A33CBC, 40.0f, &npc7->pos.z);
npc8->pos.x = npc7->pos.x;
npc8->pos.z = npc7->pos.z;
npc7->colliderPos.x = npc7->pos.x;
npc7->colliderPos.z = npc7->pos.z;
npc8->colliderPos.x = npc8->pos.x;
npc8->colliderPos.z = npc8->pos.z;
D_80249A7C_A33CBC++;
if (D_80249A7C_A33CBC <= 40) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
ApiStatus func_802423D4_A2C614(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
func_802410E4_A2B324(4, 35.0f, 35.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E0);
func_802410E4_A2B324(4, 130.0f, 270.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E4);
func_802410E4_A2B324(4, 30.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E8);
func_802410E4_A2B324(4, 232.0f, 177.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2EC);
func_802410E4_A2B324(4, 0.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2F0_C0CB70);
func_80240D54_A2AF94(0, D_8024F2E0);
camera->panActive = TRUE;
camera->controlSettings.boomLength = D_8024F2E4;
camera->movePos.x = D_8024F2E8;
camera->movePos.y = D_8024F2EC;
camera->movePos.z = D_8024F2F0_C0CB70;
D_80249A80_A33CC0++;
if (D_80249A80_A33CC0 <= 90) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
ApiStatus func_802425A0_A2C7E0(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
func_802410E4_A2B324(0, 40.0f, -130.0f, D_80249A90_A33CD0, 170.0f, &D_80249A84_A33CC4);
func_802410E4_A2B324(0, -40.0f, 130.0f, D_80249A90_A33CD0, 170.0f, &D_80249A88_A33CC8);
func_802410E4_A2B324(3, 45.0f, 25.0f, D_80249A90_A33CD0, 170.0f, &D_80249A8C_A33CCC);
camera->panActive = TRUE;
camera->movePos.x = D_80249A84_A33CC4;
camera->movePos.z = D_80249A88_A33CC8;
camera->controlSettings.posB.x = sin_deg(D_80249A8C_A33CCC) * 500.0f;
camera->controlSettings.posB.z = cos_deg(D_80249A8C_A33CCC) * 500.0f;
D_80249A90_A33CD0++;
if (D_80249A90_A33CD0 == 170) {
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
ApiStatus func_80242704_A2C944(void) {
Camera* camera = &gCameras[gCurrentCameraID];
func_802410E4_A2B324(3, 25.0f, 200.0f, D_80249AA4_A33CE4, 120.0f, &D_80249AA0_A33CE0);
func_802410E4_A2B324(3, 50.0f, 35.0f, D_80249AA4_A33CE4, 30.0f, &D_80249A94_A33CD4);
func_802410E4_A2B324(3, 246.1f, 180.0f, D_80249AA4_A33CE4, 30.0f, &D_80249A98_A33CD8);
func_802410E4_A2B324(3, 200.0f, 220.0f, D_80249AA4_A33CE4, 30.0f, &D_80249A9C_A33CDC);
camera->controlSettings.posB.x = sin_deg(D_80249AA0_A33CE0) * 500.0f;
camera->controlSettings.posB.z = cos_deg(D_80249AA0_A33CE0) * 500.0f;
func_80240D54_A2AF94(0, D_80249A94_A33CD4);
camera->panActive = TRUE;
camera->controlSettings.boomLength = D_80249A98_A33CD8;
camera->movePos.y = D_80249A9C_A33CDC;
D_80249AA4_A33CE4++;
if (D_80249AA4_A33CE4 <= 120) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802428C8_A2CB08); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802428C8_A2CB08);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242F74_A2D1B4); ApiStatus func_80242F74_A2D1B4(Evt* script, s32 isInitialCall) {
Camera* camera = &gCameras[gCurrentCameraID];
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024301C_A2D25C); func_80241044_A2B284(D_8024987C_A33ABC, D_802498A8_A33AE8, D_8024A9C8_A34C08, 1.0f, &D_8024A9C8_A34C08);
camera->panActive = TRUE;
camera->controlSettings.boomLength = D_8024A9C8_A34C08;
if (D_8024A9C8_A34C08 == 700.0f) {
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243100_A2D340); ApiStatus func_8024301C_A2D25C(Evt* script, s32 isInitialCall) {
Npc* npc = resolve_npc(script, 9);
if (isInitialCall) {
D_8024F2F4 = npc->pos.x;
D_8024F2F8 = npc->pos.z;
}
func_802410E4_A2B324(3, D_8024F2F4, -95.0f, D_8024A9CC_A34C0C, 40.0f, &npc->pos.x);
func_802410E4_A2B324(3, D_8024F2F8, 20.0f, D_8024A9CC_A34C0C, 40.0f, &npc->pos.z);
npc->colliderPos.x = npc->pos.x;
npc->colliderPos.z = npc->pos.z;
D_8024A9CC_A34C0C++;
if (D_8024A9CC_A34C0C <= 40) {
return ApiStatus_BLOCK;
}
return ApiStatus_DONE1;
}
void func_80243164_A2D3A4(
s32 baseX, s32 baseY,
IMG_PTR img, PAL_PTR pal,
s32 alpha, s32 width, s32 height, s32 lineHeight
);
void func_80243100_A2D340(void) {
s32 x = D_8024AA20_A34C60->unk_44 << 0x10;
s32 y = D_8024AA20_A34C60->unk_46 << 0x10;
if (D_8024AA20_A34C60->unk_00 != 0) {
func_80243164_A2D3A4(
x >> 0x10, y >> 0x10,
D_8024AA20_A34C60->unk_1C, D_8024AA20_A34C60->unk_20,
255, 128, 128, 16
);
}
}
void func_80243164_A2D3A4(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s32 alpha, s32 width, s32 height, s32 lineHeight) { void func_80243164_A2D3A4(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s32 alpha, s32 width, s32 height, s32 lineHeight) {
u8 overlayType; u8 overlayType;
@ -205,7 +649,13 @@ void func_80243164_A2D3A4(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s32 al
gDPPipeSync(gMasterGfxPos++); gDPPipeSync(gMasterGfxPos++);
} }
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024370C_A2D94C); void func_8024370C_A2D94C(void) {
func_80243164_A2D3A4(
D_8024AA20_A34C60->unk_48, D_8024AA20_A34C60->unk_4A,
D_8024AA20_A34C60->unk_18, NULL,
D_8024AA20_A34C60->unk_5C, 128, 128, 32
);
}
void func_80243758_A2D998(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal) { void func_80243758_A2D998(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal) {
s32 i; s32 i;
@ -230,22 +680,260 @@ void func_80243758_A2D998(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal) {
gDPPipeSync(gMasterGfxPos++); gDPPipeSync(gMasterGfxPos++);
} }
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243CC0_A2DF00); void func_80243CC0_A2DF00(void) {
Camera* camera = &gCameras[gCurrentCameraID];
s32 vpX = camera->viewportStartX;
s32 vpY = camera->viewportStartY;
u8 sp10;
f32 sp14;
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243ED0_A2E110); func_8024370C_A2D94C();
gSPDisplayList(gMasterGfxPos++, D_8024AA28_A34C68);
gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr);
if (D_8024AA20_A34C60->unk_5A < 255) {
gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_8024AA20_A34C60->unk_5A);
}
get_screen_overlay_params(1, &sp10, &sp14);
if (sp14 != 0.0f) {
gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, TEXEL0,
PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1);
gDPSetPrimColor(gMasterGfxPos++, 0, 0, 208, 208, 208, (s32) sp14);
}
if (!D_8024AA20_A34C60->unk_58) {
func_80243758_A2D998(
vpX + D_8024AA20_A34C60->unk_40,
vpY + D_8024AA20_A34C60->unk_42,
D_8024AA20_A34C60->unk_0C,
D_8024AA20_A34C60->unk_10
);
func_80243758_A2D998(
vpX + D_8024AA20_A34C60->unk_3C,
vpY + D_8024AA20_A34C60->unk_3E,
D_8024AA20_A34C60->unk_04,
D_8024AA20_A34C60->unk_08
);
} else {
func_80243758_A2D998(
vpX + D_8024AA20_A34C60->unk_3C,
vpY + D_8024AA20_A34C60->unk_3E,
D_8024AA20_A34C60->unk_04,
D_8024AA20_A34C60->unk_08
);
func_80243758_A2D998(
vpX + D_8024AA20_A34C60->unk_40,
vpY + D_8024AA20_A34C60->unk_42,
D_8024AA20_A34C60->unk_0C,
D_8024AA20_A34C60->unk_10
);
}
}
void func_80243ED0_A2E110(s32 arg0, s32 idx) {
s32 i;
idx--;
if (idx < 0) {
u16* pal = D_8024AA20_A34C60->unk_08;
for (i = 0; i < 256; i++) {
*pal++ = 0xD6B5;
}
return;
}
if (!arg0) {
dma_copy(
title_bg_1_ROM_START + idx * 0xA910,
title_bg_1_ROM_START + (idx + 1) * 0xA910 ,
D_8024AA20_A34C60->unk_04
);
} else {
dma_copy(
title_bg_1_ROM_START + idx * 0xA910,
title_bg_1_ROM_START + (idx + 1) * 0xA910 ,
D_8024AA20_A34C60->unk_0C
);
}
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243FC4_A2E204); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243FC4_A2E204);
// needs D_8024AAB4_A34CF4 to be migrated
#ifdef NON_MATCHING
ApiStatus func_802440D0_A2E310(Evt* script, s32 isInitialCall) {
switch (D_8024AAB0_A34CF0) {
case 0:
D_8024AAB0_A34CF0++;
D_8024AAB8_A34CF8 = D_8024AAC0_A34D00[D_8024AAB4_A34CF4];
break;
case 1:
if (D_8024AAB8_A34CF8 != 0) {
D_8024AAB8_A34CF8--;
} else {
D_8024AAB8_A34CF8 = 26;
D_8024AAB0_A34CF0++;
sfx_play_sound(SOUND_B0);
}
break;
case 2:
if (D_8024AAB8_A34CF8 != 0) {
D_8024AAB8_A34CF8--;
if (!D_8024AA20_A34C60->unk_58) {
D_8024AA20_A34C60->unk_3C = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
D_8024AA20_A34C60->unk_3E = 0;
} else {
D_8024AA20_A34C60->unk_40 = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
D_8024AA20_A34C60->unk_42 = 0;
}
} else {
D_8024AAB4_A34CF4++;
if (D_8024AAB4_A34CF4 + 1 < 5) {
func_80243ED0_A2E110(D_8024AA20_A34C60->unk_58, D_8024AAB4_A34CF4 + 1);
D_8024AAB0_A34CF0 = 0;
D_8024AA20_A34C60->unk_3C = 0;
D_8024AA20_A34C60->unk_3E = 0;
D_8024AA20_A34C60->unk_40 = 0;
D_8024AA20_A34C60->unk_42 = 0;
D_8024AA20_A34C60->unk_58 = D_8024AA20_A34C60->unk_58 ^ 1;
} else {
if (!D_8024AA20_A34C60->unk_58) {
D_8024AA20_A34C60->unk_40 = 0;
D_8024AA20_A34C60->unk_42 = 0;
} else {
D_8024AA20_A34C60->unk_3C = 0;
D_8024AA20_A34C60->unk_3E = 0;
}
gCameras[CAM_DEFAULT].flags &= ~CAMERA_FLAGS_ENABLED;
D_8024AAB0_A34CF0++;
}
}
break;
case 3:
D_8024AABC_A34CFC = 0;
D_8024AAB0_A34CF0++;
D_8024AAB8_A34CF8 = D_8024AAC0_A34D00[D_8024AAB4_A34CF4];
break;
case 4:
if (D_8024AAB8_A34CF8 != 0) {
if (D_8024AAB8_A34CF8 < D_8024AAC0_A34D00[D_8024AAB4_A34CF4] - 268) {
u32 temp_v1 = D_8024AABC_A34CFC - 320;
if (D_8024AABC_A34CFC < 320) {
D_8024AA20_A34C60->unk_44 = D_8024AC7C_A34EBC[0];
D_8024AA20_A34C60->unk_46 = D_8024AB3C_A34D7C[D_8024AABC_A34CFC];
} else if (temp_v1 < 15) {
D_8024AA20_A34C60->unk_44 = D_8024AC7C_A34EBC[temp_v1];
if (temp_v1 < 13) {
D_8024AA20_A34C60->unk_46 = D_8024AC7B_A34EBB + D_8024AC9C_A34EDC[temp_v1];
}
}
D_8024AABC_A34CFC++;
}
D_8024AAB8_A34CF8--;
} else {
D_8024AAB8_A34CF8 = 26;
D_8024AAB0_A34CF0++;
D_8024AA20_A34C60->unk_5C = 255;
sfx_play_sound(SOUND_B0);
}
break;
case 5:
if (D_8024AAB8_A34CF8 != 0) {
D_8024AAB8_A34CF8--;
if (!D_8024AA20_A34C60->unk_58) {
D_8024AA20_A34C60->unk_40 = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
D_8024AA20_A34C60->unk_42 = 0;
} else {
D_8024AA20_A34C60->unk_3C = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
D_8024AA20_A34C60->unk_3E = 0;
}
} else {
D_8024AAB0_A34CF0++;
}
break;
case 6:
default:
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
#else
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802440D0_A2E310); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802440D0_A2E310);
#endif
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244454_A2E694); ApiStatus func_80244454_A2E694(Evt* script, s32 isInitialCall) {
if (D_8024ACB8_A34EF8 != 0) {
D_8024ACB8_A34EF8--;
D_8024AA20_A34C60->unk_5C = (D_8024ACB8_A34EF8 * 255) / 30;
return ApiStatus_BLOCK;
} else {
D_8024AA20_A34C60->unk_5C = 0;
free_generic_entity(D_8024AA20_A34C60->unk_00);
D_8024AA20_A34C60->unk_00 = 0;
return ApiStatus_DONE1;
}
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802444E8_A2E728); ApiStatus func_802444E8_A2E728(Evt* script, s32 isInitialCall) {
Npc* npc = resolve_npc(script, 10);
npc->yaw = npc->renderYaw = 180.0f - gCameras[gCurrentCameraID].currentYaw;
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244550_A2E790); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244550_A2E790);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244774_A2E9B4); ApiStatus func_80244774_A2E9B4(Evt* script, s32 isInitialCall) {
Npc* npc7 = resolve_npc(script, 7);
Npc* npc8 = resolve_npc(script, 8);
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024486C_A2EAAC); if (isInitialCall) {
D_8024F374 = npc7->pos.y;
}
func_802410E4_A2B324(3, D_8024F374, D_8024F374 + 500.0f, D_8024AEC4_A35104, 40.0f, &npc7->pos.y);
npc8->pos.y = npc7->pos.y;
npc7->colliderPos.y = npc7->pos.y;
npc8->colliderPos.y = npc8->pos.y;
D_8024AEC4_A35104++;
if (D_8024AEC4_A35104 > 40.0f) {
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244934_A2EB74); ApiStatus func_8024486C_A2EAAC(Evt* script, s32 isInitialCall) {
Npc* npc = resolve_npc(script, 9);
if (isInitialCall) {
D_8024F378 = npc->pos.y;
}
func_802410E4_A2B324(3, D_8024F378, D_8024F378 + 500.0f, D_8024AEC8_A35108, 40.0f, &npc->pos.y);
npc->colliderPos.y = npc->pos.y;
D_8024AEC8_A35108++;
if (D_8024AEC8_A35108 > 40.0f) {
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
ApiStatus func_80244934_A2EB74(Evt* script, s32 isInitialCall) {
if (isInitialCall) {
script->functionTemp[0] = 0;
set_screen_overlay_params_back(1, 255.0f);
set_screen_overlay_color(1, 250, 250, 250);
return ApiStatus_BLOCK;
}
script->functionTemp[0]++;
if (script->functionTemp[0] == 10) {
set_screen_overlay_params_back(0, 0.0f);
set_screen_overlay_color(1, 250, 250, 250);
return ApiStatus_DONE2;
}
set_screen_overlay_params_back(1, (10 - script->functionTemp[0]) * 25);
set_screen_overlay_color(1, 250, 250, 250);
return ApiStatus_BLOCK;
}

11
src/world/area_hos/hos_06/A397F0.c
View File

@ -18,7 +18,16 @@ extern IconHudScriptPair gItemHudScripts[];
INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34);
INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 hos_06_D_80246260[]; extern s32 hos_06_D_80246260[];

177
src/world/area_hos/hos_06/A3A230.c
View File

@ -8,9 +8,22 @@
extern u8 D_802447D0_A3DCB0[]; extern u8 D_802447D0_A3DCB0[];
#define NAMESPACE dup_hos_06
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C);
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
#define NAMESPACE hos_06
extern s32 hos_06_D_80246430[]; extern s32 hos_06_D_80246430[];
@ -62,11 +75,167 @@ ApiStatus func_802411F0_A3A6D0(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_8024126C_A3A74C); typedef struct UnkThing {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ s32 unk_08;
} UnkThing; // size = 0xC
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802414E4_A3A9C4); extern UnkThing D_802447D4_A3DCB4[79];
extern UnkThing D_80244B88_A3E068[16];
extern UnkThing D_80244C48_A3E128[63];
INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241668_A3AB48); ApiStatus func_8024126C_A3A74C(Evt* script, s32 isInitialCall) {
s32 temp_s6 = evt_get_variable(NULL, GameByte(0));
u32 count = 0;
UnkThing* it;
s32 temp_s5;
u32 i;
script->varTable[1] = 0;
for (i = 0, it = D_802447D4_A3DCB4; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
if (temp_s6 >= it->unk_08 &&
func_802411BC_A3A69C(it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(3 + i)) == 0) {
count++;
}
}
if (count > 0) {
temp_s5 = rand_int(count - 1);
it = D_802447D4_A3DCB4;
count = 0;
i = 0;
for (; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
if (temp_s6 >= it->unk_08 &&
func_802411BC_A3A69C(it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(3 + i)) == 0)
{
if (count == temp_s5) {
script->varTable[1] = it->unk_00;
evt_set_variable(NULL, AreaFlag(3 + i), 1);
break;
}
count++;
}
}
return ApiStatus_DONE2;
}
for (i = 0, it = D_802447D4_A3DCB4; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
if (it->unk_08 == 0x2712 &&
func_802411BC_A3A69C(it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(3 + i)) == 0)
{
count++;
}
}
if (count > 0) {
temp_s5 = rand_int(count - 1);
it = D_802447D4_A3DCB4;
count = 0;
i = 0;
for (; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
if (it->unk_08 == 0x2712 &&
func_802411BC_A3A69C(it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(3 + i)) == 0)
{
if (count == temp_s5) {
script->varTable[1] = it->unk_00;
evt_set_variable(NULL, AreaFlag(3 + i), 1);
break;
}
count++;
}
}
}
return ApiStatus_DONE2;
}
ApiStatus func_802414E4_A3A9C4(Evt* script, s32 isInitialCall) {
s32 temp_s5 = evt_get_variable(NULL, GameByte(0));
u32 count = 0;
s32 temp_s7;
UnkThing* it;
u32 i;
script->varTable[1] = 0;
it = D_80244B88_A3E068;
for (i = 0; i < ARRAY_COUNT(D_80244B88_A3E068); i++, it++) {
if (temp_s5 >= it->unk_08 &&
evt_get_variable(NULL, it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(100 + i)) == 0)
{
count++;
}
}
if (count > 0) {
temp_s7 = rand_int(count - 1);
it = D_80244B88_A3E068;
count = 0;
for (i = 0; i < ARRAY_COUNT(D_80244B88_A3E068); i++, it++) {
if (temp_s5 >= it->unk_08 &&
evt_get_variable(NULL, it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(100 + i)) == 0)
{
if (count == temp_s7) {
script->varTable[1] = it->unk_00;
evt_set_variable(NULL, AreaFlag(100 + i), 1);
break;
}
count++;
}
}
}
return ApiStatus_DONE2;
}
ApiStatus func_80241668_A3AB48(Evt* script, s32 isInitialCall) {
s32 temp_s5 = evt_get_variable(NULL, GameByte(0));
u32 count = 0;
s32 temp_s7;
UnkThing* it;
u32 i;
script->varTable[1] = 0;
it = D_80244C48_A3E128;
for (i = 0; i < ARRAY_COUNT(D_80244C48_A3E128); i++, it++) {
if (temp_s5 >= it->unk_08 &&
evt_get_variable(NULL, it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(116 + i)) == 0)
{
count++;
}
}
if (count > 0) {
temp_s7 = rand_int(count - 1);
it = D_80244C48_A3E128;
count = 0;
for (i = 0; i < ARRAY_COUNT(D_80244C48_A3E128); i++, it++) {
if (temp_s5 >= it->unk_08 &&
evt_get_variable(NULL, it->unk_04) == 0 &&
evt_get_variable(NULL, AreaFlag(116 + i)) == 0)
{
if (count == temp_s7) {
script->varTable[1] = it->unk_00;
evt_set_variable(NULL, AreaFlag(116 + i), 1);
break;
}
count++;
}
}
}
return ApiStatus_DONE2;
}
ApiStatus func_802417EC_A3ACCC(Evt* script, s32 isInitialCall) { ApiStatus func_802417EC_A3ACCC(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;

11
src/world/area_jan/jan_02/B2C8A0.c
View File

@ -10,7 +10,16 @@
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_80248760_jan_02[]; extern s32 D_80248760_jan_02[];

11
src/world/area_jan/jan_03/B34BD0.c
View File

@ -29,7 +29,16 @@ static char* N(exit_str_4) = "tik_08";
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_8024FBA0[]; extern s32 D_8024FBA0[];

19
src/world/area_kkj/kkj_18/AF2FE0.c
View File

@ -1,8 +1,8 @@
#include "kkj_18.h" #include "kkj_18.h"
#include "camera.h" #include "camera.h"
extern s32 D_80241F10_AF4BB0; extern s32 N(ItemChoice_HasSelectedItem);
extern s32 D_80241F14_AF4BB4; extern s32 N(ItemChoice_SelectedItemID);
extern s32 kkj_18_D_80244E78[]; extern s32 kkj_18_D_80244E78[];
#include "world/common/todo/GetNpcCollisionHeight.inc.c" #include "world/common/todo/GetNpcCollisionHeight.inc.c"
@ -15,12 +15,12 @@ ApiStatus func_8024056C_AF320C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80241F10_AF4BB0 = 0; kkj_18_ItemChoice_HasSelectedItem = 0;
} }
if (D_80241F10_AF4BB0 != 0) { if (kkj_18_ItemChoice_HasSelectedItem != 0) {
D_80241F10_AF4BB0 = 0; kkj_18_ItemChoice_HasSelectedItem = 0;
evt_set_variable(script, *args++, D_80241F14_AF4BB4); evt_set_variable(script, *args++, kkj_18_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -30,12 +30,11 @@ ApiStatus func_8024056C_AF320C(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C); INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C);
#endif #endif
ApiStatus func_802405C0_AF3260(Evt* script, s32 isInitialCall) { ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_80241F14_AF4BB4 = evt_get_variable(script, *args++); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
D_80241F10_AF4BB0 = 1; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

19
src/world/area_kkj/kkj_19/AF7C00.c
View File

@ -1,8 +1,8 @@
#include "kkj_19.h" #include "kkj_19.h"
#include "hud_element.h" #include "hud_element.h"
extern s32 D_80241B10_AF9460; extern s32 kkj_19_ItemChoice_HasSelectedItem;
extern s32 D_80241B14_AF9464; extern s32 kkj_19_ItemChoice_SelectedItemID;
extern s32 kkj_19_D_802461F0[]; extern s32 kkj_19_D_802461F0[];
extern s32 D_802463B8_kkj_19[]; extern s32 D_802463B8_kkj_19[];
extern s32 D_8024652C; extern s32 D_8024652C;
@ -32,12 +32,12 @@ ApiStatus func_802404DC_AF7E2C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80241B10_AF9460 = 0; kkj_19_ItemChoice_HasSelectedItem = 0;
} }
if (D_80241B10_AF9460 != 0) { if (kkj_19_ItemChoice_HasSelectedItem != 0) {
D_80241B10_AF9460 = 0; kkj_19_ItemChoice_HasSelectedItem = 0;
evt_set_variable(script, *args++, D_80241B14_AF9464); evt_set_variable(script, *args++, kkj_19_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -47,12 +47,11 @@ ApiStatus func_802404DC_AF7E2C(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C);
#endif #endif
ApiStatus func_80240530_AF7E80(Evt* script, s32 isInitialCall) { ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_80241B14_AF9464 = evt_get_variable(script, *args++); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
D_80241B10_AF9460 = 1; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

11
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -47,7 +47,16 @@ ApiStatus func_80242014_8B2084(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 kmr_02_D_80257F58[]; extern s32 kmr_02_D_80257F58[];

25
src/world/area_kpa/kpa_81/A78510.c
View File

@ -4,8 +4,8 @@
#include "world/common/todo/AddPlayerHandsOffset.inc.c" #include "world/common/todo/AddPlayerHandsOffset.inc.c"
extern s32 D_80240D98_A79258; extern s32 N(ItemChoice_HasSelectedItem);
extern s32 D_80240D9C_A7925C; extern s32 N(ItemChoice_SelectedItemID);
// Needs data migrated // Needs data migrated
#ifdef NON_MATCHING #ifdef NON_MATCHING
@ -13,11 +13,11 @@ ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80240D98_A79258 = 0; kpa_81_ItemChoice_HasSelectedItem = 0;
} }
if (D_80240D98_A79258 != 0) { if (kpa_81_ItemChoice_HasSelectedItem != 0) {
D_80240D98_A79258 = 0; kpa_81_ItemChoice_HasSelectedItem = 0;
evt_set_variable(script, *args++, D_80240D9C_A7925C); evt_set_variable(script, *args++, kpa_81_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -32,12 +32,19 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C);
ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) { ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_80240D9C_A7925C = evt_get_variable(script, *args++); kpa_81_ItemChoice_SelectedItemID = evt_get_variable(script, *args++);
D_80240D98_A79258 = 1; kpa_81_ItemChoice_HasSelectedItem = 1;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
#else #else
INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
#endif #endif
INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8); INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8);

10
src/world/area_kpa/kpa_82/A7A550.c
View File

@ -6,14 +6,14 @@
INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C); INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C);
extern s32 D_80240C20_A7B120; extern s32 N(ItemChoice_HasSelectedItem);
extern s32 D_80240C24_A7B124; extern s32 N(ItemChoice_SelectedItemID);
ApiStatus func_802402D0_A7A7D0(Evt* script, s32 isInitialCall) { ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_80240C24_A7B124 = evt_get_variable(script, *args++); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
D_80240C20_A7B120 = 1; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

11
src/world/area_mac/mac_00/7EB340.c
View File

@ -17,7 +17,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600);
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 mac_00_D_80255BA0[]; extern s32 mac_00_D_80255BA0[];

13
src/world/area_mac/mac_00/7ED280.c
View File

@ -22,7 +22,18 @@ static char* N(exit_str_0) = "mac_01";
INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454);
INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); #define NAMESPACE dup_mac_00
extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
#define NAMESPACE mac_00
extern s32 D_80255EE0[]; extern s32 D_80255EE0[];

10
src/world/area_mac/mac_01/8017D0.c
View File

@ -3,8 +3,8 @@
#define CHUCK_QUIZMO_NPC_ID 5 #define CHUCK_QUIZMO_NPC_ID 5
extern s32 D_8024D944_80E1C4; extern s32 mac_01_ItemChoice_HasSelectedItem;
extern s32 D_8024D948_80E1C8; extern s32 mac_01_ItemChoice_SelectedItemID;
extern s32 D_80258404_818C84; extern s32 D_80258404_818C84;
extern s32 D_80262F68; extern s32 D_80262F68;
@ -68,11 +68,11 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554);
ApiStatus func_80243D28_8045A8(Evt* script, s32 isInitialCall) { ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_8024D948_80E1C8 = evt_get_variable(script, *args++); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
D_8024D944_80E1C4 = 1; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

22
src/world/area_mac/mac_02/823BF0.c
View File

@ -9,8 +9,8 @@ extern s32 N(Quizmo_AnswerResult);
extern EffectInstance* N(Quizmo_StageEffect); extern EffectInstance* N(Quizmo_StageEffect);
extern EffectInstance* N(Quizmo_AudienceEffect); extern EffectInstance* N(Quizmo_AudienceEffect);
extern EffectInstance* N(Quizmo_VannaTEffect); extern EffectInstance* N(Quizmo_VannaTEffect);
extern s32 D_80248778_82BA38; extern s32 N(ItemChoice_HasSelectedItem);
extern s32 D_8024877C_82BA3C; extern s32 N(ItemChoice_SelectedItemID);
extern s32 D_8024EA10; extern s32 D_8024EA10;
extern s32 D_8024EA14; extern s32 D_8024EA14;
@ -22,16 +22,16 @@ extern s32 D_8024EA14;
// needs data migration, matching otherwise // needs data migration, matching otherwise
#ifdef NON_MATCHING #ifdef NON_MATCHING
s32 D_8024877C_82BA3C = 0; s32 mac_02_ItemChoice_SelectedItemID = 0;
ApiStatus func_80242A80_825D40(Evt* script, s32 isInitialCall) { ApiStatus func_80242A80_825D40(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80248778_82BA38 = 0; mac_02_ItemChoice_HasSelectedItem = 0;
} }
if (D_80248778_82BA38 != 0) { if (mac_02_ItemChoice_HasSelectedItem != 0) {
D_80248778_82BA38 = 0; mac_02_ItemChoice_HasSelectedItem = 0;
evt_set_variable(script, args[0], D_8024877C_82BA3C); evt_set_variable(script, args[0], mac_02_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
return ApiStatus_BLOCK; return ApiStatus_BLOCK;
@ -40,7 +40,13 @@ ApiStatus func_80242A80_825D40(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40);
#endif #endif
INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 mac_02_D_8024E570[]; extern s32 mac_02_D_8024E570[];

11
src/world/area_mac/mac_03/831B20.c
View File

@ -19,7 +19,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70);
INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 mac_03_D_80251400[]; extern s32 mac_03_D_80251400[];

11
src/world/area_mac/mac_04/843030.c
View File

@ -17,7 +17,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0);
INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 mac_04_D_8024F5D0[]; extern s32 mac_04_D_8024F5D0[];

11
src/world/area_mac/mac_05/852170.c
View File

@ -33,7 +33,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750);
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 mac_05_D_80252A00[]; extern s32 mac_05_D_80252A00[];

20
src/world/area_nok/nok_01/9C53E0.c
View File

@ -1,8 +1,8 @@
#include "nok_01.h" #include "nok_01.h"
#include "effects.h" #include "effects.h"
extern s32 D_8024856C_9CD94C; extern s32 N(ItemChoice_HasSelectedItem);
extern s32 D_80248570_9CD950; extern s32 N(ItemChoice_SelectedItemID);
static char* N(exit_str_0) = "nok_13"; static char* N(exit_str_0) = "nok_13";
static char* N(exit_str_1) = "nok_02"; static char* N(exit_str_1) = "nok_02";
@ -31,12 +31,12 @@ ApiStatus func_80242028_9C7408(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_8024856C_9CD94C = FALSE; nok_01_ItemChoice_HasSelectedItem = FALSE;
} }
if (D_8024856C_9CD94C) { if (nok_01_ItemChoice_HasSelectedItem) {
D_8024856C_9CD94C = FALSE; nok_01_ItemChoice_HasSelectedItem = FALSE;
evt_set_variable(script, *args++, D_80248570_9CD950); evt_set_variable(script, *args++, nok_01_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
return ApiStatus_BLOCK; return ApiStatus_BLOCK;
@ -45,7 +45,13 @@ ApiStatus func_80242028_9C7408(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
#endif #endif
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 nok_01_D_80251C70[]; extern s32 nok_01_D_80251C70[];

11
src/world/area_nok/nok_02/9D7020.c
View File

@ -16,7 +16,16 @@ static char* N(exit_str_3) = "";
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 nok_02_D_802547D0[]; extern s32 nok_02_D_802547D0[];

13
src/world/area_nok/nok_02/9D7AA0.c
View File

@ -21,7 +21,18 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44); #define NAMESPACE dup_nok_02
extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
#define NAMESPACE nok_02
extern s32 nok_02_D_802549D0[]; extern s32 nok_02_D_802549D0[];

15
src/world/area_nok/nok_02/9DA8F0.c
View File

@ -31,15 +31,22 @@ ApiStatus func_802438D0_9DA8F0(Evt* script, s32 isInitialCall) {
#define NAMESPACE dup2_nok_02 #define NAMESPACE dup2_nok_02
#include "world/common/todo/GetNpcCollisionHeight.inc.c" #include "world/common/todo/GetNpcCollisionHeight.inc.c"
#define NAMESPACE nok_02
#define NAMESPACE dup2_nok_02
#include "world/common/todo/AddPlayerHandsOffset.inc.c" #include "world/common/todo/AddPlayerHandsOffset.inc.c"
#define NAMESPACE nok_02
INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
#define NAMESPACE nok_02
extern s32 nok_02_D_80254BA0[]; extern s32 nok_02_D_80254BA0[];

11
src/world/area_obk/obk_01/BBD980.c
View File

@ -10,7 +10,16 @@
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4); INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4);
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50); INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50);

11
src/world/area_obk/obk_03/BC43F0.c
View File

@ -10,7 +10,16 @@
INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734);
INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_80243BE0[]; extern s32 D_80243BE0[];

11
src/world/area_omo/omo_05/DB22C0.c
View File

@ -15,7 +15,16 @@ static char* N(exit_str_1) = "";
INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438);
INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_80245650[]; extern s32 D_80245650[];

19
src/world/area_omo/omo_13/DE2710.c
View File

@ -14,12 +14,12 @@ ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80241C04_DE4094 = FALSE; omo_13_ItemChoice_HasSelectedItem = FALSE;
} }
if (D_80241C04_DE4094) { if (omo_13_ItemChoice_HasSelectedItem) {
D_80241C04_DE4094 = FALSE; omo_13_ItemChoice_HasSelectedItem = FALSE;
evt_set_variable(script, *args++, D_80241C08_DE4098); evt_set_variable(script, *args++, omo_13_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -29,7 +29,16 @@ ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390);
#endif #endif
INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 omo_13_80243220[]; extern s32 omo_13_80243220[];

25
src/world/area_osr/osr_01/AB0350.c
View File

@ -8,8 +8,8 @@
#include "world/common/todo/AddPlayerHandsOffset.inc.c" #include "world/common/todo/AddPlayerHandsOffset.inc.c"
extern s32 D_8024121C_AB120C; extern s32 N(ItemChoice_HasSelectedItem);
extern s32 D_80241220_AB1210; extern s32 N(ItemChoice_SelectedItemID);
// Needs data migrated // Needs data migrated
#ifdef NON_MATCHING #ifdef NON_MATCHING
@ -17,12 +17,12 @@ ApiStatus func_802406A4_AB0694(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_8024121C_AB120C = 0; osr_01_ItemChoice_HasSelectedItem = 0;
} }
if (D_8024121C_AB120C != 0) { if (osr_01_ItemChoice_HasSelectedItem != 0) {
D_8024121C_AB120C = 0; osr_01_ItemChoice_HasSelectedItem = 0;
evt_set_variable(script, *args++, D_80241220_AB1210); evt_set_variable(script, *args++, osr_01_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -37,12 +37,19 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694);
ApiStatus func_802406F8_AB06E8(Evt* script, s32 isInitialCall) { ApiStatus func_802406F8_AB06E8(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_80241220_AB1210 = evt_get_variable(script, *args++); osr_01_ItemChoice_SelectedItemID = evt_get_variable(script, *args++);
D_8024121C_AB120C = 1; osr_01_ItemChoice_HasSelectedItem = 1;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
#else #else
INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
#endif #endif
INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720);

2
src/world/area_osr/osr_03/AB62B0.c
View File

@ -3,7 +3,7 @@
ApiStatus func_80240020_AB62B0(Evt* script, s32 isInitialCall) { ApiStatus func_80240020_AB62B0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args, sin_deg(evt_get_variable(script, *args)) * 20.0f); evt_set_variable(script, *args++, sin_deg(evt_get_variable(script, *args)) * 20.0f);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/world/area_osr/osr_04/AB92B0.c
View File

@ -12,6 +12,6 @@ const char* N(exit_str_0) = "kkj_03";
ApiStatus func_80240050_AB9300(Evt* script, s32 isInitialCall) { ApiStatus func_80240050_AB9300(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args, (sin_deg(evt_get_variable(script, *args)) * 20.0f)); evt_set_variable(script, *args++, (sin_deg(evt_get_variable(script, *args)) * 20.0f));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

11
src/world/area_pra/pra_01/D4D060.c
View File

@ -15,7 +15,16 @@ ApiStatus func_80240F60_D4DFA0(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC);
INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_80242FB0[]; extern s32 D_80242FB0[];

11
src/world/area_pra/pra_02/D50010.c
View File

@ -8,7 +8,16 @@
INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C);
INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411A0_D51190); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8);

11
src/world/area_pra/pra_09/D588B0.c
View File

@ -9,7 +9,16 @@
INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC); INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC);
INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411A0_D59A30); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 flo_18_shakeTree[]; extern s32 flo_18_shakeTree[];

11
src/world/area_pra/pra_13/D64600.c
View File

@ -8,7 +8,16 @@
INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C); INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C);
INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411A0_D65780); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_80243720[]; extern s32 D_80243720[];

11
src/world/area_pra/pra_19/D6E9D0.c
View File

@ -8,7 +8,16 @@
INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC); INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC);
INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411A0_D6FB50); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_802479F0[]; extern s32 D_802479F0[];

11
src/world/area_pra/pra_31/D7ED80.c
View File

@ -6,7 +6,16 @@
INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC);
INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_80247CA0[]; extern s32 D_80247CA0[];

11
src/world/area_sam/sam_01/CF7E80.c
View File

@ -9,7 +9,16 @@
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC);
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_8024DBC0[]; extern s32 D_8024DBC0[];

11
src/world/area_sam/sam_04/D138E0.c
View File

@ -6,7 +6,16 @@
INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C); INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C);
INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240590_D13B60); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 sam_04_80245210[]; extern s32 sam_04_80245210[];

11
src/world/area_sam/sam_06/D203E0.c
View File

@ -12,7 +12,16 @@
INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C);
INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70); extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
extern s32 D_8024BEA0[]; extern s32 D_8024BEA0[];

2
src/world/area_trd/trd_03/trd_03_1_main.c
View File

@ -18,7 +18,7 @@ API_CALLABLE(N(GetHiddenDoorPushDirection)) {
pushDir = 2; pushDir = 2;
} }
evt_set_variable(script, *args, pushDir); evt_set_variable(script, *args++, pushDir);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/world/common/atomic/ItemChoice_PartA.inc.c
View File

@ -13,7 +13,7 @@ ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) {
if (N(ItemChoice_HasSelectedItem)) { if (N(ItemChoice_HasSelectedItem)) {
N(ItemChoice_HasSelectedItem) = FALSE; N(ItemChoice_HasSelectedItem) = FALSE;
evt_set_variable(script, *args, N(ItemChoice_SelectedItemID)); evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/world/common/complete/KeyItemChoice.inc.c
View File

@ -23,7 +23,7 @@ ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) {
if (N(ItemChoice_HasSelectedItem)) { if (N(ItemChoice_HasSelectedItem)) {
N(ItemChoice_HasSelectedItem) = FALSE; N(ItemChoice_HasSelectedItem) = FALSE;
evt_set_variable(script, *args, N(ItemChoice_SelectedItemID)); evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/world/common/complete/NormalItemChoice.inc.c
View File

@ -23,7 +23,7 @@ API_CALLABLE(N(ItemChoice_WaitForSelection)) {
if (N(ItemChoice_HasSelectedItem)) { if (N(ItemChoice_HasSelectedItem)) {
N(ItemChoice_HasSelectedItem) = FALSE; N(ItemChoice_HasSelectedItem) = FALSE;
evt_set_variable(script, *args, N(ItemChoice_SelectedItemID)); evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

6
src/world/common/todo/UnkFunc52.inc.c
View File

@ -38,16 +38,16 @@ ApiStatus N(UnkFunc52)(Evt* script, s32 isInitialCall) {
case ACTOR_TYPE_UNUSED_62: case ACTOR_TYPE_UNUSED_62:
case ACTOR_TYPE_UNUSED_63: case ACTOR_TYPE_UNUSED_63:
case ACTOR_TYPE_UNUSED_64: case ACTOR_TYPE_UNUSED_64:
evt_set_variable(script, *args, -1); evt_set_variable(script, *args++, -1);
break; break;
case ACTOR_TYPE_DRY_BONES: case ACTOR_TYPE_DRY_BONES:
if (actor->state.varTable[8] == 1) { if (actor->state.varTable[8] == 1) {
evt_set_variable(script, *args, -1); evt_set_variable(script, *args++, -1);
break; break;
} }
default: default:
evt_set_variable(script, *args, 0); evt_set_variable(script, *args++, 0);
} }
return ApiStatus_DONE2; return ApiStatus_DONE2;

18
src/world/dead/dead_03/EB1170.c
View File

@ -1,8 +1,8 @@
#include "dead_03.h" #include "dead_03.h"
extern s32 func_80059AC8(s32, s32); extern s32 func_80059AC8(s32, s32);
extern s32 D_802417E4_EB2644; extern s32 dead_03_ItemChoice_HasSelectedItem;
extern s32 D_802417E8_EB2648; extern s32 dead_03_ItemChoice_SelectedItemID;
extern s32 dead_03_D_802442D0[]; extern s32 dead_03_D_802442D0[];
extern s32 dead_03_LetterDelivery_SavedNpcAnim; extern s32 dead_03_LetterDelivery_SavedNpcAnim;
extern s32 D_800B8DEC; extern s32 D_800B8DEC;
@ -21,11 +21,11 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_802417E4_EB2644 = 0; dead_03_ItemChoice_HasSelectedItem = 0;
} }
if (D_802417E4_EB2644 != 0) { if (dead_03_ItemChoice_HasSelectedItem != 0) {
D_802417E4_EB2644 = 0; dead_03_ItemChoice_HasSelectedItem = 0;
dead_evt_set_variable(script, *args++, D_802417E8_EB2648); dead_evt_set_variable(script, *args++, dead_03_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
return ApiStatus_BLOCK; return ApiStatus_BLOCK;
@ -34,11 +34,11 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4); INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4);
#endif #endif
ApiStatus func_802406A8_EB1508(Evt* script, s32 isInitialCall) { ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_802417E8_EB2648 = evt_get_variable(script, *args++); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
D_802417E4_EB2644 = 1; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

21
src/world/dead/flo_12/EDC020.c
View File

@ -17,12 +17,12 @@ ApiStatus func_802405C0_EDC5A0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80241850_EDD830 = FALSE; dead_flo_12_ItemChoice_HasSelectedItem = FALSE;
} }
if (D_80241850_EDD830) { if (dead_flo_12_ItemChoice_HasSelectedItem) {
D_80241850_EDD830 = FALSE; dead_flo_12_ItemChoice_HasSelectedItem = FALSE;
evt_set_variable(script, *args, D_80241850_EDD834); evt_set_variable(script, *args++, D_80241850_EDD834);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -32,17 +32,16 @@ ApiStatus func_802405C0_EDC5A0(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "EDC020", func_802405C0_EDC5A0); INCLUDE_ASM(s32, "EDC020", func_802405C0_EDC5A0);
#endif #endif
#ifdef NON_MATCHING // TODO(data) extern s32 N(ItemChoice_HasSelectedItem);
ApiStatus func_80240614_EDC5F4(Evt* script, s32 isInitialCall) { extern s32 N(ItemChoice_SelectedItemID);
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_80241850_EDD834 = evt_get_variable(script, *args); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
D_80241850_EDD830 = TRUE; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
#else
INCLUDE_ASM(s32, "EDC020", func_80240614_EDC5F4);
#endif
ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) { ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;

23
src/world/dead/kzn_17/EA0C10.c
View File

@ -34,12 +34,12 @@ ApiStatus func_802429C0_EA32C0(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_802441B8_EA4AB8 = FALSE; dead_kzn_17_ItemChoice_HasSelectedItem = FALSE;
} }
if (D_802441B8_EA4AB8) { if (dead_kzn_17_ItemChoice_HasSelectedItem) {
D_802441B8_EA4AB8 = FALSE; dead_kzn_17_ItemChoice_HasSelectedItem = FALSE;
evt_set_variable(script, *args++, D_802441BC_EA4ABC); evt_set_variable(script, *args++, dead_kzn_17_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -49,19 +49,16 @@ ApiStatus func_802429C0_EA32C0(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "EA0C10", func_802429C0_EA32C0); INCLUDE_ASM(s32, "EA0C10", func_802429C0_EA32C0);
#endif #endif
// Requires data migration extern s32 N(ItemChoice_HasSelectedItem);
#ifdef NON_MATCHING extern s32 N(ItemChoice_SelectedItemID);
ApiStatus func_80242A14_EA3314(Evt* script, s32 isInitialCall) {
ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
D_802441BC_EA4ABC = dead_evt_get_variable(script, *args++); N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
D_802441B8_EA4AB8 = TRUE; N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
#else
INCLUDE_ASM(s32, "EA0C10", func_80242A14_EA3314);
#endif
ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) { ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;

20
src/world/dead/kzn_19/EA8AE0.c
View File

@ -2,8 +2,8 @@
extern Gfx D_80243AD8_EAC5B8[]; extern Gfx D_80243AD8_EAC5B8[];
extern s32 D_80243BB8_EAC698[]; extern s32 D_80243BB8_EAC698[];
extern s32 D_80243DD8_EAC8B8; extern s32 dead_kzn_19_ItemChoice_HasSelectedItem;
extern s32 D_80243DDC_EAC8BC; extern s32 dead_kzn_19_ItemChoice_SelectedItemID;
extern s32 D_80248380; extern s32 D_80248380;
extern s32 N(D_80248388)[]; extern s32 N(D_80248388)[];
@ -297,12 +297,12 @@ ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;
if (isInitialCall) { if (isInitialCall) {
D_80243DD8_EAC8B8 = FALSE; dead_kzn_19_ItemChoice_HasSelectedItem = FALSE;
} }
if (D_80243DD8_EAC8B8) { if (dead_kzn_19_ItemChoice_HasSelectedItem) {
D_80243DD8_EAC8B8 = FALSE; dead_kzn_19_ItemChoice_HasSelectedItem = FALSE;
evt_set_variable(script, *args++, D_80243DDC_EAC8BC); evt_set_variable(script, *args++, dead_kzn_19_ItemChoice_SelectedItemID);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -313,7 +313,13 @@ ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C); INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C);
#endif #endif
INCLUDE_ASM(s32, "EA8AE0", func_80241800_EAA2E0); ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) { ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos; Bytecode* args = script->ptrReadPos;

45
tools/substitute.py
View File

@ -21,10 +21,21 @@ from_funcs = []
with open(args.from_list) as f: with open(args.from_list) as f:
from_text = f.readlines() from_text = f.readlines()
to_line = from_text[0].strip() to_line = """
func_name = to_line[to_line.rfind("/") + 1:to_line.find(".")] extern s32 N(ItemChoice_HasSelectedItem);
extern s32 N(ItemChoice_SelectedItemID);
for from_line in from_text[1:]: ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
N(ItemChoice_HasSelectedItem) = TRUE;
return ApiStatus_DONE2;
}
"""
func_name = "ItemChoice_SaveSelected"
for from_line in from_text:
if len(from_line.strip()) > 0: if len(from_line.strip()) > 0:
from_funcs.append(from_line.rstrip().split(" ")[-1]) from_funcs.append(from_line.rstrip().split(" ")[-1])
@ -38,7 +49,7 @@ for root, dirs, files in os.walk(src_dir):
f_text = f_text_orig f_text = f_text_orig
for func in from_funcs: for func in from_funcs:
search_pattern = re.compile("\n.*" + func + "\).*\n") search_pattern = re.compile("\n.*" + func + "\).*\n")
f_text = re.sub(search_pattern, "\n" + to_line + "\n", f_text) f_text = re.sub(search_pattern, to_line, f_text)
if f_text != f_text_orig: if f_text != f_text_orig:
with open(f_path, "w", newline="\n") as f: with open(f_path, "w", newline="\n") as f:
f.write(f_text) f.write(f_text)
@ -46,6 +57,8 @@ for root, dirs, files in os.walk(src_dir):
# # Rename symbols in from_funcs to namespace equivalents # # Rename symbols in from_funcs to namespace equivalents
# for root, dirs, files in os.walk # for root, dirs, files in os.walk
to_replace = []
for root, dirs, files in os.walk(asm_dir): for root, dirs, files in os.walk(asm_dir):
for f_name in files: for f_name in files:
if f_name.endswith(".s"): if f_name.endswith(".s"):
@ -55,18 +68,26 @@ for root, dirs, files in os.walk(asm_dir):
f_text = f_text_orig f_text = f_text_orig
if Path(f_path).parent.parent.name == "nonmatchings": namespace = Path(f_path).parent.name
namespace = Path(f_path).parent.name non_matching = "nonmatchings" in str(Path(f_path))
else:
namespace = Path(f_path).parent.parent.name
# TODO refactor into new func if non_matching:
# if f_name[:-2] in from_funcs: namespace = Path(f_path).parent.name
# syms = list(set(re.findall(r"D_[0-9A-F]{8}_[0-9A-F]{6}", f_text))) if "world" not in str(Path(f_path)):
# print(f"{syms[0]} {namespace}_varTable") namespace = Path(f_path).parent.name
namespace = "dead_" + namespace
for func in from_funcs: for func in from_funcs:
f_text = f_text.replace(func, namespace + "_" + func_name) f_text = f_text.replace(func, namespace + "_" + func_name)
if f_text != f_text_orig: if f_text != f_text_orig:
if non_matching:
syms = sorted(set(re.findall(r"D_[0-9A-F]{8}_[0-9A-F]{6}", f_text)))
to_replace.append(syms[0] + " " + namespace + "_ItemChoice_HasSelectedItem\n")
to_replace.append(syms[1] + " " + namespace + "_ItemChoice_SelectedItemID\n")
with open(f_path, "w", newline="\n") as f: with open(f_path, "w", newline="\n") as f:
f.write(f_text) f.write(f_text)
with open("to_rename.txt", "w") as f:
f.writelines(to_replace)

2
ver/us/asm/data/world/area_hos/hos_05/A30810.data.s
View File

File diff suppressed because one or more lines are too long

8
ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s
View File

@ -14,20 +14,20 @@ dlabel hos_06_varStash
dlabel D_80242C0C_A3C0EC dlabel D_80242C0C_A3C0EC
.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242C6C_A3C14C dlabel hos_06_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80242C70_A3C150 dlabel hos_06_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80242C74_A3C154 dlabel D_80242C74_A3C154
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, hos_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242E08_A3C2E8 dlabel D_80242E08_A3C2E8
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242E88_A3C368 dlabel D_80242E88_A3C368
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, hos_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802431AC_A3C68C dlabel D_802431AC_A3C68C
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

11
ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s
View File

@ -2,14 +2,14 @@
.section .data .section .data
dlabel D_802445D0_A3DAB0 dlabel dup_hos_06_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802445D4_A3DAB4 dlabel dup_hos_06_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802445D8_A3DAB8 dlabel D_802445D8_A3DAB8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240FD0_A3A4B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_hos_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024471C_A3DBFC dlabel D_8024471C_A3DBFC
.word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, hos_06_D_80246430, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, hos_06_D_80246430, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -30,10 +30,7 @@ dlabel D_802447D8_A3DCB8
.word 0x0000010A, 0xFFFFFFF3, 0x00220002, 0x0000010C, 0x0000002B, 0x00220004, 0x0000012F, 0xFFFFFFB6, 0x00220003, 0x000000E1, 0xFFFFFFB6, 0x00220005, 0x000000EB, 0xFFFFFFCB, 0x00220007, 0x0000012E, 0xFFFFFFDF, 0x00220008, 0x000000E4, 0xFFFFFFA7, 0x00220006, 0x000000EF, 0x00000019, 0x00220000, 0x00000123, 0x0000003F, 0x00220009, 0x00000124, 0xFFFFFFC5, 0x0022000B, 0x00000109, 0xFFFFFFA7, 0x0022000C, 0x0000010B, 0x00000029, 0x0022000D, 0x000000E0, 0xFFFFFFF3, 0x00220011, 0x00000107, 0xFFFFD8F0, 0x0022000E, 0x000000E8, 0xFFFFFFB9, 0x0022000F, 0x00000117, 0x0000000B, 0x00220010, 0x00000108, 0x00000029, 0x00220012, 0x000000EE, 0xFFFFFFB6, 0x0022000A, 0x00000126, 0x0000002B, 0x00220013, 0x000000E9, 0xFFFFFFCB, 0x00220016, 0x000000ED, 0xFFFFFFD8, 0x00220041, 0x00000104, 0xFFFFFFA7, 0x00220014, 0x00000106, 0x0000004D, 0x00220017, 0x00000129, 0xFFFFFFCB, 0x00220018, 0x00000132, 0xFFFFFFF6, 0x00220019, 0x00000133, 0x0000005E, 0x0022001A, 0x000000E7, 0xFFFFFFCE, 0x0022001B, 0x00000134, 0xFFFFD8F0, 0x0022001D, 0x000000F8, 0xFFFFFFCE, 0x0022001E, 0x00000135, 0xFFFFFFA7, 0x00220020, 0x000000FF, 0x00002712, 0x00220021, 0x00000136, 0x0000000B, 0x00220022, 0x00000140, 0x00002712, 0x00220023, 0x00000141, 0x0000002B, 0x00220024, 0x00000105, 0x00002712, 0x00220025, 0x00000138, 0x0000002B, 0x00220026, 0x000000E3, 0xFFFFFFCB, 0x00220027, 0x00000116, 0x0000004D, 0x00220028, 0x00000113, 0x0000004D, 0x00220029, 0x000000F4, 0x00000007, 0x0022002A, 0x000000E2, 0x00002712, 0x0022002B, 0x0000013C, 0xFFFFFFF6, 0x0022002C, 0x000000F5, 0x00002712, 0x00220038, 0x00000100, 0x00002712, 0x00220034, 0x000000FA, 0xFFFFFFF6, 0x00220035, 0x000000EC, 0x00000019, 0x00220036, 0x000000E5, 0xFFFFFFC2, 0x0022002F, 0x00000112, 0xFFFFD8F0, 0x0022002D, 0x00000111, 0xFFFFFFF3, 0x0022002E, 0x0000010D, 0xFFFFFFCB, 0x00220030, 0x000000F9, 0xFFFFFFDF, 0x00220037, 0x000000F2, 0x00002712, 0x00220031, 0x00000130, 0x00000029, 0x00220032, 0x0000013A, 0xFFFFFFB9, 0x00220039, 0x000000F1, 0x00002712, 0x00220033, 0x000000FB, 0xFFFFFFF6, 0x0022003A, 0x00000114, 0x0000003F, 0x0022003B, 0x000000F7, 0xFFFFFFC2, 0x0022003C, 0x000000F3, 0x00002712, 0x00220042, 0x000000FC, 0x00002712, 0x00220043, 0x00000103, 0xFFFFFFBA, 0x00220044, 0x0000011A, 0x00002712, 0x00220045, 0x0000011B, 0x00002712, 0x00220046, 0x000000FD, 0x00002712, 0x0022004A, 0x0000011F, 0xFFFFFFB6, 0x00220048, 0x0000011E, 0xFFFFFFF6, 0x0022004B, 0x0000011D, 0xFFFFD8F0, 0x00220049, 0x000000FE, 0x00002712, 0x0022004E, 0x000000E6, 0xFFFFFFB6, 0x0022004C, 0x0000011C, 0xFFFFFFBA, 0x0022004D, 0x00000120, 0x0000000F, 0x00220015, 0x00000143, 0xFFFFFFF3, 0x0022003D, 0x00000145, 0xFFFFFFCB, 0x0022003E, 0x00000146, 0xFFFFD8F0, 0x0022003F, 0x00000147, 0x0000003F, 0x00220040, 0x00000148, 0xFFFFFFBA, 0x00220047, 0x00000144, 0x00002712, 0x0022001C, 0x0000014A, 0x00000007, 0x0022001F, 0x0000014D, 0x00000007 .word 0x0000010A, 0xFFFFFFF3, 0x00220002, 0x0000010C, 0x0000002B, 0x00220004, 0x0000012F, 0xFFFFFFB6, 0x00220003, 0x000000E1, 0xFFFFFFB6, 0x00220005, 0x000000EB, 0xFFFFFFCB, 0x00220007, 0x0000012E, 0xFFFFFFDF, 0x00220008, 0x000000E4, 0xFFFFFFA7, 0x00220006, 0x000000EF, 0x00000019, 0x00220000, 0x00000123, 0x0000003F, 0x00220009, 0x00000124, 0xFFFFFFC5, 0x0022000B, 0x00000109, 0xFFFFFFA7, 0x0022000C, 0x0000010B, 0x00000029, 0x0022000D, 0x000000E0, 0xFFFFFFF3, 0x00220011, 0x00000107, 0xFFFFD8F0, 0x0022000E, 0x000000E8, 0xFFFFFFB9, 0x0022000F, 0x00000117, 0x0000000B, 0x00220010, 0x00000108, 0x00000029, 0x00220012, 0x000000EE, 0xFFFFFFB6, 0x0022000A, 0x00000126, 0x0000002B, 0x00220013, 0x000000E9, 0xFFFFFFCB, 0x00220016, 0x000000ED, 0xFFFFFFD8, 0x00220041, 0x00000104, 0xFFFFFFA7, 0x00220014, 0x00000106, 0x0000004D, 0x00220017, 0x00000129, 0xFFFFFFCB, 0x00220018, 0x00000132, 0xFFFFFFF6, 0x00220019, 0x00000133, 0x0000005E, 0x0022001A, 0x000000E7, 0xFFFFFFCE, 0x0022001B, 0x00000134, 0xFFFFD8F0, 0x0022001D, 0x000000F8, 0xFFFFFFCE, 0x0022001E, 0x00000135, 0xFFFFFFA7, 0x00220020, 0x000000FF, 0x00002712, 0x00220021, 0x00000136, 0x0000000B, 0x00220022, 0x00000140, 0x00002712, 0x00220023, 0x00000141, 0x0000002B, 0x00220024, 0x00000105, 0x00002712, 0x00220025, 0x00000138, 0x0000002B, 0x00220026, 0x000000E3, 0xFFFFFFCB, 0x00220027, 0x00000116, 0x0000004D, 0x00220028, 0x00000113, 0x0000004D, 0x00220029, 0x000000F4, 0x00000007, 0x0022002A, 0x000000E2, 0x00002712, 0x0022002B, 0x0000013C, 0xFFFFFFF6, 0x0022002C, 0x000000F5, 0x00002712, 0x00220038, 0x00000100, 0x00002712, 0x00220034, 0x000000FA, 0xFFFFFFF6, 0x00220035, 0x000000EC, 0x00000019, 0x00220036, 0x000000E5, 0xFFFFFFC2, 0x0022002F, 0x00000112, 0xFFFFD8F0, 0x0022002D, 0x00000111, 0xFFFFFFF3, 0x0022002E, 0x0000010D, 0xFFFFFFCB, 0x00220030, 0x000000F9, 0xFFFFFFDF, 0x00220037, 0x000000F2, 0x00002712, 0x00220031, 0x00000130, 0x00000029, 0x00220032, 0x0000013A, 0xFFFFFFB9, 0x00220039, 0x000000F1, 0x00002712, 0x00220033, 0x000000FB, 0xFFFFFFF6, 0x0022003A, 0x00000114, 0x0000003F, 0x0022003B, 0x000000F7, 0xFFFFFFC2, 0x0022003C, 0x000000F3, 0x00002712, 0x00220042, 0x000000FC, 0x00002712, 0x00220043, 0x00000103, 0xFFFFFFBA, 0x00220044, 0x0000011A, 0x00002712, 0x00220045, 0x0000011B, 0x00002712, 0x00220046, 0x000000FD, 0x00002712, 0x0022004A, 0x0000011F, 0xFFFFFFB6, 0x00220048, 0x0000011E, 0xFFFFFFF6, 0x0022004B, 0x0000011D, 0xFFFFD8F0, 0x00220049, 0x000000FE, 0x00002712, 0x0022004E, 0x000000E6, 0xFFFFFFB6, 0x0022004C, 0x0000011C, 0xFFFFFFBA, 0x0022004D, 0x00000120, 0x0000000F, 0x00220015, 0x00000143, 0xFFFFFFF3, 0x0022003D, 0x00000145, 0xFFFFFFCB, 0x0022003E, 0x00000146, 0xFFFFD8F0, 0x0022003F, 0x00000147, 0x0000003F, 0x00220040, 0x00000148, 0xFFFFFFBA, 0x00220047, 0x00000144, 0x00002712, 0x0022001C, 0x0000014A, 0x00000007, 0x0022001F, 0x0000014D, 0x00000007
dlabel D_80244B88_A3E068 dlabel D_80244B88_A3E068
.word 0x0022004F .word 0x0022004F, 0xF8405D31, 0xFFFFFFC5, 0x00220050, 0xF8405D32, 0xFFFFFFD8, 0x00220051, 0xF8405D33, 0x00000018, 0x00220052, 0xF8405D34, 0x0000003D, 0x00220053, 0xF8405D35, 0x0000000F, 0x00220054, 0xF8405E51, 0xFFFFFFC5, 0x00220055, 0xF8405EBD, 0xFFFFFFB5, 0x00220056, 0xF8405F07, 0xFFFFFFC2, 0x00220057, 0xF8405F96, 0xFFFFFFE1, 0x00220058, 0xF840602A, 0xFFFFFFF6, 0x00220059, 0xF840607E, 0x0000000B, 0x0022005A, 0xF84060B0, 0x00000018, 0x0022005B, 0xF84060B1, 0x00000018, 0x0022005C, 0xF84060FA, 0x0000002B, 0x0022005D, 0xF84060FB, 0x0000002B, 0x0022005E, 0xF8406131, 0x0000003F
dlabel D_80244B8C_A3E06C
.word 0xF8405D31, 0xFFFFFFC5, 0x00220050, 0xF8405D32, 0xFFFFFFD8, 0x00220051, 0xF8405D33, 0x00000018, 0x00220052, 0xF8405D34, 0x0000003D, 0x00220053, 0xF8405D35, 0x0000000F, 0x00220054, 0xF8405E51, 0xFFFFFFC5, 0x00220055, 0xF8405EBD, 0xFFFFFFB5, 0x00220056, 0xF8405F07, 0xFFFFFFC2, 0x00220057, 0xF8405F96, 0xFFFFFFE1, 0x00220058, 0xF840602A, 0xFFFFFFF6, 0x00220059, 0xF840607E, 0x0000000B, 0x0022005A, 0xF84060B0, 0x00000018, 0x0022005B, 0xF84060B1, 0x00000018, 0x0022005C, 0xF84060FA, 0x0000002B, 0x0022005D, 0xF84060FB, 0x0000002B, 0x0022005E, 0xF8406131, 0x0000003F
dlabel D_80244C48_A3E128 dlabel D_80244C48_A3E128
.word 0x0022005F .word 0x0022005F

6
ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
View File

@ -14,14 +14,14 @@ dlabel D_80242FFC_B2F46C
dlabel D_8024301C_B2F48C dlabel D_8024301C_B2F48C
.word 0x00000000, 0x00300020, 0x00000000, 0x00000000, D_80242FFC_B2F46C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x00300020, 0x00000000, 0x00000000, D_80242FFC_B2F46C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_80243048_B2F4B8 dlabel jan_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_8024304C_B2F4BC dlabel jan_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80243050_B2F4C0 dlabel D_80243050_B2F4C0
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241540_B2D9B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_jan_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_jan_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel jan_02_varStash dlabel jan_02_varStash
.word 0x00000000 .word 0x00000000

10
ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
View File

@ -122,20 +122,20 @@ dlabel D_80246F44_B3BB14
dlabel D_8024709C_B3BC6C dlabel D_8024709C_B3BC6C
.word 0x00000043, 0x00000004, jan_03_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024A6B8_B3F288, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, jan_03_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, jan_03_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246F44_B3BB14, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A718_B3F2E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246ECC_B3BA9C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024A9AC_B3F57C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, jan_03_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, jan_03_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024A6B8_B3F288, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, jan_03_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, jan_03_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246F44_B3BB14, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A718_B3F2E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246ECC_B3BA9C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024A9AC_B3F57C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, jan_03_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247444_B3C014 dlabel jan_03_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80247448_B3C018 dlabel jan_03_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_8024744C_B3C01C dlabel D_8024744C_B3C01C
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247590_B3C160 dlabel D_80247590_B3C160
.word 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_8024744C_B3C01C, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_8024744C_B3C01C, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802475E0_B3C1B0 dlabel D_802475E0_B3C1B0
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247714_B3C2E4 dlabel D_80247714_B3C2E4
.word 0x00000043, 0x00000002, func_80241B00_B366D0, 0xFE363C80, 0x0000004E, 0x00000006, D_802475E0_B3C1B0, 0x00000010, 0x00000000, D_8024FD68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80241B00_B366D0, 0xFE363C80, 0x0000004E, 0x00000006, D_802475E0_B3C1B0, 0x00000010, 0x00000000, D_8024FD68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -216,7 +216,7 @@ dlabel D_80249D8C_B3E95C
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80249E0C_B3E9DC dlabel D_80249E0C_B3E9DC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80249D8C_B3E95C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80249D8C_B3E95C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024A130_B3ED00 dlabel D_8024A130_B3ED00
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_80249E0C_B3E9DC, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_80249E0C_B3E9DC, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s
View File

@ -2,17 +2,17 @@
.section .data .section .data
dlabel D_80241F10_AF4BB0 dlabel kkj_18_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241F14_AF4BB4 dlabel kkj_18_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241F18_AF4BB8 dlabel D_80241F18_AF4BB8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_18_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802420AC_AF4D4C dlabel D_802420AC_AF4D4C
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_18_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242230_AF4ED0 dlabel D_80242230_AF4ED0
.word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000 .word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000

8
ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
View File

@ -2,17 +2,17 @@
.section .data .section .data
dlabel D_80241B10_AF9460 dlabel kkj_19_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241B14_AF9464 dlabel kkj_19_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241B18_AF9468 dlabel D_80241B18_AF9468
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241CAC_AF95FC dlabel D_80241CAC_AF95FC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241E30_AF9780 dlabel D_80241E30_AF9780
.word 0x0000005D, 0x0000005E, 0x0000005F, 0x00000061, 0x00000060, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066 .word 0x0000005D, 0x0000005E, 0x0000005F, 0x00000061, 0x00000060, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066

8
ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
View File

@ -107,14 +107,14 @@ dlabel D_80247D80_8B7DF0
dlabel D_80247DAC_8B7E1C dlabel D_80247DAC_8B7E1C
.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_80247E30_8B7EA0 dlabel kmr_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80247E34_8B7EA4 dlabel kmr_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80247E38_8B7EA8 dlabel D_80247E38_8B7EA8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kmr_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247FCC_8B803C dlabel D_80247FCC_8B803C
.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 .word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001
@ -144,7 +144,7 @@ dlabel D_80248154_8B81C4
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802481D4_8B8244 dlabel D_802481D4_8B8244
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kmr_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802484F8_8B8568 dlabel D_802484F8_8B8568
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s
View File

@ -5,17 +5,17 @@
dlabel D_80240D40_A79200 dlabel D_80240D40_A79200
.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_80240D98_A79258 dlabel kpa_81_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80240D9C_A7925C dlabel kpa_81_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80240DA0_A79260 dlabel D_80240DA0_A79260
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A78790, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, func_80242040_8B20B0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, func_80242040_8B20B0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80240F34_A793F4 dlabel D_80240F34_A793F4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A78790, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A78864, 0xFE363C80, 0x0000004E, 0x00000006, D_80240F34_A793F4, 0x00000010, 0x00000000, D_80242208, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A78864, 0xFE363C80, 0x0000004E, 0x00000006, D_80240F34_A793F4, 0x00000010, 0x00000000, D_80242208, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802410B8_A79578 dlabel D_802410B8_A79578
.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s
View File

@ -32,17 +32,17 @@ dlabel D_80240BD4_A7B0D4
dlabel D_80240BF4_A7B0F4 dlabel D_80240BF4_A7B0F4
.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80240BD4_A7B0D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000E0000 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80240BD4_A7B0D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000E0000
dlabel D_80240C20_A7B120 dlabel kpa_82_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80240C24_A7B124 dlabel kpa_82_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80240C28_A7B128 dlabel D_80240C28_A7B128
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A7A7D0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A7A808, 0xFE363C80, 0x0000004E, 0x00000006, D_80240C28_A7B128, 0x00000010, 0x00000000, D_80248F90, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_82_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A7A808, 0xFE363C80, 0x0000004E, 0x00000006, D_80240C28_A7B128, 0x00000010, 0x00000000, D_80248F90, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80240DBC_A7B2BC dlabel D_80240DBC_A7B2BC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A7A7D0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A7A8A4, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DBC_A7B2BC, 0x00000010, 0x00000000, D_80249158, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_82_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A7A8A4, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DBC_A7B2BC, 0x00000010, 0x00000000, D_80249158, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80240F40_A7B440 dlabel D_80240F40_A7B440
.word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

10
ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
View File

@ -83,20 +83,20 @@ dlabel D_80248370_7F3080
dlabel D_80248390_7F30A0 dlabel D_80248390_7F30A0
.word 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, 0x00000000, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, D_80248370_7F3080, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, 0x00000000, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, D_80248370_7F3080, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_802483E8_7F30F8 dlabel mac_00_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802483EC_7F30FC dlabel mac_00_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802483F0_7F3100 dlabel D_802483F0_7F3100
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248534_7F3244 dlabel D_80248534_7F3244
.word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248584_7F3294 dlabel D_80248584_7F3294
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802486B8_7F33C8 dlabel D_802486B8_7F33C8
.word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, mac_00_D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, mac_00_D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -105,7 +105,7 @@ dlabel D_80248708_7F3418
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248788_7F3498 dlabel D_80248788_7F3498
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248AAC_7F37BC dlabel D_80248AAC_7F37BC
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s
View File

@ -29,20 +29,20 @@ dlabel dup_mac_00_varStash
dlabel D_8024ECEC_7F99FC dlabel D_8024ECEC_7F99FC
.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024ED4C_7F9A5C dlabel dup_mac_00_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_8024ED50_7F9A60 dlabel dup_mac_00_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_8024ED54_7F9A64 dlabel D_8024ED54_7F9A64
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024ED54_7F9A64, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024ED54_7F9A64, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024EEE8_7F9BF8 dlabel D_8024EEE8_7F9BF8
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024EF68_7F9C78 dlabel D_8024EF68_7F9C78
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024EEE8_7F9BF8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024EEE8_7F9BF8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024F28C_7F9F9C dlabel D_8024F28C_7F9F9C
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024EF68_7F9C78, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024EF68_7F9C78, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
View File

@ -188,14 +188,14 @@ dlabel D_8024D444_80DCC4
dlabel D_8024D59C_80DE1C dlabel D_8024D59C_80DE1C
.word 0x00000043, 0x00000004, mac_01_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025BAE0_81C360, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, mac_01_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mac_01_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D444_80DCC4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8025BB80_81C400, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D3CC_80DC4C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025BDDC_81C65C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, mac_01_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, mac_01_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025BAE0_81C360, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, mac_01_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mac_01_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D444_80DCC4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8025BB80_81C400, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D3CC_80DC4C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025BDDC_81C65C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, mac_01_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024D944_80E1C4 dlabel mac_01_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_8024D948_80E1C8 dlabel mac_01_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_8024D94C_80E1CC dlabel D_8024D94C_80E1CC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024DA90_80E310 dlabel D_8024DA90_80E310
.word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -204,7 +204,7 @@ dlabel D_8024DAE0_80E360
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024DB60_80E3E0 dlabel D_8024DB60_80E3E0
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024DE84_80E704 dlabel D_8024DE84_80E704
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

10
ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
View File

@ -110,20 +110,20 @@ dlabel D_802486D0_82B990
dlabel D_80248700_82B9C0 dlabel D_80248700_82B9C0
.word 0x00000043, 0x00000002, BasicAI_Main, D_802486D0_82B990, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, 0x00000000, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, D_80248700_82B9C0, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00000043, 0x00000002, BasicAI_Main, D_802486D0_82B990, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, 0x00000000, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, D_80248700_82B9C0, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_80248778_82BA38 dlabel mac_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_8024877C_82BA3C dlabel mac_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80248780_82BA40 dlabel D_80248780_82BA40
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802488C4_82BB84 dlabel D_802488C4_82BB84
.word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248914_82BBD4 dlabel D_80248914_82BBD4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248A48_82BD08 dlabel D_80248A48_82BD08
.word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, mac_02_D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, mac_02_D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -177,7 +177,7 @@ dlabel D_8024A1B4_82D474
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024A234_82D4F4 dlabel D_8024A234_82D4F4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024A558_82D818 dlabel D_8024A558_82D818
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
View File

@ -98,20 +98,20 @@ dlabel D_80248BC4_83A3C4
dlabel D_80248BF4_83A3F4 dlabel D_80248BF4_83A3F4
.word 0x00000043, 0x00000002, BasicAI_Main, D_80248BC4_83A3C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, 0x00000000, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, D_80248BF4_83A3F4, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00000043, 0x00000002, BasicAI_Main, D_80248BC4_83A3C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, 0x00000000, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, D_80248BF4_83A3F4, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_80248C6C_83A46C dlabel mac_03_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80248C70_83A470 dlabel mac_03_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80248C74_83A474 dlabel D_80248C74_83A474
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248E08_83A608 dlabel D_80248E08_83A608
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248E88_83A688 dlabel D_80248E88_83A688
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802491AC_83A9AC dlabel D_802491AC_83A9AC
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
View File

@ -98,14 +98,14 @@ dlabel D_80246598_849168
dlabel D_802465B8_849188 dlabel D_802465B8_849188
.word 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, 0x00000000, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, D_80246598_849168, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, 0x00000000, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, D_80246598_849168, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_80246610_8491E0 dlabel mac_04_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80246614_8491E4 dlabel mac_04_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80246618_8491E8 dlabel D_80246618_8491E8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241774_844344, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024675C_84932C dlabel D_8024675C_84932C
.word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, mac_04_D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, mac_04_D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

10
ver/us/asm/data/world/area_mac/mac_05/857070.data.s
View File

@ -92,20 +92,20 @@ dlabel D_80247660_8597D0
dlabel D_80247680_8597F0 dlabel D_80247680_8597F0
.word 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, 0x00000000, 0x00000000, D_80247614_859784, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, D_80247660_8597D0, 0x00000000, D_80247614_859784, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, 0x00000000, 0x00000000, D_80247614_859784, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, D_80247660_8597D0, 0x00000000, D_80247614_859784, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_802476D8_859848 dlabel mac_05_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802476DC_85984C dlabel mac_05_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802476E0_859850 dlabel D_802476E0_859850
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247824_859994 dlabel D_80247824_859994
.word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247874_8599E4 dlabel D_80247874_8599E4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802479A8_859B18 dlabel D_802479A8_859B18
.word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, mac_05_D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, mac_05_D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -114,7 +114,7 @@ dlabel D_802479F8_859B68
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247A78_859BE8 dlabel D_80247A78_859BE8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80247D9C_859F0C dlabel D_80247D9C_859F0C
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
View File

@ -176,20 +176,20 @@ dlabel D_802484F4_9CD8D4
dlabel D_80248514_9CD8F4 dlabel D_80248514_9CD8F4
.word 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, 0x00000000, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, D_802484F4_9CD8D4, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, 0x00000000, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, D_802484F4_9CD8D4, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_8024856C_9CD94C dlabel nok_01_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80248570_9CD950 dlabel nok_01_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80248574_9CD954 dlabel D_80248574_9CD954
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, nok_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248708_9CDAE8 dlabel D_80248708_9CDAE8
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248788_9CDB68 dlabel D_80248788_9CDB68
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, nok_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80248AAC_9CDE8C dlabel D_80248AAC_9CDE8C
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
View File

@ -11,14 +11,14 @@ dlabel D_80244EC0_9DBEE0
dlabel dup_nok_02_varStash dlabel dup_nok_02_varStash
.word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80245434_9DC454 dlabel nok_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80245438_9DC458 dlabel nok_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_8024543C_9DC45C dlabel D_8024543C_9DC45C
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240678_9D7698, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, nok_02_D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, nok_02_D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802455D0_9DC5F0 dlabel D_802455D0_9DC5F0
.word 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80254600, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80254600, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
View File

@ -110,14 +110,14 @@ dlabel D_80249678_9E0698
dlabel D_80249698_9E06B8 dlabel D_80249698_9E06B8
.word 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, 0x00000000, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, D_80249678_9E0698, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 .word 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, 0x00000000, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, D_80249678_9E0698, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
dlabel D_802496F0_9E0710 dlabel dup_nok_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802496F4_9E0714 dlabel dup_nok_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802496F8_9E0718 dlabel D_802496F8_9E0718
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024983C_9E085C dlabel D_8024983C_9E085C
.word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -129,7 +129,7 @@ dlabel D_802498D4_9E08F4
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80249954_9E0974 dlabel D_80249954_9E0974
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80249C78_9E0C98 dlabel D_80249C78_9E0C98
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s
View File

@ -2,20 +2,20 @@
.section .data .section .data
dlabel D_80252400_9E9420 dlabel dup2_nok_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80252404_9E9424 dlabel dup2_nok_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80252408_9E9428 dlabel D_80252408_9E9428
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup2_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8025254C_9E956C dlabel D_8025254C_9E956C
.word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, nok_02_D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, nok_02_D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8025259C_9E95BC dlabel D_8025259C_9E95BC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup2_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802526D0_9E96F0 dlabel D_802526D0_9E96F0
.word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, nok_02_D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, nok_02_D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
View File

@ -23,20 +23,20 @@ dlabel obk_01_varStash
dlabel D_802440F4_BC1294 dlabel D_802440F4_BC1294
.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244154_BC12F4 dlabel obk_01_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80244158_BC12F8 dlabel obk_01_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_8024415C_BC12FC dlabel D_8024415C_BC12FC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802442F0_BC1490 dlabel D_802442F0_BC1490
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244370_BC1510 dlabel D_80244370_BC1510
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244694_BC1834 dlabel D_80244694_BC1834
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_80244370_BC1510, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_80244370_BC1510, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s
View File

@ -11,20 +11,20 @@ dlabel obk_03_varStash
dlabel D_80242ED0_BC7150 dlabel D_80242ED0_BC7150
.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242F30_BC71B0 dlabel obk_03_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80242F34_BC71B4 dlabel obk_03_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80242F38_BC71B8 dlabel D_80242F38_BC71B8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242F38_BC71B8, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242F38_BC71B8, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802430CC_BC734C dlabel D_802430CC_BC734C
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024314C_BC73CC dlabel D_8024314C_BC73CC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802430CC_BC734C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802430CC_BC734C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80243470_BC76F0 dlabel D_80243470_BC76F0
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024314C_BC73CC, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024314C_BC73CC, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s
View File

@ -47,14 +47,14 @@ dlabel D_80242FD0_DB5290
dlabel D_8024306C_DB532C dlabel D_8024306C_DB532C
.word 0x00000000, 0x0044003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x0044003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_80243098_DB5358 dlabel omo_05_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_8024309C_DB535C dlabel omo_05_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802430A0_DB5360 dlabel D_802430A0_DB5360
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802421CC_DB448C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, omo_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802431D4_DB5494 dlabel D_802431D4_DB5494
.word 0x00000043, 0x00000002, func_80242204_DB44C4, 0xFE363C80, 0x0000004E, 0x00000006, D_802430A0_DB5360, 0x00000010, 0x00000000, D_80245650, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242178_DB4438, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80242204_DB44C4, 0xFE363C80, 0x0000004E, 0x00000006, D_802430A0_DB5360, 0x00000010, 0x00000000, D_80245650, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242178_DB4438, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
View File

@ -23,14 +23,14 @@ dlabel D_80241BAC_DE403C
dlabel D_80241BD8_DE4068 dlabel D_80241BD8_DE4068
.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001
dlabel D_80241C04_DE4094 dlabel omo_13_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241C08_DE4098 dlabel omo_13_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241C0C_DE409C dlabel D_80241C0C_DE409C
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240F54_DE33E4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, omo_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241D40_DE41D0 dlabel D_80241D40_DE41D0
.word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, omo_13_80243220, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F00_DE3390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, omo_13_80243220, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F00_DE3390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s
View File

@ -11,20 +11,20 @@ dlabel osr_01_varStash
dlabel D_802411BC_AB11AC dlabel D_802411BC_AB11AC
.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024121C_AB120C dlabel osr_01_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241220_AB1210 dlabel osr_01_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241224_AB1214 dlabel D_80241224_AB1214
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241224_AB1214, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, osr_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241224_AB1214, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802413B8_AB13A8 dlabel D_802413B8_AB13A8
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241438_AB1428 dlabel D_80241438_AB1428
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802413B8_AB13A8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802413B8_AB13A8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, osr_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024175C_AB174C dlabel D_8024175C_AB174C
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241438_AB1428, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241438_AB1428, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s
View File

@ -5,17 +5,17 @@
dlabel D_80241F10_D4EF50 dlabel D_80241F10_D4EF50
.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_80241F94_D4EFD4 dlabel pra_01_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241F98_D4EFD8 dlabel pra_01_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241F9C_D4EFDC dlabel D_80241F9C_D4EFDC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241200_D4E240, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241238_D4E278, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F9C_D4EFDC, 0x00000010, 0x00000000, D_80242FB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241238_D4E278, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F9C_D4EFDC, 0x00000010, 0x00000000, D_80242FB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242130_D4F170 dlabel D_80242130_D4F170
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241200_D4E240, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802412D4_D4E314, 0xFE363C80, 0x0000004E, 0x00000006, D_80242130_D4F170, 0x00000010, 0x00000000, pra_01_80243178, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802412D4_D4E314, 0xFE363C80, 0x0000004E, 0x00000006, D_80242130_D4F170, 0x00000010, 0x00000000, pra_01_80243178, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802422B4_D4F2F4 dlabel D_802422B4_D4F2F4
.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s
View File

@ -5,14 +5,14 @@
dlabel D_80242A90_D52A80 dlabel D_80242A90_D52A80
.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00460019, D_80242A90_D52A80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00460019, D_80242A90_D52A80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_80242ACC_D52ABC dlabel pra_02_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80242AD0_D52AC0 dlabel pra_02_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80242AD4_D52AC4 dlabel D_80242AD4_D52AC4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D51190, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D511C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_D52AC4, 0x00000010, 0x00000000, func_80243CC0_A2DF00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D511C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_D52AC4, 0x00000010, 0x00000000, func_80243CC0_A2DF00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242C68_D52C58 dlabel D_80242C68_D52C58
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D51190, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, D_80243E88_846A58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, D_80243E88_846A58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

8
ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
View File

@ -32,17 +32,17 @@ dlabel D_80241D40_D5A5D0
dlabel D_80241D6C_D5A5FC dlabel D_80241D6C_D5A5FC
.word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000
dlabel D_80241D98_D5A628 dlabel pra_09_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241D9C_D5A62C dlabel pra_09_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241DA0_D5A630 dlabel D_80241DA0_D5A630
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, flo_18_shakeTree, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, flo_18_shakeTree, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241F34_D5A7C4 dlabel D_80241F34_D5A7C4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802420B8_D5A948 dlabel D_802420B8_D5A948
.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
View File

@ -5,17 +5,17 @@
dlabel D_802422A0_D66880 dlabel D_802422A0_D66880
.word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_802422CC_D668AC dlabel pra_13_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802422D0_D668B0 dlabel pra_13_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802422D4_D668B4 dlabel D_802422D4_D668B4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D657B8, 0xFE363C80, 0x0000004E, 0x00000006, D_802422D4_D668B4, 0x00000010, 0x00000000, D_80243720, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D657B8, 0xFE363C80, 0x0000004E, 0x00000006, D_802422D4_D668B4, 0x00000010, 0x00000000, D_80243720, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242468_D66A48 dlabel D_80242468_D66A48
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D65854, 0xFE363C80, 0x0000004E, 0x00000006, D_80242468_D66A48, 0x00000010, 0x00000000, pra_13_802438E8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D65854, 0xFE363C80, 0x0000004E, 0x00000006, D_80242468_D66A48, 0x00000010, 0x00000000, pra_13_802438E8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802425EC_D66BCC dlabel D_802425EC_D66BCC
.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
View File

@ -17,17 +17,17 @@ dlabel D_80242144_D70AF4
dlabel D_80242170_D70B20 dlabel D_80242170_D70B20
.word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_8024219C_D70B4C dlabel pra_19_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802421A0_D70B50 dlabel pra_19_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802421A4_D70B54 dlabel D_802421A4_D70B54
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D6FB88, 0xFE363C80, 0x0000004E, 0x00000006, D_802421A4_D70B54, 0x00000010, 0x00000000, D_802479F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D6FB88, 0xFE363C80, 0x0000004E, 0x00000006, D_802421A4_D70B54, 0x00000010, 0x00000000, D_802479F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80242338_D70CE8 dlabel D_80242338_D70CE8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_pra_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_pra_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802424BC_D70E6C dlabel D_802424BC_D70E6C
.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_pra/pra_31/D7FEC0.data.s
View File

@ -8,17 +8,17 @@ dlabel D_80241160_D7FEC0
dlabel D_80241170_D7FED0 dlabel D_80241170_D7FED0
.word 0x00000000, 0x00460032, D_80241160_D7FEC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x00460032, D_80241160_D7FEC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000
dlabel D_8024119C_D7FEFC dlabel pra_31_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802411A0_D7FF00 dlabel pra_31_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802411A4_D7FF04 dlabel D_802411A4_D7FF04
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402A0_D7F000, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802402D8_D7F038, 0xFE363C80, 0x0000004E, 0x00000006, D_802411A4_D7FF04, 0x00000010, 0x00000000, D_80247CA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_31_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802402D8_D7F038, 0xFE363C80, 0x0000004E, 0x00000006, D_802411A4_D7FF04, 0x00000010, 0x00000000, D_80247CA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241338_D80098 dlabel D_80241338_D80098
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402A0_D7F000, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240374_D7F0D4, 0xFE363C80, 0x0000004E, 0x00000006, D_80241338_D80098, 0x00000010, 0x00000000, D_80247E68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_31_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240374_D7F0D4, 0xFE363C80, 0x0000004E, 0x00000006, D_80241338_D80098, 0x00000010, 0x00000000, D_80247E68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802414BC_D8021C dlabel D_802414BC_D8021C
.word 0x00000043, 0x00000001, func_80240410_D7F170, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000002D, 0x00000086, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005A, 0x00000021, 0x00000002, 0x00000087, 0x000000E0, 0x00000024, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0001, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x00000021, 0x00000002, 0x000000E1, 0x0000013A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0002, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F85, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240468_D7F1C8, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F87, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F88, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000001ED, 0x00000000, 0x00000014, 0x00000001, 0xFE363C85, 0x0000001D, 0x00000001, 0x0000005A, 0x0000001D, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000021C, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0xFE363C8A, 0x0000001C, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C86, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C85, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C85, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C85, 0x00000023, 0x00000000, 0x00000043, 0x00000003, func_80240818_D7F578, 0xFE363C83, 0xFE363C85, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFE363C86, 0xFE363C86, 0x00000005, 0xFE363C84, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000001, func_80240410_D7F170, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000002D, 0x00000086, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005A, 0x00000021, 0x00000002, 0x00000087, 0x000000E0, 0x00000024, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0001, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x00000021, 0x00000002, 0x000000E1, 0x0000013A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0002, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F85, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240468_D7F1C8, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F87, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F88, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000001ED, 0x00000000, 0x00000014, 0x00000001, 0xFE363C85, 0x0000001D, 0x00000001, 0x0000005A, 0x0000001D, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000021C, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0xFE363C8A, 0x0000001C, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C86, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C85, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C85, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C85, 0x00000023, 0x00000000, 0x00000043, 0x00000003, func_80240818_D7F578, 0xFE363C83, 0xFE363C85, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFE363C86, 0xFE363C86, 0x00000005, 0xFE363C84, 0x00000002, 0x00000000, 0x00000001, 0x00000000

10
ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
View File

@ -83,17 +83,17 @@ dlabel D_802430E4_CFAC54
dlabel D_802431BC_CFAD2C dlabel D_802431BC_CFAD2C
.word 0x00000043, 0x00000003, SetGroupEnabled, 0x0000003F, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0x00000041, 0x00000046, 0x00000001, D_802430E4_CFAC54, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000060, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80242CEC_CFA85C, D_80242D1C_CFA88C, 0x00000000, D_80242DC4_CFA934, 0x00000022, 0x00000023, 0x0000006D, D_802430D0_CFAC40, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00001002, D_80242E70_CFA9E0, D_80242ED0_CFAA40, 0x00000000, D_80242F78_CFAAE8, 0x0000002F, 0x00000030, 0x0000009A, D_802430D8_CFAC48, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80242EA0_CFAA10, D_80242ED0_CFAA40, 0x00000000, D_8024300C_CFAB7C, 0x00000034, 0x00000035, 0x0000009A, D_802430D8_CFAC48, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000003, SetGroupEnabled, 0x0000003F, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0x00000041, 0x00000046, 0x00000001, D_802430E4_CFAC54, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000060, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80242CEC_CFA85C, D_80242D1C_CFA88C, 0x00000000, D_80242DC4_CFA934, 0x00000022, 0x00000023, 0x0000006D, D_802430D0_CFAC40, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00001002, D_80242E70_CFA9E0, D_80242ED0_CFAA40, 0x00000000, D_80242F78_CFAAE8, 0x0000002F, 0x00000030, 0x0000009A, D_802430D8_CFAC48, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80242EA0_CFAA10, D_80242ED0_CFAA40, 0x00000000, D_8024300C_CFAB7C, 0x00000034, 0x00000035, 0x0000009A, D_802430D8_CFAC48, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802432D0_CFAE40 dlabel sam_01_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802432D4_CFAE44 dlabel sam_01_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802432D8_CFAE48 dlabel D_802432D8_CFAE48
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_802432D8_CFAE48, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_802432D8_CFAE48, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024346C_CFAFDC dlabel D_8024346C_CFAFDC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_CF81D4, 0xFE363C80, 0x0000004E, 0x00000006, D_8024346C_CFAFDC, 0x00000010, 0x00000000, D_8024DD88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_CF81D4, 0xFE363C80, 0x0000004E, 0x00000006, D_8024346C_CFAFDC, 0x00000010, 0x00000000, D_8024DD88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel sam_01_varStash dlabel sam_01_varStash
.word 0x00000000 .word 0x00000000
@ -183,7 +183,7 @@ dlabel D_80245CC0_CFD830
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80245D40_CFD8B0 dlabel D_80245D40_CFD8B0
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245CC0_CFD830, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245CC0_CFD830, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80246064_CFDBD4 dlabel D_80246064_CFDBD4
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_80245D40_CFD8B0, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_80245D40_CFD8B0, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/area_sam/sam_04/D16E20.data.s
View File

@ -5,17 +5,17 @@
dlabel D_80243850_D16E20 dlabel D_80243850_D16E20
.word 0x00000000, 0x003C0028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 .word 0x00000000, 0x003C0028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
dlabel D_8024387C_D16E4C dlabel sam_04_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80243880_D16E50 dlabel sam_04_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80243884_D16E54 dlabel D_80243884_D16E54
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_D13B60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_D13B98, 0xFE363C80, 0x0000004E, 0x00000006, D_80243884_D16E54, 0x00000010, 0x00000000, sam_04_80245210, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_D13B98, 0xFE363C80, 0x0000004E, 0x00000006, D_80243884_D16E54, 0x00000010, 0x00000000, sam_04_80245210, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80243A18_D16FE8 dlabel D_80243A18_D16FE8
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_D13B60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_D13C34, 0xFE363C80, 0x0000004E, 0x00000006, D_80243A18_D16FE8, 0x00000010, 0x00000000, D_802453D8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_D13C34, 0xFE363C80, 0x0000004E, 0x00000006, D_80243A18_D16FE8, 0x00000010, 0x00000000, D_802453D8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80243B9C_D1716C dlabel D_80243B9C_D1716C
.word 0x00000031, 0x00000000 .word 0x00000031, 0x00000000

10
ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
View File

@ -56,17 +56,17 @@ dlabel sam_06_varStash
dlabel D_802443D4_D24264 dlabel D_802443D4_D24264
.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244434_D242C4 dlabel sam_06_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80244438_D242C8 dlabel sam_06_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_8024443C_D242CC dlabel D_8024443C_D242CC
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_8024443C_D242CC, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_8024443C_D242CC, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802445D0_D24460 dlabel D_802445D0_D24460
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241EB4_D21D44, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D0_D24460, 0x00000010, 0x00000000, D_8024C068, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241EB4_D21D44, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D0_D24460, 0x00000010, 0x00000000, D_8024C068, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244754_D245E4 dlabel D_80244754_D245E4
.word D_80246068_D25EF8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80244A88_D24918, 0x00000000 .word D_80246068_D25EF8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80244A88_D24918, 0x00000000
@ -144,7 +144,7 @@ dlabel D_80246E3C_D26CCC
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80246EBC_D26D4C dlabel D_80246EBC_D26D4C
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80246E3C_D26CCC, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80246E3C_D26CCC, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802471E0_D27070 dlabel D_802471E0_D27070
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_80246EBC_D26D4C, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_80246EBC_D26D4C, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/dead/dead_03/EB1920.data.s
View File

@ -56,20 +56,20 @@ dlabel dead_03_varStash
dlabel D_80241784_EB25E4 dlabel D_80241784_EB25E4
.word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802417E4_EB2644 dlabel dead_03_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802417E8_EB2648 dlabel dead_03_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802417EC_EB264C dlabel D_802417EC_EB264C
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241980_EB27E0 dlabel D_80241980_EB27E0
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241A00_EB2860 dlabel D_80241A00_EB2860
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241D24_EB2B84 dlabel D_80241D24_EB2B84
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

6
ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s
View File

@ -38,14 +38,14 @@ dlabel dead_flo_12_varStash
dlabel D_802417F0_EDD7D0 dlabel D_802417F0_EDD7D0
.word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80241850_EDD830 dlabel dead_flo_12_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80241854_EDD834 dlabel dead_flo_12_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80241858_EDD838 dlabel D_80241858_EDD838
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_flo_12_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_flo_12_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_flo_12_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_8024199C_EDD97C dlabel D_8024199C_EDD97C
.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, dead_flo_12_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, dead_flo_12_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s
View File

@ -101,20 +101,20 @@ dlabel dead_kzn_17_varStash
dlabel D_80244158_EA4A58 dlabel D_80244158_EA4A58
.word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802441B8_EA4AB8 dlabel dead_kzn_17_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_802441BC_EA4ABC dlabel dead_kzn_17_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_802441C0_EA4AC0 dlabel D_802441C0_EA4AC0
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_17_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244354_EA4C54 dlabel D_80244354_EA4C54
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802443D4_EA4CD4 dlabel D_802443D4_EA4CD4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_17_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_802446F8_EA4FF8 dlabel D_802446F8_EA4FF8
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

8
ver/us/asm/data/world/dead/kzn_19/EAA810.data.s
View File

@ -149,20 +149,20 @@ dlabel dead_kzn_19_varStash
dlabel D_80243D78_EAC858 dlabel D_80243D78_EAC858
.word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80243DD8_EAC8B8 dlabel dead_kzn_19_ItemChoice_HasSelectedItem
.word 0x00000000 .word 0x00000000
dlabel D_80243DDC_EAC8BC dlabel dead_kzn_19_ItemChoice_SelectedItemID
.word 0x00000000 .word 0x00000000
dlabel D_80243DE0_EAC8C0 dlabel D_80243DE0_EAC8C0
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80243F74_EACA54 dlabel D_80243F74_EACA54
.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80243FF4_EACAD4 dlabel D_80243FF4_EACAD4
.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
dlabel D_80244318_EACDF8 dlabel D_80244318_EACDF8
.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

12
ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s
View File

@ -6,11 +6,11 @@ glabel func_802429C0_EA32C0
/* EA32C4 802429C4 AFBF0010 */ sw $ra, 0x10($sp) /* EA32C4 802429C4 AFBF0010 */ sw $ra, 0x10($sp)
/* EA32C8 802429C8 10A00003 */ beqz $a1, .L802429D8 /* EA32C8 802429C8 10A00003 */ beqz $a1, .L802429D8
/* EA32CC 802429CC 8C86000C */ lw $a2, 0xc($a0) /* EA32CC 802429CC 8C86000C */ lw $a2, 0xc($a0)
/* EA32D0 802429D0 3C018024 */ lui $at, %hi(D_802441B8_EA4AB8) /* EA32D0 802429D0 3C018024 */ lui $at, %hi(dead_kzn_17_ItemChoice_HasSelectedItem)
/* EA32D4 802429D4 AC2041B8 */ sw $zero, %lo(D_802441B8_EA4AB8)($at) /* EA32D4 802429D4 AC2041B8 */ sw $zero, %lo(dead_kzn_17_ItemChoice_HasSelectedItem)($at)
.L802429D8: .L802429D8:
/* EA32D8 802429D8 3C038024 */ lui $v1, %hi(D_802441B8_EA4AB8) /* EA32D8 802429D8 3C038024 */ lui $v1, %hi(dead_kzn_17_ItemChoice_HasSelectedItem)
/* EA32DC 802429DC 246341B8 */ addiu $v1, $v1, %lo(D_802441B8_EA4AB8) /* EA32DC 802429DC 246341B8 */ addiu $v1, $v1, %lo(dead_kzn_17_ItemChoice_HasSelectedItem)
/* EA32E0 802429E0 8C620000 */ lw $v0, ($v1) /* EA32E0 802429E0 8C620000 */ lw $v0, ($v1)
/* EA32E4 802429E4 54400003 */ bnel $v0, $zero, .L802429F4 /* EA32E4 802429E4 54400003 */ bnel $v0, $zero, .L802429F4
/* EA32E8 802429E8 AC600000 */ sw $zero, ($v1) /* EA32E8 802429E8 AC600000 */ sw $zero, ($v1)
@ -18,9 +18,9 @@ glabel func_802429C0_EA32C0
/* EA32F0 802429F0 0000102D */ daddu $v0, $zero, $zero /* EA32F0 802429F0 0000102D */ daddu $v0, $zero, $zero
.L802429F4: .L802429F4:
/* EA32F4 802429F4 8CC50000 */ lw $a1, ($a2) /* EA32F4 802429F4 8CC50000 */ lw $a1, ($a2)
/* EA32F8 802429F8 3C068024 */ lui $a2, %hi(D_802441BC_EA4ABC) /* EA32F8 802429F8 3C068024 */ lui $a2, %hi(dead_kzn_17_ItemChoice_SelectedItemID)
/* EA32FC 802429FC 0C0B551A */ jal dead_evt_set_variable /* EA32FC 802429FC 0C0B551A */ jal dead_evt_set_variable
/* EA3300 80242A00 8CC641BC */ lw $a2, %lo(D_802441BC_EA4ABC)($a2) /* EA3300 80242A00 8CC641BC */ lw $a2, %lo(dead_kzn_17_ItemChoice_SelectedItemID)($a2)
/* EA3304 80242A04 24020002 */ addiu $v0, $zero, 2 /* EA3304 80242A04 24020002 */ addiu $v0, $zero, 2
.L80242A08: .L80242A08:
/* EA3308 80242A08 8FBF0010 */ lw $ra, 0x10($sp) /* EA3308 80242A08 8FBF0010 */ lw $ra, 0x10($sp)

Some files were not shown because too many files have changed in this diff Show More