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

Decompile misc battle map funcs (#528)

Browse Source 
* .

* .

* resolve issues

* Update fx_api.c

* Update fx_api.c
This commit is contained in:
Alexander Faßbender 2021-11-14 21:23:07 +01:00 committed by GitHub
parent 75e2c18977
commit e9f80f2856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 196 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/effects.h
View File

@ -149,6 +149,13 @@ typedef struct EffectTableEntry {
/* 0x14 */ void* graphicsDmaEnd; /* 0x14 */ void* graphicsDmaEnd;
} EffectTableEntry; // size = 0x18 } EffectTableEntry; // size = 0x18
typedef struct EffectWhirlwind {
/* 0x00 */ char unk_00[40];
/* 0x28 */ f32 unk_28;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ f32 unk_30;
} EffectWhirlwind;
EffectInstance* create_effect_instance(EffectBlueprint* effectBp); EffectInstance* create_effect_instance(EffectBlueprint* effectBp);
void remove_effect(EffectInstance*); void remove_effect(EffectInstance*);
s32 load_effect(s32 effectIndex); s32 load_effect(s32 effectIndex);
@ -223,7 +230,7 @@ EffectInstance* playFX_42(s32, s32, s32, f32, s32, s32);
EffectInstance* playFX_43(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_43(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_44(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_44(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_45(s32, s32); EffectInstance* playFX_45(s32, s32);
EffectInstance* playFX_46_whirlwind(s32, s32, f32, s32); EffectInstance* playFX_46_whirlwind(s32, EffectWhirlwind*, f32, s32);
EffectInstance* playFX_47(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_47(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_48(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_48(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_49(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_49(s32, f32, f32, f32, f32, s32);

2
include/functions.h
View File

@ -352,6 +352,8 @@ void sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32
void sfx_play_sound_at_player(s32 soundID, s32 arg0); void sfx_play_sound_at_player(s32 soundID, s32 arg0);
void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID); void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID);
s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume); s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
void bgm_set_battle_song(s32, s32);
void bgm_push_battle_song(void);
void func_801497FC(s32 arg0); void func_801497FC(s32 arg0);
s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2); s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2);

15
src/battle/area_trd_part_1/4A10A0.c
View File

@ -2,6 +2,19 @@
#define NAMESPACE b_area_trd_part_1 #define NAMESPACE b_area_trd_part_1
INCLUDE_ASM(s32, "battle/area_trd_part_1/4A10A0", func_80218000_4A10A0); typedef struct AreaTrdPart1Struct {
/* 0x00 */ char unk_00[12];
/* 0x0C */ s32 unk_0C;
/* 0x10 */ s32 unk_10;
} AreaTrdPart1Struct;
extern AreaTrdPart1Struct D_8021A4E8_4A3588;
ApiStatus func_80218000_4A10A0(Evt* script, s32 isInitialCall) {
D_8021A4E8_4A3588.unk_0C = 1;
D_8021A4E8_4A3588.unk_10 = script->owner1.actorID;
return ApiStatus_DONE2;
}
#include "common/UnkBattleFunc1.inc.c" #include "common/UnkBattleFunc1.inc.c"

22
src/battle/area_trd_part_2/4B11F0.c
View File

@ -6,10 +6,24 @@
#include "common/StartRumbleWithParams.inc.c" #include "common/StartRumbleWithParams.inc.c"
#define NAMESPACE b_area_trd_part_2 #define NAMESPACE b_area_trd_part_2
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B11F0", func_80218058_4B1248); #define NAMESPACE dup2_b_area_trd_part_2
#include "world/common/UnkFunc27.inc.c"
#define NAMESPACE b_area_trd_part_2
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B11F0", func_8021817C_4B136C); #define NAMESPACE dup2_b_area_trd_part_2
#include "world/common/UnkFunc26.inc.c"
#define NAMESPACE b_area_trd_part_2
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B11F0", func_80218350_4B1540); ApiStatus func_80218350_4B1540(Evt* script, s32 isInitialCall) {
bgm_set_battle_song(8, 0);
bgm_push_battle_song();
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B11F0", func_8021837C_4B156C); ApiStatus func_8021837C_4B156C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Actor* actor = get_actor(evt_get_variable(script, *args++));
play_movement_dust_effects(2, actor->state.goalPos.x - 15.0f, actor->state.goalPos.y, actor->state.goalPos.z, actor->state.angle);
return ApiStatus_DONE2;
}

15
src/battle/area_trd_part_2/4B15D0.c
View File

@ -6,10 +6,21 @@
#include "common/StartRumbleWithParams.inc.c" #include "common/StartRumbleWithParams.inc.c"
#define NAMESPACE b_area_trd_part_2 #define NAMESPACE b_area_trd_part_2
// Requires data migration to match
#ifdef NON_MATCHING
#define NAMESPACE dup3_b_area_trd_part_2
#include "common/UnkWhirlwindEffectFunc.inc.c"
#define NAMESPACE b_area_trd_part_2
#else
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_80218438_4B1628); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_80218438_4B1628);
#endif
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_80218510_4B1700); #define NAMESPACE dup3_b_area_trd_part_2
#include "common/UnkEnemyFunc.inc.c"
#define NAMESPACE b_area_trd_part_2
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_802185B0_4B17A0); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_802185B0_4B17A0);
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B15D0", func_80218B48_4B1D38); #define NAMESPACE dup3_b_area_trd_part_2
#include "common/GetLastActorEventType.inc.c"
#define NAMESPACE b_area_trd_part_2

9
src/battle/area_trd_part_2/4B1D90.c
View File

@ -4,10 +4,15 @@
#include "common/StartRumbleWithParams.inc.c" #include "common/StartRumbleWithParams.inc.c"
// Requires data migration to match
#ifdef NON_MATCHING
#include "common/UnkWhirlwindEffectFunc.inc.c"
#else
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218BF8_4B1DE8); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218BF8_4B1DE8);
#endif
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218CD0_4B1EC0); #include "common/UnkEnemyFunc.inc.c"
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218D70_4B1F60); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80218D70_4B1F60);
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B1D90", func_80219308_4B24F8); #include "common/GetLastActorEventType.inc.c"

16
src/battle/area_trd_part_2/4B2550.c
View File

@ -1,4 +1,5 @@
#include "common.h" #include "common.h"
#include "effects.h"
#define NAMESPACE b_area_trd_part_2 #define NAMESPACE b_area_trd_part_2
@ -6,10 +7,21 @@
#include "common/StartRumbleWithParams.inc.c" #include "common/StartRumbleWithParams.inc.c"
#define NAMESPACE b_area_trd_part_2 #define NAMESPACE b_area_trd_part_2
// Requires data migration to match
#ifdef NON_MATCHING
#define NAMESPACE dup4_b_area_trd_part_2
#include "common/UnkWhirlwindEffectFunc.inc.c"
#define NAMESPACE b_area_trd_part_2
#else
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_802193B8_4B25A8); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_802193B8_4B25A8);
#endif
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_80219490_4B2680); #define NAMESPACE dup4_b_area_trd_part_2
#include "common/UnkEnemyFunc.inc.c"
#define NAMESPACE b_area_trd_part_2
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_80219530_4B2720); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_80219530_4B2720);
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2550", func_80219AC8_4B2CB8); #define NAMESPACE dup4_b_area_trd_part_2
#include "common/GetLastActorEventType.inc.c"
#define NAMESPACE b_area_trd_part_2

15
src/battle/area_trd_part_2/4B2D10.c
View File

@ -6,10 +6,21 @@
#include "common/StartRumbleWithParams.inc.c" #include "common/StartRumbleWithParams.inc.c"
#define NAMESPACE b_area_trd_part_2 #define NAMESPACE b_area_trd_part_2
// Requires data migration to match
#ifdef NON_MATCHING
#define NAMESPACE dup_b_area_trd_part_2
#include "common/UnkWhirlwindEffectFunc.inc.c"
#define NAMESPACE b_area_trd_part_2
#else
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219B78_4B2D68); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219B78_4B2D68);
#endif
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219C50_4B2E40); #define NAMESPACE dup_b_area_trd_part_2
#include "common/UnkEnemyFunc.inc.c"
#define NAMESPACE b_area_trd_part_2
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219CF0_4B2EE0); INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_80219CF0_4B2EE0);
INCLUDE_ASM(s32, "battle/area_trd_part_2/4B2D10", func_8021A288_4B3478); #define NAMESPACE dup_b_area_trd_part_2
#include "common/GetLastActorEventType.inc.c"
#define NAMESPACE b_area_trd_part_2

10
src/common/GetLastActorEventType.inc.c Normal file
View File

@ -0,0 +1,10 @@
#include "common.h"
#include "npc.h"
ApiStatus N(GetLastActorEventType)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
Actor* actor = get_actor(script->owner1.actorID);
actor->lastEventType = evt_get_variable(script, *args++);
return ApiStatus_DONE2;
}

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

@ -0,0 +1,26 @@
#include "common.h"
#include "npc.h"
Actor* N(UnkEnemyFunc)(s32 arg0) {
Actor* enemy = get_actor(ACTOR_ENEMY0);
if (enemy != NULL && enemy->state.varTable[1] == arg0) {
return enemy;
}
enemy = get_actor(ACTOR_ENEMY1);
if (enemy != NULL && enemy->state.varTable[1] == arg0) {
return enemy;
}
enemy = get_actor(ACTOR_ENEMY2);
if (enemy != NULL && enemy->state.varTable[1] == arg0) {
return enemy;
}
enemy = get_actor(ACTOR_ENEMY3);
if (enemy != NULL && enemy->state.varTable[1] == arg0) {
return enemy;
}
return NULL;
}

19
src/common/UnkWhirlwindEffectFunc.inc.c Normal file
View File

@ -0,0 +1,19 @@
#include "common.h"
#include "effects.h"
EffectWhirlwind effectStruct;
ApiStatus N(UnkWhirlwindEffectFunc)(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++);
s32 var4 = evt_get_variable(script, *args++);
effectStruct.unk_28 = var1;
effectStruct.unk_2C = var2 - 10.0f;
effectStruct.unk_30 = var3;
playFX_46_whirlwind(6, (s32) &effectStruct, 1.0f, var4);
return ApiStatus_DONE2;
}

10
ver/us/asm/data/battle/area_trd_part_2/4B3740.data.s
View File

File diff suppressed because one or more lines are too long

12
ver/us/asm/nonmatchings/battle/area_trd_part_1/4A10A0/func_80218000_4A10A0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218000_4A10A0
/* 4A10A0 80218000 3C028022 */ lui $v0, %hi(D_8021A4E8_4A3588)
/* 4A10A4 80218004 2442A4E8 */ addiu $v0, $v0, %lo(D_8021A4E8_4A3588)
/* 4A10A8 80218008 24030001 */ addiu $v1, $zero, 1
/* 4A10AC 8021800C AC43000C */ sw $v1, 0xc($v0)
/* 4A10B0 80218010 8C830148 */ lw $v1, 0x148($a0)
/* 4A10B4 80218014 AC430010 */ sw $v1, 0x10($v0)
/* 4A10B8 80218018 03E00008 */ jr $ra
/* 4A10BC 8021801C 24020002 */ addiu $v0, $zero, 2

