pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Duplighost battle functions (#556)

Browse Source 
* decomp some functions in 1AC760.c

* broken data migration

* data nearly migrated, rodata in laki file is null

* fix building and laki data migration

* data migration for kpa3 WIP

* add missing data

* decomp duplighost functions and duplicates

* fix some warnings

* resolve issues

* fix warnings

Co-authored-by: Brotenko <brotenko@gmail.com>
This commit is contained in:
Rainchus 2021-12-24 19:34:55 -06:00 committed by GitHub
parent 3428ae1941
commit 095680b006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 888 additions and 1618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/common_structs.h
View File

@ -1428,14 +1428,14 @@ typedef struct CollisionStatus {
typedef struct DecorationUnk {
/* 0x00 */ s16 unk00;
/* 0x02 */ s16 unk02;
/* 0x04 */ s16 unk04;
/* 0x06 */ s16 unk06;
/* 0x08 */ s16 unk08;
/* 0x0A */ s16 unk0A;
/* 0x0C */ s16 unk0C;
/* 0x10 */ s16 unk10;
/* 0x14 */ s16 unk14;
/* 0x18 */ s16 unk18;
/* 0x1C */ s16 unk1C;
} DecorationUnk; // size = 0x20
/* 0x0E */ s16 unk0E;
} DecorationUnk; // size = 0x10
typedef struct DecorationTable {
/* 0x000 */ char unk_00[0x6C0];
@ -1644,7 +1644,7 @@ typedef struct ActorState { // TODO: Make the first field of this an ActorMoveme
typedef struct Actor {
/* 0x000 */ s32 flags;
/* 0x004 */ char unk_04[4];
/* 0x004 */ s32 flags2;
/* 0x008 */ struct ActorDesc* staticActorData;
/* 0x00C */ ActorState state;
/* 0x0C8 */ ActorMovement fly;
@ -2304,4 +2304,26 @@ typedef struct SpriteShadingProfile {
/* 0xAF */ s8 ambientPower; // ?
} SpriteShadingProfile; // size = 0xB0
typedef struct UnkDuplighost {
/* 0x00 */ s32 flags;
/* 0x04 */ s32 unk_04;
/* 0x08 */ s32 unk_08;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x14 */ struct EffectInstance* effect1;
/* 0x18 */ struct EffectInstance* effect2;
/* 0x1C */ s32 debuff;
} UnkDuplighost;
typedef struct UnkStruct1 {
/* 0x00 */ char unk_00[8];
/* 0x08 */ f32 unk_08;
} UnkStruct1;
typedef struct UnkStruct0 {
/* 0x00 */ s32 flags;
/* 0x04 */ char unk_04[8];
/* 0x0C */ UnkStruct1* unk_0C;
} UnkStruct0;
#endif

20
include/effects.h
View File

@ -191,6 +191,26 @@ typedef struct EffectWhirlwind {
/* 0x30 */ f32 unk_30;
} EffectWhirlwind;
typedef struct Effect6FData {
/* 0x00 */ EffectInstanceDataThing* unk_00;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3i rotation;
/* 0x1C */ Vec3i scale;
/* 0x28 */ Vec3i color;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
/* 0x3C */ s32 unk_3C;
/* 0x40 */ char unk_40[0x4];
} Effect6FData; // size = 0x44
typedef struct Effect6FInstance {
/* 0x00 */ s32 flags;
/* 0x04 */ s32 effectIndex;
/* 0x08 */ s32 numParts;
/* 0x0C */ Effect6FData* data;
/* 0x10 */ struct EffectGraphics* effect;
} Effect6FInstance;
EffectInstance* create_effect_instance(EffectBlueprint* effectBp);
void remove_effect(EffectInstance*);
s32 load_effect(s32 effectIndex);

2
include/functions.h
View File

@ -635,6 +635,8 @@ s32 store_item(s32 itemID);
void open_status_menu_short(void);
void func_8024EFE0(f32 x, f32 y, f32 z, s32 a, s32 b, s32 c);
void func_802664DC(f32 x, f32 y, f32 z, s32 attack, s32 a);
s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion);
s32 calc_partner_test_enemy(void);
void init_encounters_ui(void);
void initialize_collision(void);

1
include/variables.h
View File

@ -373,6 +373,7 @@ extern s32 D_800F7BBC[];
extern unkPartnerStruct D_802BE940;
extern unkPartnerStruct D_802BDF40;
extern unkPartnerStruct D_802BD600;
extern unkPartnerStruct D_802BFF30;
//various
extern s32 D_802C05CC;

4
src/197F40.c
View File

@ -2379,9 +2379,9 @@ ApiStatus ModifyActorDecoration(Evt* script, s32 isInitialCall) {
actorPart = get_actor_part(actor, partIndex);
decorationtable = actorPart->decorationTable;
decorationtable->unk_8C6[temp_s4].unk00 = evt_get_variable(script, *args++);
decorationtable->unk_8C6[temp_s4].unk02 = evt_get_variable(script, *args++);
decorationtable->unk_8C6[temp_s4].unk04 = evt_get_variable(script, *args++);
decorationtable->unk_8C6[temp_s4].unk08 = evt_get_variable(script, *args++);
decorationtable->unk_8C6[temp_s4].unk0C = evt_get_variable(script, *args++);
decorationtable->unk_8C6[temp_s4].unk06 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}

394
src/1AC760.c
View File

@ -1,5 +1,6 @@
#include "common.h"
#include "battle/battle.h"
s32 calc_partner_damage_enemy(void);
void dispatch_event_partner(s32 lastEventType) {
BattleStatus* battleStatus = &gBattleStatus;
@ -42,7 +43,104 @@ void dispatch_event_partner_continue_turn(s8 lastEventType) {
}
}
#ifdef NON_EQUIVALENT
s32 calc_partner_test_enemy(void) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* actor;
Actor* partner;
ActorPart* actorPart;
ActorMovement* state;
s32 temp_s2;
s32 new_var;
partner = battleStatus->partnerActor;
state = &partner->state;
temp_s2 = battleStatus->currentTargetPart;
new_var = battleStatus->currentTargetID;
battleStatus->currentTargetID2 = new_var;
battleStatus->currentTargetPart2 = battleStatus->currentTargetPart;
actor = get_actor(battleStatus->currentTargetID);
if (actor != NULL) {
actorPart = get_actor_part(actor, temp_s2);
ASSERT(actorPart != NULL);
if (actor->stoneStatus != 0xC) {
if (!(actorPart->eventFlags & 0x20) && actor->transStatus != 0xE) {
if ((battleStatus->currentAttackElement & 0x80) != 0) {
if (actorPart->eventFlags & 0x10 && !(actor->flags2 & 0x800)) {
sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
partner->state.currentPos.y, partner->state.currentPos.z);
return 4;
}
}
if (!(battleStatus->currentAttackElement & (0x10000000 | 0x80)) &&
(actorPart->eventFlags & 0x10000) && !(battleStatus->currentAttackEventSuppression & 4) &&
!(player_team_is_ability_active(state, 2))) {
sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
partner->state.currentPos.y, partner->state.currentPos.z);
dispatch_damage_event_partner_1(1, 0x2A);
dispatch_event_actor(actor, 0x1B);
return -1;
}
if ((battleStatus->currentAttackElement & (0x10000000 | 0x40)) ||
!(actorPart->eventFlags & 2) || battleStatus->currentAttackEventSuppression & 0x10) {
if (battleStatus->currentAttackElement & 0x8000) {
if (!(battleStatus->currentAttackElement & 0x10000000)) {
if ((actorPart->eventFlags & 0x10) && (!(actor->flags & 0x800))&&
!(battleStatus->currentAttackEventSuppression & 1)) {
sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
partner->state.currentPos.y, partner->state.currentPos.z);
dispatch_damage_event_partner_1(1, 0x2A);
dispatch_event_actor(actor, 0x1B);
return -1;
}
if ((!(battleStatus->currentAttackElement & 0x10000000)) &&
(actorPart->eventFlags & 0x200000) && !(actor->flags & 0x800) &&
!(battleStatus->currentAttackEventSuppression & 0x80)) {
sfx_play_sound_at_position(0x108, 0, partner->state.currentPos.x,
partner->state.currentPos.y, partner->state.currentPos.z);
dispatch_damage_event_partner_1(1, 0x2A);
dispatch_event_actor(actor, 0x1B);
return -1;
}
}
if (actor->staticStatus == 0xB) {
//missing code here (?)
}
if ((actor->staticStatus == 0xB || actorPart->eventFlags & 0x80) &&
!(battleStatus->currentAttackElement & 0x10000000) &&
!(battleStatus->currentAttackEventSuppression & 8)) {
sfx_play_sound_at_position(0x37B, 0, partner->state.currentPos.x,
partner->state.currentPos.y, partner->state.currentPos.z);
func_80251474(partner);
dispatch_damage_event_partner_1(1, 0x2F);
return -1;
}
}
}
//missing code here (?)
sfx_play_sound_at_position(0xEA, 0, partner->state.currentPos.x,
partner->state.currentPos.y, partner->state.currentPos.z);
dispatch_damage_event_partner_1(1, 0x2C);
dispatch_event_actor(actor, 0x1C);
return -1;
}
return 6;
}
return 8;
}
return 0;
}
#else
INCLUDE_ASM(s32, "1AC760", calc_partner_test_enemy);
#endif
INCLUDE_ASM(s32, "1AC760", calc_partner_damage_enemy);
@ -51,7 +149,7 @@ INCLUDE_ASM(s32, "1AC760", calc_partner_damage_enemy);
s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* partner = battleStatus->partnerActor;
ActorMovement* walkMovement = &partner->walk;
ActorMovement* state = &partner->state;
s32 flagCheck;
s32 temp_a1;
@ -92,12 +190,12 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) {
}
if (stopMotion == 0) {
set_goal_pos_to_part(walkMovement, 0x100, 0);
set_goal_pos_to_part(state, 0x100, 0);
}
show_damage_popup(walkMovement->goalPos.x, walkMovement->goalPos.y, walkMovement->goalPos.z,
show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z,
battleStatus->lastAttackDamage, 1);
func_802666E4(partner, walkMovement->goalPos.x, walkMovement->goalPos.y, walkMovement->goalPos.z,
func_802666E4(partner, state->goalPos.x, state->goalPos.y, state->goalPos.z,
battleStatus->lastAttackDamage);
if (battleStatus->lastAttackDamage > 0) {
@ -118,7 +216,7 @@ s32 dispatch_damage_event_partner_0(s32 damageAmount, s32 event, s32 stopMotion)
return dispatch_damage_event_partner(damageAmount, event, FALSE);
}
s32 dispatch_damage_event_partner_1(s32 damageAmount, s32 event, s32 stopMotion) {
s32 dispatch_damage_event_partner_1(s32 damageAmount, s32 event) {
return dispatch_damage_event_partner(damageAmount, event, TRUE);
}
@ -126,7 +224,7 @@ ApiStatus MakeOwnerTargetIndex(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Actor* actor = get_actor(script->owner1.actorID);
s32 numTargets = actor->targetListLength;
s8* targetList = &actor->targetIndexList;
s8* targetList = actor->targetIndexList;
s32 arg1 = evt_get_variable(script, *args++);
s32 arg2 = evt_get_variable(script, *args++);
s32 otherArg = *args++;
@ -152,8 +250,6 @@ ApiStatus MakeOwnerTargetIndex(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
s32 calc_partner_damage_enemy(void);
ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
BattleStatus* battleStatus = &gBattleStatus;
@ -168,7 +264,7 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) {
outVar = *args++;
actor = get_actor(actorID);
battleStatus->flags1 |= 0x20;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
hitResult = calc_partner_damage_enemy();
show_damage_popup(actor->state.goalPos.x, actor->state.goalPos.y, actor->state.goalPos.z, battleStatus->lastAttackDamage,
@ -181,7 +277,7 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) {
ApiStatus GetActorLevel(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 actorID = evt_get_variable(script, *args++);
Bytecode* outVar;
Bytecode outVar;
if (actorID == ACTOR_SELF) {
actorID = script->owner1.enemyID;
@ -193,75 +289,154 @@ ApiStatus GetActorLevel(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "1AC760", PartnerDamageEnemy);
ApiStatus PartnerDamageEnemy(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
PlayerStatus* playerStatus = &gPlayerStatus;
Bytecode* args = script->ptrReadPos;
Actor* enemy = get_actor(script->owner1.enemyID);
s32 temp_s4 = *args++;
s32 flags;
s32 damageResult;
u8 statusChance;
gBattleStatus.currentAttackElement = *args++;
gBattleStatus.currentAttackEventSuppression = *args++;
gBattleStatus.currentAttackStatus = *args++;
gBattleStatus.currentAttackDamage = evt_get_variable(script, *args++);
gBattleStatus.powerBounceCounter = 0;
flags = *args++;
if ((flags & 0x30) == 0x30) {
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x10) {
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x20) {
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else {
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
}
if (flags & 0x40) {
gBattleStatus.flags1 |= BS_FLAGS1_40;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_40;
}
if (flags & 0x200) {
gBattleStatus.flags1 |= BS_FLAGS1_200;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_200;
}
if (flags & 0x80) {
gBattleStatus.flags1 |= BS_FLAGS1_80;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_80;
}
if (flags & 0x800) {
gBattleStatus.flags1 |= BS_FLAGS1_800;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_800;
}
statusChance = battleStatus->currentAttackStatus;
battleStatus->currentTargetID = enemy->targetActorID;
battleStatus->currentTargetPart = enemy->targetPartIndex;
battleStatus->statusChance = statusChance;
if (statusChance == 0xFF) {
battleStatus->statusChance = 0;
}
battleStatus->statusDuration = (battleStatus->currentAttackStatus & 0xF00) >> 8;
damageResult = calc_partner_damage_enemy();
if (damageResult < 0) {
return ApiStatus_FINISH;
}
evt_set_variable(script, temp_s4, damageResult);
if (!does_script_exist_by_ref(script)) {
return ApiStatus_FINISH;
}
return ApiStatus_DONE2;
}
ApiStatus PartnerAfflictEnemy(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
Bytecode* args = script->ptrReadPos;
Actor* actor = get_actor(script->owner1.enemyID);
s32 returnValue;
s32 returnValue = *args++;
s32 flags;
u8 statusChance;
s32 damageResult;
returnValue = *args++;
battleStatus->currentAttackElement = *args++;
battleStatus->currentAttackEventSuppression = *args++;
battleStatus->currentAttackStatus = *args++;
battleStatus->currentAttackStatus |= evt_get_variable(script, *args++);
battleStatus->currentAttackDamage = evt_get_variable(script, *args++);
battleStatus->powerBounceCounter = 0;
flags = *args++;
if ((flags & 0x30) == 0x30) {
battleStatus->flags1 |= 0x10;
battleStatus->flags1 |= 0x20;
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x10) {
battleStatus->flags1 |= 0x10;
battleStatus->flags1 &= ~0x20;
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x20) {
battleStatus->flags1 &= ~0x10;
battleStatus->flags1 |= 0x20;
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else {
battleStatus->flags1 &= ~0x10;
battleStatus->flags1 &= ~0x20;
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
}
if (flags & 0x40) {
gBattleStatus.flags1 |= 0x40;
gBattleStatus.flags1 |= BS_FLAGS1_40;
} else {
gBattleStatus.flags1 &= ~0x40;
gBattleStatus.flags1 &= ~BS_FLAGS1_40;
}
if (flags & 0x200) {
gBattleStatus.flags1 |= 0x200;
gBattleStatus.flags1 |= BS_FLAGS1_200;
} else {
gBattleStatus.flags1 &= ~0x200;
gBattleStatus.flags1 &= ~BS_FLAGS1_200;
}
if (flags & 0x80) {
gBattleStatus.flags1 |= 0x80;
gBattleStatus.flags1 |= BS_FLAGS1_80;
} else {
gBattleStatus.flags1 &= ~0x80;
gBattleStatus.flags1 &= ~BS_FLAGS1_80;
}
if (flags & 0x800) {
gBattleStatus.flags1 |= 0x800;
gBattleStatus.flags1 |= BS_FLAGS1_800;
} else {
gBattleStatus.flags1 &= ~0x800;
gBattleStatus.flags1 &= ~BS_FLAGS1_800;
}
statusChance = battleStatus->currentAttackStatus;
battleStatus->currentTargetID = actor->targetActorID;
battleStatus->currentTargetPart = actor->targetPartIndex;
battleStatus->statusChance = statusChance;
if (statusChance == 0xFF) {
battleStatus->statusChance = 0;
}
battleStatus->statusDuration = (battleStatus->currentAttackStatus & 0xF00) >> 8;
battleStatus->statusDuration = (battleStatus->currentAttackStatus & 0xF00) >> 8;
damageResult = calc_partner_damage_enemy();
if (damageResult < 0) {
return ApiStatus_FINISH;
}
evt_set_variable(script, returnValue, damageResult);
if (!does_script_exist_by_ref(script)) {
@ -271,9 +446,158 @@ ApiStatus PartnerAfflictEnemy(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "1AC760", PartnerPowerBounceEnemy);
ApiStatus PartnerPowerBounceEnemy(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
Bytecode* args = script->ptrReadPos;
Actor* actor = get_actor(script->owner1.enemyID);
s32 returnValue = *args++;
s32 flags;
u8 statusChance;
s32 damageResult;
INCLUDE_ASM(s32, "1AC760", PartnerTestEnemy);
battleStatus->currentAttackElement = *args++;
battleStatus->currentAttackEventSuppression = *args++;
battleStatus->currentAttackStatus = *args++;
battleStatus->currentAttackDamage = evt_get_variable(script, *args++);
battleStatus->powerBounceCounter = evt_get_variable(script, *args++);
flags = *args++;
if ((flags & 0x30) == 0x30) {
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x10) {
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x20) {
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else {
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
}
if (flags & 0x40) {
gBattleStatus.flags1 |= BS_FLAGS1_40;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_40;
}
if (flags & 0x200) {
gBattleStatus.flags1 |= BS_FLAGS1_200;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_200;
}
if (flags & 0x80) {
gBattleStatus.flags1 |= BS_FLAGS1_80;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_80;
}
if (flags & 0x800) {
gBattleStatus.flags1 |= BS_FLAGS1_800;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_800;
}
statusChance = battleStatus->currentAttackStatus;
battleStatus->currentTargetID = actor->targetActorID;
battleStatus->currentTargetPart = actor->targetPartIndex;
battleStatus->statusChance = statusChance;
if (statusChance == 0xFF) {
battleStatus->statusChance = 0;
}
battleStatus->statusDuration = (battleStatus->currentAttackStatus & 0xF00) >> 8;
damageResult = calc_partner_damage_enemy();
if (damageResult < 0) {
return ApiStatus_FINISH;
}
evt_set_variable(script, returnValue, damageResult);
if (!does_script_exist_by_ref(script)) {
return ApiStatus_FINISH;
}
return ApiStatus_DONE2;
}
ApiStatus PartnerTestEnemy(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
PlayerStatus* playerStatus = &gPlayerStatus;
Bytecode* args = script->ptrReadPos;
Actor* enemy = get_actor(script->owner1.enemyID);
s32 temp_s4;
s32 flags;
s32 damageResult;
u8 statusChance;
temp_s4 = *args++;
gBattleStatus.currentAttackElement = *args++;
gBattleStatus.currentAttackEventSuppression = *args++;
gBattleStatus.currentAttackStatus = *args++;
gBattleStatus.currentAttackDamage = evt_get_variable(script, *args++);
gBattleStatus.powerBounceCounter = 0;
flags = *args++;
if ((flags & 0x30) == 0x30) {
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x10) {
battleStatus->flags1 |= BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
} else if (flags & 0x20) {
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE;
} else {
battleStatus->flags1 &= ~BS_FLAGS1_10;
battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE;
}
if (flags & 0x40) {
gBattleStatus.flags1 |= BS_FLAGS1_40;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_40;
}
if (flags & 0x200) {
gBattleStatus.flags1 |= BS_FLAGS1_200;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_200;
}
if (flags & 0x80) {
gBattleStatus.flags1 |= BS_FLAGS1_80;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_80;
}
if (flags & 0x800) {
gBattleStatus.flags1 |= BS_FLAGS1_800;
} else {
gBattleStatus.flags1 &= ~BS_FLAGS1_800;
}
statusChance = battleStatus->currentAttackStatus;
battleStatus->currentTargetID = enemy->targetActorID;
battleStatus->currentTargetPart = enemy->targetPartIndex;
battleStatus->statusChance = statusChance;
if (statusChance == 0xFF) {
battleStatus->statusChance = 0;
}
battleStatus->statusDuration = (battleStatus->currentAttackStatus & 0xF00) >> 8;
damageResult = calc_partner_test_enemy();
if (damageResult < 0) {
return ApiStatus_FINISH;
}
evt_set_variable(script, temp_s4, damageResult);
return ApiStatus_DONE2;
}
ApiStatus func_8028070C(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
@ -285,7 +609,7 @@ ApiStatus func_8028070C(Evt* script, s32 isInitialCall) {
battleStatus->currentTargetID = actor->targetActorID;
battleStatus->currentTargetPart = actor->targetPartIndex;
if (dispatch_damage_event_partner_0(damageAmount, event, battleStatus) >= 0) {
if (dispatch_damage_event_partner_0(damageAmount, event, (s32) battleStatus) >= 0) {
return does_script_exist_by_ref(script) ? ApiStatus_DONE2 : ApiStatus_BLOCK;
}

51
src/battle/area_jan2/584940.c
View File

@ -1,59 +1,10 @@
#include "common.h"
#include "effects.h"
typedef struct Effect6FData {
/* 0x00 */ EffectInstanceDataThing* unk_00;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3i rotation;
/* 0x1C */ Vec3i scale;
/* 0x28 */ Vec3i color;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
/* 0x3C */ s32 unk_3C;
/* 0x40 */ char unk_40[0x4];
} Effect6FData; // size = 0x4
typedef struct Effect6FInstance {
/* 0x00 */ s32 flags;
/* 0x04 */ s32 effectIndex;
/* 0x08 */ s32 numParts;
/* 0x0C */ Effect6FData* data;
/* 0x10 */ struct EffectGraphics* effect;
} Effect6FInstance;
#define NAMESPACE b_area_jan2
#define NAMESPACE dup_b_area_jan2
#include "common/UnkBattleFunc1.inc.c"
#define NAMESPACE b_area_jan2
ApiStatus func_802180CC_584A0C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Effect6FInstance* effect;
f32 temp_f20;
s32 temp_s0_9;
s32 temp_s1;
s32 temp_s2;
s32 temp_s3;
s32 temp_s4;
s32 temp_s5;
s32 temp_s6;
evt_get_variable(script, *args++);
temp_s6 = evt_get_variable(script, *args++);
temp_s5 = evt_get_variable(script, *args++);
temp_s4 = evt_get_variable(script, *args++);
temp_f20 = evt_get_float_variable(script, *args++);
temp_s2 = evt_get_variable(script, *args++);
temp_s3 = evt_get_variable(script, *args++);
temp_s1 = evt_get_variable(script, *args++);
temp_s0_9 = evt_get_variable(script, *args++);
effect = playFX_6F(1, temp_s6, temp_s5, temp_s4, temp_f20, temp_s2);
effect->data->rotation.z = temp_s3;
effect->data->scale.x = temp_s1;
effect->data->scale.y = temp_s0_9;
effect->data->color.x = 255; // red
effect->data->color.y = 255; // green
effect->data->color.z = 255; // blue
return ApiStatus_DONE2;
}
#include "common/UnkEffect6FFunc.inc.c"

64
src/battle/area_kpa3/6BBC60.c
View File

@ -10,9 +10,21 @@ INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802180D0_6BBC60);
#include "common/UnkEffect6CFunc.inc.c"
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218BC4_6BC754);
ApiStatus func_80218BC4_6BC754(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkStruct0* unkStruct0 = (UnkStruct0*)evt_get_variable(script, *args++);
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218BFC_6BC78C);
unkStruct0->unk_0C->unk_08 = -1000.0f;
return ApiStatus_DONE2;
}
ApiStatus func_80218BFC_6BC78C(Evt* script, s32 isInitialCall) {
UnkStruct0* unkStruct0 = (UnkStruct0*)evt_get_variable(script, *script->ptrReadPos);
unkStruct0->unk_0C->unk_08 = 144.0f;
unkStruct0->flags |= 0x10;
return ApiStatus_DONE2;
}
#define NAMESPACE dup_b_area_kpa3
#include "common/UnkBattleFunc1.inc.c"
@ -26,18 +38,56 @@ INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218BFC_6BC78C);
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80218F58_6BCAE8);
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802193D4_6BCF64);
ApiStatus func_802193D4_6BCF64(Evt* script, s32 isInitialCall) {
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.actorID)->state.varTable[2];
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219428_6BCFB8);
unkDuplighost->flags = 0;
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219474_6BD004);
if (unkDuplighost->effect1 != NULL) {
unkDuplighost->effect1->flags |= EFFECT_INSTANCE_FLAGS_10;
}
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802194C0_6BD050);
if (unkDuplighost->effect2 != NULL) {
unkDuplighost->effect2->flags |= EFFECT_INSTANCE_FLAGS_10;
}
return ApiStatus_DONE2;
}
ApiStatus func_80219428_6BCFB8(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.actorID)->state.varTable[2];
unkDuplighost->unk_04 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_80219474_6BD004(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[2];
unkDuplighost->unk_0C = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_802194C0_6BD050(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[2];
unkDuplighost->unk_10 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
#include "common/UnkBackgroundFunc3.inc.c"
#include "common/SetBackgroundAlpha.inc.c"
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219588_6BD118);
ApiStatus func_80219588_6BD118(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args++, gPlayerData.currentPartner);
evt_set_variable(script, *args++, gPlayerData.partners[gPlayerData.currentPartner].level);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802195F4_6BD184);

3
src/battle/area_kzn/58C2F0.c
View File

@ -1,4 +1,5 @@
#include "common.h"
#include "effects.h"
#define NAMESPACE b_area_kzn
@ -6,4 +7,4 @@
#include "common/UnkBattleFunc1.inc.c"
INCLUDE_ASM(s32, "battle/area_kzn/58C2F0", func_802181FC_58C4EC);
#include "common/UnkEffect6FFunc.inc.c"

64
src/battle/area_mac/464560.c
View File

@ -14,9 +14,21 @@ INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218300_464790);
#include "common/UnkEffect6CFunc.inc.c"
INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218DF4_465284);
ApiStatus func_80218DF4_465284(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkStruct0* unkStruct0 = (UnkStruct0*)evt_get_variable(script, *args++);
INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218E2C_4652BC);
unkStruct0->unk_0C->unk_08 = -1000.0f;
return ApiStatus_DONE2;
}
ApiStatus func_80218E2C_4652BC(Evt* script, s32 isInitialCall) {
UnkStruct0* unkStruct0 = (UnkStruct0*) evt_get_variable(script, *script->ptrReadPos);
unkStruct0->unk_0C->unk_08 = 144.0f;
unkStruct0->flags |= 0x10;
return ApiStatus_DONE2;
}
#define NAMESPACE dup_b_area_mac
#include "common/UnkBattleFunc1.inc.c"
@ -30,18 +42,56 @@ INCLUDE_ASM(s32, "battle/area_mac/464560", func_80218E2C_4652BC);
INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219188_465618);
INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219604_465A94);
ApiStatus func_80219604_465A94(Evt* script, s32 isInitialCall) {
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.actorID)->state.varTable[3];
INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219658_465AE8);
unkDuplighost->flags = 0;
INCLUDE_ASM(s32, "battle/area_mac/464560", func_802196A4_465B34);
if (unkDuplighost->effect1 != NULL) {
unkDuplighost->effect1->flags |= EFFECT_INSTANCE_FLAGS_10;
}
INCLUDE_ASM(s32, "battle/area_mac/464560", func_802196F0_465B80);
if (unkDuplighost->effect2 != NULL) {
unkDuplighost->effect2->flags |= EFFECT_INSTANCE_FLAGS_10;
}
return ApiStatus_DONE2;
}
ApiStatus func_80219658_465AE8(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[3];
unkDuplighost->unk_04 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_802196A4_465B34(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[3];
unkDuplighost->unk_0C = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_802196F0_465B80(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[3];
unkDuplighost->unk_10 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
#include "common/UnkBackgroundFunc3.inc.c"
#include "common/SetBackgroundAlpha.inc.c"
INCLUDE_ASM(s32, "battle/area_mac/464560", func_802197B8_465C48);
ApiStatus func_802197B8_465C48(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args++, gPlayerData.currentPartner);
evt_set_variable(script, *args++, gPlayerData.partners[gPlayerData.currentPartner].level);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219824_465CB4);

48
src/battle/area_pra3/669D80.c
View File

@ -10,7 +10,13 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218000_669D80);
#include "common/UnkEffect6CFunc.inc.c"
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218AF4_66A874);
ApiStatus func_80218AF4_66A874(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkStruct0* unkStruct0 = (UnkStruct0*)evt_get_variable(script, *args++);
unkStruct0->unk_0C->unk_08 = -1000.0f;
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218B2C_66A8AC);
@ -24,11 +30,37 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218C40_66A9C0);
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80218E88_66AC08);
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219304_66B084);
ApiStatus func_80219304_66B084(Evt* script, s32 isInitialCall) {
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.actorID)->state.varTable[2];
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219358_66B0D8);
unkDuplighost->flags = 0;
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802193A4_66B124);
if (unkDuplighost->effect1 != NULL) {
unkDuplighost->effect1->flags |= 0x10;
}
if (unkDuplighost->effect2 != NULL) {
unkDuplighost->effect2->flags |= 0x10;
}
return ApiStatus_DONE2;
}
ApiStatus func_80219358_66B0D8(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[2];
unkDuplighost->unk_04 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_802193A4_66B124(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[2];
unkDuplighost->unk_0C = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802193F0_66B170);
@ -36,7 +68,13 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802193F0_66B170);
#include "common/SetBackgroundAlpha.inc.c"
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802194B8_66B238);
ApiStatus func_802194B8_66B238(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args++, gPlayerData.currentPartner);
evt_set_variable(script, *args++, gPlayerData.partners[gPlayerData.currentPartner].level);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219524_66B2A4);