85
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218058_4B1248.s
View File

@ -1,85 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218058_4B1248
/* 4B1248 80218058 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4B124C 8021805C AFB10014 */ sw $s1, 0x14($sp)
/* 4B1250 80218060 0080882D */ daddu $s1, $a0, $zero
/* 4B1254 80218064 AFBF001C */ sw $ra, 0x1c($sp)
/* 4B1258 80218068 AFB20018 */ sw $s2, 0x18($sp)
/* 4B125C 8021806C AFB00010 */ sw $s0, 0x10($sp)
/* 4B1260 80218070 8E30000C */ lw $s0, 0xc($s1)
/* 4B1264 80218074 8E050000 */ lw $a1, ($s0)
/* 4B1268 80218078 0C0B1EAF */ jal evt_get_variable
/* 4B126C 8021807C 26100004 */ addiu $s0, $s0, 4
/* 4B1270 80218080 8E050000 */ lw $a1, ($s0)
/* 4B1274 80218084 26100004 */ addiu $s0, $s0, 4
/* 4B1278 80218088 0220202D */ daddu $a0, $s1, $zero
/* 4B127C 8021808C 0C0B1EAF */ jal evt_get_variable
/* 4B1280 80218090 0040902D */ daddu $s2, $v0, $zero
/* 4B1284 80218094 0220202D */ daddu $a0, $s1, $zero
/* 4B1288 80218098 8E050000 */ lw $a1, ($s0)
/* 4B128C 8021809C 0C0B1EAF */ jal evt_get_variable
/* 4B1290 802180A0 0040802D */ daddu $s0, $v0, $zero
/* 4B1294 802180A4 0040882D */ daddu $s1, $v0, $zero
/* 4B1298 802180A8 2402FFFF */ addiu $v0, $zero, -1
/* 4B129C 802180AC 16020005 */ bne $s0, $v0, .L802180C4
/* 4B12A0 802180B0 24020001 */ addiu $v0, $zero, 1
/* 4B12A4 802180B4 0C04760B */ jal mdl_set_all_fog_mode
/* 4B12A8 802180B8 0220202D */ daddu $a0, $s1, $zero
/* 4B12AC 802180BC 08086059 */ j .L80218164
/* 4B12B0 802180C0 24020002 */ addiu $v0, $zero, 2
.L802180C4:
/* 4B12B4 802180C4 12420018 */ beq $s2, $v0, .L80218128
/* 4B12B8 802180C8 2A420002 */ slti $v0, $s2, 2
/* 4B12BC 802180CC 10400005 */ beqz $v0, .L802180E4
/* 4B12C0 802180D0 24020002 */ addiu $v0, $zero, 2
/* 4B12C4 802180D4 12400007 */ beqz $s2, .L802180F4
/* 4B12C8 802180D8 3412FFFF */ ori $s2, $zero, 0xffff
/* 4B12CC 802180DC 08086059 */ j .L80218164
/* 4B12D0 802180E0 00000000 */ nop
.L802180E4:
/* 4B12D4 802180E4 1242001B */ beq $s2, $v0, .L80218154
/* 4B12D8 802180E8 24020002 */ addiu $v0, $zero, 2
/* 4B12DC 802180EC 08086059 */ j .L80218164
/* 4B12E0 802180F0 00000000 */ nop
.L802180F4:
/* 4B12E4 802180F4 8E040000 */ lw $a0, ($s0)
/* 4B12E8 802180F8 1092001A */ beq $a0, $s2, .L80218164
/* 4B12EC 802180FC 24020002 */ addiu $v0, $zero, 2
/* 4B12F0 80218100 0C046C04 */ jal get_model_list_index_from_tree_index
/* 4B12F4 80218104 26100004 */ addiu $s0, $s0, 4
/* 4B12F8 80218108 0C046B4C */ jal get_model_from_list_index
/* 4B12FC 8021810C 0040202D */ daddu $a0, $v0, $zero
/* 4B1300 80218110 0040202D */ daddu $a0, $v0, $zero
/* 4B1304 80218114 2405FFFF */ addiu $a1, $zero, -1
/* 4B1308 80218118 0C046F1F */ jal set_mdl_custom_gfx_set
/* 4B130C 8021811C 0220302D */ daddu $a2, $s1, $zero
/* 4B1310 80218120 0808603D */ j .L802180F4
/* 4B1314 80218124 00000000 */ nop
.L80218128:
/* 4B1318 80218128 3412FFFF */ ori $s2, $zero, 0xffff
.L8021812C:
/* 4B131C 8021812C 8E020000 */ lw $v0, ($s0)
/* 4B1320 80218130 1052000B */ beq $v0, $s2, .L80218160
/* 4B1324 80218134 2405FFFF */ addiu $a1, $zero, -1
/* 4B1328 80218138 96040002 */ lhu $a0, 2($s0)
/* 4B132C 8021813C 0220302D */ daddu $a2, $s1, $zero
/* 4B1330 80218140 26100004 */ addiu $s0, $s0, 4
/* 4B1334 80218144 0C046E54 */ jal func_8011B950
/* 4B1338 80218148 0000382D */ daddu $a3, $zero, $zero
/* 4B133C 8021814C 0808604B */ j .L8021812C
/* 4B1340 80218150 00000000 */ nop
.L80218154:
/* 4B1344 80218154 3C028015 */ lui $v0, %hi(D_801512F0)
/* 4B1348 80218158 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0)
/* 4B134C 8021815C A0510000 */ sb $s1, ($v0)
.L80218160:
/* 4B1350 80218160 24020002 */ addiu $v0, $zero, 2
.L80218164:
/* 4B1354 80218164 8FBF001C */ lw $ra, 0x1c($sp)
/* 4B1358 80218168 8FB20018 */ lw $s2, 0x18($sp)
/* 4B135C 8021816C 8FB10014 */ lw $s1, 0x14($sp)
/* 4B1360 80218170 8FB00010 */ lw $s0, 0x10($sp)
/* 4B1364 80218174 03E00008 */ jr $ra
/* 4B1368 80218178 27BD0020 */ addiu $sp, $sp, 0x20

126
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021817C_4B136C.s
View File

@ -1,126 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8021817C_4B136C
/* 4B136C 8021817C 27BDFFA8 */ addiu $sp, $sp, -0x58
/* 4B1370 80218180 AFB10034 */ sw $s1, 0x34($sp)
/* 4B1374 80218184 0080882D */ daddu $s1, $a0, $zero
/* 4B1378 80218188 AFBF0054 */ sw $ra, 0x54($sp)
/* 4B137C 8021818C AFBE0050 */ sw $fp, 0x50($sp)
/* 4B1380 80218190 AFB7004C */ sw $s7, 0x4c($sp)
/* 4B1384 80218194 AFB60048 */ sw $s6, 0x48($sp)
/* 4B1388 80218198 AFB50044 */ sw $s5, 0x44($sp)
/* 4B138C 8021819C AFB40040 */ sw $s4, 0x40($sp)
/* 4B1390 802181A0 AFB3003C */ sw $s3, 0x3c($sp)
/* 4B1394 802181A4 AFB20038 */ sw $s2, 0x38($sp)
/* 4B1398 802181A8 AFB00030 */ sw $s0, 0x30($sp)
/* 4B139C 802181AC 8E30000C */ lw $s0, 0xc($s1)
/* 4B13A0 802181B0 8E050000 */ lw $a1, ($s0)
/* 4B13A4 802181B4 0C0B1EAF */ jal evt_get_variable
/* 4B13A8 802181B8 26100004 */ addiu $s0, $s0, 4
/* 4B13AC 802181BC 8E050000 */ lw $a1, ($s0)
/* 4B13B0 802181C0 26100004 */ addiu $s0, $s0, 4
/* 4B13B4 802181C4 0220202D */ daddu $a0, $s1, $zero
/* 4B13B8 802181C8 0C0B1EAF */ jal evt_get_variable
/* 4B13BC 802181CC 0040982D */ daddu $s3, $v0, $zero
/* 4B13C0 802181D0 8E050000 */ lw $a1, ($s0)
/* 4B13C4 802181D4 26100004 */ addiu $s0, $s0, 4
/* 4B13C8 802181D8 0220202D */ daddu $a0, $s1, $zero
/* 4B13CC 802181DC 0C0B1EAF */ jal evt_get_variable
/* 4B13D0 802181E0 0040B02D */ daddu $s6, $v0, $zero
/* 4B13D4 802181E4 8E050000 */ lw $a1, ($s0)
/* 4B13D8 802181E8 26100004 */ addiu $s0, $s0, 4
/* 4B13DC 802181EC 0220202D */ daddu $a0, $s1, $zero
/* 4B13E0 802181F0 0C0B1EAF */ jal evt_get_variable
/* 4B13E4 802181F4 0040A82D */ daddu $s5, $v0, $zero
/* 4B13E8 802181F8 8E050000 */ lw $a1, ($s0)
/* 4B13EC 802181FC 26100004 */ addiu $s0, $s0, 4
/* 4B13F0 80218200 0220202D */ daddu $a0, $s1, $zero
/* 4B13F4 80218204 0C0B1EAF */ jal evt_get_variable
/* 4B13F8 80218208 0040A02D */ daddu $s4, $v0, $zero
/* 4B13FC 8021820C 8E050000 */ lw $a1, ($s0)
/* 4B1400 80218210 26100004 */ addiu $s0, $s0, 4
/* 4B1404 80218214 0220202D */ daddu $a0, $s1, $zero
/* 4B1408 80218218 0C0B1EAF */ jal evt_get_variable
/* 4B140C 8021821C 0040902D */ daddu $s2, $v0, $zero
/* 4B1410 80218220 8E050000 */ lw $a1, ($s0)
/* 4B1414 80218224 26100004 */ addiu $s0, $s0, 4
/* 4B1418 80218228 0220202D */ daddu $a0, $s1, $zero
/* 4B141C 8021822C 0C0B1EAF */ jal evt_get_variable
/* 4B1420 80218230 AFA20028 */ sw $v0, 0x28($sp)
/* 4B1424 80218234 8E050000 */ lw $a1, ($s0)
/* 4B1428 80218238 26100004 */ addiu $s0, $s0, 4
/* 4B142C 8021823C 0220202D */ daddu $a0, $s1, $zero
/* 4B1430 80218240 0C0B1EAF */ jal evt_get_variable
/* 4B1434 80218244 0040F02D */ daddu $fp, $v0, $zero
/* 4B1438 80218248 8E050000 */ lw $a1, ($s0)
/* 4B143C 8021824C 26100004 */ addiu $s0, $s0, 4
/* 4B1440 80218250 0220202D */ daddu $a0, $s1, $zero
/* 4B1444 80218254 0C0B1EAF */ jal evt_get_variable
/* 4B1448 80218258 0040B82D */ daddu $s7, $v0, $zero
/* 4B144C 8021825C 0220202D */ daddu $a0, $s1, $zero
/* 4B1450 80218260 8E050000 */ lw $a1, ($s0)
/* 4B1454 80218264 0C0B1EAF */ jal evt_get_variable
/* 4B1458 80218268 0040802D */ daddu $s0, $v0, $zero
/* 4B145C 8021826C 0040182D */ daddu $v1, $v0, $zero
/* 4B1460 80218270 24020002 */ addiu $v0, $zero, 2
/* 4B1464 80218274 12620012 */ beq $s3, $v0, .L802182C0
/* 4B1468 80218278 2A620003 */ slti $v0, $s3, 3
/* 4B146C 8021827C 10400005 */ beqz $v0, .L80218294
/* 4B1470 80218280 24020001 */ addiu $v0, $zero, 1
/* 4B1474 80218284 12620008 */ beq $s3, $v0, .L802182A8
/* 4B1478 80218288 32C400FF */ andi $a0, $s6, 0xff
/* 4B147C 8021828C 080860C7 */ j .L8021831C
/* 4B1480 80218290 00000000 */ nop
.L80218294:
/* 4B1484 80218294 24020003 */ addiu $v0, $zero, 3
/* 4B1488 80218298 12620018 */ beq $s3, $v0, .L802182FC
/* 4B148C 8021829C 32C400FF */ andi $a0, $s6, 0xff
/* 4B1490 802182A0 080860C7 */ j .L8021831C
/* 4B1494 802182A4 00000000 */ nop
.L802182A8:
/* 4B1498 802182A8 32A500FF */ andi $a1, $s5, 0xff
/* 4B149C 802182AC 328600FF */ andi $a2, $s4, 0xff
/* 4B14A0 802182B0 0C046F97 */ jal set_background_color_blend
/* 4B14A4 802182B4 324700FF */ andi $a3, $s2, 0xff
/* 4B14A8 802182B8 080860C7 */ j .L8021831C
/* 4B14AC 802182BC 00000000 */ nop
.L802182C0:
/* 4B14B0 802182C0 32C400FF */ andi $a0, $s6, 0xff
/* 4B14B4 802182C4 32A500FF */ andi $a1, $s5, 0xff
/* 4B14B8 802182C8 328600FF */ andi $a2, $s4, 0xff
/* 4B14BC 802182CC 324700FF */ andi $a3, $s2, 0xff
/* 4B14C0 802182D0 93A2002B */ lbu $v0, 0x2b($sp)
/* 4B14C4 802182D4 AFB0001C */ sw $s0, 0x1c($sp)
/* 4B14C8 802182D8 AFA30020 */ sw $v1, 0x20($sp)
/* 4B14CC 802182DC AFA20010 */ sw $v0, 0x10($sp)
/* 4B14D0 802182E0 33C200FF */ andi $v0, $fp, 0xff
/* 4B14D4 802182E4 AFA20014 */ sw $v0, 0x14($sp)
/* 4B14D8 802182E8 32E200FF */ andi $v0, $s7, 0xff
/* 4B14DC 802182EC 0C046FAD */ jal set_model_fog_color_parameters
/* 4B14E0 802182F0 AFA20018 */ sw $v0, 0x18($sp)
/* 4B14E4 802182F4 080860C7 */ j .L8021831C
/* 4B14E8 802182F8 00000000 */ nop
.L802182FC:
/* 4B14EC 802182FC 32A500FF */ andi $a1, $s5, 0xff
/* 4B14F0 80218300 328600FF */ andi $a2, $s4, 0xff
/* 4B14F4 80218304 324700FF */ andi $a3, $s2, 0xff
/* 4B14F8 80218308 93A2002B */ lbu $v0, 0x2b($sp)
/* 4B14FC 8021830C AFA20010 */ sw $v0, 0x10($sp)
/* 4B1500 80218310 33C200FF */ andi $v0, $fp, 0xff
/* 4B1504 80218314 0C046FE6 */ jal set_model_env_color_parameters
/* 4B1508 80218318 AFA20014 */ sw $v0, 0x14($sp)
.L8021831C:
/* 4B150C 8021831C 8FBF0054 */ lw $ra, 0x54($sp)
/* 4B1510 80218320 8FBE0050 */ lw $fp, 0x50($sp)
/* 4B1514 80218324 8FB7004C */ lw $s7, 0x4c($sp)
/* 4B1518 80218328 8FB60048 */ lw $s6, 0x48($sp)
/* 4B151C 8021832C 8FB50044 */ lw $s5, 0x44($sp)
/* 4B1520 80218330 8FB40040 */ lw $s4, 0x40($sp)
/* 4B1524 80218334 8FB3003C */ lw $s3, 0x3c($sp)
/* 4B1528 80218338 8FB20038 */ lw $s2, 0x38($sp)
/* 4B152C 8021833C 8FB10034 */ lw $s1, 0x34($sp)
/* 4B1530 80218340 8FB00030 */ lw $s0, 0x30($sp)
/* 4B1534 80218344 24020002 */ addiu $v0, $zero, 2
/* 4B1538 80218348 03E00008 */ jr $ra
/* 4B153C 8021834C 27BD0058 */ addiu $sp, $sp, 0x58

15
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_80218350_4B1540.s
View File

@ -1,15 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218350_4B1540
/* 4B1540 80218350 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 4B1544 80218354 24040008 */ addiu $a0, $zero, 8
/* 4B1548 80218358 AFBF0010 */ sw $ra, 0x10($sp)
/* 4B154C 8021835C 0C052BE3 */ jal bgm_set_battle_song
/* 4B1550 80218360 0000282D */ daddu $a1, $zero, $zero
/* 4B1554 80218364 0C052BBE */ jal bgm_push_battle_song
/* 4B1558 80218368 00000000 */ nop
/* 4B155C 8021836C 8FBF0010 */ lw $ra, 0x10($sp)
/* 4B1560 80218370 24020002 */ addiu $v0, $zero, 2
/* 4B1564 80218374 03E00008 */ jr $ra
/* 4B1568 80218378 27BD0018 */ addiu $sp, $sp, 0x18

29
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B11F0/func_8021837C_4B156C.s
View File

@ -1,29 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8021837C_4B156C
/* 4B156C 8021837C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4B1570 80218380 AFBF0018 */ sw $ra, 0x18($sp)
/* 4B1574 80218384 8C82000C */ lw $v0, 0xc($a0)
/* 4B1578 80218388 0C0B1EAF */ jal evt_get_variable
/* 4B157C 8021838C 8C450000 */ lw $a1, ($v0)
/* 4B1580 80218390 0C09A75B */ jal get_actor
/* 4B1584 80218394 0040202D */ daddu $a0, $v0, $zero
/* 4B1588 80218398 C4440018 */ lwc1 $f4, 0x18($v0)
/* 4B158C 8021839C 3C014170 */ lui $at, 0x4170
/* 4B1590 802183A0 44810000 */ mtc1 $at, $f0
/* 4B1594 802183A4 C4420054 */ lwc1 $f2, 0x54($v0)
/* 4B1598 802183A8 46002101 */ sub.s $f4, $f4, $f0
/* 4B159C 802183AC E7A20010 */ swc1 $f2, 0x10($sp)
/* 4B15A0 802183B0 8C46001C */ lw $a2, 0x1c($v0)
/* 4B15A4 802183B4 8C470020 */ lw $a3, 0x20($v0)
/* 4B15A8 802183B8 44052000 */ mfc1 $a1, $f4
/* 4B15AC 802183BC 0C0990BC */ jal play_movement_dust_effects
/* 4B15B0 802183C0 24040002 */ addiu $a0, $zero, 2
/* 4B15B4 802183C4 8FBF0018 */ lw $ra, 0x18($sp)
/* 4B15B8 802183C8 24020002 */ addiu $v0, $zero, 2
/* 4B15BC 802183CC 03E00008 */ jr $ra
/* 4B15C0 802183D0 27BD0020 */ addiu $sp, $sp, 0x20
/* 4B15C4 802183D4 00000000 */ nop
/* 4B15C8 802183D8 00000000 */ nop
/* 4B15CC 802183DC 00000000 */ nop

48
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218510_4B1700.s
View File

@ -1,48 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218510_4B1700
/* 4B1700 80218510 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 4B1704 80218514 AFB00010 */ sw $s0, 0x10($sp)
/* 4B1708 80218518 0080802D */ daddu $s0, $a0, $zero
/* 4B170C 8021851C AFBF0014 */ sw $ra, 0x14($sp)
/* 4B1710 80218520 0C09A75B */ jal get_actor
/* 4B1714 80218524 24040200 */ addiu $a0, $zero, 0x200
/* 4B1718 80218528 0040202D */ daddu $a0, $v0, $zero
/* 4B171C 8021852C 10800004 */ beqz $a0, .L80218540
/* 4B1720 80218530 00000000 */ nop
/* 4B1724 80218534 8C82008C */ lw $v0, 0x8c($a0)
/* 4B1728 80218538 10500019 */ beq $v0, $s0, .L802185A0
/* 4B172C 8021853C 0080102D */ daddu $v0, $a0, $zero
.L80218540:
/* 4B1730 80218540 0C09A75B */ jal get_actor
/* 4B1734 80218544 24040201 */ addiu $a0, $zero, 0x201
/* 4B1738 80218548 0040202D */ daddu $a0, $v0, $zero
/* 4B173C 8021854C 10800004 */ beqz $a0, .L80218560
/* 4B1740 80218550 00000000 */ nop
/* 4B1744 80218554 8C82008C */ lw $v0, 0x8c($a0)
/* 4B1748 80218558 10500011 */ beq $v0, $s0, .L802185A0
/* 4B174C 8021855C 0080102D */ daddu $v0, $a0, $zero
.L80218560:
/* 4B1750 80218560 0C09A75B */ jal get_actor
/* 4B1754 80218564 24040202 */ addiu $a0, $zero, 0x202
/* 4B1758 80218568 0040202D */ daddu $a0, $v0, $zero
/* 4B175C 8021856C 10800004 */ beqz $a0, .L80218580
/* 4B1760 80218570 00000000 */ nop
/* 4B1764 80218574 8C82008C */ lw $v0, 0x8c($a0)
/* 4B1768 80218578 10500009 */ beq $v0, $s0, .L802185A0
/* 4B176C 8021857C 0080102D */ daddu $v0, $a0, $zero
.L80218580:
/* 4B1770 80218580 0C09A75B */ jal get_actor
/* 4B1774 80218584 24040203 */ addiu $a0, $zero, 0x203
/* 4B1778 80218588 0040202D */ daddu $a0, $v0, $zero
/* 4B177C 8021858C 50800004 */ beql $a0, $zero, .L802185A0
/* 4B1780 80218590 0000102D */ daddu $v0, $zero, $zero
/* 4B1784 80218594 8C83008C */ lw $v1, 0x8c($a0)
/* 4B1788 80218598 54700001 */ bnel $v1, $s0, .L802185A0
/* 4B178C 8021859C 0000102D */ daddu $v0, $zero, $zero
.L802185A0:
/* 4B1790 802185A0 8FBF0014 */ lw $ra, 0x14($sp)
/* 4B1794 802185A4 8FB00010 */ lw $s0, 0x10($sp)
/* 4B1798 802185A8 03E00008 */ jr $ra
/* 4B179C 802185AC 27BD0018 */ addiu $sp, $sp, 0x18