66
src/battle/area_sam/623BA0.c
View File

@ -11,9 +11,21 @@ INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218000_623BA0);
#include "common/UnkEffect6CFunc.inc.c"
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218AF4_624694);
ApiStatus func_80218AF4_624694(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkStruct0* unkStruct0 = (UnkStruct0*)evt_get_variable(script, *args++);
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218B2C_6246CC);
unkStruct0->unk_0C->unk_08 = -1000.0f;
return ApiStatus_DONE2;
}
ApiStatus func_80218B2C_6246CC(Evt* script, s32 isInitialCall) {
UnkStruct0* unkStruct0 = (UnkStruct0*)evt_get_variable(script, *script->ptrReadPos);
unkStruct0->unk_0C->unk_08 = 144.0f;
unkStruct0->flags |= 0x10;
return ApiStatus_DONE2;
}
#include "common/UnkBattleFunc1.inc.c"
@ -25,19 +37,57 @@ INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218B2C_6246CC);
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80218E88_624A28);
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80219304_624EA4);
ApiStatus func_80219304_624EA4(Evt* script, s32 isInitialCall) {
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.actorID)->state.varTable[2];
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80219358_624EF8);
unkDuplighost->flags = 0;
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802193A4_624F44);
if (unkDuplighost->effect1 != NULL) {
unkDuplighost->effect1->flags |= EFFECT_INSTANCE_FLAGS_10;
}
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802193F0_624F90);
if (unkDuplighost->effect2 != NULL) {
unkDuplighost->effect2->flags |= EFFECT_INSTANCE_FLAGS_10;
}
return ApiStatus_DONE2;
}
ApiStatus func_80219358_624EF8(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.actorID)->state.varTable[2];
unkDuplighost->unk_04 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_802193A4_624F44(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[2];
unkDuplighost->unk_0C = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
ApiStatus func_802193F0_624F90(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
UnkDuplighost* unkDuplighost = (UnkDuplighost*)get_actor(script->owner1.enemyID)->state.varTable[2];
unkDuplighost->unk_10 = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}
#include "common/UnkBackgroundFunc3.inc.c"
#include "common/SetBackgroundAlpha.inc.c"
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802194B8_625058);
ApiStatus func_802194B8_625058(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
evt_set_variable(script, *args++, gPlayerData.currentPartner);
evt_set_variable(script, *args++, gPlayerData.partners[gPlayerData.currentPartner].level);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80219524_6250C4);
@ -45,4 +95,4 @@ INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80219524_6250C4);
#include "common/UnkBattleFunc1.inc.c"
#define NAMESPACE b_area_sam
INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802196BC_62525C);
#include "common/UnkEffect6FFunc.inc.c"

26
src/common/UnkEffect6FFunc.inc.c Normal file
View File

@ -0,0 +1,26 @@
#include "battle/battle.h"
#include "effects.h"
ApiStatus N(UnkEffect6FFunc)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Effect6FInstance* effect;
s32 unused_var = evt_get_variable(script, *args++);
s32 temp_s6 = evt_get_variable(script, *args++);
s32 temp_s5 = evt_get_variable(script, *args++);
s32 temp_s4 = evt_get_variable(script, *args++);
f32 temp_f20 = evt_get_float_variable(script, *args++);
s32 temp_s2 = evt_get_variable(script, *args++);
s32 temp_s3 = evt_get_variable(script, *args++);
s32 temp_s1 = evt_get_variable(script, *args++);
s32 temp_s0_9 = evt_get_variable(script, *args++);
effect = (Effect6FInstance*)playFX_6F(1, temp_s6, temp_s5, temp_s4, temp_f20, temp_s2);
effect->data->rotation.z = temp_s3;
effect->data->scale.x = temp_s1;
effect->data->scale.y = temp_s0_9;
effect->data->color.x = 255;
effect->data->color.y = 255;
effect->data->color.z = 255;
return ApiStatus_DONE2;
}

38
src/world/partner/lakilester.c
View File