18
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_802185B0_4B17A0.s
View File

@ -28,7 +28,7 @@ glabel func_802185B0_4B17A0
/* 4B17F8 80218608 080861D0 */ j .L80218740 /* 4B17F8 80218608 080861D0 */ j .L80218740
/* 4B17FC 8021860C 2622FFFF */ addiu $v0, $s1, -1 /* 4B17FC 8021860C 2622FFFF */ addiu $v0, $s1, -1
.L80218610: .L80218610:
/* 4B1800 80218610 0C086144 */ jal func_80218510_4B1700 /* 4B1800 80218610 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B1804 80218614 24040003 */ addiu $a0, $zero, 3 /* 4B1804 80218614 24040003 */ addiu $a0, $zero, 3
/* 4B1808 80218618 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B1808 80218618 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B180C 8021861C E7A00020 */ swc1 $f0, 0x20($sp) /* 4B180C 8021861C E7A00020 */ swc1 $f0, 0x20($sp)
@ -36,7 +36,7 @@ glabel func_802185B0_4B17A0
/* 4B1814 80218624 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B1814 80218624 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B1818 80218628 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B1818 80218628 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B181C 8021862C 24040006 */ addiu $a0, $zero, 6 /* 4B181C 8021862C 24040006 */ addiu $a0, $zero, 6
/* 4B1820 80218630 0C086144 */ jal func_80218510_4B1700 /* 4B1820 80218630 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B1824 80218634 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B1824 80218634 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B1828 80218638 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B1828 80218638 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B182C 8021863C E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B182C 8021863C E7A0002C */ swc1 $f0, 0x2c($sp)
@ -46,7 +46,7 @@ glabel func_802185B0_4B17A0
/* 4B183C 8021864C 080861CE */ j .L80218738 /* 4B183C 8021864C 080861CE */ j .L80218738
/* 4B1840 80218650 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B1840 80218650 E7A00034 */ swc1 $f0, 0x34($sp)
.L80218654: .L80218654:
/* 4B1844 80218654 0C086144 */ jal func_80218510_4B1700 /* 4B1844 80218654 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B1848 80218658 24040003 */ addiu $a0, $zero, 3 /* 4B1848 80218658 24040003 */ addiu $a0, $zero, 3
/* 4B184C 8021865C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B184C 8021865C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B1850 80218660 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B1850 80218660 E7A00020 */ swc1 $f0, 0x20($sp)
@ -54,7 +54,7 @@ glabel func_802185B0_4B17A0
/* 4B1858 80218668 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B1858 80218668 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B185C 8021866C C4400140 */ lwc1 $f0, 0x140($v0) /* 4B185C 8021866C C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B1860 80218670 24040005 */ addiu $a0, $zero, 5 /* 4B1860 80218670 24040005 */ addiu $a0, $zero, 5
/* 4B1864 80218674 0C086144 */ jal func_80218510_4B1700 /* 4B1864 80218674 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B1868 80218678 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B1868 80218678 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B186C 8021867C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B186C 8021867C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B1870 80218680 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B1870 80218680 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -62,7 +62,7 @@ glabel func_802185B0_4B17A0
/* 4B1878 80218688 E7A00030 */ swc1 $f0, 0x30($sp) /* 4B1878 80218688 E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B187C 8021868C C4400140 */ lwc1 $f0, 0x140($v0) /* 4B187C 8021868C C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B1880 80218690 24040006 */ addiu $a0, $zero, 6 /* 4B1880 80218690 24040006 */ addiu $a0, $zero, 6
/* 4B1884 80218694 0C086144 */ jal func_80218510_4B1700 /* 4B1884 80218694 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B1888 80218698 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B1888 80218698 E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B188C 8021869C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B188C 8021869C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B1890 802186A0 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B1890 802186A0 E7A00038 */ swc1 $f0, 0x38($sp)
@ -72,7 +72,7 @@ glabel func_802185B0_4B17A0
/* 4B18A0 802186B0 080861CE */ j .L80218738 /* 4B18A0 802186B0 080861CE */ j .L80218738
/* 4B18A4 802186B4 E7A00040 */ swc1 $f0, 0x40($sp) /* 4B18A4 802186B4 E7A00040 */ swc1 $f0, 0x40($sp)
.L802186B8: .L802186B8:
/* 4B18A8 802186B8 0C086144 */ jal func_80218510_4B1700 /* 4B18A8 802186B8 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B18AC 802186BC 24040003 */ addiu $a0, $zero, 3 /* 4B18AC 802186BC 24040003 */ addiu $a0, $zero, 3
/* 4B18B0 802186C0 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B18B0 802186C0 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B18B4 802186C4 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B18B4 802186C4 E7A00020 */ swc1 $f0, 0x20($sp)
@ -80,7 +80,7 @@ glabel func_802185B0_4B17A0
/* 4B18BC 802186CC E7A00024 */ swc1 $f0, 0x24($sp) /* 4B18BC 802186CC E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B18C0 802186D0 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B18C0 802186D0 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B18C4 802186D4 24040004 */ addiu $a0, $zero, 4 /* 4B18C4 802186D4 24040004 */ addiu $a0, $zero, 4
/* 4B18C8 802186D8 0C086144 */ jal func_80218510_4B1700 /* 4B18C8 802186D8 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B18CC 802186DC E7A00028 */ swc1 $f0, 0x28($sp) /* 4B18CC 802186DC E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B18D0 802186E0 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B18D0 802186E0 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B18D4 802186E4 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B18D4 802186E4 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -88,7 +88,7 @@ glabel func_802185B0_4B17A0
/* 4B18DC 802186EC E7A00030 */ swc1 $f0, 0x30($sp) /* 4B18DC 802186EC E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B18E0 802186F0 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B18E0 802186F0 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B18E4 802186F4 24040005 */ addiu $a0, $zero, 5 /* 4B18E4 802186F4 24040005 */ addiu $a0, $zero, 5
/* 4B18E8 802186F8 0C086144 */ jal func_80218510_4B1700 /* 4B18E8 802186F8 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B18EC 802186FC E7A00034 */ swc1 $f0, 0x34($sp) /* 4B18EC 802186FC E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B18F0 80218700 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B18F0 80218700 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B18F4 80218704 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B18F4 80218704 E7A00038 */ swc1 $f0, 0x38($sp)
@ -96,7 +96,7 @@ glabel func_802185B0_4B17A0
/* 4B18FC 8021870C E7A0003C */ swc1 $f0, 0x3c($sp) /* 4B18FC 8021870C E7A0003C */ swc1 $f0, 0x3c($sp)
/* 4B1900 80218710 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B1900 80218710 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B1904 80218714 24040006 */ addiu $a0, $zero, 6 /* 4B1904 80218714 24040006 */ addiu $a0, $zero, 6
/* 4B1908 80218718 0C086144 */ jal func_80218510_4B1700 /* 4B1908 80218718 0C086144 */ jal dup3_b_area_trd_part_2_UnkEnemyFunc
/* 4B190C 8021871C E7A00040 */ swc1 $f0, 0x40($sp) /* 4B190C 8021871C E7A00040 */ swc1 $f0, 0x40($sp)
/* 4B1910 80218720 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B1910 80218720 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B1914 80218724 E7A00044 */ swc1 $f0, 0x44($sp) /* 4B1914 80218724 E7A00044 */ swc1 $f0, 0x44($sp)

26
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B15D0/func_80218B48_4B1D38.s
View File

@ -1,26 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218B48_4B1D38
/* 4B1D38 80218B48 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4B1D3C 80218B4C AFB00010 */ sw $s0, 0x10($sp)
/* 4B1D40 80218B50 0080802D */ daddu $s0, $a0, $zero
/* 4B1D44 80218B54 AFBF0018 */ sw $ra, 0x18($sp)
/* 4B1D48 80218B58 AFB10014 */ sw $s1, 0x14($sp)
/* 4B1D4C 80218B5C 8E040148 */ lw $a0, 0x148($s0)
/* 4B1D50 80218B60 0C09A75B */ jal get_actor
/* 4B1D54 80218B64 8E11000C */ lw $s1, 0xc($s0)
/* 4B1D58 80218B68 0200202D */ daddu $a0, $s0, $zero
/* 4B1D5C 80218B6C 8E250000 */ lw $a1, ($s1)
/* 4B1D60 80218B70 0C0B1EAF */ jal evt_get_variable
/* 4B1D64 80218B74 0040802D */ daddu $s0, $v0, $zero
/* 4B1D68 80218B78 A20201F0 */ sb $v0, 0x1f0($s0)
/* 4B1D6C 80218B7C 8FBF0018 */ lw $ra, 0x18($sp)
/* 4B1D70 80218B80 8FB10014 */ lw $s1, 0x14($sp)
/* 4B1D74 80218B84 8FB00010 */ lw $s0, 0x10($sp)
/* 4B1D78 80218B88 24020002 */ addiu $v0, $zero, 2
/* 4B1D7C 80218B8C 03E00008 */ jr $ra
/* 4B1D80 80218B90 27BD0020 */ addiu $sp, $sp, 0x20
/* 4B1D84 80218B94 00000000 */ nop
/* 4B1D88 80218B98 00000000 */ nop
/* 4B1D8C 80218B9C 00000000 */ nop

48
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218CD0_4B1EC0.s
View File

@ -1,48 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80218CD0_4B1EC0
/* 4B1EC0 80218CD0 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 4B1EC4 80218CD4 AFB00010 */ sw $s0, 0x10($sp)
/* 4B1EC8 80218CD8 0080802D */ daddu $s0, $a0, $zero
/* 4B1ECC 80218CDC AFBF0014 */ sw $ra, 0x14($sp)
/* 4B1ED0 80218CE0 0C09A75B */ jal get_actor
/* 4B1ED4 80218CE4 24040200 */ addiu $a0, $zero, 0x200
/* 4B1ED8 80218CE8 0040202D */ daddu $a0, $v0, $zero
/* 4B1EDC 80218CEC 10800004 */ beqz $a0, .L80218D00
/* 4B1EE0 80218CF0 00000000 */ nop
/* 4B1EE4 80218CF4 8C82008C */ lw $v0, 0x8c($a0)
/* 4B1EE8 80218CF8 10500019 */ beq $v0, $s0, .L80218D60
/* 4B1EEC 80218CFC 0080102D */ daddu $v0, $a0, $zero
.L80218D00:
/* 4B1EF0 80218D00 0C09A75B */ jal get_actor
/* 4B1EF4 80218D04 24040201 */ addiu $a0, $zero, 0x201
/* 4B1EF8 80218D08 0040202D */ daddu $a0, $v0, $zero
/* 4B1EFC 80218D0C 10800004 */ beqz $a0, .L80218D20
/* 4B1F00 80218D10 00000000 */ nop
/* 4B1F04 80218D14 8C82008C */ lw $v0, 0x8c($a0)
/* 4B1F08 80218D18 10500011 */ beq $v0, $s0, .L80218D60
/* 4B1F0C 80218D1C 0080102D */ daddu $v0, $a0, $zero
.L80218D20:
/* 4B1F10 80218D20 0C09A75B */ jal get_actor
/* 4B1F14 80218D24 24040202 */ addiu $a0, $zero, 0x202
/* 4B1F18 80218D28 0040202D */ daddu $a0, $v0, $zero
/* 4B1F1C 80218D2C 10800004 */ beqz $a0, .L80218D40
/* 4B1F20 80218D30 00000000 */ nop
/* 4B1F24 80218D34 8C82008C */ lw $v0, 0x8c($a0)
/* 4B1F28 80218D38 10500009 */ beq $v0, $s0, .L80218D60
/* 4B1F2C 80218D3C 0080102D */ daddu $v0, $a0, $zero
.L80218D40:
/* 4B1F30 80218D40 0C09A75B */ jal get_actor
/* 4B1F34 80218D44 24040203 */ addiu $a0, $zero, 0x203
/* 4B1F38 80218D48 0040202D */ daddu $a0, $v0, $zero
/* 4B1F3C 80218D4C 50800004 */ beql $a0, $zero, .L80218D60
/* 4B1F40 80218D50 0000102D */ daddu $v0, $zero, $zero
/* 4B1F44 80218D54 8C83008C */ lw $v1, 0x8c($a0)
/* 4B1F48 80218D58 54700001 */ bnel $v1, $s0, .L80218D60
/* 4B1F4C 80218D5C 0000102D */ daddu $v0, $zero, $zero
.L80218D60:
/* 4B1F50 80218D60 8FBF0014 */ lw $ra, 0x14($sp)
/* 4B1F54 80218D64 8FB00010 */ lw $s0, 0x10($sp)
/* 4B1F58 80218D68 03E00008 */ jr $ra
/* 4B1F5C 80218D6C 27BD0018 */ addiu $sp, $sp, 0x18

18
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80218D70_4B1F60.s
View File

@ -28,7 +28,7 @@ glabel func_80218D70_4B1F60
/* 4B1FB8 80218DC8 080863C0 */ j .L80218F00 /* 4B1FB8 80218DC8 080863C0 */ j .L80218F00
/* 4B1FBC 80218DCC 2622FFFF */ addiu $v0, $s1, -1 /* 4B1FBC 80218DCC 2622FFFF */ addiu $v0, $s1, -1
.L80218DD0: .L80218DD0:
/* 4B1FC0 80218DD0 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B1FC0 80218DD0 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B1FC4 80218DD4 24040003 */ addiu $a0, $zero, 3 /* 4B1FC4 80218DD4 24040003 */ addiu $a0, $zero, 3
/* 4B1FC8 80218DD8 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B1FC8 80218DD8 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B1FCC 80218DDC E7A00020 */ swc1 $f0, 0x20($sp) /* 4B1FCC 80218DDC E7A00020 */ swc1 $f0, 0x20($sp)
@ -36,7 +36,7 @@ glabel func_80218D70_4B1F60
/* 4B1FD4 80218DE4 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B1FD4 80218DE4 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B1FD8 80218DE8 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B1FD8 80218DE8 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B1FDC 80218DEC 24040006 */ addiu $a0, $zero, 6 /* 4B1FDC 80218DEC 24040006 */ addiu $a0, $zero, 6
/* 4B1FE0 80218DF0 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B1FE0 80218DF0 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B1FE4 80218DF4 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B1FE4 80218DF4 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B1FE8 80218DF8 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B1FE8 80218DF8 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B1FEC 80218DFC E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B1FEC 80218DFC E7A0002C */ swc1 $f0, 0x2c($sp)
@ -46,7 +46,7 @@ glabel func_80218D70_4B1F60
/* 4B1FFC 80218E0C 080863BE */ j .L80218EF8 /* 4B1FFC 80218E0C 080863BE */ j .L80218EF8
/* 4B2000 80218E10 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B2000 80218E10 E7A00034 */ swc1 $f0, 0x34($sp)
.L80218E14: .L80218E14:
/* 4B2004 80218E14 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B2004 80218E14 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B2008 80218E18 24040003 */ addiu $a0, $zero, 3 /* 4B2008 80218E18 24040003 */ addiu $a0, $zero, 3
/* 4B200C 80218E1C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B200C 80218E1C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2010 80218E20 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B2010 80218E20 E7A00020 */ swc1 $f0, 0x20($sp)
@ -54,7 +54,7 @@ glabel func_80218D70_4B1F60
/* 4B2018 80218E28 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B2018 80218E28 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B201C 80218E2C C4400140 */ lwc1 $f0, 0x140($v0) /* 4B201C 80218E2C C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2020 80218E30 24040005 */ addiu $a0, $zero, 5 /* 4B2020 80218E30 24040005 */ addiu $a0, $zero, 5
/* 4B2024 80218E34 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B2024 80218E34 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B2028 80218E38 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B2028 80218E38 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B202C 80218E3C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B202C 80218E3C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2030 80218E40 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B2030 80218E40 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -62,7 +62,7 @@ glabel func_80218D70_4B1F60
/* 4B2038 80218E48 E7A00030 */ swc1 $f0, 0x30($sp) /* 4B2038 80218E48 E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B203C 80218E4C C4400140 */ lwc1 $f0, 0x140($v0) /* 4B203C 80218E4C C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2040 80218E50 24040006 */ addiu $a0, $zero, 6 /* 4B2040 80218E50 24040006 */ addiu $a0, $zero, 6
/* 4B2044 80218E54 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B2044 80218E54 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B2048 80218E58 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B2048 80218E58 E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B204C 80218E5C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B204C 80218E5C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2050 80218E60 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B2050 80218E60 E7A00038 */ swc1 $f0, 0x38($sp)
@ -72,7 +72,7 @@ glabel func_80218D70_4B1F60
/* 4B2060 80218E70 080863BE */ j .L80218EF8 /* 4B2060 80218E70 080863BE */ j .L80218EF8
/* 4B2064 80218E74 E7A00040 */ swc1 $f0, 0x40($sp) /* 4B2064 80218E74 E7A00040 */ swc1 $f0, 0x40($sp)
.L80218E78: .L80218E78:
/* 4B2068 80218E78 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B2068 80218E78 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B206C 80218E7C 24040003 */ addiu $a0, $zero, 3 /* 4B206C 80218E7C 24040003 */ addiu $a0, $zero, 3
/* 4B2070 80218E80 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2070 80218E80 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2074 80218E84 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B2074 80218E84 E7A00020 */ swc1 $f0, 0x20($sp)
@ -80,7 +80,7 @@ glabel func_80218D70_4B1F60
/* 4B207C 80218E8C E7A00024 */ swc1 $f0, 0x24($sp) /* 4B207C 80218E8C E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B2080 80218E90 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2080 80218E90 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2084 80218E94 24040004 */ addiu $a0, $zero, 4 /* 4B2084 80218E94 24040004 */ addiu $a0, $zero, 4
/* 4B2088 80218E98 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B2088 80218E98 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B208C 80218E9C E7A00028 */ swc1 $f0, 0x28($sp) /* 4B208C 80218E9C E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B2090 80218EA0 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2090 80218EA0 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2094 80218EA4 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B2094 80218EA4 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -88,7 +88,7 @@ glabel func_80218D70_4B1F60
/* 4B209C 80218EAC E7A00030 */ swc1 $f0, 0x30($sp) /* 4B209C 80218EAC E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B20A0 80218EB0 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B20A0 80218EB0 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B20A4 80218EB4 24040005 */ addiu $a0, $zero, 5 /* 4B20A4 80218EB4 24040005 */ addiu $a0, $zero, 5
/* 4B20A8 80218EB8 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B20A8 80218EB8 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B20AC 80218EBC E7A00034 */ swc1 $f0, 0x34($sp) /* 4B20AC 80218EBC E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B20B0 80218EC0 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B20B0 80218EC0 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B20B4 80218EC4 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B20B4 80218EC4 E7A00038 */ swc1 $f0, 0x38($sp)
@ -96,7 +96,7 @@ glabel func_80218D70_4B1F60
/* 4B20BC 80218ECC E7A0003C */ swc1 $f0, 0x3c($sp) /* 4B20BC 80218ECC E7A0003C */ swc1 $f0, 0x3c($sp)
/* 4B20C0 80218ED0 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B20C0 80218ED0 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B20C4 80218ED4 24040006 */ addiu $a0, $zero, 6 /* 4B20C4 80218ED4 24040006 */ addiu $a0, $zero, 6
/* 4B20C8 80218ED8 0C086334 */ jal func_80218CD0_4B1EC0 /* 4B20C8 80218ED8 0C086334 */ jal b_area_trd_part_2_UnkEnemyFunc
/* 4B20CC 80218EDC E7A00040 */ swc1 $f0, 0x40($sp) /* 4B20CC 80218EDC E7A00040 */ swc1 $f0, 0x40($sp)
/* 4B20D0 80218EE0 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B20D0 80218EE0 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B20D4 80218EE4 E7A00044 */ swc1 $f0, 0x44($sp) /* 4B20D4 80218EE4 E7A00044 */ swc1 $f0, 0x44($sp)

26
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B1D90/func_80219308_4B24F8.s
View File

@ -1,26 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219308_4B24F8
/* 4B24F8 80219308 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4B24FC 8021930C AFB00010 */ sw $s0, 0x10($sp)
/* 4B2500 80219310 0080802D */ daddu $s0, $a0, $zero
/* 4B2504 80219314 AFBF0018 */ sw $ra, 0x18($sp)
/* 4B2508 80219318 AFB10014 */ sw $s1, 0x14($sp)
/* 4B250C 8021931C 8E040148 */ lw $a0, 0x148($s0)
/* 4B2510 80219320 0C09A75B */ jal get_actor
/* 4B2514 80219324 8E11000C */ lw $s1, 0xc($s0)
/* 4B2518 80219328 0200202D */ daddu $a0, $s0, $zero
/* 4B251C 8021932C 8E250000 */ lw $a1, ($s1)
/* 4B2520 80219330 0C0B1EAF */ jal evt_get_variable
/* 4B2524 80219334 0040802D */ daddu $s0, $v0, $zero
/* 4B2528 80219338 A20201F0 */ sb $v0, 0x1f0($s0)
/* 4B252C 8021933C 8FBF0018 */ lw $ra, 0x18($sp)
/* 4B2530 80219340 8FB10014 */ lw $s1, 0x14($sp)
/* 4B2534 80219344 8FB00010 */ lw $s0, 0x10($sp)
/* 4B2538 80219348 24020002 */ addiu $v0, $zero, 2
/* 4B253C 8021934C 03E00008 */ jr $ra
/* 4B2540 80219350 27BD0020 */ addiu $sp, $sp, 0x20
/* 4B2544 80219354 00000000 */ nop
/* 4B2548 80219358 00000000 */ nop
/* 4B254C 8021935C 00000000 */ nop

48
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219490_4B2680.s
View File