@ -136,7 +136,7 @@ ApiStatus func_802BD2D4_320E24(Evt* script, s32 isInitialCall) {
lakilester->pos.y += tempY;
lakilester->renderYaw = clamp_angle(360.0f - D_802BFE7C_3239CC->unk_10);
D_802BFE7C_3239CC->unk_14 += D_802BFEF0;
D_802BFE7C_3239CC->unk_14 += 0.8;
if (D_802BFE7C_3239CC->unk_14 > 40.0f) {
D_802BFE7C_3239CC->unk_14 = 40.0f;
@ -516,7 +516,7 @@ void func_802BDDD8_321928(Npc* npc) {
collisionStatus->currentFloor = -1;
playerStatus->decorationList = playerStatus->decorationList + 1;
npc->unk_84 = -1;
npc->jumpScale += D_802BFEF8;
npc->jumpScale += 1.8;
if (npc->jumpScale > 12.0f) {
npc->jumpScale = 12.0f;
@ -540,6 +540,7 @@ s32 func_802BE6A0_3221F0(f32* arg0) {
&hitDirX, &hitDirZ);
}
ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall);
INCLUDE_ASM(s32, "world/partner/lakilester", func_802BE724_322274);
ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) {
@ -800,3 +801,36 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
//data
EvtSource D_802BFE60_3239B0 = {
EVT_CALL(func_802BD29C_320DEC)
EVT_RETURN
EVT_END
};
unkPartnerStruct* D_802BFE7C_3239CC = &D_802BFF30;
EvtSource D_802BFE7C_3239D0 = {
EVT_CALL(func_802BD2D4_320E24)
EVT_RETURN
EVT_END
};
EvtSource D_802BFE98_323A08 = {
EVT_CALL(func_802BE724_322274)
EVT_RETURN
EVT_END
};
EvtSource D_802BFEB4_323A24 = {
EVT_CALL(func_802BF4F0_323040)
EVT_RETURN
EVT_END
};
EvtSource D_802BFED0_323A40 = {
EVT_CALL(func_802BFBA0_3236F0)
EVT_RETURN
EVT_END
};

19
src/world/partner/sushie.c
View File

@ -8,10 +8,11 @@ extern s32 D_802BFEEC;
extern f32 D_802BFEE0;
void func_802BD368_31E0D8(s32, f32, f32, f32, f32, f32);
void partner_kill_ability_script(void);
extern s32 D_802BFEE4;
extern s32 D_802BFEE8;
extern s32 D_802BFEF0;
extern s32 D_802BFEF4;
extern s32 bss_802BFEE4;
extern s32 bss_802BFEE8;
extern s32 bss_802BFEF0;
extern s32 bss_802BFEF4;
extern f32 bss_802BFEFC;
extern f32 D_802BFDB0_320B20;
extern f32 D_802BFDB4_320B24;
extern s16 D_8010C97A;
@ -51,7 +52,7 @@ void func_802BD20C_31DF7C(f32* arg0, f32* arg1) {
if (dist2D(0.0f, 0.0f, D_802BFDB0_320B20, -D_802BFDB4_320B24) >= 1.0) {
if (SQ(D_802BFDB0_320B20) + SQ(D_802BFDB4_320B24) > 3025.0f) {
if (D_802BFEE4) {
if (bss_802BFEE4) {
phi_f20 = 2.0f;
} else {
phi_f20 = 4.0f;
@ -105,10 +106,10 @@ void func_802BF520_320290(Npc* sushie) {
sushie->collisionRadius = 36;
sushie->unk_80 = 0x10000;
D_802BFEEC = 0;
D_802BFEE4 = 0;
D_802BFEE8 = 0;
D_802BFEF0 = 0;
D_802BFEF4 = 0;
bss_802BFEE4 = 0;
bss_802BFEE8 = 0;
bss_802BFEF0 = 0;
bss_802BFEF4 = 0;
}
s32 func_802BF568_3202D8(Evt* script, s32 isInitialCall) {

2
ver/us/asm/data/battle/area_jan2/585000.data.s
View File

File diff suppressed because one or more lines are too long

54
ver/us/asm/data/battle/area_kpa3/6BD250.data.s
View File

@ -394,57 +394,3 @@ dlabel D_802282F4_6CBE84
dlabel D_8022832C_6CBEBC
.word D_8021B300_6BEE90, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021B300_6BEE90, 0x00000001, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021B300_6BEE90, 0x00000002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021B300_6BEE90, 0x00000003, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802284C0_6CC050, 0x00000003, D_802282A0_6CBE30, D_80228274_6CBE04, 0x00000000, D_802284B4_6CC044, 0x00000002, D_802282F4_6CBE84, D_80228274_6CBE04, 0x00000000, D_802284A8_6CC038, 0x00000004, D_8022832C_6CBEBC, D_80228274_6CBE04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802284D4_6CC064, D_80228274_6CBE04, 0x00000000, 0x00000000, 0x00000000
dlabel D_80228400_6CBF90
.double 47.0
dlabel D_80228408_6CBF98
.double 1.12
dlabel D_80228410_6CBFA0
.double 0.53
dlabel D_80228418_6CBFA8
.double 47.0
dlabel D_80228420_6CBFB0
.double 0.8
dlabel D_80228428_6CBFB8
.double 0.53
dlabel D_80228430_6CBFC0
.double 0.8
dlabel D_80228438_6CBFC8
.double 16.5
dlabel D_80228440_6CBFD0
.double 33.0
dlabel D_80228448_6CBFD8
.double 4.800000000000001
dlabel jtbl_80228450_6CBFE0
.word L80219648_6BD1D8, L80219654_6BD1E4, L80219660_6BD1F0, L8021966C_6BD1FC, L802196A4_6BD234, L80219684_6BD214, L80219690_6BD220, L8021969C_6BD22C, L80219678_6BD208, 0, 0, 0
dlabel D_80228480_6CC010
.word 0x6B70615F, 0x62743031, 0x5F686974, 0x00000000
dlabel D_80228490_6CC020
.word 0x6B70615F, 0x62743031, 0x5F736861, 0x70650000
dlabel D_802284A0_6CC030
.word 0x6B70615F, 0x74657800
dlabel D_802284A8_6CC038
.word 0x836F8350, 0x836F8350, 0x78825300
dlabel D_802284B4_6CC044
.word 0x836F8350, 0x836F8350, 0x78825100
dlabel D_802284C0_6CC050
.word 0x83758389, 0x8362834E, 0x83778343, 0x837A815B, 0x78825200
dlabel D_802284D4_6CC064
.word 0x6B70615F, 0x30310000, 0x00000000

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

File diff suppressed because one or more lines are too long

2
ver/us/asm/data/battle/area_sam/626A30.data.s
View File

File diff suppressed because one or more lines are too long

8
ver/us/asm/data/world/partner/3239B0.data.s
View File

@ -11,19 +11,19 @@ dlabel D_802BFE7C_3239CC
dlabel D_802BFEE0
.word 0x00000002
dlabel D_802BFEE4
dlabel bss_802BFEE4
.word 0x00000000
dlabel D_802BFEE8
dlabel bss_802BFEE8
.word 0x00000001
dlabel D_802BFEEC
.word 0x00000000
dlabel D_802BFEF0
dlabel bss_802BFEF0
.byte 0x3F, 0xE9, 0x99, 0x99
dlabel D_802BFEF4
dlabel bss_802BFEF4
.word 0x9999999A
dlabel D_802BFEF8

168
ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s
View File

@ -1,168 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel PartnerDamageEnemy
/* 1AE694 8027FDB4 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 1AE698 8027FDB8 AFB20018 */ sw $s2, 0x18($sp)
/* 1AE69C 8027FDBC 0080902D */ daddu $s2, $a0, $zero
/* 1AE6A0 8027FDC0 AFBF0024 */ sw $ra, 0x24($sp)
/* 1AE6A4 8027FDC4 AFB40020 */ sw $s4, 0x20($sp)
/* 1AE6A8 8027FDC8 AFB3001C */ sw $s3, 0x1c($sp)
/* 1AE6AC 8027FDCC AFB10014 */ sw $s1, 0x14($sp)
/* 1AE6B0 8027FDD0 AFB00010 */ sw $s0, 0x10($sp)
/* 1AE6B4 8027FDD4 8E440148 */ lw $a0, 0x148($s2)
/* 1AE6B8 8027FDD8 0C09A75B */ jal get_actor
/* 1AE6BC 8027FDDC 8E50000C */ lw $s0, 0xc($s2)
/* 1AE6C0 8027FDE0 8E140000 */ lw $s4, ($s0)
/* 1AE6C4 8027FDE4 26100004 */ addiu $s0, $s0, 4
/* 1AE6C8 8027FDE8 8E030000 */ lw $v1, ($s0)
/* 1AE6CC 8027FDEC 26100004 */ addiu $s0, $s0, 4
/* 1AE6D0 8027FDF0 0240202D */ daddu $a0, $s2, $zero
/* 1AE6D4 8027FDF4 3C11800E */ lui $s1, %hi(gBattleStatus)
/* 1AE6D8 8027FDF8 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus)
/* 1AE6DC 8027FDFC 0040982D */ daddu $s3, $v0, $zero
/* 1AE6E0 8027FE00 AE230188 */ sw $v1, 0x188($s1)
/* 1AE6E4 8027FE04 8E030000 */ lw $v1, ($s0)
/* 1AE6E8 8027FE08 26100004 */ addiu $s0, $s0, 4
/* 1AE6EC 8027FE0C AE23018C */ sw $v1, 0x18c($s1)
/* 1AE6F0 8027FE10 8E030000 */ lw $v1, ($s0)
/* 1AE6F4 8027FE14 26100004 */ addiu $s0, $s0, 4
/* 1AE6F8 8027FE18 AE230190 */ sw $v1, 0x190($s1)
/* 1AE6FC 8027FE1C 8E050000 */ lw $a1, ($s0)
/* 1AE700 8027FE20 0C0B1EAF */ jal evt_get_variable
/* 1AE704 8027FE24 26100004 */ addiu $s0, $s0, 4
/* 1AE708 8027FE28 A622017E */ sh $v0, 0x17e($s1)
/* 1AE70C 8027FE2C A2200198 */ sb $zero, 0x198($s1)
/* 1AE710 8027FE30 8E100000 */ lw $s0, ($s0)
/* 1AE714 8027FE34 24020030 */ addiu $v0, $zero, 0x30
/* 1AE718 8027FE38 32030030 */ andi $v1, $s0, 0x30
/* 1AE71C 8027FE3C 54620004 */ bnel $v1, $v0, .L8027FE50
/* 1AE720 8027FE40 32020010 */ andi $v0, $s0, 0x10
/* 1AE724 8027FE44 8E220000 */ lw $v0, ($s1)
/* 1AE728 8027FE48 0809FFA4 */ j .L8027FE90
/* 1AE72C 8027FE4C 34420030 */ ori $v0, $v0, 0x30
.L8027FE50:
/* 1AE730 8027FE50 10400004 */ beqz $v0, .L8027FE64
/* 1AE734 8027FE54 2403FFDF */ addiu $v1, $zero, -0x21
/* 1AE738 8027FE58 8E220000 */ lw $v0, ($s1)
/* 1AE73C 8027FE5C 0809FFA3 */ j .L8027FE8C
/* 1AE740 8027FE60 34420010 */ ori $v0, $v0, 0x10
.L8027FE64:
/* 1AE744 8027FE64 32020020 */ andi $v0, $s0, 0x20
/* 1AE748 8027FE68 10400005 */ beqz $v0, .L8027FE80
/* 1AE74C 8027FE6C 2403FFEF */ addiu $v1, $zero, -0x11
/* 1AE750 8027FE70 8E220000 */ lw $v0, ($s1)
/* 1AE754 8027FE74 00431024 */ and $v0, $v0, $v1
/* 1AE758 8027FE78 0809FFA4 */ j .L8027FE90
/* 1AE75C 8027FE7C 34420020 */ ori $v0, $v0, 0x20
.L8027FE80:
/* 1AE760 8027FE80 8E220000 */ lw $v0, ($s1)
/* 1AE764 8027FE84 00431024 */ and $v0, $v0, $v1
/* 1AE768 8027FE88 2403FFDF */ addiu $v1, $zero, -0x21
.L8027FE8C:
/* 1AE76C 8027FE8C 00431024 */ and $v0, $v0, $v1
.L8027FE90:
/* 1AE770 8027FE90 AE220000 */ sw $v0, ($s1)
/* 1AE774 8027FE94 32020040 */ andi $v0, $s0, 0x40
/* 1AE778 8027FE98 10400007 */ beqz $v0, .L8027FEB8
/* 1AE77C 8027FE9C 2404FFBF */ addiu $a0, $zero, -0x41
/* 1AE780 8027FEA0 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AE784 8027FEA4 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AE788 8027FEA8 8C620000 */ lw $v0, ($v1)
/* 1AE78C 8027FEAC 34420040 */ ori $v0, $v0, 0x40
/* 1AE790 8027FEB0 0809FFB3 */ j .L8027FECC
/* 1AE794 8027FEB4 AC620000 */ sw $v0, ($v1)
.L8027FEB8:
/* 1AE798 8027FEB8 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AE79C 8027FEBC 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AE7A0 8027FEC0 8C430000 */ lw $v1, ($v0)
/* 1AE7A4 8027FEC4 00641824 */ and $v1, $v1, $a0
/* 1AE7A8 8027FEC8 AC430000 */ sw $v1, ($v0)
.L8027FECC:
/* 1AE7AC 8027FECC 32020200 */ andi $v0, $s0, 0x200
/* 1AE7B0 8027FED0 10400007 */ beqz $v0, .L8027FEF0
/* 1AE7B4 8027FED4 2404FDFF */ addiu $a0, $zero, -0x201
/* 1AE7B8 8027FED8 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AE7BC 8027FEDC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AE7C0 8027FEE0 8C620000 */ lw $v0, ($v1)
/* 1AE7C4 8027FEE4 34420200 */ ori $v0, $v0, 0x200
/* 1AE7C8 8027FEE8 0809FFC1 */ j .L8027FF04
/* 1AE7CC 8027FEEC AC620000 */ sw $v0, ($v1)
.L8027FEF0:
/* 1AE7D0 8027FEF0 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AE7D4 8027FEF4 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AE7D8 8027FEF8 8C430000 */ lw $v1, ($v0)
/* 1AE7DC 8027FEFC 00641824 */ and $v1, $v1, $a0
/* 1AE7E0 8027FF00 AC430000 */ sw $v1, ($v0)
.L8027FF04:
/* 1AE7E4 8027FF04 32020080 */ andi $v0, $s0, 0x80
/* 1AE7E8 8027FF08 10400007 */ beqz $v0, .L8027FF28
/* 1AE7EC 8027FF0C 2404FF7F */ addiu $a0, $zero, -0x81
/* 1AE7F0 8027FF10 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AE7F4 8027FF14 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AE7F8 8027FF18 8C620000 */ lw $v0, ($v1)
/* 1AE7FC 8027FF1C 34420080 */ ori $v0, $v0, 0x80
/* 1AE800 8027FF20 0809FFCF */ j .L8027FF3C
/* 1AE804 8027FF24 AC620000 */ sw $v0, ($v1)
.L8027FF28:
/* 1AE808 8027FF28 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AE80C 8027FF2C 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AE810 8027FF30 8C430000 */ lw $v1, ($v0)
/* 1AE814 8027FF34 00641824 */ and $v1, $v1, $a0
/* 1AE818 8027FF38 AC430000 */ sw $v1, ($v0)
.L8027FF3C:
/* 1AE81C 8027FF3C 32020800 */ andi $v0, $s0, 0x800
/* 1AE820 8027FF40 10400007 */ beqz $v0, .L8027FF60
/* 1AE824 8027FF44 2404F7FF */ addiu $a0, $zero, -0x801
/* 1AE828 8027FF48 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AE82C 8027FF4C 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AE830 8027FF50 8C620000 */ lw $v0, ($v1)
/* 1AE834 8027FF54 34420800 */ ori $v0, $v0, 0x800
/* 1AE838 8027FF58 0809FFDD */ j .L8027FF74
/* 1AE83C 8027FF5C AC620000 */ sw $v0, ($v1)
.L8027FF60:
/* 1AE840 8027FF60 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AE844 8027FF64 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AE848 8027FF68 8C430000 */ lw $v1, ($v0)
/* 1AE84C 8027FF6C 00641824 */ and $v1, $v1, $a0
/* 1AE850 8027FF70 AC430000 */ sw $v1, ($v0)
.L8027FF74:
/* 1AE854 8027FF74 96620428 */ lhu $v0, 0x428($s3)
/* 1AE858 8027FF78 92230193 */ lbu $v1, 0x193($s1)
/* 1AE85C 8027FF7C A62201A0 */ sh $v0, 0x1a0($s1)
/* 1AE860 8027FF80 92620426 */ lbu $v0, 0x426($s3)
/* 1AE864 8027FF84 A2230194 */ sb $v1, 0x194($s1)
/* 1AE868 8027FF88 306300FF */ andi $v1, $v1, 0xff
/* 1AE86C 8027FF8C A22201A2 */ sb $v0, 0x1a2($s1)
/* 1AE870 8027FF90 240200FF */ addiu $v0, $zero, 0xff
/* 1AE874 8027FF94 50620001 */ beql $v1, $v0, .L8027FF9C
/* 1AE878 8027FF98 A2200194 */ sb $zero, 0x194($s1)
.L8027FF9C:
/* 1AE87C 8027FF9C 8E220190 */ lw $v0, 0x190($s1)
/* 1AE880 8027FFA0 30420F00 */ andi $v0, $v0, 0xf00
/* 1AE884 8027FFA4 00021203 */ sra $v0, $v0, 8
/* 1AE888 8027FFA8 0C09F8CA */ jal calc_partner_damage_enemy
/* 1AE88C 8027FFAC A2220195 */ sb $v0, 0x195($s1)
/* 1AE890 8027FFB0 0440000B */ bltz $v0, .L8027FFE0
/* 1AE894 8027FFB4 0240202D */ daddu $a0, $s2, $zero
/* 1AE898 8027FFB8 0280282D */ daddu $a1, $s4, $zero
/* 1AE89C 8027FFBC 0C0B2026 */ jal evt_set_variable
/* 1AE8A0 8027FFC0 0040302D */ daddu $a2, $v0, $zero
/* 1AE8A4 8027FFC4 0C0B1069 */ jal does_script_exist_by_ref
/* 1AE8A8 8027FFC8 0240202D */ daddu $a0, $s2, $zero
/* 1AE8AC 8027FFCC 0040182D */ daddu $v1, $v0, $zero
/* 1AE8B0 8027FFD0 10600004 */ beqz $v1, .L8027FFE4
/* 1AE8B4 8027FFD4 240200FF */ addiu $v0, $zero, 0xff
/* 1AE8B8 8027FFD8 0809FFF9 */ j .L8027FFE4
/* 1AE8BC 8027FFDC 24020002 */ addiu $v0, $zero, 2
.L8027FFE0:
/* 1AE8C0 8027FFE0 240200FF */ addiu $v0, $zero, 0xff
.L8027FFE4:
/* 1AE8C4 8027FFE4 8FBF0024 */ lw $ra, 0x24($sp)
/* 1AE8C8 8027FFE8 8FB40020 */ lw $s4, 0x20($sp)
/* 1AE8CC 8027FFEC 8FB3001C */ lw $s3, 0x1c($sp)
/* 1AE8D0 8027FFF0 8FB20018 */ lw $s2, 0x18($sp)
/* 1AE8D4 8027FFF4 8FB10014 */ lw $s1, 0x14($sp)
/* 1AE8D8 8027FFF8 8FB00010 */ lw $s0, 0x10($sp)
/* 1AE8DC 8027FFFC 03E00008 */ jr $ra
/* 1AE8E0 80280000 27BD0028 */ addiu $sp, $sp, 0x28

172
ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s
View File

@ -1,172 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel PartnerPowerBounceEnemy
/* 1AEB50 80280270 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 1AEB54 80280274 AFB20018 */ sw $s2, 0x18($sp)
/* 1AEB58 80280278 0080902D */ daddu $s2, $a0, $zero
/* 1AEB5C 8028027C AFBF0024 */ sw $ra, 0x24($sp)
/* 1AEB60 80280280 AFB40020 */ sw $s4, 0x20($sp)
/* 1AEB64 80280284 AFB3001C */ sw $s3, 0x1c($sp)
/* 1AEB68 80280288 AFB10014 */ sw $s1, 0x14($sp)
/* 1AEB6C 8028028C AFB00010 */ sw $s0, 0x10($sp)
/* 1AEB70 80280290 8E440148 */ lw $a0, 0x148($s2)
/* 1AEB74 80280294 0C09A75B */ jal get_actor
/* 1AEB78 80280298 8E50000C */ lw $s0, 0xc($s2)
/* 1AEB7C 8028029C 8E140000 */ lw $s4, ($s0)
/* 1AEB80 802802A0 26100004 */ addiu $s0, $s0, 4
/* 1AEB84 802802A4 8E030000 */ lw $v1, ($s0)
/* 1AEB88 802802A8 26100004 */ addiu $s0, $s0, 4
/* 1AEB8C 802802AC 0240202D */ daddu $a0, $s2, $zero
/* 1AEB90 802802B0 3C11800E */ lui $s1, %hi(gBattleStatus)
/* 1AEB94 802802B4 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus)
/* 1AEB98 802802B8 0040982D */ daddu $s3, $v0, $zero
/* 1AEB9C 802802BC AE230188 */ sw $v1, 0x188($s1)
/* 1AEBA0 802802C0 8E030000 */ lw $v1, ($s0)
/* 1AEBA4 802802C4 26100004 */ addiu $s0, $s0, 4
/* 1AEBA8 802802C8 AE23018C */ sw $v1, 0x18c($s1)
/* 1AEBAC 802802CC 8E030000 */ lw $v1, ($s0)
/* 1AEBB0 802802D0 26100004 */ addiu $s0, $s0, 4
/* 1AEBB4 802802D4 AE230190 */ sw $v1, 0x190($s1)
/* 1AEBB8 802802D8 8E050000 */ lw $a1, ($s0)
/* 1AEBBC 802802DC 0C0B1EAF */ jal evt_get_variable
/* 1AEBC0 802802E0 26100004 */ addiu $s0, $s0, 4
/* 1AEBC4 802802E4 A622017E */ sh $v0, 0x17e($s1)
/* 1AEBC8 802802E8 8E050000 */ lw $a1, ($s0)
/* 1AEBCC 802802EC 26100004 */ addiu $s0, $s0, 4
/* 1AEBD0 802802F0 0C0B1EAF */ jal evt_get_variable
/* 1AEBD4 802802F4 0240202D */ daddu $a0, $s2, $zero
/* 1AEBD8 802802F8 A2220198 */ sb $v0, 0x198($s1)
/* 1AEBDC 802802FC 8E100000 */ lw $s0, ($s0)
/* 1AEBE0 80280300 24020030 */ addiu $v0, $zero, 0x30
/* 1AEBE4 80280304 32030030 */ andi $v1, $s0, 0x30
/* 1AEBE8 80280308 54620004 */ bnel $v1, $v0, .L8028031C
/* 1AEBEC 8028030C 32020010 */ andi $v0, $s0, 0x10
/* 1AEBF0 80280310 8E220000 */ lw $v0, ($s1)
/* 1AEBF4 80280314 080A00D7 */ j .L8028035C
/* 1AEBF8 80280318 34420030 */ ori $v0, $v0, 0x30
.L8028031C:
/* 1AEBFC 8028031C 10400004 */ beqz $v0, .L80280330
/* 1AEC00 80280320 2403FFDF */ addiu $v1, $zero, -0x21
/* 1AEC04 80280324 8E220000 */ lw $v0, ($s1)
/* 1AEC08 80280328 080A00D6 */ j .L80280358
/* 1AEC0C 8028032C 34420010 */ ori $v0, $v0, 0x10
.L80280330:
/* 1AEC10 80280330 32020020 */ andi $v0, $s0, 0x20
/* 1AEC14 80280334 10400005 */ beqz $v0, .L8028034C
/* 1AEC18 80280338 2403FFEF */ addiu $v1, $zero, -0x11
/* 1AEC1C 8028033C 8E220000 */ lw $v0, ($s1)
/* 1AEC20 80280340 00431024 */ and $v0, $v0, $v1
/* 1AEC24 80280344 080A00D7 */ j .L8028035C
/* 1AEC28 80280348 34420020 */ ori $v0, $v0, 0x20
.L8028034C:
/* 1AEC2C 8028034C 8E220000 */ lw $v0, ($s1)
/* 1AEC30 80280350 00431024 */ and $v0, $v0, $v1
/* 1AEC34 80280354 2403FFDF */ addiu $v1, $zero, -0x21
.L80280358:
/* 1AEC38 80280358 00431024 */ and $v0, $v0, $v1
.L8028035C:
/* 1AEC3C 8028035C AE220000 */ sw $v0, ($s1)
/* 1AEC40 80280360 32020040 */ andi $v0, $s0, 0x40
/* 1AEC44 80280364 10400007 */ beqz $v0, .L80280384
/* 1AEC48 80280368 2404FFBF */ addiu $a0, $zero, -0x41
/* 1AEC4C 8028036C 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AEC50 80280370 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AEC54 80280374 8C620000 */ lw $v0, ($v1)
/* 1AEC58 80280378 34420040 */ ori $v0, $v0, 0x40
/* 1AEC5C 8028037C 080A00E6 */ j .L80280398
/* 1AEC60 80280380 AC620000 */ sw $v0, ($v1)
.L80280384:
/* 1AEC64 80280384 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AEC68 80280388 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AEC6C 8028038C 8C430000 */ lw $v1, ($v0)
/* 1AEC70 80280390 00641824 */ and $v1, $v1, $a0
/* 1AEC74 80280394 AC430000 */ sw $v1, ($v0)
.L80280398:
/* 1AEC78 80280398 32020200 */ andi $v0, $s0, 0x200
/* 1AEC7C 8028039C 10400007 */ beqz $v0, .L802803BC
/* 1AEC80 802803A0 2404FDFF */ addiu $a0, $zero, -0x201
/* 1AEC84 802803A4 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AEC88 802803A8 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AEC8C 802803AC 8C620000 */ lw $v0, ($v1)
/* 1AEC90 802803B0 34420200 */ ori $v0, $v0, 0x200
/* 1AEC94 802803B4 080A00F4 */ j .L802803D0
/* 1AEC98 802803B8 AC620000 */ sw $v0, ($v1)
.L802803BC:
/* 1AEC9C 802803BC 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AECA0 802803C0 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AECA4 802803C4 8C430000 */ lw $v1, ($v0)
/* 1AECA8 802803C8 00641824 */ and $v1, $v1, $a0
/* 1AECAC 802803CC AC430000 */ sw $v1, ($v0)
.L802803D0:
/* 1AECB0 802803D0 32020080 */ andi $v0, $s0, 0x80
/* 1AECB4 802803D4 10400007 */ beqz $v0, .L802803F4
/* 1AECB8 802803D8 2404FF7F */ addiu $a0, $zero, -0x81
/* 1AECBC 802803DC 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AECC0 802803E0 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AECC4 802803E4 8C620000 */ lw $v0, ($v1)
/* 1AECC8 802803E8 34420080 */ ori $v0, $v0, 0x80
/* 1AECCC 802803EC 080A0102 */ j .L80280408
/* 1AECD0 802803F0 AC620000 */ sw $v0, ($v1)
.L802803F4:
/* 1AECD4 802803F4 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AECD8 802803F8 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AECDC 802803FC 8C430000 */ lw $v1, ($v0)
/* 1AECE0 80280400 00641824 */ and $v1, $v1, $a0
/* 1AECE4 80280404 AC430000 */ sw $v1, ($v0)
.L80280408:
/* 1AECE8 80280408 32020800 */ andi $v0, $s0, 0x800
/* 1AECEC 8028040C 10400007 */ beqz $v0, .L8028042C
/* 1AECF0 80280410 2404F7FF */ addiu $a0, $zero, -0x801
/* 1AECF4 80280414 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AECF8 80280418 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AECFC 8028041C 8C620000 */ lw $v0, ($v1)
/* 1AED00 80280420 34420800 */ ori $v0, $v0, 0x800
/* 1AED04 80280424 080A0110 */ j .L80280440
/* 1AED08 80280428 AC620000 */ sw $v0, ($v1)
.L8028042C:
/* 1AED0C 8028042C 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AED10 80280430 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AED14 80280434 8C430000 */ lw $v1, ($v0)
/* 1AED18 80280438 00641824 */ and $v1, $v1, $a0
/* 1AED1C 8028043C AC430000 */ sw $v1, ($v0)
.L80280440:
/* 1AED20 80280440 96620428 */ lhu $v0, 0x428($s3)
/* 1AED24 80280444 92230193 */ lbu $v1, 0x193($s1)
/* 1AED28 80280448 A62201A0 */ sh $v0, 0x1a0($s1)
/* 1AED2C 8028044C 92620426 */ lbu $v0, 0x426($s3)
/* 1AED30 80280450 A2230194 */ sb $v1, 0x194($s1)
/* 1AED34 80280454 306300FF */ andi $v1, $v1, 0xff
/* 1AED38 80280458 A22201A2 */ sb $v0, 0x1a2($s1)
/* 1AED3C 8028045C 240200FF */ addiu $v0, $zero, 0xff
/* 1AED40 80280460 50620001 */ beql $v1, $v0, .L80280468
/* 1AED44 80280464 A2200194 */ sb $zero, 0x194($s1)
.L80280468:
/* 1AED48 80280468 8E220190 */ lw $v0, 0x190($s1)
/* 1AED4C 8028046C 30420F00 */ andi $v0, $v0, 0xf00
/* 1AED50 80280470 00021203 */ sra $v0, $v0, 8
/* 1AED54 80280474 0C09F8CA */ jal calc_partner_damage_enemy
/* 1AED58 80280478 A2220195 */ sb $v0, 0x195($s1)
/* 1AED5C 8028047C 0440000B */ bltz $v0, .L802804AC
/* 1AED60 80280480 0240202D */ daddu $a0, $s2, $zero
/* 1AED64 80280484 0280282D */ daddu $a1, $s4, $zero
/* 1AED68 80280488 0C0B2026 */ jal evt_set_variable
/* 1AED6C 8028048C 0040302D */ daddu $a2, $v0, $zero
/* 1AED70 80280490 0C0B1069 */ jal does_script_exist_by_ref
/* 1AED74 80280494 0240202D */ daddu $a0, $s2, $zero
/* 1AED78 80280498 0040182D */ daddu $v1, $v0, $zero
/* 1AED7C 8028049C 10600004 */ beqz $v1, .L802804B0
/* 1AED80 802804A0 240200FF */ addiu $v0, $zero, 0xff
/* 1AED84 802804A4 080A012C */ j .L802804B0
/* 1AED88 802804A8 24020002 */ addiu $v0, $zero, 2
.L802804AC:
/* 1AED8C 802804AC 240200FF */ addiu $v0, $zero, 0xff
.L802804B0:
/* 1AED90 802804B0 8FBF0024 */ lw $ra, 0x24($sp)
/* 1AED94 802804B4 8FB40020 */ lw $s4, 0x20($sp)
/* 1AED98 802804B8 8FB3001C */ lw $s3, 0x1c($sp)
/* 1AED9C 802804BC 8FB20018 */ lw $s2, 0x18($sp)
/* 1AEDA0 802804C0 8FB10014 */ lw $s1, 0x14($sp)
/* 1AEDA4 802804C4 8FB00010 */ lw $s0, 0x10($sp)
/* 1AEDA8 802804C8 03E00008 */ jr $ra
/* 1AEDAC 802804CC 27BD0028 */ addiu $sp, $sp, 0x28

163
ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s
View File

@ -1,163 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel PartnerTestEnemy
/* 1AEDB0 802804D0 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 1AEDB4 802804D4 AFB20018 */ sw $s2, 0x18($sp)
/* 1AEDB8 802804D8 0080902D */ daddu $s2, $a0, $zero
/* 1AEDBC 802804DC AFBF0024 */ sw $ra, 0x24($sp)
/* 1AEDC0 802804E0 AFB40020 */ sw $s4, 0x20($sp)
/* 1AEDC4 802804E4 AFB3001C */ sw $s3, 0x1c($sp)
/* 1AEDC8 802804E8 AFB10014 */ sw $s1, 0x14($sp)
/* 1AEDCC 802804EC AFB00010 */ sw $s0, 0x10($sp)
/* 1AEDD0 802804F0 8E440148 */ lw $a0, 0x148($s2)
/* 1AEDD4 802804F4 0C09A75B */ jal get_actor
/* 1AEDD8 802804F8 8E50000C */ lw $s0, 0xc($s2)
/* 1AEDDC 802804FC 8E140000 */ lw $s4, ($s0)
/* 1AEDE0 80280500 26100004 */ addiu $s0, $s0, 4
/* 1AEDE4 80280504 8E030000 */ lw $v1, ($s0)
/* 1AEDE8 80280508 26100004 */ addiu $s0, $s0, 4
/* 1AEDEC 8028050C 0240202D */ daddu $a0, $s2, $zero
/* 1AEDF0 80280510 3C11800E */ lui $s1, %hi(gBattleStatus)
/* 1AEDF4 80280514 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus)
/* 1AEDF8 80280518 0040982D */ daddu $s3, $v0, $zero
/* 1AEDFC 8028051C AE230188 */ sw $v1, 0x188($s1)
/* 1AEE00 80280520 8E030000 */ lw $v1, ($s0)
/* 1AEE04 80280524 26100004 */ addiu $s0, $s0, 4
/* 1AEE08 80280528 AE23018C */ sw $v1, 0x18c($s1)
/* 1AEE0C 8028052C 8E030000 */ lw $v1, ($s0)
/* 1AEE10 80280530 26100004 */ addiu $s0, $s0, 4
/* 1AEE14 80280534 AE230190 */ sw $v1, 0x190($s1)
/* 1AEE18 80280538 8E050000 */ lw $a1, ($s0)
/* 1AEE1C 8028053C 0C0B1EAF */ jal evt_get_variable
/* 1AEE20 80280540 26100004 */ addiu $s0, $s0, 4
/* 1AEE24 80280544 A622017E */ sh $v0, 0x17e($s1)
/* 1AEE28 80280548 A2200198 */ sb $zero, 0x198($s1)
/* 1AEE2C 8028054C 8E100000 */ lw $s0, ($s0)
/* 1AEE30 80280550 24020030 */ addiu $v0, $zero, 0x30
/* 1AEE34 80280554 32030030 */ andi $v1, $s0, 0x30
/* 1AEE38 80280558 54620004 */ bnel $v1, $v0, .L8028056C
/* 1AEE3C 8028055C 32020010 */ andi $v0, $s0, 0x10
/* 1AEE40 80280560 8E220000 */ lw $v0, ($s1)
/* 1AEE44 80280564 080A016B */ j .L802805AC
/* 1AEE48 80280568 34420030 */ ori $v0, $v0, 0x30
.L8028056C:
/* 1AEE4C 8028056C 10400004 */ beqz $v0, .L80280580
/* 1AEE50 80280570 2403FFDF */ addiu $v1, $zero, -0x21
/* 1AEE54 80280574 8E220000 */ lw $v0, ($s1)
/* 1AEE58 80280578 080A016A */ j .L802805A8
/* 1AEE5C 8028057C 34420010 */ ori $v0, $v0, 0x10
.L80280580:
/* 1AEE60 80280580 32020020 */ andi $v0, $s0, 0x20
/* 1AEE64 80280584 10400005 */ beqz $v0, .L8028059C
/* 1AEE68 80280588 2403FFEF */ addiu $v1, $zero, -0x11
/* 1AEE6C 8028058C 8E220000 */ lw $v0, ($s1)
/* 1AEE70 80280590 00431024 */ and $v0, $v0, $v1
/* 1AEE74 80280594 080A016B */ j .L802805AC
/* 1AEE78 80280598 34420020 */ ori $v0, $v0, 0x20
.L8028059C:
/* 1AEE7C 8028059C 8E220000 */ lw $v0, ($s1)
/* 1AEE80 802805A0 00431024 */ and $v0, $v0, $v1
/* 1AEE84 802805A4 2403FFDF */ addiu $v1, $zero, -0x21
.L802805A8:
/* 1AEE88 802805A8 00431024 */ and $v0, $v0, $v1
.L802805AC:
/* 1AEE8C 802805AC AE220000 */ sw $v0, ($s1)
/* 1AEE90 802805B0 32020040 */ andi $v0, $s0, 0x40
/* 1AEE94 802805B4 10400007 */ beqz $v0, .L802805D4
/* 1AEE98 802805B8 2404FFBF */ addiu $a0, $zero, -0x41
/* 1AEE9C 802805BC 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AEEA0 802805C0 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AEEA4 802805C4 8C620000 */ lw $v0, ($v1)
/* 1AEEA8 802805C8 34420040 */ ori $v0, $v0, 0x40
/* 1AEEAC 802805CC 080A017A */ j .L802805E8
/* 1AEEB0 802805D0 AC620000 */ sw $v0, ($v1)
.L802805D4:
/* 1AEEB4 802805D4 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AEEB8 802805D8 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AEEBC 802805DC 8C430000 */ lw $v1, ($v0)
/* 1AEEC0 802805E0 00641824 */ and $v1, $v1, $a0
/* 1AEEC4 802805E4 AC430000 */ sw $v1, ($v0)
.L802805E8:
/* 1AEEC8 802805E8 32020200 */ andi $v0, $s0, 0x200
/* 1AEECC 802805EC 10400007 */ beqz $v0, .L8028060C
/* 1AEED0 802805F0 2404FDFF */ addiu $a0, $zero, -0x201
/* 1AEED4 802805F4 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AEED8 802805F8 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AEEDC 802805FC 8C620000 */ lw $v0, ($v1)
/* 1AEEE0 80280600 34420200 */ ori $v0, $v0, 0x200
/* 1AEEE4 80280604 080A0188 */ j .L80280620
/* 1AEEE8 80280608 AC620000 */ sw $v0, ($v1)
.L8028060C:
/* 1AEEEC 8028060C 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AEEF0 80280610 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AEEF4 80280614 8C430000 */ lw $v1, ($v0)
/* 1AEEF8 80280618 00641824 */ and $v1, $v1, $a0
/* 1AEEFC 8028061C AC430000 */ sw $v1, ($v0)
.L80280620:
/* 1AEF00 80280620 32020080 */ andi $v0, $s0, 0x80
/* 1AEF04 80280624 10400007 */ beqz $v0, .L80280644
/* 1AEF08 80280628 2404FF7F */ addiu $a0, $zero, -0x81
/* 1AEF0C 8028062C 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AEF10 80280630 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AEF14 80280634 8C620000 */ lw $v0, ($v1)
/* 1AEF18 80280638 34420080 */ ori $v0, $v0, 0x80
/* 1AEF1C 8028063C 080A0196 */ j .L80280658
/* 1AEF20 80280640 AC620000 */ sw $v0, ($v1)
.L80280644:
/* 1AEF24 80280644 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AEF28 80280648 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AEF2C 8028064C 8C430000 */ lw $v1, ($v0)
/* 1AEF30 80280650 00641824 */ and $v1, $v1, $a0
/* 1AEF34 80280654 AC430000 */ sw $v1, ($v0)
.L80280658:
/* 1AEF38 80280658 32020800 */ andi $v0, $s0, 0x800
/* 1AEF3C 8028065C 10400007 */ beqz $v0, .L8028067C
/* 1AEF40 80280660 2404F7FF */ addiu $a0, $zero, -0x801
/* 1AEF44 80280664 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 1AEF48 80280668 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 1AEF4C 8028066C 8C620000 */ lw $v0, ($v1)
/* 1AEF50 80280670 34420800 */ ori $v0, $v0, 0x800
/* 1AEF54 80280674 080A01A4 */ j .L80280690
/* 1AEF58 80280678 AC620000 */ sw $v0, ($v1)
.L8028067C:
/* 1AEF5C 8028067C 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 1AEF60 80280680 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 1AEF64 80280684 8C430000 */ lw $v1, ($v0)
/* 1AEF68 80280688 00641824 */ and $v1, $v1, $a0
/* 1AEF6C 8028068C AC430000 */ sw $v1, ($v0)
.L80280690:
/* 1AEF70 80280690 96620428 */ lhu $v0, 0x428($s3)
/* 1AEF74 80280694 92230193 */ lbu $v1, 0x193($s1)
/* 1AEF78 80280698 A62201A0 */ sh $v0, 0x1a0($s1)
/* 1AEF7C 8028069C 92620426 */ lbu $v0, 0x426($s3)
/* 1AEF80 802806A0 A2230194 */ sb $v1, 0x194($s1)
/* 1AEF84 802806A4 306300FF */ andi $v1, $v1, 0xff
/* 1AEF88 802806A8 A22201A2 */ sb $v0, 0x1a2($s1)
/* 1AEF8C 802806AC 240200FF */ addiu $v0, $zero, 0xff
/* 1AEF90 802806B0 50620001 */ beql $v1, $v0, .L802806B8
/* 1AEF94 802806B4 A2200194 */ sb $zero, 0x194($s1)
.L802806B8:
/* 1AEF98 802806B8 8E220190 */ lw $v0, 0x190($s1)
/* 1AEF9C 802806BC 30420F00 */ andi $v0, $v0, 0xf00
/* 1AEFA0 802806C0 00021203 */ sra $v0, $v0, 8
/* 1AEFA4 802806C4 0C09F7DF */ jal calc_partner_test_enemy
/* 1AEFA8 802806C8 A2220195 */ sb $v0, 0x195($s1)
/* 1AEFAC 802806CC 04400006 */ bltz $v0, .L802806E8
/* 1AEFB0 802806D0 0240202D */ daddu $a0, $s2, $zero
/* 1AEFB4 802806D4 0280282D */ daddu $a1, $s4, $zero
/* 1AEFB8 802806D8 0C0B2026 */ jal evt_set_variable
/* 1AEFBC 802806DC 0040302D */ daddu $a2, $v0, $zero
/* 1AEFC0 802806E0 080A01BB */ j .L802806EC
/* 1AEFC4 802806E4 24020002 */ addiu $v0, $zero, 2
.L802806E8:
/* 1AEFC8 802806E8 240200FF */ addiu $v0, $zero, 0xff
.L802806EC:
/* 1AEFCC 802806EC 8FBF0024 */ lw $ra, 0x24($sp)
/* 1AEFD0 802806F0 8FB40020 */ lw $s4, 0x20($sp)
/* 1AEFD4 802806F4 8FB3001C */ lw $s3, 0x1c($sp)
/* 1AEFD8 802806F8 8FB20018 */ lw $s2, 0x18($sp)
/* 1AEFDC 802806FC 8FB10014 */ lw $s1, 0x14($sp)
/* 1AEFE0 80280700 8FB00010 */ lw $s0, 0x10($sp)
/* 1AEFE4 80280704 03E00008 */ jr $ra
/* 1AEFE8 80280708 27BD0028 */ addiu $sp, $sp, 0x28

30
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s
View File

@ -1,6 +1,36 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_80228400_6CBF90
.double 47.0
dlabel D_80228408_6CBF98
.double 1.12
dlabel D_80228410_6CBFA0
.double 0.53
dlabel D_80228418_6CBFA8
.double 47.0
dlabel D_80228420_6CBFB0
.double 0.8
dlabel D_80228428_6CBFB8
.double 0.53
dlabel D_80228430_6CBFC0
.double 0.8
dlabel D_80228438_6CBFC8
.double 16.5
dlabel D_80228440_6CBFD0
.double 33.0
.section .text
glabel func_802180D0_6BBC60
/* 6BBC60 802180D0 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 6BBC64 802180D4 AFB40020 */ sw $s4, 0x20($sp)

18
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BC4_6BC754.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218BC4_6BC754
/* 6BC754 80218BC4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 6BC758 80218BC8 AFBF0010 */ sw $ra, 0x10($sp)
/* 6BC75C 80218BCC 8C82000C */ lw $v0, 0xc($a0)
/* 6BC760 80218BD0 0C0B1EAF */ jal evt_get_variable
/* 6BC764 80218BD4 8C450000 */ lw $a1, ($v0)
/* 6BC768 80218BD8 8C43000C */ lw $v1, 0xc($v0)
/* 6BC76C 80218BDC 3C01C47A */ lui $at, 0xc47a
/* 6BC770 80218BE0 44810000 */ mtc1 $at, $f0
/* 6BC774 80218BE4 00000000 */ nop
/* 6BC778 80218BE8 E4600008 */ swc1 $f0, 8($v1)
/* 6BC77C 80218BEC 8FBF0010 */ lw $ra, 0x10($sp)
/* 6BC780 80218BF0 24020002 */ addiu $v0, $zero, 2
/* 6BC784 80218BF4 03E00008 */ jr $ra
/* 6BC788 80218BF8 27BD0018 */ addiu $sp, $sp, 0x18

22
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218BFC_6BC78C.s
View File

@ -1,22 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218BFC_6BC78C
/* 6BC78C 80218BFC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 6BC790 80218C00 AFBF0010 */ sw $ra, 0x10($sp)
/* 6BC794 80218C04 8C82000C */ lw $v0, 0xc($a0)
/* 6BC798 80218C08 0C0B1EAF */ jal evt_get_variable
/* 6BC79C 80218C0C 8C450000 */ lw $a1, ($v0)
/* 6BC7A0 80218C10 0040202D */ daddu $a0, $v0, $zero
/* 6BC7A4 80218C14 8C82000C */ lw $v0, 0xc($a0)
/* 6BC7A8 80218C18 3C014310 */ lui $at, 0x4310
/* 6BC7AC 80218C1C 44810000 */ mtc1 $at, $f0
/* 6BC7B0 80218C20 00000000 */ nop
/* 6BC7B4 80218C24 E4400008 */ swc1 $f0, 8($v0)
/* 6BC7B8 80218C28 8C830000 */ lw $v1, ($a0)
/* 6BC7BC 80218C2C 34630010 */ ori $v1, $v1, 0x10
/* 6BC7C0 80218C30 AC830000 */ sw $v1, ($a0)
/* 6BC7C4 80218C34 8FBF0010 */ lw $ra, 0x10($sp)
/* 6BC7C8 80218C38 24020002 */ addiu $v0, $zero, 2
/* 6BC7CC 80218C3C 03E00008 */ jr $ra
/* 6BC7D0 80218C40 27BD0018 */ addiu $sp, $sp, 0x18

6
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s
View File

@ -1,6 +1,12 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_80228448_6CBFD8
.double 4.800000000000001
.section .text
glabel func_80218F58_6BCAE8
/* 6BCAE8 80218F58 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 6BCAEC 80218F5C AFBF002C */ sw $ra, 0x2c($sp)

27
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802193D4_6BCF64.s
View File

@ -1,27 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802193D4_6BCF64
/* 6BCF64 802193D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 6BCF68 802193D8 AFBF0010 */ sw $ra, 0x10($sp)
/* 6BCF6C 802193DC 0C09A75B */ jal get_actor
/* 6BCF70 802193E0 8C840148 */ lw $a0, 0x148($a0)
/* 6BCF74 802193E4 8C440090 */ lw $a0, 0x90($v0)
/* 6BCF78 802193E8 8C830014 */ lw $v1, 0x14($a0)
/* 6BCF7C 802193EC 10600004 */ beqz $v1, .L80219400
/* 6BCF80 802193F0 AC800000 */ sw $zero, ($a0)
/* 6BCF84 802193F4 8C620000 */ lw $v0, ($v1)
/* 6BCF88 802193F8 34420010 */ ori $v0, $v0, 0x10
/* 6BCF8C 802193FC AC620000 */ sw $v0, ($v1)
.L80219400:
/* 6BCF90 80219400 8C830018 */ lw $v1, 0x18($a0)
/* 6BCF94 80219404 10600004 */ beqz $v1, .L80219418
/* 6BCF98 80219408 00000000 */ nop
/* 6BCF9C 8021940C 8C620000 */ lw $v0, ($v1)
/* 6BCFA0 80219410 34420010 */ ori $v0, $v0, 0x10
/* 6BCFA4 80219414 AC620000 */ sw $v0, ($v1)
.L80219418:
/* 6BCFA8 80219418 8FBF0010 */ lw $ra, 0x10($sp)
/* 6BCFAC 8021941C 24020002 */ addiu $v0, $zero, 2
/* 6BCFB0 80219420 03E00008 */ jr $ra
/* 6BCFB4 80219424 27BD0018 */ addiu $sp, $sp, 0x18

23
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219428_6BCFB8.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219428_6BCFB8
/* 6BCFB8 80219428 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 6BCFBC 8021942C AFB00010 */ sw $s0, 0x10($sp)
/* 6BCFC0 80219430 0080802D */ daddu $s0, $a0, $zero
/* 6BCFC4 80219434 AFBF0018 */ sw $ra, 0x18($sp)
/* 6BCFC8 80219438 AFB10014 */ sw $s1, 0x14($sp)
/* 6BCFCC 8021943C 8E040148 */ lw $a0, 0x148($s0)
/* 6BCFD0 80219440 0C09A75B */ jal get_actor
/* 6BCFD4 80219444 8E11000C */ lw $s1, 0xc($s0)
/* 6BCFD8 80219448 0200202D */ daddu $a0, $s0, $zero
/* 6BCFDC 8021944C 8E250000 */ lw $a1, ($s1)
/* 6BCFE0 80219450 0C0B1EAF */ jal evt_get_variable
/* 6BCFE4 80219454 8C500090 */ lw $s0, 0x90($v0)
/* 6BCFE8 80219458 AE020004 */ sw $v0, 4($s0)
/* 6BCFEC 8021945C 8FBF0018 */ lw $ra, 0x18($sp)
/* 6BCFF0 80219460 8FB10014 */ lw $s1, 0x14($sp)
/* 6BCFF4 80219464 8FB00010 */ lw $s0, 0x10($sp)
/* 6BCFF8 80219468 24020002 */ addiu $v0, $zero, 2
/* 6BCFFC 8021946C 03E00008 */ jr $ra
/* 6BD000 80219470 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219474_6BD004.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219474_6BD004
/* 6BD004 80219474 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 6BD008 80219478 AFB00010 */ sw $s0, 0x10($sp)
/* 6BD00C 8021947C 0080802D */ daddu $s0, $a0, $zero
/* 6BD010 80219480 AFBF0018 */ sw $ra, 0x18($sp)
/* 6BD014 80219484 AFB10014 */ sw $s1, 0x14($sp)
/* 6BD018 80219488 8E040148 */ lw $a0, 0x148($s0)
/* 6BD01C 8021948C 0C09A75B */ jal get_actor
/* 6BD020 80219490 8E11000C */ lw $s1, 0xc($s0)
/* 6BD024 80219494 0200202D */ daddu $a0, $s0, $zero
/* 6BD028 80219498 8E250000 */ lw $a1, ($s1)
/* 6BD02C 8021949C 0C0B1EAF */ jal evt_get_variable
/* 6BD030 802194A0 8C500090 */ lw $s0, 0x90($v0)
/* 6BD034 802194A4 AE02000C */ sw $v0, 0xc($s0)
/* 6BD038 802194A8 8FBF0018 */ lw $ra, 0x18($sp)
/* 6BD03C 802194AC 8FB10014 */ lw $s1, 0x14($sp)
/* 6BD040 802194B0 8FB00010 */ lw $s0, 0x10($sp)
/* 6BD044 802194B4 24020002 */ addiu $v0, $zero, 2
/* 6BD048 802194B8 03E00008 */ jr $ra
/* 6BD04C 802194BC 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802194C0_6BD050.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802194C0_6BD050
/* 6BD050 802194C0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 6BD054 802194C4 AFB00010 */ sw $s0, 0x10($sp)
/* 6BD058 802194C8 0080802D */ daddu $s0, $a0, $zero
/* 6BD05C 802194CC AFBF0018 */ sw $ra, 0x18($sp)
/* 6BD060 802194D0 AFB10014 */ sw $s1, 0x14($sp)
/* 6BD064 802194D4 8E040148 */ lw $a0, 0x148($s0)
/* 6BD068 802194D8 0C09A75B */ jal get_actor
/* 6BD06C 802194DC 8E11000C */ lw $s1, 0xc($s0)
/* 6BD070 802194E0 0200202D */ daddu $a0, $s0, $zero
/* 6BD074 802194E4 8E250000 */ lw $a1, ($s1)
/* 6BD078 802194E8 0C0B1EAF */ jal evt_get_variable
/* 6BD07C 802194EC 8C500090 */ lw $s0, 0x90($v0)
/* 6BD080 802194F0 AE020010 */ sw $v0, 0x10($s0)
/* 6BD084 802194F4 8FBF0018 */ lw $ra, 0x18($sp)
/* 6BD088 802194F8 8FB10014 */ lw $s1, 0x14($sp)
/* 6BD08C 802194FC 8FB00010 */ lw $s0, 0x10($sp)
/* 6BD090 80219500 24020002 */ addiu $v0, $zero, 2
/* 6BD094 80219504 03E00008 */ jr $ra
/* 6BD098 80219508 27BD0020 */ addiu $sp, $sp, 0x20

31
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219588_6BD118.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219588_6BD118
/* 6BD118 80219588 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 6BD11C 8021958C AFB20018 */ sw $s2, 0x18($sp)
/* 6BD120 80219590 0080902D */ daddu $s2, $a0, $zero
/* 6BD124 80219594 AFB10014 */ sw $s1, 0x14($sp)
/* 6BD128 80219598 3C118011 */ lui $s1, %hi(gPlayerData)
/* 6BD12C 8021959C 2631F290 */ addiu $s1, $s1, %lo(gPlayerData)
/* 6BD130 802195A0 AFBF001C */ sw $ra, 0x1c($sp)
/* 6BD134 802195A4 AFB00010 */ sw $s0, 0x10($sp)
/* 6BD138 802195A8 8E50000C */ lw $s0, 0xc($s2)
/* 6BD13C 802195AC 82260012 */ lb $a2, 0x12($s1)
/* 6BD140 802195B0 8E050000 */ lw $a1, ($s0)
/* 6BD144 802195B4 0C0B2026 */ jal evt_set_variable
/* 6BD148 802195B8 26100004 */ addiu $s0, $s0, 4
/* 6BD14C 802195BC 82220012 */ lb $v0, 0x12($s1)
/* 6BD150 802195C0 8E050000 */ lw $a1, ($s0)
/* 6BD154 802195C4 000210C0 */ sll $v0, $v0, 3
/* 6BD158 802195C8 00511021 */ addu $v0, $v0, $s1
/* 6BD15C 802195CC 80460015 */ lb $a2, 0x15($v0)
/* 6BD160 802195D0 0C0B2026 */ jal evt_set_variable
/* 6BD164 802195D4 0240202D */ daddu $a0, $s2, $zero
/* 6BD168 802195D8 8FBF001C */ lw $ra, 0x1c($sp)
/* 6BD16C 802195DC 8FB20018 */ lw $s2, 0x18($sp)
/* 6BD170 802195E0 8FB10014 */ lw $s1, 0x14($sp)
/* 6BD174 802195E4 8FB00010 */ lw $s0, 0x10($sp)
/* 6BD178 802195E8 24020002 */ addiu $v0, $zero, 2
/* 6BD17C 802195EC 03E00008 */ jr $ra
/* 6BD180 802195F0 27BD0020 */ addiu $sp, $sp, 0x20

27
ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802195F4_6BD184.s
View File

@ -1,6 +1,33 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel jtbl_80228450_6CBFE0
.word L80219648_6BD1D8, L80219654_6BD1E4, L80219660_6BD1F0, L8021966C_6BD1FC, L802196A4_6BD234, L80219684_6BD214, L80219690_6BD220, L8021969C_6BD22C, L80219678_6BD208, 0, 0, 0
dlabel D_80228480_6CC010
.word 0x6B70615F, 0x62743031, 0x5F686974, 0x00000000
dlabel D_80228490_6CC020
.word 0x6B70615F, 0x62743031, 0x5F736861, 0x70650000
dlabel D_802284A0_6CC030
.word 0x6B70615F, 0x74657800
dlabel D_802284A8_6CC038
.word 0x836F8350, 0x836F8350, 0x78825300
dlabel D_802284B4_6CC044
.word 0x836F8350, 0x836F8350, 0x78825100
dlabel D_802284C0_6CC050
.word 0x83758389, 0x8362834E, 0x83778343, 0x837A815B, 0x78825200
dlabel D_802284D4_6CC064
.word 0x6B70615F, 0x30310000, 0x00000000
.section .text
glabel func_802195F4_6BD184
/* 6BD184 802195F4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 6BD188 802195F8 AFB00010 */ sw $s0, 0x10($sp)

101
ver/us/asm/nonmatchings/battle/area_kzn/58C2F0/func_802181FC_58C4EC.s
View File

@ -1,101 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802181FC_58C4EC
/* 58C4EC 802181FC 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 58C4F0 80218200 AFB1001C */ sw $s1, 0x1c($sp)
/* 58C4F4 80218204 0080882D */ daddu $s1, $a0, $zero
/* 58C4F8 80218208 AFBF0034 */ sw $ra, 0x34($sp)
/* 58C4FC 8021820C AFB60030 */ sw $s6, 0x30($sp)
/* 58C500 80218210 AFB5002C */ sw $s5, 0x2c($sp)
/* 58C504 80218214 AFB40028 */ sw $s4, 0x28($sp)
/* 58C508 80218218 AFB30024 */ sw $s3, 0x24($sp)
/* 58C50C 8021821C AFB20020 */ sw $s2, 0x20($sp)
/* 58C510 80218220 AFB00018 */ sw $s0, 0x18($sp)
/* 58C514 80218224 F7B40038 */ sdc1 $f20, 0x38($sp)
/* 58C518 80218228 8E30000C */ lw $s0, 0xc($s1)
/* 58C51C 8021822C 8E050000 */ lw $a1, ($s0)
/* 58C520 80218230 0C0B1EAF */ jal evt_get_variable
/* 58C524 80218234 26100004 */ addiu $s0, $s0, 4
/* 58C528 80218238 8E050000 */ lw $a1, ($s0)
/* 58C52C 8021823C 26100004 */ addiu $s0, $s0, 4
/* 58C530 80218240 0C0B1EAF */ jal evt_get_variable
/* 58C534 80218244 0220202D */ daddu $a0, $s1, $zero
/* 58C538 80218248 8E050000 */ lw $a1, ($s0)
/* 58C53C 8021824C 26100004 */ addiu $s0, $s0, 4
/* 58C540 80218250 0220202D */ daddu $a0, $s1, $zero
/* 58C544 80218254 0C0B1EAF */ jal evt_get_variable
/* 58C548 80218258 0040B02D */ daddu $s6, $v0, $zero
/* 58C54C 8021825C 8E050000 */ lw $a1, ($s0)
/* 58C550 80218260 26100004 */ addiu $s0, $s0, 4
/* 58C554 80218264 0220202D */ daddu $a0, $s1, $zero
/* 58C558 80218268 0C0B1EAF */ jal evt_get_variable
/* 58C55C 8021826C 0040A82D */ daddu $s5, $v0, $zero
/* 58C560 80218270 8E050000 */ lw $a1, ($s0)
/* 58C564 80218274 26100004 */ addiu $s0, $s0, 4
/* 58C568 80218278 0220202D */ daddu $a0, $s1, $zero
/* 58C56C 8021827C 0C0B210B */ jal evt_get_float_variable
/* 58C570 80218280 0040A02D */ daddu $s4, $v0, $zero
/* 58C574 80218284 8E050000 */ lw $a1, ($s0)
/* 58C578 80218288 26100004 */ addiu $s0, $s0, 4
/* 58C57C 8021828C 0220202D */ daddu $a0, $s1, $zero
/* 58C580 80218290 0C0B1EAF */ jal evt_get_variable
/* 58C584 80218294 46000506 */ mov.s $f20, $f0
/* 58C588 80218298 8E050000 */ lw $a1, ($s0)
/* 58C58C 8021829C 26100004 */ addiu $s0, $s0, 4
/* 58C590 802182A0 0220202D */ daddu $a0, $s1, $zero
/* 58C594 802182A4 0C0B1EAF */ jal evt_get_variable
/* 58C598 802182A8 0040902D */ daddu $s2, $v0, $zero
/* 58C59C 802182AC 8E050000 */ lw $a1, ($s0)
/* 58C5A0 802182B0 26100004 */ addiu $s0, $s0, 4
/* 58C5A4 802182B4 0220202D */ daddu $a0, $s1, $zero
/* 58C5A8 802182B8 0C0B1EAF */ jal evt_get_variable
/* 58C5AC 802182BC 0040982D */ daddu $s3, $v0, $zero
/* 58C5B0 802182C0 0220202D */ daddu $a0, $s1, $zero
/* 58C5B4 802182C4 8E050000 */ lw $a1, ($s0)
/* 58C5B8 802182C8 0C0B1EAF */ jal evt_get_variable
/* 58C5BC 802182CC 0040882D */ daddu $s1, $v0, $zero
/* 58C5C0 802182D0 24040001 */ addiu $a0, $zero, 1
/* 58C5C4 802182D4 44961000 */ mtc1 $s6, $f2
/* 58C5C8 802182D8 00000000 */ nop
/* 58C5CC 802182DC 468010A0 */ cvt.s.w $f2, $f2
/* 58C5D0 802182E0 44051000 */ mfc1 $a1, $f2
/* 58C5D4 802182E4 44951000 */ mtc1 $s5, $f2
/* 58C5D8 802182E8 00000000 */ nop
/* 58C5DC 802182EC 468010A0 */ cvt.s.w $f2, $f2
/* 58C5E0 802182F0 44061000 */ mfc1 $a2, $f2
/* 58C5E4 802182F4 44941000 */ mtc1 $s4, $f2
/* 58C5E8 802182F8 00000000 */ nop
/* 58C5EC 802182FC 468010A0 */ cvt.s.w $f2, $f2
/* 58C5F0 80218300 44071000 */ mfc1 $a3, $f2
/* 58C5F4 80218304 0040802D */ daddu $s0, $v0, $zero
/* 58C5F8 80218308 E7B40010 */ swc1 $f20, 0x10($sp)
/* 58C5FC 8021830C 0C01C88C */ jal playFX_6F
/* 58C600 80218310 AFB20014 */ sw $s2, 0x14($sp)
/* 58C604 80218314 8C43000C */ lw $v1, 0xc($v0)
/* 58C608 80218318 AC730018 */ sw $s3, 0x18($v1)
/* 58C60C 8021831C 8C43000C */ lw $v1, 0xc($v0)
/* 58C610 80218320 AC71001C */ sw $s1, 0x1c($v1)
/* 58C614 80218324 8C43000C */ lw $v1, 0xc($v0)
/* 58C618 80218328 AC700020 */ sw $s0, 0x20($v1)
/* 58C61C 8021832C 8C43000C */ lw $v1, 0xc($v0)
/* 58C620 80218330 240400FF */ addiu $a0, $zero, 0xff
/* 58C624 80218334 AC640028 */ sw $a0, 0x28($v1)
/* 58C628 80218338 8C43000C */ lw $v1, 0xc($v0)
/* 58C62C 8021833C AC64002C */ sw $a0, 0x2c($v1)
/* 58C630 80218340 8C43000C */ lw $v1, 0xc($v0)
/* 58C634 80218344 AC640030 */ sw $a0, 0x30($v1)
/* 58C638 80218348 8FBF0034 */ lw $ra, 0x34($sp)
/* 58C63C 8021834C 8FB60030 */ lw $s6, 0x30($sp)
/* 58C640 80218350 8FB5002C */ lw $s5, 0x2c($sp)
/* 58C644 80218354 8FB40028 */ lw $s4, 0x28($sp)
/* 58C648 80218358 8FB30024 */ lw $s3, 0x24($sp)
/* 58C64C 8021835C 8FB20020 */ lw $s2, 0x20($sp)
/* 58C650 80218360 8FB1001C */ lw $s1, 0x1c($sp)
/* 58C654 80218364 8FB00018 */ lw $s0, 0x18($sp)
/* 58C658 80218368 D7B40038 */ ldc1 $f20, 0x38($sp)
/* 58C65C 8021836C 24020002 */ addiu $v0, $zero, 2
/* 58C660 80218370 03E00008 */ jr $ra
/* 58C664 80218374 27BD0040 */ addiu $sp, $sp, 0x40
/* 58C668 80218378 00000000 */ nop
/* 58C66C 8021837C 00000000 */ nop

18
ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218DF4_465284.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218DF4_465284
/* 465284 80218DF4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 465288 80218DF8 AFBF0010 */ sw $ra, 0x10($sp)
/* 46528C 80218DFC 8C82000C */ lw $v0, 0xc($a0)
/* 465290 80218E00 0C0B1EAF */ jal evt_get_variable
/* 465294 80218E04 8C450000 */ lw $a1, ($v0)
/* 465298 80218E08 8C43000C */ lw $v1, 0xc($v0)
/* 46529C 80218E0C 3C01C47A */ lui $at, 0xc47a
/* 4652A0 80218E10 44810000 */ mtc1 $at, $f0
/* 4652A4 80218E14 00000000 */ nop
/* 4652A8 80218E18 E4600008 */ swc1 $f0, 8($v1)
/* 4652AC 80218E1C 8FBF0010 */ lw $ra, 0x10($sp)
/* 4652B0 80218E20 24020002 */ addiu $v0, $zero, 2
/* 4652B4 80218E24 03E00008 */ jr $ra
/* 4652B8 80218E28 27BD0018 */ addiu $sp, $sp, 0x18

22
ver/us/asm/nonmatchings/battle/area_mac/464560/func_80218E2C_4652BC.s
View File

@ -1,22 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218E2C_4652BC
/* 4652BC 80218E2C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 4652C0 80218E30 AFBF0010 */ sw $ra, 0x10($sp)
/* 4652C4 80218E34 8C82000C */ lw $v0, 0xc($a0)
/* 4652C8 80218E38 0C0B1EAF */ jal evt_get_variable
/* 4652CC 80218E3C 8C450000 */ lw $a1, ($v0)
/* 4652D0 80218E40 0040202D */ daddu $a0, $v0, $zero
/* 4652D4 80218E44 8C82000C */ lw $v0, 0xc($a0)
/* 4652D8 80218E48 3C014310 */ lui $at, 0x4310
/* 4652DC 80218E4C 44810000 */ mtc1 $at, $f0
/* 4652E0 80218E50 00000000 */ nop
/* 4652E4 80218E54 E4400008 */ swc1 $f0, 8($v0)
/* 4652E8 80218E58 8C830000 */ lw $v1, ($a0)
/* 4652EC 80218E5C 34630010 */ ori $v1, $v1, 0x10
/* 4652F0 80218E60 AC830000 */ sw $v1, ($a0)
/* 4652F4 80218E64 8FBF0010 */ lw $ra, 0x10($sp)
/* 4652F8 80218E68 24020002 */ addiu $v0, $zero, 2
/* 4652FC 80218E6C 03E00008 */ jr $ra
/* 465300 80218E70 27BD0018 */ addiu $sp, $sp, 0x18

27
ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219604_465A94.s
View File

@ -1,27 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219604_465A94
/* 465A94 80219604 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 465A98 80219608 AFBF0010 */ sw $ra, 0x10($sp)
/* 465A9C 8021960C 0C09A75B */ jal get_actor
/* 465AA0 80219610 8C840148 */ lw $a0, 0x148($a0)
/* 465AA4 80219614 8C440094 */ lw $a0, 0x94($v0)
/* 465AA8 80219618 8C830014 */ lw $v1, 0x14($a0)
/* 465AAC 8021961C 10600004 */ beqz $v1, .L80219630
/* 465AB0 80219620 AC800000 */ sw $zero, ($a0)
/* 465AB4 80219624 8C620000 */ lw $v0, ($v1)
/* 465AB8 80219628 34420010 */ ori $v0, $v0, 0x10
/* 465ABC 8021962C AC620000 */ sw $v0, ($v1)
.L80219630:
/* 465AC0 80219630 8C830018 */ lw $v1, 0x18($a0)
/* 465AC4 80219634 10600004 */ beqz $v1, .L80219648
/* 465AC8 80219638 00000000 */ nop
/* 465ACC 8021963C 8C620000 */ lw $v0, ($v1)
/* 465AD0 80219640 34420010 */ ori $v0, $v0, 0x10
/* 465AD4 80219644 AC620000 */ sw $v0, ($v1)
.L80219648:
/* 465AD8 80219648 8FBF0010 */ lw $ra, 0x10($sp)
/* 465ADC 8021964C 24020002 */ addiu $v0, $zero, 2
/* 465AE0 80219650 03E00008 */ jr $ra
/* 465AE4 80219654 27BD0018 */ addiu $sp, $sp, 0x18

23
ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219658_465AE8.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219658_465AE8
/* 465AE8 80219658 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 465AEC 8021965C AFB00010 */ sw $s0, 0x10($sp)
/* 465AF0 80219660 0080802D */ daddu $s0, $a0, $zero
/* 465AF4 80219664 AFBF0018 */ sw $ra, 0x18($sp)
/* 465AF8 80219668 AFB10014 */ sw $s1, 0x14($sp)
/* 465AFC 8021966C 8E040148 */ lw $a0, 0x148($s0)
/* 465B00 80219670 0C09A75B */ jal get_actor
/* 465B04 80219674 8E11000C */ lw $s1, 0xc($s0)
/* 465B08 80219678 0200202D */ daddu $a0, $s0, $zero
/* 465B0C 8021967C 8E250000 */ lw $a1, ($s1)
/* 465B10 80219680 0C0B1EAF */ jal evt_get_variable
/* 465B14 80219684 8C500094 */ lw $s0, 0x94($v0)
/* 465B18 80219688 AE020004 */ sw $v0, 4($s0)
/* 465B1C 8021968C 8FBF0018 */ lw $ra, 0x18($sp)
/* 465B20 80219690 8FB10014 */ lw $s1, 0x14($sp)
/* 465B24 80219694 8FB00010 */ lw $s0, 0x10($sp)
/* 465B28 80219698 24020002 */ addiu $v0, $zero, 2
/* 465B2C 8021969C 03E00008 */ jr $ra
/* 465B30 802196A0 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_mac/464560/func_802196A4_465B34.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802196A4_465B34
/* 465B34 802196A4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 465B38 802196A8 AFB00010 */ sw $s0, 0x10($sp)
/* 465B3C 802196AC 0080802D */ daddu $s0, $a0, $zero
/* 465B40 802196B0 AFBF0018 */ sw $ra, 0x18($sp)
/* 465B44 802196B4 AFB10014 */ sw $s1, 0x14($sp)
/* 465B48 802196B8 8E040148 */ lw $a0, 0x148($s0)
/* 465B4C 802196BC 0C09A75B */ jal get_actor
/* 465B50 802196C0 8E11000C */ lw $s1, 0xc($s0)
/* 465B54 802196C4 0200202D */ daddu $a0, $s0, $zero
/* 465B58 802196C8 8E250000 */ lw $a1, ($s1)
/* 465B5C 802196CC 0C0B1EAF */ jal evt_get_variable
/* 465B60 802196D0 8C500094 */ lw $s0, 0x94($v0)
/* 465B64 802196D4 AE02000C */ sw $v0, 0xc($s0)
/* 465B68 802196D8 8FBF0018 */ lw $ra, 0x18($sp)
/* 465B6C 802196DC 8FB10014 */ lw $s1, 0x14($sp)
/* 465B70 802196E0 8FB00010 */ lw $s0, 0x10($sp)
/* 465B74 802196E4 24020002 */ addiu $v0, $zero, 2
/* 465B78 802196E8 03E00008 */ jr $ra
/* 465B7C 802196EC 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_mac/464560/func_802196F0_465B80.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802196F0_465B80
/* 465B80 802196F0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 465B84 802196F4 AFB00010 */ sw $s0, 0x10($sp)
/* 465B88 802196F8 0080802D */ daddu $s0, $a0, $zero
/* 465B8C 802196FC AFBF0018 */ sw $ra, 0x18($sp)
/* 465B90 80219700 AFB10014 */ sw $s1, 0x14($sp)
/* 465B94 80219704 8E040148 */ lw $a0, 0x148($s0)
/* 465B98 80219708 0C09A75B */ jal get_actor
/* 465B9C 8021970C 8E11000C */ lw $s1, 0xc($s0)
/* 465BA0 80219710 0200202D */ daddu $a0, $s0, $zero
/* 465BA4 80219714 8E250000 */ lw $a1, ($s1)
/* 465BA8 80219718 0C0B1EAF */ jal evt_get_variable
/* 465BAC 8021971C 8C500094 */ lw $s0, 0x94($v0)
/* 465BB0 80219720 AE020010 */ sw $v0, 0x10($s0)
/* 465BB4 80219724 8FBF0018 */ lw $ra, 0x18($sp)
/* 465BB8 80219728 8FB10014 */ lw $s1, 0x14($sp)
/* 465BBC 8021972C 8FB00010 */ lw $s0, 0x10($sp)
/* 465BC0 80219730 24020002 */ addiu $v0, $zero, 2
/* 465BC4 80219734 03E00008 */ jr $ra
/* 465BC8 80219738 27BD0020 */ addiu $sp, $sp, 0x20

31
ver/us/asm/nonmatchings/battle/area_mac/464560/func_802197B8_465C48.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802197B8_465C48
/* 465C48 802197B8 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 465C4C 802197BC AFB20018 */ sw $s2, 0x18($sp)
/* 465C50 802197C0 0080902D */ daddu $s2, $a0, $zero
/* 465C54 802197C4 AFB10014 */ sw $s1, 0x14($sp)
/* 465C58 802197C8 3C118011 */ lui $s1, %hi(gPlayerData)
/* 465C5C 802197CC 2631F290 */ addiu $s1, $s1, %lo(gPlayerData)
/* 465C60 802197D0 AFBF001C */ sw $ra, 0x1c($sp)
/* 465C64 802197D4 AFB00010 */ sw $s0, 0x10($sp)
/* 465C68 802197D8 8E50000C */ lw $s0, 0xc($s2)
/* 465C6C 802197DC 82260012 */ lb $a2, 0x12($s1)
/* 465C70 802197E0 8E050000 */ lw $a1, ($s0)
/* 465C74 802197E4 0C0B2026 */ jal evt_set_variable
/* 465C78 802197E8 26100004 */ addiu $s0, $s0, 4
/* 465C7C 802197EC 82220012 */ lb $v0, 0x12($s1)
/* 465C80 802197F0 8E050000 */ lw $a1, ($s0)
/* 465C84 802197F4 000210C0 */ sll $v0, $v0, 3
/* 465C88 802197F8 00511021 */ addu $v0, $v0, $s1
/* 465C8C 802197FC 80460015 */ lb $a2, 0x15($v0)
/* 465C90 80219800 0C0B2026 */ jal evt_set_variable
/* 465C94 80219804 0240202D */ daddu $a0, $s2, $zero
/* 465C98 80219808 8FBF001C */ lw $ra, 0x1c($sp)
/* 465C9C 8021980C 8FB20018 */ lw $s2, 0x18($sp)
/* 465CA0 80219810 8FB10014 */ lw $s1, 0x14($sp)
/* 465CA4 80219814 8FB00010 */ lw $s0, 0x10($sp)
/* 465CA8 80219818 24020002 */ addiu $v0, $zero, 2
/* 465CAC 8021981C 03E00008 */ jr $ra
/* 465CB0 80219820 27BD0020 */ addiu $sp, $sp, 0x20

18
ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218AF4_66A874.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218AF4_66A874
/* 66A874 80218AF4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 66A878 80218AF8 AFBF0010 */ sw $ra, 0x10($sp)
/* 66A87C 80218AFC 8C82000C */ lw $v0, 0xc($a0)
/* 66A880 80218B00 0C0B1EAF */ jal evt_get_variable
/* 66A884 80218B04 8C450000 */ lw $a1, ($v0)
/* 66A888 80218B08 8C43000C */ lw $v1, 0xc($v0)
/* 66A88C 80218B0C 3C01C47A */ lui $at, 0xc47a
/* 66A890 80218B10 44810000 */ mtc1 $at, $f0
/* 66A894 80218B14 00000000 */ nop
/* 66A898 80218B18 E4600008 */ swc1 $f0, 8($v1)
/* 66A89C 80218B1C 8FBF0010 */ lw $ra, 0x10($sp)
/* 66A8A0 80218B20 24020002 */ addiu $v0, $zero, 2
/* 66A8A4 80218B24 03E00008 */ jr $ra
/* 66A8A8 80218B28 27BD0018 */ addiu $sp, $sp, 0x18

27
ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219304_66B084.s
View File

@ -1,27 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219304_66B084
/* 66B084 80219304 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 66B088 80219308 AFBF0010 */ sw $ra, 0x10($sp)
/* 66B08C 8021930C 0C09A75B */ jal get_actor
/* 66B090 80219310 8C840148 */ lw $a0, 0x148($a0)
/* 66B094 80219314 8C440090 */ lw $a0, 0x90($v0)
/* 66B098 80219318 8C830014 */ lw $v1, 0x14($a0)
/* 66B09C 8021931C 10600004 */ beqz $v1, .L80219330
/* 66B0A0 80219320 AC800000 */ sw $zero, ($a0)
/* 66B0A4 80219324 8C620000 */ lw $v0, ($v1)
/* 66B0A8 80219328 34420010 */ ori $v0, $v0, 0x10
/* 66B0AC 8021932C AC620000 */ sw $v0, ($v1)
.L80219330:
/* 66B0B0 80219330 8C830018 */ lw $v1, 0x18($a0)
/* 66B0B4 80219334 10600004 */ beqz $v1, .L80219348
/* 66B0B8 80219338 00000000 */ nop
/* 66B0BC 8021933C 8C620000 */ lw $v0, ($v1)
/* 66B0C0 80219340 34420010 */ ori $v0, $v0, 0x10
/* 66B0C4 80219344 AC620000 */ sw $v0, ($v1)
.L80219348:
/* 66B0C8 80219348 8FBF0010 */ lw $ra, 0x10($sp)
/* 66B0CC 8021934C 24020002 */ addiu $v0, $zero, 2
/* 66B0D0 80219350 03E00008 */ jr $ra
/* 66B0D4 80219354 27BD0018 */ addiu $sp, $sp, 0x18

23
ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219358_66B0D8.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219358_66B0D8
/* 66B0D8 80219358 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 66B0DC 8021935C AFB00010 */ sw $s0, 0x10($sp)
/* 66B0E0 80219360 0080802D */ daddu $s0, $a0, $zero
/* 66B0E4 80219364 AFBF0018 */ sw $ra, 0x18($sp)
/* 66B0E8 80219368 AFB10014 */ sw $s1, 0x14($sp)
/* 66B0EC 8021936C 8E040148 */ lw $a0, 0x148($s0)
/* 66B0F0 80219370 0C09A75B */ jal get_actor
/* 66B0F4 80219374 8E11000C */ lw $s1, 0xc($s0)
/* 66B0F8 80219378 0200202D */ daddu $a0, $s0, $zero
/* 66B0FC 8021937C 8E250000 */ lw $a1, ($s1)
/* 66B100 80219380 0C0B1EAF */ jal evt_get_variable
/* 66B104 80219384 8C500090 */ lw $s0, 0x90($v0)
/* 66B108 80219388 AE020004 */ sw $v0, 4($s0)
/* 66B10C 8021938C 8FBF0018 */ lw $ra, 0x18($sp)
/* 66B110 80219390 8FB10014 */ lw $s1, 0x14($sp)
/* 66B114 80219394 8FB00010 */ lw $s0, 0x10($sp)
/* 66B118 80219398 24020002 */ addiu $v0, $zero, 2
/* 66B11C 8021939C 03E00008 */ jr $ra
/* 66B120 802193A0 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_802193A4_66B124.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802193A4_66B124
/* 66B124 802193A4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 66B128 802193A8 AFB00010 */ sw $s0, 0x10($sp)
/* 66B12C 802193AC 0080802D */ daddu $s0, $a0, $zero
/* 66B130 802193B0 AFBF0018 */ sw $ra, 0x18($sp)
/* 66B134 802193B4 AFB10014 */ sw $s1, 0x14($sp)
/* 66B138 802193B8 8E040148 */ lw $a0, 0x148($s0)
/* 66B13C 802193BC 0C09A75B */ jal get_actor
/* 66B140 802193C0 8E11000C */ lw $s1, 0xc($s0)
/* 66B144 802193C4 0200202D */ daddu $a0, $s0, $zero
/* 66B148 802193C8 8E250000 */ lw $a1, ($s1)
/* 66B14C 802193CC 0C0B1EAF */ jal evt_get_variable
/* 66B150 802193D0 8C500090 */ lw $s0, 0x90($v0)
/* 66B154 802193D4 AE02000C */ sw $v0, 0xc($s0)
/* 66B158 802193D8 8FBF0018 */ lw $ra, 0x18($sp)
/* 66B15C 802193DC 8FB10014 */ lw $s1, 0x14($sp)
/* 66B160 802193E0 8FB00010 */ lw $s0, 0x10($sp)
/* 66B164 802193E4 24020002 */ addiu $v0, $zero, 2
/* 66B168 802193E8 03E00008 */ jr $ra
/* 66B16C 802193EC 27BD0020 */ addiu $sp, $sp, 0x20

31
ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_802194B8_66B238.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802194B8_66B238
/* 66B238 802194B8 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 66B23C 802194BC AFB20018 */ sw $s2, 0x18($sp)
/* 66B240 802194C0 0080902D */ daddu $s2, $a0, $zero
/* 66B244 802194C4 AFB10014 */ sw $s1, 0x14($sp)
/* 66B248 802194C8 3C118011 */ lui $s1, %hi(gPlayerData)
/* 66B24C 802194CC 2631F290 */ addiu $s1, $s1, %lo(gPlayerData)
/* 66B250 802194D0 AFBF001C */ sw $ra, 0x1c($sp)
/* 66B254 802194D4 AFB00010 */ sw $s0, 0x10($sp)
/* 66B258 802194D8 8E50000C */ lw $s0, 0xc($s2)
/* 66B25C 802194DC 82260012 */ lb $a2, 0x12($s1)
/* 66B260 802194E0 8E050000 */ lw $a1, ($s0)
/* 66B264 802194E4 0C0B2026 */ jal evt_set_variable
/* 66B268 802194E8 26100004 */ addiu $s0, $s0, 4
/* 66B26C 802194EC 82220012 */ lb $v0, 0x12($s1)
/* 66B270 802194F0 8E050000 */ lw $a1, ($s0)
/* 66B274 802194F4 000210C0 */ sll $v0, $v0, 3
/* 66B278 802194F8 00511021 */ addu $v0, $v0, $s1
/* 66B27C 802194FC 80460015 */ lb $a2, 0x15($v0)
/* 66B280 80219500 0C0B2026 */ jal evt_set_variable
/* 66B284 80219504 0240202D */ daddu $a0, $s2, $zero
/* 66B288 80219508 8FBF001C */ lw $ra, 0x1c($sp)
/* 66B28C 8021950C 8FB20018 */ lw $s2, 0x18($sp)
/* 66B290 80219510 8FB10014 */ lw $s1, 0x14($sp)
/* 66B294 80219514 8FB00010 */ lw $s0, 0x10($sp)
/* 66B298 80219518 24020002 */ addiu $v0, $zero, 2
/* 66B29C 8021951C 03E00008 */ jr $ra
/* 66B2A0 80219520 27BD0020 */ addiu $sp, $sp, 0x20

18
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218AF4_624694.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218AF4_624694
/* 624694 80218AF4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 624698 80218AF8 AFBF0010 */ sw $ra, 0x10($sp)
/* 62469C 80218AFC 8C82000C */ lw $v0, 0xc($a0)
/* 6246A0 80218B00 0C0B1EAF */ jal evt_get_variable
/* 6246A4 80218B04 8C450000 */ lw $a1, ($v0)
/* 6246A8 80218B08 8C43000C */ lw $v1, 0xc($v0)
/* 6246AC 80218B0C 3C01C47A */ lui $at, 0xc47a
/* 6246B0 80218B10 44810000 */ mtc1 $at, $f0
/* 6246B4 80218B14 00000000 */ nop
/* 6246B8 80218B18 E4600008 */ swc1 $f0, 8($v1)
/* 6246BC 80218B1C 8FBF0010 */ lw $ra, 0x10($sp)
/* 6246C0 80218B20 24020002 */ addiu $v0, $zero, 2
/* 6246C4 80218B24 03E00008 */ jr $ra
/* 6246C8 80218B28 27BD0018 */ addiu $sp, $sp, 0x18

22
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218B2C_6246CC.s
View File

@ -1,22 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218B2C_6246CC
/* 6246CC 80218B2C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 6246D0 80218B30 AFBF0010 */ sw $ra, 0x10($sp)
/* 6246D4 80218B34 8C82000C */ lw $v0, 0xc($a0)
/* 6246D8 80218B38 0C0B1EAF */ jal evt_get_variable
/* 6246DC 80218B3C 8C450000 */ lw $a1, ($v0)
/* 6246E0 80218B40 0040202D */ daddu $a0, $v0, $zero
/* 6246E4 80218B44 8C82000C */ lw $v0, 0xc($a0)
/* 6246E8 80218B48 3C014310 */ lui $at, 0x4310
/* 6246EC 80218B4C 44810000 */ mtc1 $at, $f0
/* 6246F0 80218B50 00000000 */ nop
/* 6246F4 80218B54 E4400008 */ swc1 $f0, 8($v0)
/* 6246F8 80218B58 8C830000 */ lw $v1, ($a0)
/* 6246FC 80218B5C 34630010 */ ori $v1, $v1, 0x10
/* 624700 80218B60 AC830000 */ sw $v1, ($a0)
/* 624704 80218B64 8FBF0010 */ lw $ra, 0x10($sp)
/* 624708 80218B68 24020002 */ addiu $v0, $zero, 2
/* 62470C 80218B6C 03E00008 */ jr $ra
/* 624710 80218B70 27BD0018 */ addiu $sp, $sp, 0x18

27
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219304_624EA4.s
View File

@ -1,27 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219304_624EA4
/* 624EA4 80219304 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 624EA8 80219308 AFBF0010 */ sw $ra, 0x10($sp)
/* 624EAC 8021930C 0C09A75B */ jal get_actor
/* 624EB0 80219310 8C840148 */ lw $a0, 0x148($a0)
/* 624EB4 80219314 8C440090 */ lw $a0, 0x90($v0)
/* 624EB8 80219318 8C830014 */ lw $v1, 0x14($a0)
/* 624EBC 8021931C 10600004 */ beqz $v1, .L80219330
/* 624EC0 80219320 AC800000 */ sw $zero, ($a0)
/* 624EC4 80219324 8C620000 */ lw $v0, ($v1)
/* 624EC8 80219328 34420010 */ ori $v0, $v0, 0x10
/* 624ECC 8021932C AC620000 */ sw $v0, ($v1)
.L80219330:
/* 624ED0 80219330 8C830018 */ lw $v1, 0x18($a0)
/* 624ED4 80219334 10600004 */ beqz $v1, .L80219348
/* 624ED8 80219338 00000000 */ nop
/* 624EDC 8021933C 8C620000 */ lw $v0, ($v1)
/* 624EE0 80219340 34420010 */ ori $v0, $v0, 0x10
/* 624EE4 80219344 AC620000 */ sw $v0, ($v1)
.L80219348:
/* 624EE8 80219348 8FBF0010 */ lw $ra, 0x10($sp)
/* 624EEC 8021934C 24020002 */ addiu $v0, $zero, 2
/* 624EF0 80219350 03E00008 */ jr $ra
/* 624EF4 80219354 27BD0018 */ addiu $sp, $sp, 0x18

23
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219358_624EF8.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219358_624EF8
/* 624EF8 80219358 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 624EFC 8021935C AFB00010 */ sw $s0, 0x10($sp)
/* 624F00 80219360 0080802D */ daddu $s0, $a0, $zero
/* 624F04 80219364 AFBF0018 */ sw $ra, 0x18($sp)
/* 624F08 80219368 AFB10014 */ sw $s1, 0x14($sp)
/* 624F0C 8021936C 8E040148 */ lw $a0, 0x148($s0)
/* 624F10 80219370 0C09A75B */ jal get_actor
/* 624F14 80219374 8E11000C */ lw $s1, 0xc($s0)
/* 624F18 80219378 0200202D */ daddu $a0, $s0, $zero
/* 624F1C 8021937C 8E250000 */ lw $a1, ($s1)
/* 624F20 80219380 0C0B1EAF */ jal evt_get_variable
/* 624F24 80219384 8C500090 */ lw $s0, 0x90($v0)
/* 624F28 80219388 AE020004 */ sw $v0, 4($s0)
/* 624F2C 8021938C 8FBF0018 */ lw $ra, 0x18($sp)
/* 624F30 80219390 8FB10014 */ lw $s1, 0x14($sp)
/* 624F34 80219394 8FB00010 */ lw $s0, 0x10($sp)
/* 624F38 80219398 24020002 */ addiu $v0, $zero, 2
/* 624F3C 8021939C 03E00008 */ jr $ra
/* 624F40 802193A0 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802193A4_624F44.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802193A4_624F44
/* 624F44 802193A4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 624F48 802193A8 AFB00010 */ sw $s0, 0x10($sp)
/* 624F4C 802193AC 0080802D */ daddu $s0, $a0, $zero
/* 624F50 802193B0 AFBF0018 */ sw $ra, 0x18($sp)
/* 624F54 802193B4 AFB10014 */ sw $s1, 0x14($sp)
/* 624F58 802193B8 8E040148 */ lw $a0, 0x148($s0)
/* 624F5C 802193BC 0C09A75B */ jal get_actor
/* 624F60 802193C0 8E11000C */ lw $s1, 0xc($s0)
/* 624F64 802193C4 0200202D */ daddu $a0, $s0, $zero
/* 624F68 802193C8 8E250000 */ lw $a1, ($s1)
/* 624F6C 802193CC 0C0B1EAF */ jal evt_get_variable
/* 624F70 802193D0 8C500090 */ lw $s0, 0x90($v0)
/* 624F74 802193D4 AE02000C */ sw $v0, 0xc($s0)
/* 624F78 802193D8 8FBF0018 */ lw $ra, 0x18($sp)
/* 624F7C 802193DC 8FB10014 */ lw $s1, 0x14($sp)
/* 624F80 802193E0 8FB00010 */ lw $s0, 0x10($sp)
/* 624F84 802193E4 24020002 */ addiu $v0, $zero, 2
/* 624F88 802193E8 03E00008 */ jr $ra
/* 624F8C 802193EC 27BD0020 */ addiu $sp, $sp, 0x20

23
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802193F0_624F90.s
View File

@ -1,23 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802193F0_624F90
/* 624F90 802193F0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 624F94 802193F4 AFB00010 */ sw $s0, 0x10($sp)
/* 624F98 802193F8 0080802D */ daddu $s0, $a0, $zero
/* 624F9C 802193FC AFBF0018 */ sw $ra, 0x18($sp)
/* 624FA0 80219400 AFB10014 */ sw $s1, 0x14($sp)
/* 624FA4 80219404 8E040148 */ lw $a0, 0x148($s0)
/* 624FA8 80219408 0C09A75B */ jal get_actor
/* 624FAC 8021940C 8E11000C */ lw $s1, 0xc($s0)
/* 624FB0 80219410 0200202D */ daddu $a0, $s0, $zero
/* 624FB4 80219414 8E250000 */ lw $a1, ($s1)
/* 624FB8 80219418 0C0B1EAF */ jal evt_get_variable
/* 624FBC 8021941C 8C500090 */ lw $s0, 0x90($v0)
/* 624FC0 80219420 AE020010 */ sw $v0, 0x10($s0)
/* 624FC4 80219424 8FBF0018 */ lw $ra, 0x18($sp)
/* 624FC8 80219428 8FB10014 */ lw $s1, 0x14($sp)
/* 624FCC 8021942C 8FB00010 */ lw $s0, 0x10($sp)
/* 624FD0 80219430 24020002 */ addiu $v0, $zero, 2
/* 624FD4 80219434 03E00008 */ jr $ra
/* 624FD8 80219438 27BD0020 */ addiu $sp, $sp, 0x20

31
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802194B8_625058.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802194B8_625058
/* 625058 802194B8 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 62505C 802194BC AFB20018 */ sw $s2, 0x18($sp)
/* 625060 802194C0 0080902D */ daddu $s2, $a0, $zero
/* 625064 802194C4 AFB10014 */ sw $s1, 0x14($sp)
/* 625068 802194C8 3C118011 */ lui $s1, %hi(gPlayerData)
/* 62506C 802194CC 2631F290 */ addiu $s1, $s1, %lo(gPlayerData)
/* 625070 802194D0 AFBF001C */ sw $ra, 0x1c($sp)
/* 625074 802194D4 AFB00010 */ sw $s0, 0x10($sp)
/* 625078 802194D8 8E50000C */ lw $s0, 0xc($s2)
/* 62507C 802194DC 82260012 */ lb $a2, 0x12($s1)
/* 625080 802194E0 8E050000 */ lw $a1, ($s0)
/* 625084 802194E4 0C0B2026 */ jal evt_set_variable
/* 625088 802194E8 26100004 */ addiu $s0, $s0, 4
/* 62508C 802194EC 82220012 */ lb $v0, 0x12($s1)
/* 625090 802194F0 8E050000 */ lw $a1, ($s0)
/* 625094 802194F4 000210C0 */ sll $v0, $v0, 3
/* 625098 802194F8 00511021 */ addu $v0, $v0, $s1
/* 62509C 802194FC 80460015 */ lb $a2, 0x15($v0)
/* 6250A0 80219500 0C0B2026 */ jal evt_set_variable
/* 6250A4 80219504 0240202D */ daddu $a0, $s2, $zero
/* 6250A8 80219508 8FBF001C */ lw $ra, 0x1c($sp)
/* 6250AC 8021950C 8FB20018 */ lw $s2, 0x18($sp)
/* 6250B0 80219510 8FB10014 */ lw $s1, 0x14($sp)
/* 6250B4 80219514 8FB00010 */ lw $s0, 0x10($sp)
/* 6250B8 80219518 24020002 */ addiu $v0, $zero, 2
/* 6250BC 8021951C 03E00008 */ jr $ra
/* 6250C0 80219520 27BD0020 */ addiu $sp, $sp, 0x20

101
ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_802196BC_62525C.s
View File

@ -1,101 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802196BC_62525C
/* 62525C 802196BC 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 625260 802196C0 AFB1001C */ sw $s1, 0x1c($sp)
/* 625264 802196C4 0080882D */ daddu $s1, $a0, $zero
/* 625268 802196C8 AFBF0034 */ sw $ra, 0x34($sp)
/* 62526C 802196CC AFB60030 */ sw $s6, 0x30($sp)
/* 625270 802196D0 AFB5002C */ sw $s5, 0x2c($sp)
/* 625274 802196D4 AFB40028 */ sw $s4, 0x28($sp)
/* 625278 802196D8 AFB30024 */ sw $s3, 0x24($sp)
/* 62527C 802196DC AFB20020 */ sw $s2, 0x20($sp)
/* 625280 802196E0 AFB00018 */ sw $s0, 0x18($sp)
/* 625284 802196E4 F7B40038 */ sdc1 $f20, 0x38($sp)
/* 625288 802196E8 8E30000C */ lw $s0, 0xc($s1)
/* 62528C 802196EC 8E050000 */ lw $a1, ($s0)
/* 625290 802196F0 0C0B1EAF */ jal evt_get_variable
/* 625294 802196F4 26100004 */ addiu $s0, $s0, 4
/* 625298 802196F8 8E050000 */ lw $a1, ($s0)
/* 62529C 802196FC 26100004 */ addiu $s0, $s0, 4
/* 6252A0 80219700 0C0B1EAF */ jal evt_get_variable
/* 6252A4 80219704 0220202D */ daddu $a0, $s1, $zero
/* 6252A8 80219708 8E050000 */ lw $a1, ($s0)
/* 6252AC 8021970C 26100004 */ addiu $s0, $s0, 4
/* 6252B0 80219710 0220202D */ daddu $a0, $s1, $zero
/* 6252B4 80219714 0C0B1EAF */ jal evt_get_variable
/* 6252B8 80219718 0040B02D */ daddu $s6, $v0, $zero
/* 6252BC 8021971C 8E050000 */ lw $a1, ($s0)
/* 6252C0 80219720 26100004 */ addiu $s0, $s0, 4
/* 6252C4 80219724 0220202D */ daddu $a0, $s1, $zero
/* 6252C8 80219728 0C0B1EAF */ jal evt_get_variable
/* 6252CC 8021972C 0040A82D */ daddu $s5, $v0, $zero
/* 6252D0 80219730 8E050000 */ lw $a1, ($s0)
/* 6252D4 80219734 26100004 */ addiu $s0, $s0, 4
/* 6252D8 80219738 0220202D */ daddu $a0, $s1, $zero
/* 6252DC 8021973C 0C0B210B */ jal evt_get_float_variable
/* 6252E0 80219740 0040A02D */ daddu $s4, $v0, $zero
/* 6252E4 80219744 8E050000 */ lw $a1, ($s0)
/* 6252E8 80219748 26100004 */ addiu $s0, $s0, 4
/* 6252EC 8021974C 0220202D */ daddu $a0, $s1, $zero
/* 6252F0 80219750 0C0B1EAF */ jal evt_get_variable
/* 6252F4 80219754 46000506 */ mov.s $f20, $f0
/* 6252F8 80219758 8E050000 */ lw $a1, ($s0)
/* 6252FC 8021975C 26100004 */ addiu $s0, $s0, 4
/* 625300 80219760 0220202D */ daddu $a0, $s1, $zero
/* 625304 80219764 0C0B1EAF */ jal evt_get_variable
/* 625308 80219768 0040902D */ daddu $s2, $v0, $zero
/* 62530C 8021976C 8E050000 */ lw $a1, ($s0)
/* 625310 80219770 26100004 */ addiu $s0, $s0, 4
/* 625314 80219774 0220202D */ daddu $a0, $s1, $zero
/* 625318 80219778 0C0B1EAF */ jal evt_get_variable
/* 62531C 8021977C 0040982D */ daddu $s3, $v0, $zero
/* 625320 80219780 0220202D */ daddu $a0, $s1, $zero
/* 625324 80219784 8E050000 */ lw $a1, ($s0)
/* 625328 80219788 0C0B1EAF */ jal evt_get_variable
/* 62532C 8021978C 0040882D */ daddu $s1, $v0, $zero
/* 625330 80219790 24040001 */ addiu $a0, $zero, 1
/* 625334 80219794 44961000 */ mtc1 $s6, $f2
/* 625338 80219798 00000000 */ nop
/* 62533C 8021979C 468010A0 */ cvt.s.w $f2, $f2
/* 625340 802197A0 44051000 */ mfc1 $a1, $f2
/* 625344 802197A4 44951000 */ mtc1 $s5, $f2
/* 625348 802197A8 00000000 */ nop
/* 62534C 802197AC 468010A0 */ cvt.s.w $f2, $f2
/* 625350 802197B0 44061000 */ mfc1 $a2, $f2
/* 625354 802197B4 44941000 */ mtc1 $s4, $f2
/* 625358 802197B8 00000000 */ nop
/* 62535C 802197BC 468010A0 */ cvt.s.w $f2, $f2
/* 625360 802197C0 44071000 */ mfc1 $a3, $f2
/* 625364 802197C4 0040802D */ daddu $s0, $v0, $zero
/* 625368 802197C8 E7B40010 */ swc1 $f20, 0x10($sp)
/* 62536C 802197CC 0C01C88C */ jal playFX_6F
/* 625370 802197D0 AFB20014 */ sw $s2, 0x14($sp)
/* 625374 802197D4 8C43000C */ lw $v1, 0xc($v0)
/* 625378 802197D8 AC730018 */ sw $s3, 0x18($v1)
/* 62537C 802197DC 8C43000C */ lw $v1, 0xc($v0)
/* 625380 802197E0 AC71001C */ sw $s1, 0x1c($v1)
/* 625384 802197E4 8C43000C */ lw $v1, 0xc($v0)
/* 625388 802197E8 AC700020 */ sw $s0, 0x20($v1)
/* 62538C 802197EC 8C43000C */ lw $v1, 0xc($v0)
/* 625390 802197F0 240400FF */ addiu $a0, $zero, 0xff
/* 625394 802197F4 AC640028 */ sw $a0, 0x28($v1)
/* 625398 802197F8 8C43000C */ lw $v1, 0xc($v0)
/* 62539C 802197FC AC64002C */ sw $a0, 0x2c($v1)
/* 6253A0 80219800 8C43000C */ lw $v1, 0xc($v0)
/* 6253A4 80219804 AC640030 */ sw $a0, 0x30($v1)
/* 6253A8 80219808 8FBF0034 */ lw $ra, 0x34($sp)
/* 6253AC 8021980C 8FB60030 */ lw $s6, 0x30($sp)
/* 6253B0 80219810 8FB5002C */ lw $s5, 0x2c($sp)
/* 6253B4 80219814 8FB40028 */ lw $s4, 0x28($sp)
/* 6253B8 80219818 8FB30024 */ lw $s3, 0x24($sp)
/* 6253BC 8021981C 8FB20020 */ lw $s2, 0x20($sp)
/* 6253C0 80219820 8FB1001C */ lw $s1, 0x1c($sp)
/* 6253C4 80219824 8FB00018 */ lw $s0, 0x18($sp)
/* 6253C8 80219828 D7B40038 */ ldc1 $f20, 0x38($sp)
/* 6253CC 8021982C 24020002 */ addiu $v0, $zero, 2
/* 6253D0 80219830 03E00008 */ jr $ra
/* 6253D4 80219834 27BD0040 */ addiu $sp, $sp, 0x40
/* 6253D8 80219838 00000000 */ nop
/* 6253DC 8021983C 00000000 */ nop

7
ver/us/asm/nonmatchings/world/partner/lakilester/func_802BDDD8_321928.s
View File

@ -1,6 +1,13 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel D_802BFEF8_323A48
.double 1.8
.section .text
glabel func_802BDDD8_321928
/* 321928 802BDDD8 27BDFF80 */ addiu $sp, $sp, -0x80
/* 32192C 802BDDDC AFB20060 */ sw $s2, 0x60($sp)

76
ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
View File

@ -37,8 +37,8 @@ glabel func_802BD414_31E184
/* 31E1D0 802BD460 26B5EBB0 */ addiu $s5, $s5, %lo(gPartnerActionStatus)
/* 31E1D4 802BD464 3C118016 */ lui $s1, %hi(gCollisionStatus)
/* 31E1D8 802BD468 2631A550 */ addiu $s1, $s1, %lo(gCollisionStatus)
/* 31E1DC 802BD46C 3C02802C */ lui $v0, %hi(D_802BFEE4)
/* 31E1E0 802BD470 8C42FEE4 */ lw $v0, %lo(D_802BFEE4)($v0)
/* 31E1DC 802BD46C 3C02802C */ lui $v0, %hi(bss_802BFEE4)
/* 31E1E0 802BD470 8C42FEE4 */ lw $v0, %lo(bss_802BFEE4)($v0)
/* 31E1E4 802BD474 3C014200 */ lui $at, 0x4200
/* 31E1E8 802BD478 4481A000 */ mtc1 $at, $f20
/* 31E1EC 802BD47C 10400003 */ beqz $v0, .L802BD48C
@ -186,8 +186,8 @@ glabel func_802BD414_31E184
/* 31E3F8 802BD688 44811000 */ mtc1 $at, $f2
/* 31E3FC 802BD68C 27A6002C */ addiu $a2, $sp, 0x2c
/* 31E400 802BD690 E7A00024 */ swc1 $f0, 0x24($sp)
/* 31E404 802BD694 3C01802C */ lui $at, %hi(D_802BFEFC)
/* 31E408 802BD698 E424FEFC */ swc1 $f4, %lo(D_802BFEFC)($at)
/* 31E404 802BD694 3C01802C */ lui $at, %hi(bss_802BFEFC)
/* 31E408 802BD698 E424FEFC */ swc1 $f4, %lo(bss_802BFEFC)($at)
/* 31E40C 802BD69C 0C00A82D */ jal sin_cos_rad
/* 31E410 802BD6A0 46026303 */ div.s $f12, $f12, $f2
/* 31E414 802BD6A4 C7A00024 */ lwc1 $f0, 0x24($sp)
@ -231,8 +231,8 @@ glabel func_802BD414_31E184
/* 31E4A8 802BD738 E426FDB8 */ swc1 $f6, %lo(D_802BFDB8_320B28)($at)
.L802BD73C:
/* 31E4AC 802BD73C 27A50028 */ addiu $a1, $sp, 0x28
/* 31E4B0 802BD740 3C01802C */ lui $at, %hi(D_802BFEFC)
/* 31E4B4 802BD744 C424FEFC */ lwc1 $f4, %lo(D_802BFEFC)($at)
/* 31E4B0 802BD740 3C01802C */ lui $at, %hi(bss_802BFEFC)
/* 31E4B4 802BD744 C424FEFC */ lwc1 $f4, %lo(bss_802BFEFC)($at)
/* 31E4B8 802BD748 3C0140C9 */ lui $at, 0x40c9
/* 31E4BC 802BD74C 34210FD0 */ ori $at, $at, 0xfd0
/* 31E4C0 802BD750 44816000 */ mtc1 $at, $f12
@ -322,15 +322,15 @@ glabel func_802BD414_31E184
/* 31E60C 802BD89C 24030004 */ addiu $v1, $zero, 4
/* 31E610 802BD8A0 14430007 */ bne $v0, $v1, .L802BD8C0
/* 31E614 802BD8A4 00000000 */ nop
/* 31E618 802BD8A8 3C03802C */ lui $v1, %hi(D_802BFEF0)
/* 31E61C 802BD8AC 2463FEF0 */ addiu $v1, $v1, %lo(D_802BFEF0)
/* 31E618 802BD8A8 3C03802C */ lui $v1, %hi(bss_802BFEF0)
/* 31E61C 802BD8AC 2463FEF0 */ addiu $v1, $v1, %lo(bss_802BFEF0)
/* 31E620 802BD8B0 8C620000 */ lw $v0, ($v1)
/* 31E624 802BD8B4 24420001 */ addiu $v0, $v0, 1
/* 31E628 802BD8B8 080AF632 */ j .L802BD8C8
/* 31E62C 802BD8BC AC620000 */ sw $v0, ($v1)
.L802BD8C0:
/* 31E630 802BD8C0 3C01802C */ lui $at, %hi(D_802BFEF0)
/* 31E634 802BD8C4 AC20FEF0 */ sw $zero, %lo(D_802BFEF0)($at)
/* 31E630 802BD8C0 3C01802C */ lui $at, %hi(bss_802BFEF0)
/* 31E634 802BD8C4 AC20FEF0 */ sw $zero, %lo(bss_802BFEF0)($at)
.L802BD8C8:
/* 31E638 802BD8C8 C7A40030 */ lwc1 $f4, 0x30($sp)
/* 31E63C 802BD8CC C6060038 */ lwc1 $f6, 0x38($s0)
@ -485,8 +485,8 @@ glabel func_802BD414_31E184
/* 31E884 802BDB14 E6060038 */ swc1 $f6, 0x38($s0)
/* 31E888 802BDB18 E6040040 */ swc1 $f4, 0x40($s0)
.L802BDB1C:
/* 31E88C 802BDB1C 3C11802C */ lui $s1, %hi(D_802BFEE4)
/* 31E890 802BDB20 2631FEE4 */ addiu $s1, $s1, %lo(D_802BFEE4)
/* 31E88C 802BDB1C 3C11802C */ lui $s1, %hi(bss_802BFEE4)
/* 31E890 802BDB20 2631FEE4 */ addiu $s1, $s1, %lo(bss_802BFEE4)
/* 31E894 802BDB24 8E220000 */ lw $v0, ($s1)
/* 31E898 802BDB28 1440002C */ bnez $v0, .L802BDBDC
/* 31E89C 802BDB2C 00000000 */ nop
@ -524,8 +524,8 @@ glabel func_802BD414_31E184
/* 31E91C 802BDBAC E6000018 */ swc1 $f0, 0x18($s0)
/* 31E920 802BDBB0 E6020064 */ swc1 $f2, 0x64($s0)
/* 31E924 802BDBB4 8EA2000C */ lw $v0, 0xc($s5)
/* 31E928 802BDBB8 3C01802C */ lui $at, %hi(D_802BFEE8)
/* 31E92C 802BDBBC AC20FEE8 */ sw $zero, %lo(D_802BFEE8)($at)
/* 31E928 802BDBB8 3C01802C */ lui $at, %hi(bss_802BFEE8)
/* 31E92C 802BDBBC AC20FEE8 */ sw $zero, %lo(bss_802BFEE8)($at)
/* 31E930 802BDBC0 30420004 */ andi $v0, $v0, 4
/* 31E934 802BDBC4 104001A1 */ beqz $v0, .L802BE24C
/* 31E938 802BDBC8 24020001 */ addiu $v0, $zero, 1
@ -534,8 +534,8 @@ glabel func_802BD414_31E184
/* 31E944 802BDBD4 AE220000 */ sw $v0, ($s1)
/* 31E948 802BDBD8 E6000018 */ swc1 $f0, 0x18($s0)
.L802BDBDC:
/* 31E94C 802BDBDC 3C04802C */ lui $a0, %hi(D_802BFEE4)
/* 31E950 802BDBE0 2484FEE4 */ addiu $a0, $a0, %lo(D_802BFEE4)
/* 31E94C 802BDBDC 3C04802C */ lui $a0, %hi(bss_802BFEE4)
/* 31E950 802BDBE0 2484FEE4 */ addiu $a0, $a0, %lo(bss_802BFEE4)
/* 31E954 802BDBE4 8C830000 */ lw $v1, ($a0)
/* 31E958 802BDBE8 24020001 */ addiu $v0, $zero, 1
/* 31E95C 802BDBEC 1462000A */ bne $v1, $v0, .L802BDC18
@ -544,19 +544,19 @@ glabel func_802BD414_31E184
/* 31E968 802BDBF8 30420004 */ andi $v0, $v0, 4
/* 31E96C 802BDBFC 10400006 */ beqz $v0, .L802BDC18
/* 31E970 802BDC00 00000000 */ nop
/* 31E974 802BDC04 3C02802C */ lui $v0, %hi(D_802BFEE8)
/* 31E978 802BDC08 8C42FEE8 */ lw $v0, %lo(D_802BFEE8)($v0)
/* 31E974 802BDC04 3C02802C */ lui $v0, %hi(bss_802BFEE8)
/* 31E978 802BDC08 8C42FEE8 */ lw $v0, %lo(bss_802BFEE8)($v0)
/* 31E97C 802BDC0C 14400002 */ bnez $v0, .L802BDC18
/* 31E980 802BDC10 24020002 */ addiu $v0, $zero, 2
/* 31E984 802BDC14 AC820000 */ sw $v0, ($a0)
.L802BDC18:
/* 31E988 802BDC18 3C03802C */ lui $v1, %hi(D_802BFEE8)
/* 31E98C 802BDC1C 2463FEE8 */ addiu $v1, $v1, %lo(D_802BFEE8)
/* 31E988 802BDC18 3C03802C */ lui $v1, %hi(bss_802BFEE8)
/* 31E98C 802BDC1C 2463FEE8 */ addiu $v1, $v1, %lo(bss_802BFEE8)
/* 31E990 802BDC20 8C620000 */ lw $v0, ($v1)
/* 31E994 802BDC24 24420001 */ addiu $v0, $v0, 1
/* 31E998 802BDC28 AC620000 */ sw $v0, ($v1)
/* 31E99C 802BDC2C 3C03802C */ lui $v1, %hi(D_802BFEE4)
/* 31E9A0 802BDC30 8C63FEE4 */ lw $v1, %lo(D_802BFEE4)($v1)
/* 31E99C 802BDC2C 3C03802C */ lui $v1, %hi(bss_802BFEE4)
/* 31E9A0 802BDC30 8C63FEE4 */ lw $v1, %lo(bss_802BFEE4)($v1)
/* 31E9A4 802BDC34 24020002 */ addiu $v0, $zero, 2
/* 31E9A8 802BDC38 146200B1 */ bne $v1, $v0, .L802BDF00
/* 31E9AC 802BDC3C 27A50030 */ addiu $a1, $sp, 0x30
@ -635,8 +635,8 @@ glabel func_802BD414_31E184
/* 31EACC 802BDD5C E6020064 */ swc1 $f2, 0x64($s0)
.L802BDD60:
/* 31EAD0 802BDD60 3C022AAA */ lui $v0, 0x2aaa
/* 31EAD4 802BDD64 3C11802C */ lui $s1, %hi(D_802BFEE8)
/* 31EAD8 802BDD68 2631FEE8 */ addiu $s1, $s1, %lo(D_802BFEE8)
/* 31EAD4 802BDD64 3C11802C */ lui $s1, %hi(bss_802BFEE8)
/* 31EAD8 802BDD68 2631FEE8 */ addiu $s1, $s1, %lo(bss_802BFEE8)
/* 31EADC 802BDD6C 8E240000 */ lw $a0, ($s1)
/* 31EAE0 802BDD70 3442AAAB */ ori $v0, $v0, 0xaaab
/* 31EAE4 802BDD74 00820018 */ mult $a0, $v0
@ -680,8 +680,8 @@ glabel func_802BD414_31E184
/* 31EB78 802BDE08 3442000A */ ori $v0, $v0, 0xa
/* 31EB7C 802BDE0C AE020028 */ sw $v0, 0x28($s0)
.L802BDE10:
/* 31EB80 802BDE10 3C03802C */ lui $v1, %hi(D_802BFEF4)
/* 31EB84 802BDE14 2463FEF4 */ addiu $v1, $v1, %lo(D_802BFEF4)
/* 31EB80 802BDE10 3C03802C */ lui $v1, %hi(bss_802BFEF4)
/* 31EB84 802BDE14 2463FEF4 */ addiu $v1, $v1, %lo(bss_802BFEF4)
/* 31EB88 802BDE18 8C620000 */ lw $v0, ($v1)
/* 31EB8C 802BDE1C 14400023 */ bnez $v0, .L802BDEAC
/* 31EB90 802BDE20 00000000 */ nop
@ -720,8 +720,8 @@ glabel func_802BD414_31E184
/* 31EC14 802BDEA4 0C00F589 */ jal func_8003D624
/* 31EC18 802BDEA8 AFA00018 */ sw $zero, 0x18($sp)
.L802BDEAC:
/* 31EC1C 802BDEAC 3C03802C */ lui $v1, %hi(D_802BFEE8)
/* 31EC20 802BDEB0 8C63FEE8 */ lw $v1, %lo(D_802BFEE8)($v1)
/* 31EC1C 802BDEAC 3C03802C */ lui $v1, %hi(bss_802BFEE8)
/* 31EC20 802BDEB0 8C63FEE8 */ lw $v1, %lo(bss_802BFEE8)($v1)
/* 31EC24 802BDEB4 2862000A */ slti $v0, $v1, 0xa
/* 31EC28 802BDEB8 14400011 */ bnez $v0, .L802BDF00
/* 31EC2C 802BDEBC 00000000 */ nop
@ -740,8 +740,8 @@ glabel func_802BD414_31E184
/* 31EC5C 802BDEEC 0C052742 */ jal sfx_play_sound_at_npc
/* 31EC60 802BDEF0 AE020028 */ sw $v0, 0x28($s0)
/* 31EC64 802BDEF4 24020003 */ addiu $v0, $zero, 3
/* 31EC68 802BDEF8 3C01802C */ lui $at, %hi(D_802BFEE4)
/* 31EC6C 802BDEFC AC22FEE4 */ sw $v0, %lo(D_802BFEE4)($at)
/* 31EC68 802BDEF8 3C01802C */ lui $at, %hi(bss_802BFEE4)
/* 31EC6C 802BDEFC AC22FEE4 */ sw $v0, %lo(bss_802BFEE4)($at)
.L802BDF00:
/* 31EC70 802BDF00 860200A8 */ lh $v0, 0xa8($s0)
/* 31EC74 802BDF04 C6020038 */ lwc1 $f2, 0x38($s0)
@ -794,8 +794,8 @@ glabel func_802BD414_31E184
/* 31ED30 802BDFC0 C7A00034 */ lwc1 $f0, 0x34($sp)
/* 31ED34 802BDFC4 C7A2003C */ lwc1 $f2, 0x3c($sp)
/* 31ED38 802BDFC8 46003001 */ sub.s $f0, $f6, $f0
/* 31ED3C 802BDFCC 3C04802C */ lui $a0, %hi(D_802BFEE8)
/* 31ED40 802BDFD0 8C84FEE8 */ lw $a0, %lo(D_802BFEE8)($a0)
/* 31ED3C 802BDFCC 3C04802C */ lui $a0, %hi(bss_802BFEE8)
/* 31ED40 802BDFD0 8C84FEE8 */ lw $a0, %lo(bss_802BFEE8)($a0)
/* 31ED44 802BDFD4 868200B0 */ lh $v0, 0xb0($s4)
/* 31ED48 802BDFD8 46020000 */ add.s $f0, $f0, $f2
/* 31ED4C 802BDFDC 44821000 */ mtc1 $v0, $f2
@ -841,8 +841,8 @@ glabel func_802BD414_31E184
/* 31EDEC 802BE07C 080AF893 */ j .L802BE24C
/* 31EDF0 802BE080 00000000 */ nop
.L802BE084:
/* 31EDF4 802BE084 3C12802C */ lui $s2, %hi(D_802BFEE4)
/* 31EDF8 802BE088 2652FEE4 */ addiu $s2, $s2, %lo(D_802BFEE4)
/* 31EDF4 802BE084 3C12802C */ lui $s2, %hi(bss_802BFEE4)
/* 31EDF8 802BE088 2652FEE4 */ addiu $s2, $s2, %lo(bss_802BFEE4)
/* 31EDFC 802BE08C 8E430000 */ lw $v1, ($s2)
/* 31EE00 802BE090 1462006E */ bne $v1, $v0, .L802BE24C
/* 31EE04 802BE094 00000000 */ nop
@ -868,8 +868,8 @@ glabel func_802BD414_31E184
/* 31EE54 802BE0E4 E4600000 */ swc1 $f0, ($v1)
.L802BE0E8:
/* 31EE58 802BE0E8 3C0238E3 */ lui $v0, 0x38e3
/* 31EE5C 802BE0EC 3C04802C */ lui $a0, %hi(D_802BFEE8)
/* 31EE60 802BE0F0 8C84FEE8 */ lw $a0, %lo(D_802BFEE8)($a0)
/* 31EE5C 802BE0EC 3C04802C */ lui $a0, %hi(bss_802BFEE8)
/* 31EE60 802BE0F0 8C84FEE8 */ lw $a0, %lo(bss_802BFEE8)($a0)
/* 31EE64 802BE0F4 34428E39 */ ori $v0, $v0, 0x8e39
/* 31EE68 802BE0F8 00820018 */ mult $a0, $v0
/* 31EE6C 802BE0FC C6020064 */ lwc1 $f2, 0x64($s0)
@ -919,8 +919,8 @@ glabel func_802BD414_31E184
/* 31EF18 802BE1A8 00000000 */ nop
/* 31EF1C 802BE1AC 45000027 */ bc1f .L802BE24C
/* 31EF20 802BE1B0 00000000 */ nop
/* 31EF24 802BE1B4 3C03802C */ lui $v1, %hi(D_802BFEF4)
/* 31EF28 802BE1B8 2463FEF4 */ addiu $v1, $v1, %lo(D_802BFEF4)
/* 31EF24 802BE1B4 3C03802C */ lui $v1, %hi(bss_802BFEF4)
/* 31EF28 802BE1B8 2463FEF4 */ addiu $v1, $v1, %lo(bss_802BFEF4)
/* 31EF2C 802BE1BC 8C620000 */ lw $v0, ($v1)
/* 31EF30 802BE1C0 10400012 */ beqz $v0, .L802BE20C
/* 31EF34 802BE1C4 3C040001 */ lui $a0, 1

48
ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
View File

@ -36,8 +36,8 @@ glabel func_802BE3A4_31F114
/* 31F168 802BE3F8 3C04FFBF */ lui $a0, 0xffbf
/* 31F16C 802BE3FC 0C0AFE48 */ jal func_802BF920_320690
/* 31F170 802BE400 0220202D */ daddu $a0, $s1, $zero
/* 31F174 802BE404 3C01802C */ lui $at, %hi(D_802BFEFC)
/* 31F178 802BE408 AC20FEFC */ sw $zero, %lo(D_802BFEFC)($at)
/* 31F174 802BE404 3C01802C */ lui $at, %hi(bss_802BFEFC)
/* 31F178 802BE408 AC20FEFC */ sw $zero, %lo(bss_802BFEFC)($at)
/* 31F17C 802BE40C 3C01802C */ lui $at, %hi(D_802BFEF8)
/* 31F180 802BE410 AC20FEF8 */ sw $zero, %lo(D_802BFEF8)($at)
/* 31F184 802BE414 3C01802C */ lui $at, %hi(D_802BFF00)
@ -132,10 +132,10 @@ glabel func_802BE3A4_31F114
/* 31F2D4 802BE564 A040007D */ sb $zero, 0x7d($v0)
/* 31F2D8 802BE568 24020007 */ addiu $v0, $zero, 7
/* 31F2DC 802BE56C A2820003 */ sb $v0, 3($s4)
/* 31F2E0 802BE570 3C01802C */ lui $at, %hi(D_802BFEE4)
/* 31F2E4 802BE574 AC20FEE4 */ sw $zero, %lo(D_802BFEE4)($at)
/* 31F2E8 802BE578 3C01802C */ lui $at, %hi(D_802BFEE8)
/* 31F2EC 802BE57C AC20FEE8 */ sw $zero, %lo(D_802BFEE8)($at)
/* 31F2E0 802BE570 3C01802C */ lui $at, %hi(bss_802BFEE4)
/* 31F2E4 802BE574 AC20FEE4 */ sw $zero, %lo(bss_802BFEE4)($at)
/* 31F2E8 802BE578 3C01802C */ lui $at, %hi(bss_802BFEE8)
/* 31F2EC 802BE57C AC20FEE8 */ sw $zero, %lo(bss_802BFEE8)($at)
/* 31F2F0 802BE580 AEA00078 */ sw $zero, 0x78($s5)
/* 31F2F4 802BE584 080AFD3C */ j .L802BF4F0_320260
/* 31F2F8 802BE588 AEB00070 */ sw $s0, 0x70($s5)
@ -495,10 +495,10 @@ glabel func_802BE3A4_31F114
/* 31F860 802BEAF0 A060007D */ sb $zero, 0x7d($v1)
/* 31F864 802BEAF4 A2820003 */ sb $v0, 3($s4)
/* 31F868 802BEAF8 24020001 */ addiu $v0, $zero, 1
/* 31F86C 802BEAFC 3C01802C */ lui $at, %hi(D_802BFEE4)
/* 31F870 802BEB00 AC20FEE4 */ sw $zero, %lo(D_802BFEE4)($at)
/* 31F874 802BEB04 3C01802C */ lui $at, %hi(D_802BFEE8)
/* 31F878 802BEB08 AC20FEE8 */ sw $zero, %lo(D_802BFEE8)($at)
/* 31F86C 802BEAFC 3C01802C */ lui $at, %hi(bss_802BFEE4)
/* 31F870 802BEB00 AC20FEE4 */ sw $zero, %lo(bss_802BFEE4)($at)
/* 31F874 802BEB04 3C01802C */ lui $at, %hi(bss_802BFEE8)
/* 31F878 802BEB08 AC20FEE8 */ sw $zero, %lo(bss_802BFEE8)($at)
/* 31F87C 802BEB0C AEA00078 */ sw $zero, 0x78($s5)
/* 31F880 802BEB10 080AFD3C */ j .L802BF4F0_320260
/* 31F884 802BEB14 AEA20070 */ sw $v0, 0x70($s5)
@ -509,8 +509,8 @@ glabel func_802BE3A4_31F114
/* 31F894 802BEB24 00431025 */ or $v0, $v0, $v1
/* 31F898 802BEB28 0C0AF505 */ jal func_802BD414_31E184
/* 31F89C 802BEB2C AE420004 */ sw $v0, 4($s2)
/* 31F8A0 802BEB30 3C10802C */ lui $s0, %hi(D_802BFEE4)
/* 31F8A4 802BEB34 2610FEE4 */ addiu $s0, $s0, %lo(D_802BFEE4)
/* 31F8A0 802BEB30 3C10802C */ lui $s0, %hi(bss_802BFEE4)
/* 31F8A4 802BEB34 2610FEE4 */ addiu $s0, $s0, %lo(bss_802BFEE4)
/* 31F8A8 802BEB38 8E020000 */ lw $v0, ($s0)
/* 31F8AC 802BEB3C 14400052 */ bnez $v0, .L802BEC88
/* 31F8B0 802BEB40 00000000 */ nop
@ -611,8 +611,8 @@ glabel func_802BE3A4_31F114
/* 31FA14 802BECA4 0C0AF440 */ jal func_802BD100_31DE70
/* 31FA18 802BECA8 00000000 */ nop
.L802BECAC:
/* 31FA1C 802BECAC 3C06802C */ lui $a2, %hi(D_802BFEE4)
/* 31FA20 802BECB0 8CC6FEE4 */ lw $a2, %lo(D_802BFEE4)($a2)
/* 31FA1C 802BECAC 3C06802C */ lui $a2, %hi(bss_802BFEE4)
/* 31FA20 802BECB0 8CC6FEE4 */ lw $a2, %lo(bss_802BFEE4)($a2)
/* 31FA24 802BECB4 24020001 */ addiu $v0, $zero, 1
/* 31FA28 802BECB8 14C20028 */ bne $a2, $v0, .L802BED5C
/* 31FA2C 802BECBC 00000000 */ nop
@ -722,14 +722,14 @@ glabel func_802BE3A4_31F114
/* 31FBB8 802BEE48 30424004 */ andi $v0, $v0, 0x4004
/* 31FBBC 802BEE4C 14400006 */ bnez $v0, .L802BEE68
/* 31FBC0 802BEE50 E4600068 */ swc1 $f0, 0x68($v1)
/* 31FBC4 802BEE54 3C02802C */ lui $v0, %hi(D_802BFEF0)
/* 31FBC8 802BEE58 8C42FEF0 */ lw $v0, %lo(D_802BFEF0)($v0)
/* 31FBC4 802BEE54 3C02802C */ lui $v0, %hi(bss_802BFEF0)
/* 31FBC8 802BEE58 8C42FEF0 */ lw $v0, %lo(bss_802BFEF0)($v0)
/* 31FBCC 802BEE5C 2842001E */ slti $v0, $v0, 0x1e
/* 31FBD0 802BEE60 144001A4 */ bnez $v0, .L802BF4F4
/* 31FBD4 802BEE64 0000102D */ daddu $v0, $zero, $zero
.L802BEE68:
/* 31FBD8 802BEE68 3C02802C */ lui $v0, %hi(D_802BFEF4)
/* 31FBDC 802BEE6C 8C42FEF4 */ lw $v0, %lo(D_802BFEF4)($v0)
/* 31FBD8 802BEE68 3C02802C */ lui $v0, %hi(bss_802BFEF4)
/* 31FBDC 802BEE6C 8C42FEF4 */ lw $v0, %lo(bss_802BFEF4)($v0)
/* 31FBE0 802BEE70 144001A0 */ bnez $v0, .L802BF4F4
/* 31FBE4 802BEE74 0000102D */ daddu $v0, $zero, $zero
/* 31FBE8 802BEE78 862200A8 */ lh $v0, 0xa8($s1)
@ -783,13 +783,13 @@ glabel func_802BE3A4_31F114
/* 31FCA4 802BEF34 10430011 */ beq $v0, $v1, .L802BEF7C
/* 31FCA8 802BEF38 AFA20040 */ sw $v0, 0x40($sp)
.L802BEF3C:
/* 31FCAC 802BEF3C 3C03802C */ lui $v1, %hi(D_802BFEE4)
/* 31FCB0 802BEF40 8C63FEE4 */ lw $v1, %lo(D_802BFEE4)($v1)
/* 31FCAC 802BEF3C 3C03802C */ lui $v1, %hi(bss_802BFEE4)
/* 31FCB0 802BEF40 8C63FEE4 */ lw $v1, %lo(bss_802BFEE4)($v1)
/* 31FCB4 802BEF44 24020002 */ addiu $v0, $zero, 2
/* 31FCB8 802BEF48 1462016A */ bne $v1, $v0, .L802BF4F4
/* 31FCBC 802BEF4C 0000102D */ daddu $v0, $zero, $zero
/* 31FCC0 802BEF50 3C03802C */ lui $v1, %hi(D_802BFEE8)
/* 31FCC4 802BEF54 8C63FEE8 */ lw $v1, %lo(D_802BFEE8)($v1)
/* 31FCC0 802BEF50 3C03802C */ lui $v1, %hi(bss_802BFEE8)
/* 31FCC4 802BEF54 8C63FEE8 */ lw $v1, %lo(bss_802BFEE8)($v1)
/* 31FCC8 802BEF58 24020001 */ addiu $v0, $zero, 1
/* 31FCCC 802BEF5C 14620165 */ bne $v1, $v0, .L802BF4F4
/* 31FCD0 802BEF60 0000102D */ daddu $v0, $zero, $zero
@ -811,8 +811,8 @@ glabel func_802BE3A4_31F114
/* 31FD0C 802BEF9C 4481A000 */ mtc1 $at, $f20
/* 31FD10 802BEFA0 C6220040 */ lwc1 $f2, 0x40($s1)
/* 31FD14 802BEFA4 0280282D */ daddu $a1, $s4, $zero
/* 31FD18 802BEFA8 3C01802C */ lui $at, %hi(D_802BFEF0)
/* 31FD1C 802BEFAC AC20FEF0 */ sw $zero, %lo(D_802BFEF0)($at)
/* 31FD18 802BEFA8 3C01802C */ lui $at, %hi(bss_802BFEF0)
/* 31FD1C 802BEFAC AC20FEF0 */ sw $zero, %lo(bss_802BFEF0)($at)
/* 31FD20 802BEFB0 46140000 */ add.s $f0, $f0, $f20
/* 31FD24 802BEFB4 E7A40020 */ swc1 $f4, 0x20($sp)
/* 31FD28 802BEFB8 E7A20028 */ swc1 $f2, 0x28($sp)

66
ver/us/splat.yaml
View File

@ -779,7 +779,7 @@ segments:
- [0x105F90, c, entity/HeartBlock]
- [0x106EF0, c, entity/SuperBlock]
- [0x107830, c, entity/SimpleSpring]
- [0x1086a0, c, entity/Chest]
- [0x1086A0, c, entity/Chest]
- [0x109660, c, entity/WoodenCrate]
- [0x10A230, c, entity/BlueWarpPipe]
- [0x10A8D0, c, entity/Signpost]
@ -2075,12 +2075,12 @@ segments:
start: 0x3169F0
vram: 0x80200000
subsegments:
- [0x3169f0, c, 3169f0]
- [0x3169F0, c, 3169f0]
- type: code
start: 0x316a70
start: 0x316A70
vram: 0x80200080
subsegments:
- [0x316a70, c, 316a70]
- [0x316A70, c, 316a70]
- type: code
start: 0x316C00
vram: 0x802AE000
@ -2092,12 +2092,12 @@ segments:
vram: 0x802AE000
overlay: True
subsegments:
- [0x316d90, c, 316d90]
- [0x316D90, c, 316d90]
- type: code
start: 0x316f30
start: 0x316F30
vram: 0x802B2000
subsegments:
- [0x316f30, c, 316f30]
- [0x316F30, c, 316f30]
- type: code
dir: world/partner
name: world_partner_goombario
@ -2111,12 +2111,12 @@ segments:
- type: code
dir: world/partner
name: world_partner_bombette
start: 0x317e50
start: 0x317E50
vram: 0x802BD100
overlay: True
subsegments:
- [0x317e50, c, bombette]
- [0x3195d0]
- [0x317E50, c, bombette]
- [0x3195D0]
- type: code
dir: world/partner
name: world_partner_parakarry
@ -2125,46 +2125,47 @@ segments:
overlay: True
subsegments:
- [0x319670, c, parakarry]
- [0x31b000, data]
- [0x31B000, data]
- [0x31B080]
- type: code
dir: world/partner
name: world_partner_kooper
start: 0x31b120
start: 0x31B120
vram: 0x802BD100
overlay: True
subsegments:
- [0x31b120, c, kooper]
- [0x31cb60, data]
- [0x31B120, c, kooper]
- [0x31CB60, data]
- [0x31CBE0]
- type: code
dir: world/partner
name: world_partner_watt
start: 0x31cc70
start: 0x31CC70
vram: 0x802BD100
overlay: True
subsegments:
- [0x31cc70, c, watt]
- [0x31ddc0, data]
- [0x31CC70, c, watt]
- [0x31DDC0, data]
- type: code
dir: world/partner
name: world_partner_sushie
start: 0x31de70
start: 0x31DE70
vram: 0x802BD100
overlay: True
subsegments:
- [0x31de70, c, sushie]
- [0x320b20, data]
- [0x31DE70, c, sushie]
- [0x320B20, data]
- [0x320BC0]
- type: code
dir: world/partner
name: world_partner_lakilester
start: 0x320c50
start: 0x320C50
vram: 0x802BD100
overlay: True
subsegments:
- [0x320c50, c, lakilester]
- [0x3239b0, data]
- [0x320C50, c, lakilester]
- [0x3239B0, .data, lakilester]
- [0x323A40]
- type: code
dir: world/partner
name: world_partner_bow
@ -2178,21 +2179,21 @@ segments:
- type: code
dir: world/partner
name: world_partner_goompa
start: 0x324a10
start: 0x324A10
vram: 0x802BD100
overlay: True
subsegments:
- [0x324a10, c, goompa]
- [0x324e80, .data, goompa]
- [0x324A10, c, goompa]
- [0x324E80, .data, goompa]
- [0x324F00]
- type: code
dir: world/partner
name: world_partner_goombaria
start: 0x324f10
start: 0x324F10
vram: 0x802BD100
overlay: True
subsegments:
- [0x324f10, c, goombaria]
- [0x324F10, c, goombaria]
- [0x325000, .data, goombaria]
- type: code
dir: world/partner
@ -2204,14 +2205,14 @@ segments:
- [0x325070, c, twink]
- [0x325160, .data, twink]
- type: code
start: 0x3251d0
start: 0x3251D0
vram: 0x802BD100
overlay: True
subsegments:
- [0x3251d0, c]
- [0x3251D0, c]
- [0x3255E0, data]
- type: code
start: 0x325ad0
start: 0x325AD0
vram: 0xE0200000
subsegments:
- [0x325AD0, c]
@ -4174,6 +4175,7 @@ segments:
- [0x6BBB90, c]
- [0x6BBC60, c]
- [0x6BD250, data]
- [0x6CBF90]
- dir: battle/area_kpa4
type: code
start: 0x6CC070
@ -10963,7 +10965,7 @@ segments:
start: 0xE20EB0
vram: 0x802B7000
subsegments:
- [0xe20eb0, c, e20eb0]
- [0xE20EB0, c, e20eb0]
- [0xE215C0, data]
- [0xE21860]
- type: code

6
ver/us/symbol_addrs.txt
View File

@ -6317,7 +6317,7 @@ b_area_jan_UnkBattleFunc1 = 0x80218310; // type:func rom:0x573C30
b_area_jan_MediGuySpriteRotationFunc = 0x802183DC; // type:func rom:0x573CFC
dup_b_area_jan_UnkBattleFunc1 = 0x802184F0; // type:func rom:0x573E10
dup_b_area_jan2_UnkBattleFunc1 = 0x80218000; // type:func rom:0x584940
func_802180CC_584A0C = 0x802180CC; // type:func rom:0x584A0C
b_area_jan2_UnkEffect6FFunc = 0x802180CC; // type:func rom:0x584A0C
b_area_jan2_ShrinkActor = 0x80218250; // type:func rom:0x584B90
b_area_jan2_GetSelectedMoveID = 0x802183A8; // type:func rom:0x584CE8
b_area_jan2_UnkBattleFunc1 = 0x802183D4; // type:func rom:0x584D14
@ -6327,7 +6327,7 @@ b_area_jan2_GetBootsHammerLevel = 0x802185BC; // type:func rom:0x584EFC
b_area_jan2_UnkBattleFunc5 = 0x8021861C; // type:func rom:0x584F5C
b_area_kzn_UnkSfxFunc = 0x80218000; // type:func rom:0x58C2F0
b_area_kzn_UnkBattleFunc1 = 0x80218130; // type:func rom:0x58C420
func_802181FC_58C4EC = 0x802181FC; // type:func rom:0x58C4EC
b_area_kzn_UnkEffect6FFunc = 0x802181FC; // type:func rom:0x58C4EC
dup_b_area_kzn_UnkBattleFunc1 = 0x80218380; // type:func rom:0x58C670
dup2_b_area_kzn_UnkBattleFunc1 = 0x80218450; // type:func rom:0x58C740
func_8021851C_58C80C = 0x8021851C; // type:func rom:0x58C80C
@ -6525,7 +6525,7 @@ b_area_sam_SetBackgroundAlpha = 0x80219480; // type:func rom:0x625020
func_802194B8_625058 = 0x802194B8; // type:func rom:0x625058
func_80219524_6250C4 = 0x80219524; // type:func rom:0x6250C4
dup_b_area_sam_UnkBattleFunc1 = 0x802195F0; // type:func rom:0x625190
func_802196BC_62525C = 0x802196BC; // type:func rom:0x62525C
b_area_sam_UnkEffect6FFunc = 0x802196BC; // type:func rom:0x62525C
b_area_sam_ShrinkActor = 0x80219840; // type:func rom:0x6253E0
b_area_sam_GetSelectedMoveID = 0x80219998; // type:func rom:0x625538
dup2_b_area_sam_UnkBattleFunc1 = 0x802199C4; // type:func rom:0x625564

10
ver/us/undefined_syms.txt
View File

@ -1161,6 +1161,15 @@ D_802BEC6C = 0x802BEC6C;
D_802BEC70 = 0x802BEC70;
D_802BEC74 = 0x802BEC74;
D_802BEC78 = 0x802BEC78;
D_802BFEEC = 0x802BFEEC;
D_802BFEE0 = 0x802BFEE0;
D_802BFEF0 = 0x802BFEF0;
bss_802BFEE4 = 0x802BFEE4;
bss_802BFEE8 = 0x802BFEE8;
bss_802BFEF0 = 0x802BFEF0;
bss_802BFEF4 = 0x802BFEF4;
bss_802BFEFC = 0x802BFEFC;
D_802BFEF8 = 0x802BFEF8;
D_802BFF00 = 0x802BFF00;
D_802BFF04 = 0x802BFF04;
D_802BFF08 = 0x802BFF08;
@ -1172,6 +1181,7 @@ D_802BFF1C = 0x802BFF1C;
D_802BFF20 = 0x802BFF20;
D_802BFF24 = 0x802BFF24;
D_802BFF28 = 0x802BFF28;
D_802BFF30 = 0x802BFF30;
D_802C0000 = 0x802C0000;
D_802C05CC = 0x802C05CC;
D_802BEBC0_31CBE0 = 0x802BEBC0;