@ -1,48 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219490_4B2680
/* 4B2680 80219490 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 4B2684 80219494 AFB00010 */ sw $s0, 0x10($sp)
/* 4B2688 80219498 0080802D */ daddu $s0, $a0, $zero
/* 4B268C 8021949C AFBF0014 */ sw $ra, 0x14($sp)
/* 4B2690 802194A0 0C09A75B */ jal get_actor
/* 4B2694 802194A4 24040200 */ addiu $a0, $zero, 0x200
/* 4B2698 802194A8 0040202D */ daddu $a0, $v0, $zero
/* 4B269C 802194AC 10800004 */ beqz $a0, .L802194C0
/* 4B26A0 802194B0 00000000 */ nop
/* 4B26A4 802194B4 8C82008C */ lw $v0, 0x8c($a0)
/* 4B26A8 802194B8 10500019 */ beq $v0, $s0, .L80219520
/* 4B26AC 802194BC 0080102D */ daddu $v0, $a0, $zero
.L802194C0:
/* 4B26B0 802194C0 0C09A75B */ jal get_actor
/* 4B26B4 802194C4 24040201 */ addiu $a0, $zero, 0x201
/* 4B26B8 802194C8 0040202D */ daddu $a0, $v0, $zero
/* 4B26BC 802194CC 10800004 */ beqz $a0, .L802194E0
/* 4B26C0 802194D0 00000000 */ nop
/* 4B26C4 802194D4 8C82008C */ lw $v0, 0x8c($a0)
/* 4B26C8 802194D8 10500011 */ beq $v0, $s0, .L80219520
/* 4B26CC 802194DC 0080102D */ daddu $v0, $a0, $zero
.L802194E0:
/* 4B26D0 802194E0 0C09A75B */ jal get_actor
/* 4B26D4 802194E4 24040202 */ addiu $a0, $zero, 0x202
/* 4B26D8 802194E8 0040202D */ daddu $a0, $v0, $zero
/* 4B26DC 802194EC 10800004 */ beqz $a0, .L80219500
/* 4B26E0 802194F0 00000000 */ nop
/* 4B26E4 802194F4 8C82008C */ lw $v0, 0x8c($a0)
/* 4B26E8 802194F8 10500009 */ beq $v0, $s0, .L80219520
/* 4B26EC 802194FC 0080102D */ daddu $v0, $a0, $zero
.L80219500:
/* 4B26F0 80219500 0C09A75B */ jal get_actor
/* 4B26F4 80219504 24040203 */ addiu $a0, $zero, 0x203
/* 4B26F8 80219508 0040202D */ daddu $a0, $v0, $zero
/* 4B26FC 8021950C 50800004 */ beql $a0, $zero, .L80219520
/* 4B2700 80219510 0000102D */ daddu $v0, $zero, $zero
/* 4B2704 80219514 8C83008C */ lw $v1, 0x8c($a0)
/* 4B2708 80219518 54700001 */ bnel $v1, $s0, .L80219520
/* 4B270C 8021951C 0000102D */ daddu $v0, $zero, $zero
.L80219520:
/* 4B2710 80219520 8FBF0014 */ lw $ra, 0x14($sp)
/* 4B2714 80219524 8FB00010 */ lw $s0, 0x10($sp)
/* 4B2718 80219528 03E00008 */ jr $ra
/* 4B271C 8021952C 27BD0018 */ addiu $sp, $sp, 0x18

18
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219530_4B2720.s
View File

@ -28,7 +28,7 @@ glabel func_80219530_4B2720
/* 4B2778 80219588 080865B0 */ j .L802196C0 /* 4B2778 80219588 080865B0 */ j .L802196C0
/* 4B277C 8021958C 2622FFFF */ addiu $v0, $s1, -1 /* 4B277C 8021958C 2622FFFF */ addiu $v0, $s1, -1
.L80219590: .L80219590:
/* 4B2780 80219590 0C086524 */ jal func_80219490_4B2680 /* 4B2780 80219590 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B2784 80219594 24040003 */ addiu $a0, $zero, 3 /* 4B2784 80219594 24040003 */ addiu $a0, $zero, 3
/* 4B2788 80219598 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2788 80219598 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B278C 8021959C E7A00020 */ swc1 $f0, 0x20($sp) /* 4B278C 8021959C E7A00020 */ swc1 $f0, 0x20($sp)
@ -36,7 +36,7 @@ glabel func_80219530_4B2720
/* 4B2794 802195A4 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B2794 802195A4 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B2798 802195A8 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2798 802195A8 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B279C 802195AC 24040006 */ addiu $a0, $zero, 6 /* 4B279C 802195AC 24040006 */ addiu $a0, $zero, 6
/* 4B27A0 802195B0 0C086524 */ jal func_80219490_4B2680 /* 4B27A0 802195B0 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B27A4 802195B4 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B27A4 802195B4 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B27A8 802195B8 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B27A8 802195B8 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B27AC 802195BC E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B27AC 802195BC E7A0002C */ swc1 $f0, 0x2c($sp)
@ -46,7 +46,7 @@ glabel func_80219530_4B2720
/* 4B27BC 802195CC 080865AE */ j .L802196B8 /* 4B27BC 802195CC 080865AE */ j .L802196B8
/* 4B27C0 802195D0 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B27C0 802195D0 E7A00034 */ swc1 $f0, 0x34($sp)
.L802195D4: .L802195D4:
/* 4B27C4 802195D4 0C086524 */ jal func_80219490_4B2680 /* 4B27C4 802195D4 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B27C8 802195D8 24040003 */ addiu $a0, $zero, 3 /* 4B27C8 802195D8 24040003 */ addiu $a0, $zero, 3
/* 4B27CC 802195DC C4400138 */ lwc1 $f0, 0x138($v0) /* 4B27CC 802195DC C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B27D0 802195E0 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B27D0 802195E0 E7A00020 */ swc1 $f0, 0x20($sp)
@ -54,7 +54,7 @@ glabel func_80219530_4B2720
/* 4B27D8 802195E8 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B27D8 802195E8 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B27DC 802195EC C4400140 */ lwc1 $f0, 0x140($v0) /* 4B27DC 802195EC C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B27E0 802195F0 24040005 */ addiu $a0, $zero, 5 /* 4B27E0 802195F0 24040005 */ addiu $a0, $zero, 5
/* 4B27E4 802195F4 0C086524 */ jal func_80219490_4B2680 /* 4B27E4 802195F4 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B27E8 802195F8 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B27E8 802195F8 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B27EC 802195FC C4400138 */ lwc1 $f0, 0x138($v0) /* 4B27EC 802195FC C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B27F0 80219600 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B27F0 80219600 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -62,7 +62,7 @@ glabel func_80219530_4B2720
/* 4B27F8 80219608 E7A00030 */ swc1 $f0, 0x30($sp) /* 4B27F8 80219608 E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B27FC 8021960C C4400140 */ lwc1 $f0, 0x140($v0) /* 4B27FC 8021960C C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2800 80219610 24040006 */ addiu $a0, $zero, 6 /* 4B2800 80219610 24040006 */ addiu $a0, $zero, 6
/* 4B2804 80219614 0C086524 */ jal func_80219490_4B2680 /* 4B2804 80219614 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B2808 80219618 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B2808 80219618 E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B280C 8021961C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B280C 8021961C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2810 80219620 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B2810 80219620 E7A00038 */ swc1 $f0, 0x38($sp)
@ -72,7 +72,7 @@ glabel func_80219530_4B2720
/* 4B2820 80219630 080865AE */ j .L802196B8 /* 4B2820 80219630 080865AE */ j .L802196B8
/* 4B2824 80219634 E7A00040 */ swc1 $f0, 0x40($sp) /* 4B2824 80219634 E7A00040 */ swc1 $f0, 0x40($sp)
.L80219638: .L80219638:
/* 4B2828 80219638 0C086524 */ jal func_80219490_4B2680 /* 4B2828 80219638 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B282C 8021963C 24040003 */ addiu $a0, $zero, 3 /* 4B282C 8021963C 24040003 */ addiu $a0, $zero, 3
/* 4B2830 80219640 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2830 80219640 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2834 80219644 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B2834 80219644 E7A00020 */ swc1 $f0, 0x20($sp)
@ -80,7 +80,7 @@ glabel func_80219530_4B2720
/* 4B283C 8021964C E7A00024 */ swc1 $f0, 0x24($sp) /* 4B283C 8021964C E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B2840 80219650 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2840 80219650 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2844 80219654 24040004 */ addiu $a0, $zero, 4 /* 4B2844 80219654 24040004 */ addiu $a0, $zero, 4
/* 4B2848 80219658 0C086524 */ jal func_80219490_4B2680 /* 4B2848 80219658 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B284C 8021965C E7A00028 */ swc1 $f0, 0x28($sp) /* 4B284C 8021965C E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B2850 80219660 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2850 80219660 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2854 80219664 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B2854 80219664 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -88,7 +88,7 @@ glabel func_80219530_4B2720
/* 4B285C 8021966C E7A00030 */ swc1 $f0, 0x30($sp) /* 4B285C 8021966C E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B2860 80219670 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2860 80219670 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2864 80219674 24040005 */ addiu $a0, $zero, 5 /* 4B2864 80219674 24040005 */ addiu $a0, $zero, 5
/* 4B2868 80219678 0C086524 */ jal func_80219490_4B2680 /* 4B2868 80219678 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B286C 8021967C E7A00034 */ swc1 $f0, 0x34($sp) /* 4B286C 8021967C E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B2870 80219680 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2870 80219680 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2874 80219684 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B2874 80219684 E7A00038 */ swc1 $f0, 0x38($sp)
@ -96,7 +96,7 @@ glabel func_80219530_4B2720
/* 4B287C 8021968C E7A0003C */ swc1 $f0, 0x3c($sp) /* 4B287C 8021968C E7A0003C */ swc1 $f0, 0x3c($sp)
/* 4B2880 80219690 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2880 80219690 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2884 80219694 24040006 */ addiu $a0, $zero, 6 /* 4B2884 80219694 24040006 */ addiu $a0, $zero, 6
/* 4B2888 80219698 0C086524 */ jal func_80219490_4B2680 /* 4B2888 80219698 0C086524 */ jal dup4_b_area_trd_part_2_UnkEnemyFunc
/* 4B288C 8021969C E7A00040 */ swc1 $f0, 0x40($sp) /* 4B288C 8021969C E7A00040 */ swc1 $f0, 0x40($sp)
/* 4B2890 802196A0 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2890 802196A0 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2894 802196A4 E7A00044 */ swc1 $f0, 0x44($sp) /* 4B2894 802196A4 E7A00044 */ swc1 $f0, 0x44($sp)

26
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2550/func_80219AC8_4B2CB8.s
View File

@ -1,26 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219AC8_4B2CB8
/* 4B2CB8 80219AC8 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4B2CBC 80219ACC AFB00010 */ sw $s0, 0x10($sp)
/* 4B2CC0 80219AD0 0080802D */ daddu $s0, $a0, $zero
/* 4B2CC4 80219AD4 AFBF0018 */ sw $ra, 0x18($sp)
/* 4B2CC8 80219AD8 AFB10014 */ sw $s1, 0x14($sp)
/* 4B2CCC 80219ADC 8E040148 */ lw $a0, 0x148($s0)
/* 4B2CD0 80219AE0 0C09A75B */ jal get_actor
/* 4B2CD4 80219AE4 8E11000C */ lw $s1, 0xc($s0)
/* 4B2CD8 80219AE8 0200202D */ daddu $a0, $s0, $zero
/* 4B2CDC 80219AEC 8E250000 */ lw $a1, ($s1)
/* 4B2CE0 80219AF0 0C0B1EAF */ jal evt_get_variable
/* 4B2CE4 80219AF4 0040802D */ daddu $s0, $v0, $zero
/* 4B2CE8 80219AF8 A20201F0 */ sb $v0, 0x1f0($s0)
/* 4B2CEC 80219AFC 8FBF0018 */ lw $ra, 0x18($sp)
/* 4B2CF0 80219B00 8FB10014 */ lw $s1, 0x14($sp)
/* 4B2CF4 80219B04 8FB00010 */ lw $s0, 0x10($sp)
/* 4B2CF8 80219B08 24020002 */ addiu $v0, $zero, 2
/* 4B2CFC 80219B0C 03E00008 */ jr $ra
/* 4B2D00 80219B10 27BD0020 */ addiu $sp, $sp, 0x20
/* 4B2D04 80219B14 00000000 */ nop
/* 4B2D08 80219B18 00000000 */ nop
/* 4B2D0C 80219B1C 00000000 */ nop

48
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219C50_4B2E40.s
View File

@ -1,48 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80219C50_4B2E40
/* 4B2E40 80219C50 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 4B2E44 80219C54 AFB00010 */ sw $s0, 0x10($sp)
/* 4B2E48 80219C58 0080802D */ daddu $s0, $a0, $zero
/* 4B2E4C 80219C5C AFBF0014 */ sw $ra, 0x14($sp)
/* 4B2E50 80219C60 0C09A75B */ jal get_actor
/* 4B2E54 80219C64 24040200 */ addiu $a0, $zero, 0x200
/* 4B2E58 80219C68 0040202D */ daddu $a0, $v0, $zero
/* 4B2E5C 80219C6C 10800004 */ beqz $a0, .L80219C80
/* 4B2E60 80219C70 00000000 */ nop
/* 4B2E64 80219C74 8C82008C */ lw $v0, 0x8c($a0)
/* 4B2E68 80219C78 10500019 */ beq $v0, $s0, .L80219CE0
/* 4B2E6C 80219C7C 0080102D */ daddu $v0, $a0, $zero
.L80219C80:
/* 4B2E70 80219C80 0C09A75B */ jal get_actor
/* 4B2E74 80219C84 24040201 */ addiu $a0, $zero, 0x201
/* 4B2E78 80219C88 0040202D */ daddu $a0, $v0, $zero
/* 4B2E7C 80219C8C 10800004 */ beqz $a0, .L80219CA0
/* 4B2E80 80219C90 00000000 */ nop
/* 4B2E84 80219C94 8C82008C */ lw $v0, 0x8c($a0)
/* 4B2E88 80219C98 10500011 */ beq $v0, $s0, .L80219CE0
/* 4B2E8C 80219C9C 0080102D */ daddu $v0, $a0, $zero
.L80219CA0:
/* 4B2E90 80219CA0 0C09A75B */ jal get_actor
/* 4B2E94 80219CA4 24040202 */ addiu $a0, $zero, 0x202
/* 4B2E98 80219CA8 0040202D */ daddu $a0, $v0, $zero
/* 4B2E9C 80219CAC 10800004 */ beqz $a0, .L80219CC0
/* 4B2EA0 80219CB0 00000000 */ nop
/* 4B2EA4 80219CB4 8C82008C */ lw $v0, 0x8c($a0)
/* 4B2EA8 80219CB8 10500009 */ beq $v0, $s0, .L80219CE0
/* 4B2EAC 80219CBC 0080102D */ daddu $v0, $a0, $zero
.L80219CC0:
/* 4B2EB0 80219CC0 0C09A75B */ jal get_actor
/* 4B2EB4 80219CC4 24040203 */ addiu $a0, $zero, 0x203
/* 4B2EB8 80219CC8 0040202D */ daddu $a0, $v0, $zero
/* 4B2EBC 80219CCC 50800004 */ beql $a0, $zero, .L80219CE0
/* 4B2EC0 80219CD0 0000102D */ daddu $v0, $zero, $zero
/* 4B2EC4 80219CD4 8C83008C */ lw $v1, 0x8c($a0)
/* 4B2EC8 80219CD8 54700001 */ bnel $v1, $s0, .L80219CE0
/* 4B2ECC 80219CDC 0000102D */ daddu $v0, $zero, $zero
.L80219CE0:
/* 4B2ED0 80219CE0 8FBF0014 */ lw $ra, 0x14($sp)
/* 4B2ED4 80219CE4 8FB00010 */ lw $s0, 0x10($sp)
/* 4B2ED8 80219CE8 03E00008 */ jr $ra
/* 4B2EDC 80219CEC 27BD0018 */ addiu $sp, $sp, 0x18

18
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_80219CF0_4B2EE0.s
View File

@ -28,7 +28,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2F38 80219D48 080867A0 */ j .L80219E80 /* 4B2F38 80219D48 080867A0 */ j .L80219E80
/* 4B2F3C 80219D4C 2622FFFF */ addiu $v0, $s1, -1 /* 4B2F3C 80219D4C 2622FFFF */ addiu $v0, $s1, -1
.L80219D50: .L80219D50:
/* 4B2F40 80219D50 0C086714 */ jal func_80219C50_4B2E40 /* 4B2F40 80219D50 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B2F44 80219D54 24040003 */ addiu $a0, $zero, 3 /* 4B2F44 80219D54 24040003 */ addiu $a0, $zero, 3
/* 4B2F48 80219D58 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2F48 80219D58 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2F4C 80219D5C E7A00020 */ swc1 $f0, 0x20($sp) /* 4B2F4C 80219D5C E7A00020 */ swc1 $f0, 0x20($sp)
@ -36,7 +36,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2F54 80219D64 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B2F54 80219D64 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B2F58 80219D68 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2F58 80219D68 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2F5C 80219D6C 24040006 */ addiu $a0, $zero, 6 /* 4B2F5C 80219D6C 24040006 */ addiu $a0, $zero, 6
/* 4B2F60 80219D70 0C086714 */ jal func_80219C50_4B2E40 /* 4B2F60 80219D70 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B2F64 80219D74 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B2F64 80219D74 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B2F68 80219D78 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2F68 80219D78 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2F6C 80219D7C E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B2F6C 80219D7C E7A0002C */ swc1 $f0, 0x2c($sp)
@ -46,7 +46,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2F7C 80219D8C 0808679E */ j .L80219E78 /* 4B2F7C 80219D8C 0808679E */ j .L80219E78
/* 4B2F80 80219D90 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B2F80 80219D90 E7A00034 */ swc1 $f0, 0x34($sp)
.L80219D94: .L80219D94:
/* 4B2F84 80219D94 0C086714 */ jal func_80219C50_4B2E40 /* 4B2F84 80219D94 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B2F88 80219D98 24040003 */ addiu $a0, $zero, 3 /* 4B2F88 80219D98 24040003 */ addiu $a0, $zero, 3
/* 4B2F8C 80219D9C C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2F8C 80219D9C C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2F90 80219DA0 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B2F90 80219DA0 E7A00020 */ swc1 $f0, 0x20($sp)
@ -54,7 +54,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2F98 80219DA8 E7A00024 */ swc1 $f0, 0x24($sp) /* 4B2F98 80219DA8 E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B2F9C 80219DAC C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2F9C 80219DAC C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2FA0 80219DB0 24040005 */ addiu $a0, $zero, 5 /* 4B2FA0 80219DB0 24040005 */ addiu $a0, $zero, 5
/* 4B2FA4 80219DB4 0C086714 */ jal func_80219C50_4B2E40 /* 4B2FA4 80219DB4 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B2FA8 80219DB8 E7A00028 */ swc1 $f0, 0x28($sp) /* 4B2FA8 80219DB8 E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B2FAC 80219DBC C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2FAC 80219DBC C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2FB0 80219DC0 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B2FB0 80219DC0 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -62,7 +62,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2FB8 80219DC8 E7A00030 */ swc1 $f0, 0x30($sp) /* 4B2FB8 80219DC8 E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B2FBC 80219DCC C4400140 */ lwc1 $f0, 0x140($v0) /* 4B2FBC 80219DCC C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B2FC0 80219DD0 24040006 */ addiu $a0, $zero, 6 /* 4B2FC0 80219DD0 24040006 */ addiu $a0, $zero, 6
/* 4B2FC4 80219DD4 0C086714 */ jal func_80219C50_4B2E40 /* 4B2FC4 80219DD4 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B2FC8 80219DD8 E7A00034 */ swc1 $f0, 0x34($sp) /* 4B2FC8 80219DD8 E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B2FCC 80219DDC C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2FCC 80219DDC C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2FD0 80219DE0 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B2FD0 80219DE0 E7A00038 */ swc1 $f0, 0x38($sp)
@ -72,7 +72,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2FE0 80219DF0 0808679E */ j .L80219E78 /* 4B2FE0 80219DF0 0808679E */ j .L80219E78
/* 4B2FE4 80219DF4 E7A00040 */ swc1 $f0, 0x40($sp) /* 4B2FE4 80219DF4 E7A00040 */ swc1 $f0, 0x40($sp)
.L80219DF8: .L80219DF8:
/* 4B2FE8 80219DF8 0C086714 */ jal func_80219C50_4B2E40 /* 4B2FE8 80219DF8 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B2FEC 80219DFC 24040003 */ addiu $a0, $zero, 3 /* 4B2FEC 80219DFC 24040003 */ addiu $a0, $zero, 3
/* 4B2FF0 80219E00 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B2FF0 80219E00 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B2FF4 80219E04 E7A00020 */ swc1 $f0, 0x20($sp) /* 4B2FF4 80219E04 E7A00020 */ swc1 $f0, 0x20($sp)
@ -80,7 +80,7 @@ glabel func_80219CF0_4B2EE0
/* 4B2FFC 80219E0C E7A00024 */ swc1 $f0, 0x24($sp) /* 4B2FFC 80219E0C E7A00024 */ swc1 $f0, 0x24($sp)
/* 4B3000 80219E10 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B3000 80219E10 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B3004 80219E14 24040004 */ addiu $a0, $zero, 4 /* 4B3004 80219E14 24040004 */ addiu $a0, $zero, 4
/* 4B3008 80219E18 0C086714 */ jal func_80219C50_4B2E40 /* 4B3008 80219E18 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B300C 80219E1C E7A00028 */ swc1 $f0, 0x28($sp) /* 4B300C 80219E1C E7A00028 */ swc1 $f0, 0x28($sp)
/* 4B3010 80219E20 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B3010 80219E20 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B3014 80219E24 E7A0002C */ swc1 $f0, 0x2c($sp) /* 4B3014 80219E24 E7A0002C */ swc1 $f0, 0x2c($sp)
@ -88,7 +88,7 @@ glabel func_80219CF0_4B2EE0
/* 4B301C 80219E2C E7A00030 */ swc1 $f0, 0x30($sp) /* 4B301C 80219E2C E7A00030 */ swc1 $f0, 0x30($sp)
/* 4B3020 80219E30 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B3020 80219E30 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B3024 80219E34 24040005 */ addiu $a0, $zero, 5 /* 4B3024 80219E34 24040005 */ addiu $a0, $zero, 5
/* 4B3028 80219E38 0C086714 */ jal func_80219C50_4B2E40 /* 4B3028 80219E38 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B302C 80219E3C E7A00034 */ swc1 $f0, 0x34($sp) /* 4B302C 80219E3C E7A00034 */ swc1 $f0, 0x34($sp)
/* 4B3030 80219E40 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B3030 80219E40 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B3034 80219E44 E7A00038 */ swc1 $f0, 0x38($sp) /* 4B3034 80219E44 E7A00038 */ swc1 $f0, 0x38($sp)
@ -96,7 +96,7 @@ glabel func_80219CF0_4B2EE0
/* 4B303C 80219E4C E7A0003C */ swc1 $f0, 0x3c($sp) /* 4B303C 80219E4C E7A0003C */ swc1 $f0, 0x3c($sp)
/* 4B3040 80219E50 C4400140 */ lwc1 $f0, 0x140($v0) /* 4B3040 80219E50 C4400140 */ lwc1 $f0, 0x140($v0)
/* 4B3044 80219E54 24040006 */ addiu $a0, $zero, 6 /* 4B3044 80219E54 24040006 */ addiu $a0, $zero, 6
/* 4B3048 80219E58 0C086714 */ jal func_80219C50_4B2E40 /* 4B3048 80219E58 0C086714 */ jal dup_b_area_trd_part_2_UnkEnemyFunc
/* 4B304C 80219E5C E7A00040 */ swc1 $f0, 0x40($sp) /* 4B304C 80219E5C E7A00040 */ swc1 $f0, 0x40($sp)
/* 4B3050 80219E60 C4400138 */ lwc1 $f0, 0x138($v0) /* 4B3050 80219E60 C4400138 */ lwc1 $f0, 0x138($v0)
/* 4B3054 80219E64 E7A00044 */ swc1 $f0, 0x44($sp) /* 4B3054 80219E64 E7A00044 */ swc1 $f0, 0x44($sp)

26
ver/us/asm/nonmatchings/battle/area_trd_part_2/4B2D10/func_8021A288_4B3478.s
View File

@ -1,26 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8021A288_4B3478
/* 4B3478 8021A288 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 4B347C 8021A28C AFB00010 */ sw $s0, 0x10($sp)
/* 4B3480 8021A290 0080802D */ daddu $s0, $a0, $zero
/* 4B3484 8021A294 AFBF0018 */ sw $ra, 0x18($sp)
/* 4B3488 8021A298 AFB10014 */ sw $s1, 0x14($sp)
/* 4B348C 8021A29C 8E040148 */ lw $a0, 0x148($s0)
/* 4B3490 8021A2A0 0C09A75B */ jal get_actor
/* 4B3494 8021A2A4 8E11000C */ lw $s1, 0xc($s0)
/* 4B3498 8021A2A8 0200202D */ daddu $a0, $s0, $zero
/* 4B349C 8021A2AC 8E250000 */ lw $a1, ($s1)
/* 4B34A0 8021A2B0 0C0B1EAF */ jal evt_get_variable
/* 4B34A4 8021A2B4 0040802D */ daddu $s0, $v0, $zero
/* 4B34A8 8021A2B8 A20201F0 */ sb $v0, 0x1f0($s0)
/* 4B34AC 8021A2BC 8FBF0018 */ lw $ra, 0x18($sp)
/* 4B34B0 8021A2C0 8FB10014 */ lw $s1, 0x14($sp)
/* 4B34B4 8021A2C4 8FB00010 */ lw $s0, 0x10($sp)
/* 4B34B8 8021A2C8 24020002 */ addiu $v0, $zero, 2
/* 4B34BC 8021A2CC 03E00008 */ jr $ra
/* 4B34C0 8021A2D0 27BD0020 */ addiu $sp, $sp, 0x20
/* 4B34C4 8021A2D4 00000000 */ nop
/* 4B34C8 8021A2D8 00000000 */ nop
/* 4B34CC 8021A2DC 00000000 */ nop

22
ver/us/symbol_addrs.txt
View File

@ -6146,30 +6146,30 @@ dup_b_area_trd_part_1_UnkBattleFunc1 = 0x80218148; // type:func rom:0x4A11E8
b_area_trd_part_1_UnkAngleFunc2 = 0x80218220; // type:func rom:0x4A12C0 b_area_trd_part_1_UnkAngleFunc2 = 0x80218220; // type:func rom:0x4A12C0
D_8021A4E8_4A3588 = 0x8021A4E8; // type:data rom:0x4A3588 D_8021A4E8_4A3588 = 0x8021A4E8; // type:data rom:0x4A3588
dup2_b_area_trd_part_2_StartRumbleWithParams = 0x80218000; // type:func rom:0x4B11F0 dup2_b_area_trd_part_2_StartRumbleWithParams = 0x80218000; // type:func rom:0x4B11F0
func_80218058_4B1248 = 0x80218058; // type:func rom:0x4B1248 dup2_b_area_trd_part_2_UnkFunc27 = 0x80218058; // type:func rom:0x4B1248
func_8021817C_4B136C = 0x8021817C; // type:func rom:0x4B136C dup2_b_area_trd_part_2_UnkFunc26 = 0x8021817C; // type:func rom:0x4B136C
func_80218350_4B1540 = 0x80218350; // type:func rom:0x4B1540 func_80218350_4B1540 = 0x80218350; // type:func rom:0x4B1540
func_8021837C_4B156C = 0x8021837C; // type:func rom:0x4B156C func_8021837C_4B156C = 0x8021837C; // type:func rom:0x4B156C
dup3_b_area_trd_part_2_StartRumbleWithParams = 0x802183E0; // type:func rom:0x4B15D0 dup3_b_area_trd_part_2_StartRumbleWithParams = 0x802183E0; // type:func rom:0x4B15D0
func_80218438_4B1628 = 0x80218438; // type:func rom:0x4B1628 func_80218438_4B1628 = 0x80218438; // type:func rom:0x4B1628
func_80218510_4B1700 = 0x80218510; // type:func rom:0x4B1700 dup3_b_area_trd_part_2_UnkEnemyFunc = 0x80218510; // type:func rom:0x4B1700
func_802185B0_4B17A0 = 0x802185B0; // type:func rom:0x4B17A0 func_802185B0_4B17A0 = 0x802185B0; // type:func rom:0x4B17A0
func_80218B48_4B1D38 = 0x80218B48; // type:func rom:0x4B1D38 dup3_b_area_trd_part_2_GetLastActorEventType = 0x80218B48; // type:func rom:0x4B1D38
b_area_trd_part_2_StartRumbleWithParams = 0x80218BA0; // type:func rom:0x4B1D90 b_area_trd_part_2_StartRumbleWithParams = 0x80218BA0; // type:func rom:0x4B1D90
func_80218BF8_4B1DE8 = 0x80218BF8; // type:func rom:0x4B1DE8 func_80218BF8_4B1DE8 = 0x80218BF8; // type:func rom:0x4B1DE8
func_80218CD0_4B1EC0 = 0x80218CD0; // type:func rom:0x4B1EC0 b_area_trd_part_2_UnkEnemyFunc = 0x80218CD0; // type:func rom:0x4B1EC0
func_80218D70_4B1F60 = 0x80218D70; // type:func rom:0x4B1F60 func_80218D70_4B1F60 = 0x80218D70; // type:func rom:0x4B1F60
func_80219308_4B24F8 = 0x80219308; // type:func rom:0x4B24F8 b_area_trd_part_2_GetLastActorEventType = 0x80219308; // type:func rom:0x4B24F8
dup4_b_area_trd_part_2_StartRumbleWithParams = 0x80219360; // type:func rom:0x4B2550 dup4_b_area_trd_part_2_StartRumbleWithParams = 0x80219360; // type:func rom:0x4B2550
func_802193B8_4B25A8 = 0x802193B8; // type:func rom:0x4B25A8 func_802193B8_4B25A8 = 0x802193B8; // type:func rom:0x4B25A8
func_80219490_4B2680 = 0x80219490; // type:func rom:0x4B2680 dup4_b_area_trd_part_2_UnkEnemyFunc = 0x80219490; // type:func rom:0x4B2680
func_80219530_4B2720 = 0x80219530; // type:func rom:0x4B2720 func_80219530_4B2720 = 0x80219530; // type:func rom:0x4B2720
func_80219AC8_4B2CB8 = 0x80219AC8; // type:func rom:0x4B2CB8 dup4_b_area_trd_part_2_GetLastActorEventType = 0x80219AC8; // type:func rom:0x4B2CB8
dup_b_area_trd_part_2_StartRumbleWithParams = 0x80219B20; // type:func rom:0x4B2D10 dup_b_area_trd_part_2_StartRumbleWithParams = 0x80219B20; // type:func rom:0x4B2D10
func_80219B78_4B2D68 = 0x80219B78; // type:func rom:0x4B2D68 func_80219B78_4B2D68 = 0x80219B78; // type:func rom:0x4B2D68
func_80219C50_4B2E40 = 0x80219C50; // type:func rom:0x4B2E40 dup_b_area_trd_part_2_UnkEnemyFunc = 0x80219C50; // type:func rom:0x4B2E40
func_80219CF0_4B2EE0 = 0x80219CF0; // type:func rom:0x4B2EE0 func_80219CF0_4B2EE0 = 0x80219CF0; // type:func rom:0x4B2EE0
func_8021A288_4B3478 = 0x8021A288; // type:func rom:0x4B3478 dup_b_area_trd_part_2_GetLastActorEventType = 0x8021A288; // type:func rom:0x4B3478
b_area_trd_part_2_UnkAngleFunc2 = 0x8021A2E0; // type:func rom:0x4B34D0 b_area_trd_part_2_UnkAngleFunc2 = 0x8021A2E0; // type:func rom:0x4B34D0
func_80218000_4CF1B0 = 0x80218000; // type:func rom:0x4CF1B0 func_80218000_4CF1B0 = 0x80218000; // type:func rom:0x4CF1B0
func_802180C8_4CF278 = 0x802180C8; // type:func rom:0x4CF278 func_802180C8_4CF278 = 0x802180C8; // type:func rom:0x4CF278
@ -19061,7 +19061,7 @@ gMessageMsgVars = 0x80155C38; // type:data
D_80155C98 = 0x80155C98; // type:data D_80155C98 = 0x80155C98; // type:data
gMessageWindowProjMatrix = 0x80155CA0; // type:data gMessageWindowProjMatrix = 0x80155CA0; // type:data
D_80155D20 = 0x80155D20; // type:data D_80155D20 = 0x80155D20; // type:data
msg_drawState = 0x80155D74; // type:data gMessageDrawStatePtr = 0x80155D74; // type:data
D_80155D80 = 0x80155D80; // type:data D_80155D80 = 0x80155D80; // type:data
D_80155D84 = 0x80155D84; // type:data D_80155D84 = 0x80155D84; // type:data
D_80155D88 = 0x80155D88; // type:data D_80155D88 = 0x80155D88; // type:data