diff --git a/include/common_structs.h b/include/common_structs.h index 742d3b4e00..e6998ee351 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -199,7 +199,7 @@ typedef struct PlayerData { /* 0x006 */ s8 curMaxFP; /* 0x007 */ u8 hardMaxFP; /* 0x008 */ u8 maxBP; - /* 0x009 */ u8 level; + /* 0x009 */ s8 level; /* 0x00A */ s8 hasActionCommands; /* 0x00B */ char unk_0B; /* 0x00C */ s16 coins; @@ -365,7 +365,7 @@ typedef struct Entity { /* 0x30 */ char unk_30[0x8]; /* 0x38 */ struct StaticEntityData* staticData; /* 0x3C */ UNK_PTR renderSetupFunc; // pointer to draw func(?) - /* 0x40 */ void* dataBuf; + /* 0x40 */ s32* dataBuf; /* 0x44 */ Mtx* vertexData; /* 0x48 */ Vec3f position; /* 0x54 */ Vec3f scale; @@ -665,11 +665,12 @@ typedef struct BattleStatus { /* 0x088 */ u8 itemUsesLeft; /* set to 2 for doublke dip, 3 for triple */ /* 0x089 */ u8 hpDrainCount; /* 0x08A */ s8 unk_8A; - /* 0x08B */ u8 hustleTurns; /* numTurns from hustle drink, normally 0 */ + /* 0x08B */ s8 hustleTurns; /* numTurns from hustle drink, normally 0 */ /* 0x08C */ char unk_8C; /* 0x08D */ s8 unk_8D; - /* 0x08E */ u8 initialEnemyCount; /* used for SP award bonus */ - /* 0x08F */ char unk_8F[3]; + /* 0x08E */ s8 initialEnemyCount; /* used for SP award bonus */ + /* 0x08F */ char unk_8F[1]; + /* 0x090 */ s16 unk_90; /* 0x092 */ s8 unk_92; /* 0x093 */ char unk_93; /* 0x094 */ s8 unk_94; @@ -695,7 +696,7 @@ typedef struct BattleStatus { /* 0x0B0 */ u8 itemLossTurns; /* 0x0B1 */ char unk_B1[3]; /* 0x0B4 */ UNK_FUN_PTR(preUpdateCallback); - /* 0x0B8 */ char unk_B8[4]; + /* 0x0B8 */ UNK_FUN_PTR(unk_B8); /* 0x0BC */ struct ScriptInstance* controlScript; /* control handed over to this when changing partners */ /* 0x0C0 */ ScriptID controlScriptID; /* 0x0C4 */ struct ScriptInstance* camMovementScript; @@ -751,7 +752,7 @@ typedef struct BattleStatus { /* 0x230 */ s32 holdInputBuffer[64]; /* 0x330 */ s32 pushInputBuffer[64]; /* 0x430 */ u8 holdInputBufferPos; - /* 0x431 */ u8 inputBufferPos; + /* 0x431 */ s8 inputBufferPos; /* 0x432 */ s8 unk_432; /* 0x433 */ char unk_433; /* 0x434 */ s32 unk_434; @@ -1229,10 +1230,10 @@ typedef struct GameStatus { /* 0x030 */ u32 prevButtons; /* from previous frame */ /* 0x034 */ char unk_34[12]; /* 0x040 */ s8 stickX; /* with deadzone */ - /* 0x041 */ u8 altStickX; /* input used for batte when flag 80000 set */ + /* 0x041 */ s8 altStickX; /* input used for batte when flag 80000 set */ /* 0x042 */ char unk_42[2]; /* 0x044 */ s8 stickY; /* with deadzone */ - /* 0x045 */ u8 altStickY; /* input used for batte when flag 80000 set */ + /* 0x045 */ s8 altStickY; /* input used for batte when flag 80000 set */ /* 0x046 */ char unk_46[2]; /* 0x048 */ s16 unk_48[4]; /* 0x050 */ s16 unk_50[4]; @@ -1381,7 +1382,7 @@ typedef struct CustomModelGfx { typedef struct SelectableTarget { /* 0x00 */ s16 actorID; /* 0x02 */ s16 partID; /* sometimes loaded as byte from 0x3 */ - /* 0x04 */ s16 pos[3]; + /* 0x04 */ Vec3s pos; /* 0x0A */ char unk_0A[7]; /* 0x11 */ u8 homeCol; /* from xpos --> 0-3 */ /* 0x12 */ u8 homeRow; /* from ypos --> 0-3 */ @@ -1544,7 +1545,7 @@ typedef struct DecorationTable { /* 0x8AC */ u8 effectType; /* 0 = blur, 14 = none? */ /* 0x8AD */ char unk_8AD[3]; /* 0x8B0 */ struct Temp8025D160* unk_8B0[2]; - /* 0x8B8 */ u8 decorationType[2]; + /* 0x8B8 */ s8 decorationType[2]; /* 0x8BA */ u8 unk_8BA[2]; /* 0x8BC */ u8 unk_8BC[2]; /* 0x8C0 */ s16 unk_8C0[6]; @@ -1760,7 +1761,7 @@ typedef struct Actor { /* 0x1F3 */ u8 numParts; /* 0x1F4 */ struct ActorPart* partsTable; /* 0x1F8 */ s16 lastDamageTaken; - /* 0x1FA */ s16 hpChangeCounter; + /* 0x1FA */ u16 hpChangeCounter; /* 0x1FC */ s16 damageCounter; /* 0x1FE */ char unk_1FE[2]; /* 0x200 */ s32** unk_200; // Probably a struct but not sure what yet @@ -1787,7 +1788,8 @@ typedef struct Actor { /* 0x222 */ s8 defenseBoost; /* 0x223 */ u8 chillOutAmount; /* attack reduction */ /* 0x224 */ u8 chillOutTurns; - /* 0x225 */ char unk_225[7]; + /* 0x225 */ char unk_225[3]; + /* 0x228 */ EffectInstance* unk_228; /* 0x22C */ struct SelectableTarget targetData[24]; /* 0x40C */ s8 targetListLength; /* 0x40D */ s8 targetIndexList[24]; /* into targetData */ @@ -1934,7 +1936,7 @@ typedef struct AnimatedModelNode { typedef struct EncounterStatus { /* 0x000 */ s32 flags; - /* 0x004 */ u8 eFirstStrike; /* 0 = none, 1 = player, 2 = enemy */ + /* 0x004 */ s8 eFirstStrike; /* 0 = none, 1 = player, 2 = enemy */ /* 0x005 */ s8 hitType; /* 1 = none/enemy, 2 = jump */ /* 0x006 */ s8 hitTier; /* 0 = normal, 1 = super, 2 = ultra */ /* 0x007 */ char unk_07; @@ -2219,4 +2221,11 @@ typedef struct TempSetZoneEnabled { /* 0x14 */ char unk_14[0x8]; } TempSetZoneEnabled; // size = 0x1C +typedef struct RenderTaskEntry { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s32 unk_04; + /* 0x08 */ void* appendGfxArg; + /* 0x0C */ void (*appendGfx)(void*); +} RenderTaskEntry; // size = 0x10 + #endif diff --git a/include/effects.h b/include/effects.h index 97196c0cb8..e164955219 100644 --- a/include/effects.h +++ b/include/effects.h @@ -135,7 +135,7 @@ EffectInstance* playFX_7D(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_7E(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_7F(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_80(s32, f32, f32, f32, f32, s32); -EffectInstance* playFX_81(s32, f32, f32, f32, f32, s32); +EffectInstance* playFX_81(s32, f32 x, f32 y, f32 z, f32, s32); void playFX_82(s32, f32, f32, f32, f32, s32 time); EffectInstance* playFX_83(s32, f32, f32, f32, f32, s32); EffectInstance* playFX_84(s32, f32, f32, f32, f32, f32); diff --git a/include/enums.h b/include/enums.h index 691c867326..bb08b8e554 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1191,39 +1191,41 @@ enum Elements { typedef UNK_TYPE Event; enum Events { - EVENT_HIT_COMBO = 9, + EVENT_HIT_COMBO = 9, EVENT_HIT, EVENT_SPIN_SMASH_HIT, EVENT_FALL_TRIGGER, EVENT_FLIP_TRIGGER, EVENT_BURN_HIT, - EVENT_SPIN_SMASH_LAUNCH_HIT = 17, - EVENT_STAR_BEAM = 19, - EVENT_POWER_BOUNCE_HIT = 21, + EVENT_SPIN_SMASH_LAUNCH_HIT = 17, + EVENT_STAR_BEAM = 19, + EVENT_POWER_BOUNCE_HIT = 21, EVENT_BLOW_AWAY, - EVENT_IMMUNE = 25, + EVENT_23 = 23, + EVENT_IMMUNE = 25, EVENT_BLOCK, EVENT_SPIKE_TAUNT, EVENT_BURN_TAUNT, - EVENT_AIR_LIFT_FAILED = 31, + EVENT_AIR_LIFT_FAILED = 31, EVENT_DEATH, EVENT_SPIN_SMASH_DEATH, EVENT_EXPLODE_TRIGGER, - EVENT_BURN_DEATH = 36, - EVENT_SHOCK_DEATH = 38, + EVENT_BURN_DEATH = 36, + EVENT_SPIN_SMASH_LAUNCH_DEATH = 37, + EVENT_SHOCK_DEATH = 38, EVENT_SPIKE_DEATH, EVENT_POWER_BOUNCE_DEATH, - EVENT_SPIKE_CONTACT = 42, - EVENT_BURN_CONTACT = 44, - EVENT_SHOCK_HIT = 47, - EVENT_RECOVER_STATUS = 49, - EVENT_END_FIRST_STRIKE = 53, - EVENT_LUCKY = 55, + EVENT_SPIKE_CONTACT = 42, + EVENT_BURN_CONTACT = 44, + EVENT_SHOCK_HIT = 47, + EVENT_RECOVER_STATUS = 49, + EVENT_END_FIRST_STRIKE = 53, + EVENT_LUCKY = 55, EVENT_BEGIN_FIRST_STRIKE, EVENT_SCARE_AWAY, EVENT_BEGIN_AIR_LIFT, - EVENT_UP_AND_AWAY = 61, - EVENT_SWAP_PARTNER = 63, + EVENT_UP_AND_AWAY = 61, + EVENT_SWAP_PARTNER = 63, EVENT_LIFE_SHROOM_PROC, EVENT_REVIVE, }; @@ -1637,12 +1639,15 @@ enum RenderMode { }; enum ActorFlags { + ACTOR_FLAG_DISABLED = 0x00000001, ///< Disables the actor. ACTOR_FLAG_NO_SHADOW = 0x00000004, ///< Hide shadow. ACTOR_FLAG_FLYING = 0x00000200, ///< Quake Hammer can't hit. ACTOR_FLAG_HP_OFFSET_BELOW = 0x00000800, ///< HP bar offset below actor (e.g. Swooper when upside-down). ACTOR_FLAG_TARGET_ONLY = 0x00004000, ///< Battle ends even if undefeated. No turn. + ACTOR_FLAG_80000 = 0x00080000, ACTOR_FLAG_NO_ATTACK = 0x00200000, ///< Skip attack turn. ACTOR_FLAG_NO_DMG_POPUP = 0x02000000, ///< Hide damage popup. + ACTOR_FLAG_10000000 = 0x10000000, }; enum ActorPartFlags { @@ -1677,6 +1682,12 @@ enum PartnerAnims { PARTNER_ANIM_HURT, }; +enum FirstStrikes { + FIRST_STRIKE_NONE, + FIRST_STRIKE_PLAYER, + FIRST_STRIKE_ENEMY, +}; + enum TimeFreezeMode { TIME_FREEZE_NORMAL, TIME_FREEZE_PARTIAL, diff --git a/include/functions.h b/include/functions.h index 94690d9d1b..b64d8e0cc6 100644 --- a/include/functions.h +++ b/include/functions.h @@ -62,6 +62,18 @@ void set_entity_model_flags(s32 idx, s32 newFlags); void clear_entity_model_flags(s32 idx, s32 newFlags); void exec_entity_model_commandlist(s32 idx); s32 load_entity_model(s32* cmdList); +RenderTaskEntry* queue_render_task(RenderTask* task); + +// append gfx funcs +void func_80257B28(s32); +void func_8025595C(Actor*); +void func_80257B68(Actor*); +void func_80257B48(s32); +void func_8025599C(s32); +void func_80257B88(void); +void func_80257DA4(void); +void func_80254C50(void); +void func_80258E14(void); f32 func_800E34D8(void); f32 player_check_collision_below(f32, s32* colliderID); @@ -121,9 +133,10 @@ s32 collision_main_above(void); s32 player_test_lateral_overlap(s32, PlayerStatus*, f32*, f32*, f32*, f32, f32); Npc* peach_make_disguise_npc(s32 peachDisguise); -void draw_box(s32 flags, s32 windowStyle, s16 posX, s16 posY, s32 posZ, s32 width, s32 height, s32 opacity, +void draw_box(s32 flags, s32 windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, s32 opacity, s32 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(s32), s32 drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, Matrix4f* outMtx); +s32 get_string_width(s32 stringID, u16 charset); s32 partner_player_can_pause(void); s32 disable_player_static_collisions(void); @@ -135,6 +148,8 @@ s32 get_map_IDs_by_name(const char* mapName, s16* areaID, s16* mapID); void get_dpad_input_radial(f32* angle, f32* magnitude); void transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS); +void try_player_footstep_sounds(s32 arg0); +void phys_update_interact_collider(void); void create_popup_menu(void*); s32 npc_test_move_simple_without_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32); @@ -194,7 +209,7 @@ void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*); f32 get_xz_dist_to_player(f32, f32); void func_800E06C0(s32); void close_status_menu(void); -void btl_state_update_switch_to_partner(s32); +void btl_state_update_switch_to_partner(void); Shadow* create_shadow_type(s32 type, f32 x, f32 y, f32 z); s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 centerY, f32 sizeX, f32 sizeZ); @@ -441,4 +456,14 @@ void sin_cos_rad(f32 rad, f32* outSinTheta, f32* outCosTheta); void* load_asset_by_name(const char* assetName, u32* decompressedSize); +EffectInstance* func_8005A2BC(EffectBlueprint* effectBp); +void remove_effect(EffectInstance* arg0); +s32 load_effect(s32 effectIndex); +void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex); +s32 func_8011CFBC(void); +s32 set_screen_overlay_center_worldpos(void); +s32 mdl_get_next_texture_address(void); +void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style); +void get_background_color_blend(u8* r, u8* g, u8* b, u8* a); + #endif diff --git a/include/variables.h b/include/variables.h index d2a31f064f..9a55d76518 100644 --- a/include/variables.h +++ b/include/variables.h @@ -226,8 +226,6 @@ extern s32 gItemMenuScrollUpIcon; extern s32 gStatsMenuIconIDs[12]; extern s32 gGameState; extern s16 gNpcCount; -extern s32 D_8009A64C; -extern s32* D_8009A658; extern s32 gOverrideFlags; extern u16 D_8009A6A0; extern u16 D_8009A6A2; @@ -295,9 +293,6 @@ extern Temp8010F250 D_8010F250; // sfx_play_sound state struct? // Effects extern EffectTableEntry gEffectTable[135]; -//nusys -extern OSPiHandle* carthandle; - extern SaveData gCurrentSaveFile; extern u32* gMapFlags; @@ -354,7 +349,6 @@ extern MusicSettings D_8014F6F0; // OS extern OSThread D_800A4270; // idle thread, id 1 extern OSThread D_800A4420; // id 3 -extern s32 D_800B8590; extern OSThread* __osActiveQueue; extern OSThread* __osRunningThread; extern OSThread* __osRunQueue; diff --git a/src/16F740.c b/src/16F740.c index b180e1d479..faadec46da 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -147,7 +147,7 @@ INCLUDE_ASM(s32, "16F740", btl_state_update_begin_partner_turn); void btl_state_draw_begin_partner_turn(void) { } -void btl_state_update_switch_to_partner(s32 arg0) { +void btl_state_update_switch_to_partner(void) { Actor* player = gBattleStatus.playerActor; Actor* partner = gBattleStatus.partnerActor; s32 i; diff --git a/src/16c8e0.c b/src/16c8e0.c index 32ecceb9ce..9c5748d8c1 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -15,6 +15,13 @@ void* D_802809FC[] = { s32 D_80280A30 = 0xFF; +extern PartnerID D_8029DA33; +extern s32 D_8029DA34; +extern Camera D_8029DA50[ARRAY_COUNT(gCameras)]; +extern f32 D_8029EFB0; +extern f32 D_8029EFB4; +extern f32 D_8029EFB8; + Script BtlPutPartnerAway = SCRIPT({ DispatchEvent(ACTOR_PARTNER, 62); parallel { @@ -193,11 +200,337 @@ void update_actor_shadows(void) { } } -INCLUDE_ASM(s32, "16c8e0", btl_update); +void btl_update(void) { + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; + Actor* partner = battleStatus->partnerActor; + f32 dpadAngle; + f32 dpadMagnitude; + s32 cond; + + if (battleStatus->inputBitmask != -1) { + if (battleStatus->flags1 & 0x80000 && gGameStatusPtr->unk_81 != 0) { + s32 inputBitmask = battleStatus->inputBitmask; + + battleStatus->currentButtonsDown = gGameStatusPtr->altCurrentButtons & inputBitmask; + battleStatus->currentButtonsPressed = gGameStatusPtr->altPressedButtons & inputBitmask; + battleStatus->currentButtonsHeld = gGameStatusPtr->altHeldButtons & inputBitmask; + battleStatus->stickX = gGameStatusPtr->altStickX; + battleStatus->stickY = gGameStatusPtr->altStickY; + } else { + s32 inputBitmask2 = battleStatus->inputBitmask; + + battleStatus->currentButtonsDown = gGameStatusPtr->currentButtons & inputBitmask2; + battleStatus->currentButtonsPressed = gGameStatusPtr->pressedButtons & inputBitmask2; + battleStatus->currentButtonsHeld = gGameStatusPtr->heldButtons & inputBitmask2; + battleStatus->stickX = gGameStatusPtr->stickX; + battleStatus->stickY = gGameStatusPtr->stickY; + } + } + + get_dpad_input_radial(&dpadAngle, &dpadMagnitude); + battleStatus->dpadX = dpadAngle; + battleStatus->dpadY = dpadMagnitude; + battleStatus->pushInputBuffer[battleStatus->inputBufferPos] = battleStatus->currentButtonsPressed; + battleStatus->holdInputBuffer[battleStatus->inputBufferPos] = battleStatus->currentButtonsDown; + + battleStatus->inputBufferPos++; + if (battleStatus->inputBufferPos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + battleStatus->inputBufferPos = 0; + } + + if (battleStatus->preUpdateCallback != NULL) { + battleStatus->preUpdateCallback(); + } + + cond = TRUE; + if (battleStatus->unk_95 == 0 || battleStatus->unk_95 != gBattleState) { + switch (gBattleState) { + case -1: + case 0: + return; + case 1: + btl_state_update_normal_start(); + cond = FALSE; + break; + case 7: + btl_state_update_begin_player_turn(); + break; + case 8: + btl_state_update_begin_partner_turn(); + break; + case 9: + func_80242FE0(); + break; + case 5: + btl_state_update_begin_turn(); + break; + case 6: + btl_state_update_end_turn(); + break; + case 10: + btl_state_update_switch_to_player(); + break; + case 11: + btl_state_update_switch_to_partner(); + break; + case 12: + btl_state_update_prepare_menu(); + break; + case 13: + btl_state_update_player_menu(); + break; + case 14: + btl_state_update_partner_menu(); + break; + case 16: + btl_state_update_twink_menu(); + break; + case 15: + btl_state_update_peach_menu(); + break; + case 17: + btl_state_update_select_target(); + break; + case 18: + btl_state_update_player_move(); + break; + case 2: + btl_state_update_first_strike(); + break; + case 22: + btl_state_update_end_player_turn(); + break; + case 23: + btl_state_update_end_partner_turn(); + break; + case 21: + btl_state_update_enemy_move(); + break; + case 3: + btl_state_update_partner_striking_first(); + break; + case 20: + btl_state_update_next_enemy(); + break; + case 19: + btl_state_update_partner_move(); + break; + case 26: + btl_state_update_victory(); + break; + case 32: + btl_state_update_end_battle(); + break; + case 29: + btl_state_update_change_partner(); + break; + case 24: + btl_state_update_run_away(); + break; + case 25: + btl_state_update_defend(); + break; + case 27: + btl_state_update_defeat(); + break; + case 28: + btl_state_update_1C(); + break; + case 30: + btl_state_update_end_training_battle(); + break; + case 4: + btl_state_update_enemy_striking_first(); + break; + case 34: + btl_state_update_22(); + break; + case 33: + btl_state_update_celebration(); + break; + case 35: + btl_state_update_end_demo_battle(); + cond = FALSE; + break; + } + } + + battleStatus->unk_90++; + if (battleStatus->unk_90 == 40) { + func_8024F7C8(); + } + + func_80266684(); + func_80266978(); + func_80266B14(); + func_8024EE48(); + update_actor_shadows(); + + if (battleStatus->unk_432 != -2) { + u8 paramType; + f32 paramAmount; + + get_screen_overlay_params(1, ¶mType, ¶mAmount); + + if (battleStatus->unk_432 > 0) { + set_screen_overlay_color(1, 0, 0, 0); + if (partner == NULL) { + set_screen_overlay_params_back(0, 215.0f); + } else if (playerData->currentPartner == 6) { + paramAmount -= 10.0f; + if (paramAmount < 0.0f) { + paramAmount = 0.0f; + } + set_screen_overlay_params_back(0, paramAmount); + } else { + paramAmount += 10.0f; + if (paramAmount > 215.0f) { + paramAmount = 215.0f; + } + set_screen_overlay_params_back(0, paramAmount); + } + } else if (battleStatus->unk_432 < 0) { + paramAmount -= 10.0f; + if (paramAmount < 0.0f) { + paramAmount = 0.0f; + set_screen_overlay_params_back(0xFF, -1.0f); + battleStatus->unk_432 = 0; + } else { + set_screen_overlay_params_back(0, paramAmount); + } + } + + if (cond || D_802809F6 != -1) { + if (D_802809F6 == -1) { + if (gGameStatusPtr->demoState == 2) { + u8 paramType; + f32 paramAmount; + + get_screen_overlay_params(0, ¶mType, ¶mAmount); + if (paramType == 0xFF) { + D_802809F6 = 0; + set_screen_overlay_params_front(0, 0.0f); + } + } + } else if (D_802809F6 == 0xFF) { + if (gBattleState != 0x23) { + btl_set_state(0x23, 0xFF); + } + } else { + D_802809F6 += 10; + if (D_802809F6 > 0xFF) { + D_802809F6 = 0xFF; + } + + set_screen_overlay_params_front(0, D_802809F6); + set_screen_overlay_color(0, 208, 208, 208); + intro_logos_set_fade_alpha(255); + intro_logos_set_fade_color(224); + } + } + } +} INCLUDE_ASM(s32, "16c8e0", btl_draw_ui); -INCLUDE_ASM(s32, "16c8e0", func_8023ED5C); +void func_8023ED5C(void) { + BattleStatus* battleStatus = &gBattleStatus; + RenderTask renderTask; + RenderTask* renderTaskPtr = &renderTask; + Actor* actor; + s32 i; + + if (gBattleState != 0) { + func_8024EEA8(); + if (battleStatus->unk_B8 != NULL) { + battleStatus->unk_B8(); + } + if (battleStatus->flags1 & 1) { + func_80255FD8(); + + if (gCurrentCamID == 1 || gCurrentCamID == 2) { + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + actor = battleStatus->enemyActors[i]; + + if (actor != NULL && !(actor->flags & ACTOR_FLAG_DISABLED)) { + renderTaskPtr->appendGfxArg = i; + renderTaskPtr->appendGfx = func_80257B28; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = actor->renderMode; + queue_render_task(renderTaskPtr); + + if (actor->flags & ACTOR_FLAG_10000000) { + renderTaskPtr->appendGfxArg = actor; + renderTaskPtr->appendGfx = func_8025595C; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = 0x22; + queue_render_task(renderTaskPtr); + } + + if (battleStatus->unk_92 & 1) { + renderTaskPtr->appendGfxArg = actor; + renderTaskPtr->appendGfx = func_80257B68; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = actor->renderMode; + queue_render_task(renderTaskPtr); + } + } + } + + actor = battleStatus->partnerActor; + if (actor != NULL && !(actor->flags & ACTOR_FLAG_DISABLED)) { + renderTaskPtr->appendGfxArg = NULL; + renderTaskPtr->appendGfx = func_80257B48; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = actor->renderMode; + queue_render_task(renderTaskPtr); + + if (actor->flags & ACTOR_FLAG_10000000) { + renderTaskPtr->appendGfxArg = actor; + renderTaskPtr->appendGfx = func_8025599C; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = 0x22; + queue_render_task(renderTaskPtr); + } + + if (battleStatus->unk_92 & 1) { + renderTaskPtr->appendGfxArg = NULL; + renderTaskPtr->appendGfx = func_80257B88; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = actor->renderMode; + queue_render_task(renderTaskPtr); + } + } + + actor = battleStatus->playerActor; + if (actor != NULL && !(actor->flags & ACTOR_FLAG_DISABLED)) { + renderTaskPtr->appendGfxArg = NULL; + renderTaskPtr->appendGfx = func_80257DA4; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = actor->renderMode; + queue_render_task(renderTaskPtr); + + if (actor->flags & ACTOR_FLAG_10000000) { + renderTaskPtr->appendGfxArg = actor; + renderTaskPtr->appendGfx = func_80254C50; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = 0x22; + queue_render_task(renderTaskPtr); + } + + if (battleStatus->unk_92 & 1) { + renderTaskPtr->appendGfxArg = NULL; + renderTaskPtr->appendGfx = func_80258E14; + renderTaskPtr->distance = actor->currentPos.z; + renderTaskPtr->renderMode = actor->renderMode; + queue_render_task(renderTaskPtr); + } + } + } + } + } +} INCLUDE_ASM(s32, "16c8e0", func_8023F060); @@ -211,9 +544,46 @@ INCLUDE_ASM(s32, "16c8e0", btl_draw_enemy_health_bars); INCLUDE_ASM(s32, "16c8e0", btl_update_starpoints_display); -INCLUDE_ASM(s32, "16c8e0", btl_save_world_cameras); +void btl_save_world_cameras(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 i; -INCLUDE_ASM(s32, "16c8e0", btl_restore_world_cameras); + for (i = 0; i < ARRAY_COUNT(gCameras); i++) { + D_8029DA50[i] = gCameras[i]; + } + + D_8029EFB0 = playerStatus->position.x; + D_8029EFB4 = playerStatus->position.y; + D_8029EFB8 = playerStatus->position.z; + playerStatus->position.x = 0.0f; + playerStatus->position.y = -1000.0f; + playerStatus->position.z = 0.0f; +} + +void btl_restore_world_cameras(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + PlayerData* playerData = &gPlayerData; + s32 i; + + for (i = 0; i < ARRAY_COUNT(gCameras); i++) { + gCameras[i] = D_8029DA50[i]; + } + + gCurrentCameraID = 0; + playerStatus->position.x = D_8029EFB0; + playerStatus->position.y = D_8029EFB4; + playerStatus->position.z = D_8029EFB8; + + if (D_8029DA34 & 0x80) { + gOverrideFlags |= 0x80; + } else { + gOverrideFlags &= ~0x80; + } + + if (gBattleStatus.flags2 & 0x40) { + playerData->currentPartner = D_8029DA33; + } +} void btl_delete_actor(Actor* actor) { ActorPart* partsTable; diff --git a/src/182B30.c b/src/182B30.c index cd689222ed..f1d71c1d79 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -51,7 +51,7 @@ void reset_actor_blur(Actor* actor) { if (decorationTable->unk_7DB != 0) { decorationTable->unk_7DB--; if (decorationTable->unk_7DB == 0) { - actor->flags &= ~0x10000000; + actor->flags &= ~ACTOR_FLAG_10000000; decorationTable->effectType = 1; } } @@ -93,7 +93,7 @@ void enable_player_blur(void) { decorationTable->effectType = 0; decorationTable->unk_7DB++; - playerActor->flags |= 0x10000000; + playerActor->flags |= ACTOR_FLAG_10000000; decorationTable->unk_7D8 = 0; decorationTable->unk_7D9 = 0; @@ -129,7 +129,7 @@ void func_80254950(void) { if (decorationTable->unk_7DB != 0) { decorationTable->unk_7DB--; if (decorationTable->unk_7DB == 0) { - playerActor->flags &= ~0x10000000; + playerActor->flags &= ~ACTOR_FLAG_10000000; decorationTable->effectType = 1; } } @@ -146,14 +146,14 @@ void func_802549C0(void) { Actor* playerActor = gBattleStatus.playerActor; DecorationTable* decorationTable = playerActor->partsTable->decorationTable; - playerActor->flags &= ~0x10000000; + playerActor->flags &= ~ACTOR_FLAG_10000000; decorationTable->unk_7DB = 0; decorationTable->effectType = 1; } INCLUDE_ASM(s32, "182B30", func_802549F4); -INCLUDE_ASM(s32, "182B30", func_80254C50); +INCLUDE_ASM(void, "182B30", func_80254C50); INCLUDE_ASM(s32, "182B30", func_802550BC); @@ -163,8 +163,8 @@ void func_8025593C(s32 arg0) { func_802550BC(0, arg0); } -void func_8025595C(s32 arg0) { - func_802552EC(0, arg0); +void func_8025595C(Actor* actor) { + func_802552EC(0, actor); } void func_8025597C(s32 arg0) { @@ -206,8 +206,8 @@ void func_80257B48(s32 arg0) { func_80255FE0(1, arg0); } -void func_80257B68(s32 arg0) { - func_802571F0(0, arg0); +void func_80257B68(Actor* actor) { + func_802571F0(0, actor); } void func_80257B88(void) { @@ -216,9 +216,9 @@ void func_80257B88(void) { INCLUDE_ASM(s32, "182B30", update_player_actor_shadow); -INCLUDE_ASM(s32, "182B30", func_80257DA4); +INCLUDE_ASM(void, "182B30", func_80257DA4); -INCLUDE_ASM(s32, "182B30", func_80258E14); +INCLUDE_ASM(void, "182B30", func_80258E14); INCLUDE_ASM(s32, "182B30", func_802591EC); @@ -326,62 +326,117 @@ INCLUDE_ASM(s32, "182B30", func_8025CD40); INCLUDE_ASM(s32, "182B30", func_8025CEC8); -INCLUDE_ASM(s32, "182B30", _remove_part_decoration); +void _remove_part_decoration(ActorPart* part, s32 decorationIndex) { + DecorationTable* decorationTable = part->decorationTable; + + switch (decorationTable->decorationType[decorationIndex]) { + case 0: + func_8025D158(part, decorationIndex); + break; + case 1: + func_8025D290(part, decorationIndex); + break; + case 2: + func_8025D3C4(part, decorationIndex); + break; + case 3: + func_8025D4A0(part, decorationIndex); + break; + case 4: + func_8025D620(part, decorationIndex); + break; + case 5: + func_8025D6FC(part, decorationIndex); + break; + case 6: + func_8025D810(part, decorationIndex); + break; + case 7: + func_8025D8EC(part, decorationIndex); + break; + case 8: + func_8025DA60(part, decorationIndex); + break; + case 9: + func_8025DBC8(part, decorationIndex); + break; + case 10: + func_8025DD40(part, decorationIndex); + break; + case 11: + func_8025DE88(part, decorationIndex); + break; + } + + decorationTable->decorationType[decorationIndex] = 0; +} void func_8025D150(void) { } -void func_8025D158(void) { +void func_8025D158(ActorPart* part, s32 decorationIndex) { } INCLUDE_ASM(s32, "182B30", func_8025D160); -INCLUDE_ASM(s32, "182B30", func_8025D290); +void func_8025D290(ActorPart* part, s32 decorationIndex) { + part->decorationTable->unk_8B0[decorationIndex]->unk_0C->unk_2C = 5; +} INCLUDE_ASM(s32, "182B30", func_8025D2B0); -void func_8025D3C4(void) { +void func_8025D3C4(ActorPart* part, s32 decorationIndex) { } INCLUDE_ASM(s32, "182B30", func_8025D3CC); -INCLUDE_ASM(s32, "182B30", func_8025D4A0); +void func_8025D4A0(ActorPart* part, s32 decorationIndex) { + remove_effect(part->decorationTable->unk_8B0[decorationIndex]); +} INCLUDE_ASM(s32, "182B30", func_8025D4C8); -INCLUDE_ASM(s32, "182B30", func_8025D620); +void func_8025D620(ActorPart* part, s32 decorationIndex) { + part->decorationTable->unk_8B0[decorationIndex]->unk_0C->unk_2C = 5; +} INCLUDE_ASM(s32, "182B30", func_8025D640); -INCLUDE_ASM(s32, "182B30", func_8025D6FC); +void func_8025D6FC(ActorPart* part, s32 decorationIndex) { + part->decorationTable->unk_8B0[decorationIndex]->unk_00 |= 0x10; +} INCLUDE_ASM(s32, "182B30", func_8025D71C); -INCLUDE_ASM(s32, "182B30", func_8025D810); +void func_8025D810(ActorPart* part, s32 decorationIndex) { + part->decorationTable->unk_8B0[decorationIndex]->unk_00 |= 0x10; +} INCLUDE_ASM(s32, "182B30", func_8025D830); -INCLUDE_ASM(s32, "182B30", func_8025D8EC); +void func_8025D8EC(ActorPart* part, s32 decorationIndex) { + part->decorationTable->unk_8B0[decorationIndex]->unk_00 |= 0x10; +} INCLUDE_ASM(s32, "182B30", func_8025D90C); -void func_8025DA60(void) { +void func_8025DA60(ActorPart* part, s32 decorationIndex) { } INCLUDE_ASM(s32, "182B30", func_8025DA68); -void func_8025DBC8(void) { +void func_8025DBC8(ActorPart* part, s32 decorationIndex) { } INCLUDE_ASM(s32, "182B30", func_8025DBD0); -void func_8025DD40(ActorPart* actorPart, s32 arg1) { - actorPart->decorationTable->unk_8B0[arg1]->unk_0C->unk_2C = 5; +void func_8025DD40(ActorPart* actorPart, s32 decorationIndex) { + actorPart->decorationTable->unk_8B0[decorationIndex]->unk_0C->unk_2C = 5; } INCLUDE_ASM(s32, "182B30", func_8025DD60); -void func_8025DE88(ActorPart* actorPart, s32 arg1) { - actorPart->decorationTable->unk_8B0[arg1]->unk_00 |= 0x10; +void func_8025DE88(ActorPart* actorPart, s32 decorationIndex) { + actorPart->decorationTable->unk_8B0[decorationIndex]->unk_00 |= 0x10; } diff --git a/src/190B20.c b/src/190B20.c index 286ad2468f..f7e4c7ca8f 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1202,7 +1202,124 @@ INCLUDE_ASM(s32, "190B20", lookup_status_chance); // exactly (?) the same as loo INCLUDE_ASM(s32, "190B20", lookup_status_duration_mod); // exactly (?) the same as lookup_defense -INCLUDE_ASM(s32, "190B20", inflict_status); +s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { + BattleStatus* battleStatus = &gBattleStatus; + EffectInstance* effect; + + switch (statusTypeKey) { + case STATUS_FEAR: + case STATUS_DIZZY: + case STATUS_PARALYZE: + case STATUS_SLEEP: + case STATUS_FROZEN: + case STATUS_STOP: + case STATUS_POISON: + case STATUS_SHRINK: + if (target->actorID != ACTOR_PLAYER || (!is_ability_active(ABILITY_FEELING_FINE) && + !is_ability_active(ABILITY_BERSERKER) && battleStatus->hustleTurns == 0)) { + + if (target->actorID != ACTOR_PARTNER) { + if (target->debuff != statusTypeKey) { + target->status = statusTypeKey; + } + target->ptrDefuffIcon->ptrPropertyList[15] = 0; + target->debuff = statusTypeKey; + target->debuffDuration = duration; + if ((s8)duration > 9) { + target->debuffDuration = 9; + } + + switch (statusTypeKey) { + case STATUS_FROZEN: + if (target->actorID != ACTOR_PARTNER) { + effect = target->unk_228; + if (effect != NULL) { + effect->flags |= 0x10; + } + target->unk_228 = playFX_81(0, target->currentPos.x, target->currentPos.y, + target->currentPos.z, 1.0f, 0); + func_80047820(target->unk_436, STATUS_FROZEN); + } + return TRUE; + case STATUS_SLEEP: + func_80266DAC(target, 3); + func_80047820(target->unk_436, STATUS_SLEEP); + return TRUE; + case STATUS_PARALYZE: + func_80266DAC(target, 7); + func_80047820(target->unk_436, STATUS_PARALYZE); + return TRUE; + case STATUS_DIZZY: + func_80047820(target->unk_436, STATUS_DIZZY); + return TRUE; + case STATUS_FEAR: + func_80266DAC(target, 5); + func_80047820(target->unk_436, STATUS_FEAR); + return TRUE; + case STATUS_POISON: + func_80266DAC(target, 6); + func_80047820(target->unk_436, STATUS_POISON); + return TRUE; + case STATUS_SHRINK: + func_80047820(target->unk_436, STATUS_SHRINK); + return TRUE; + } + } + return TRUE; + } else { + return FALSE; + } + break; + case STATUS_STATIC: + if (target->actorID != ACTOR_PARTNER) { + target->staticStatus = statusTypeKey; + target->staticDuration = duration; + if ((s8)duration > 9) { + target->staticDuration = 9; + } + target->status = STATUS_STATIC; + func_80266DAC(target, 4); + func_80047928(target->unk_436, STATUS_STATIC); + } + return TRUE; + case STATUS_STONE: + if (target->actorID != ACTOR_PARTNER) { + target->stoneStatus = STATUS_STONE; + target->stoneDuration = duration; + if ((s8)duration > 9) { + target->stoneDuration = 9; + } + target->status = STATUS_STONE; + } + return TRUE; + case STATUS_DAZE: + if (target->koStatus < statusTypeKey) { + target->koStatus = STATUS_DAZE; + target->koDuration = duration; + if ((s8)duration > 9) { + target->koDuration = 9; + } + target->status = STATUS_DAZE; + } + return TRUE; + case STATUS_E: + if (target->actorID != ACTOR_PARTNER) { + target->transStatus = STATUS_E; + target->transDuration = duration; + if ((s8)duration > 9) { + target->transDuration = 9; + } + target->status = STATUS_E; + func_80047A30(target->unk_436, STATUS_E); + } + return TRUE; + case STATUS_END: + case STATUS_NORMAL: + case STATUS_DEFAULT: + default: + return TRUE; + } +} s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) { if (statusTypeKey == STATUS_DAZE) { diff --git a/src/1A5830.c b/src/1A5830.c index c999343cce..bd2f8d3d8e 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -1,7 +1,11 @@ #include "common.h" #include "battle/battle.h" +extern s32 D_802946E0[]; + void dispatch_event_actor(Actor* actor, Event event); +s32 func_80263230(Actor*, Actor*); +void func_80267018(Actor* actor, s32 arg1); s32 has_enchanted_part(Actor* actor) { ActorPart* partIt = actor->partsTable; @@ -127,7 +131,82 @@ INCLUDE_ASM(s32, "1A5830", calc_enemy_test_target); INCLUDE_ASM(s32, "1A5830", calc_enemy_damage_target); + +// part before the first conditional needs work +#ifdef NON_MATCHING +s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEvent, s32 stopMotion) { + BattleStatus* battleStatus = &gBattleStatus; + ActorMovementWalk* walk; + s32 dispatchEvent; + + u16 temp_v1; + + battleStatus->currentAttackDamage = damageAmount; + temp_v1 = actor->hpChangeCounter + battleStatus->currentAttackDamage; + actor->hpChangeCounter += temp_v1; + actor->damageCounter += temp_v1; + battleStatus->lastAttackDamage = 0; + actor->hpChangeCounter -= temp_v1; + actor->currentHP -= temp_v1; + + dispatchEvent = originalEvent; + + walk = &actor->walk; + if (actor->currentHP <= 0) { + battleStatus->lastAttackDamage += actor->currentHP; + actor->currentHP = 0; + dispatchEvent = EVENT_DEATH; + } + + battleStatus->lastAttackDamage += temp_v1; + actor->lastDamageTaken = battleStatus->lastAttackDamage; + battleStatus->unk_19A = 0; + + if (battleStatus->flags1 & 0x20) { + if (dispatchEvent == EVENT_HIT_COMBO) { + dispatchEvent = EVENT_HIT; + } + if (dispatchEvent == EVENT_23) { + dispatchEvent = EVENT_IMMUNE; + } + } + + if (dispatchEvent == EVENT_DEATH) { + if (originalEvent == EVENT_SPIN_SMASH_LAUNCH_HIT) { + dispatchEvent = EVENT_SPIN_SMASH_LAUNCH_DEATH; + } + if (originalEvent == EVENT_SHOCK_HIT) { + dispatchEvent = EVENT_SHOCK_DEATH; + } + } + + if (stopMotion == 0) { + s32 targetActorID = actor->targetActorID; // why? + + if (func_80263230(actor, actor) != 0) { + show_damage_popup(actor->targetData[0].pos.x, actor->targetData[0].pos.y, actor->targetData[0].pos.z, + battleStatus->lastAttackDamage, 0); + func_802666E4(actor, actor->targetData[0].pos.x, actor->targetData[0].pos.y, actor->targetData[0].pos.z, + battleStatus->lastAttackDamage); + actor->targetActorID = targetActorID; + } else { + actor->targetActorID = targetActorID; + } + } else { + show_damage_popup(walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, battleStatus->lastAttackDamage, 0); + func_802666E4(actor, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z, battleStatus->lastAttackDamage); + } + + if (battleStatus->lastAttackDamage > 0) { + func_80267018(actor, 1); + } + actor->flags |= ACTOR_FLAG_80000; + dispatch_event_actor(actor, dispatchEvent); + return 0; +} +#else INCLUDE_ASM(s32, "1A5830", dispatch_damage_event_actor); +#endif s32 dispatch_damage_event_actor_0(Actor* actor, s32 damageAmount, s32 event) { return dispatch_damage_event_actor(actor, damageAmount, event, FALSE); @@ -466,7 +545,62 @@ ApiStatus RemoveActor(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "1A5830", RemoveActor); #endif -INCLUDE_ASM(s32, "1A5830", DropStarPoints); +ApiStatus DropStarPoints(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; + Bytecode* args = script->ptrReadPos; + Actor* dropper; + f32 playerLevel; + f32 enemyLevel; + ActorID actorID; + f32 ntd; + s32 numToDrop; + + actorID = get_variable(script, *args++); + if (actorID == ACTOR_SELF) { + actorID = script->owner1.enemyID; + } + dropper = get_actor(actorID); + + enemyLevel = dropper->staticActorData->level; + if (dropper->staticActorData->level == 0.0f) { + enemyLevel = 1.0f; + } + + playerLevel = playerData->level; + if (playerLevel == 0.0f) { + playerLevel = 1.0f; + } + + ntd = 0.0f; + if (!(enemyLevel < playerLevel)) { + ntd = ((enemyLevel - playerLevel) * 0.5f) * D_802946E0[battleStatus->initialEnemyCount]; + ntd = (ntd + 50.0f) / 100.0f; + } + numToDrop = ntd; + + if (playerData->level < 27) { + s32 spawnMode; + s32 i; + + if (dropper->flags & ACTOR_FLAG_HP_OFFSET_BELOW) { + spawnMode = ITEM_SPAWN_MODE_UNKNOWN_19; + } else { + spawnMode = ITEM_SPAWN_MODE_UNKNOWN_17; + } + + for (i = 0; i < numToDrop; i++) { + make_item_entity_delayed(ITEM_STAR_POINT, dropper->currentPos.x, dropper->currentPos.y, + dropper->currentPos.z, spawnMode, i, 0); + } + + battleStatus->incrementStarPointDelay = 40; + battleStatus->pendingStarPoints += numToDrop; + } + + gBattleStatus.flags1 |= 0x1000000; + return ApiStatus_DONE2; +} ApiStatus SetDefenseTable(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index a358cac663..458f6ace55 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -2,6 +2,7 @@ #include "map.h" #include "effects.h" +extern s16 D_8009A668; extern s32 D_800A0BA0; extern f32 D_800A0BA4; extern EffectInstance* D_800A0BA8; @@ -59,7 +60,11 @@ ApiStatus FadeBackgroundToBlack(ScriptInstance* script, s32 isInitialCall) { set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0]) * 10) & 254); script->functionTemp[0]--; do {} while (0); - return (script->functionTemp[0] == 0) * ApiStatus_DONE2; + + if (script->functionTemp[0] == 0) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; } ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) { @@ -335,9 +340,61 @@ void draw_encounters_pre_battle(void) { } } -extern s16* D_8009A668; +void show_first_strike_message(void) { + EncounterStatus* currentEncounter = &gCurrentEncounter; + s32 posX; + s32 width; + s32 xOffset; + s32 screenWidthHalf; -INCLUDE_ASM(s32, "1a1f0_len_5390", show_first_strike_message); + if (currentEncounter->unk_94 == 0) { + D_8009A668 = -200; + return; + } + + D_8009A668 += 40; + xOffset = D_8009A668; + if (xOffset > 0) { + if (xOffset < 1600) { + xOffset = 0; + } else { + xOffset -= 1600; + } + } + + screenWidthHalf = SCREEN_WIDTH / 2; + + switch (currentEncounter->eFirstStrike) { + case FIRST_STRIKE_PLAYER: + switch (currentEncounter->hitType) { + case 2: + case 4: + width = get_string_width(0x1D00AC, 0) + 24; + posX = (xOffset + screenWidthHalf) - (width / 2); + draw_box(0, 0x14, posX, 69, 0, width, 28, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, 0, NULL, + SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + draw_string(0x1D00AC, posX + 11, 75, 0xFF, 0xA, 0); + break; + case 6: + width = get_string_width(0x1D00AD, 0) + 24; + posX = (xOffset + screenWidthHalf) - (width / 2); + draw_box(0, 0x14, posX, 69, 0, width, 28, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, 0, NULL, + SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + draw_string(0x1D00AD, posX + 11, 75, 0xFF, 0xA, 0); + break; + } + break; + case FIRST_STRIKE_ENEMY: + if (!is_ability_active(ABILITY_CHILL_OUT)) { + width = get_string_width(0x1D00AE, 0) + 24; + posX = (xOffset + screenWidthHalf) - (width / 2); + draw_box(0, 4, posX, 69, 0, width, 28, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, 0, NULL, + SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + draw_string(0x1D00AE, posX + 11, 75, 0xFF, 0xA, 0); + } + break; + } +} INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_post_battle); diff --git a/src/25f00_len_940.c b/src/25f00_len_940.c index 82dce9637f..f7cea0a01d 100644 --- a/src/25f00_len_940.c +++ b/src/25f00_len_940.c @@ -101,7 +101,7 @@ s32 nuAuDmaCallBack(s32 addr, s32 len, void *state, u8 arg3) { mesg->dramAddr = temp_s2; mesg->devAddr = temp_s3; mesg->size = 0x500; - osEPiStartDma(carthandle, mesg, 0); + osEPiStartDma(nuPiCartHandle, mesg, 0); return osVirtualToPhysical(temp_s2) + temp_s0; } #else diff --git a/src/325AD0.c b/src/325AD0.c index a4432b5184..b4d67f5cca 100644 --- a/src/325AD0.c +++ b/src/325AD0.c @@ -1,7 +1,34 @@ #include "common.h" -extern u32 D_E0200690; -extern u32 D_E0200734[]; +u32 D_E0200690 = 0x1E6D3457; + +void* effectFuncs[] = { + guRotateF, guTranslateF, guTranslate, guScaleF, guMtxCatF, guMtxF2L, guMtxL2F, queue_render_task, func_8005A2BC, + remove_effect, general_heap_malloc, mem_clear, NULL, rand_int, clamp_angle, sin_deg, cos_deg, atan2, + npc_raycast_down_sides, load_effect, sqrtf, mdl_draw_hidden_panel_surface, func_8011CFBC, guPerspectiveF, + guMtxIdentF, transform_point, guLookAtHiliteF, set_screen_overlay_params_back, set_screen_overlay_center, + set_screen_overlay_center_worldpos, mdl_get_next_texture_address, guPositionF, guOrthoF, guFrustumF, func_80138D88, + draw_box, draw_string, get_string_width, get_background_color_blend, sfx_play_sound_at_position +}; + +s32 D_E0200734[128] = { + 0x100B2AF5, 0x45B59924, 0x35094B45, 0x4ABFA67A, 0x164F5371, 0x7B195845, 0x58562A56, 0x25733D41, 0x48008107, + 0x0E004F28, 0x6963B8AD, 0x5B82AB71, 0x6BC1F51B, 0x3D947816, 0x39705175, 0x44409A59, 0x0ED99067, 0x5F70B6F8, + 0x3225AEEE, 0x08B5E97C, 0x2CDE7594, 0x5E9E5B7D, 0x5B2A2888, 0x107F0F50, 0x58FBC53B, 0x65F69F19, 0x3AF6CEF3, + 0x15C3894F, 0x4C931A2C, 0x39A897E9, 0x5945BB8C, 0x5C9E4521, 0x7F5E310D, 0x0E4F06D2, 0x275DEB9C, 0x15AD847F, + 0x09685F17, 0x7FB415F2, 0x3B20C1C0, 0x5168E01E, 0x0DB4651A, 0x24847A6D, 0x2CEB8B8F, 0x79765A35, 0x6218F283, + 0x665BDD04, 0x3DB6F48F, 0x70F282EB, 0x45CC93FC, 0x6FDCA37D, 0x79A86C67, 0x72AB0990, 0x4E7AFEFA, 0x54D294F0, + 0x032A18E0, 0x2776C435, 0x3AC93409, 0x3E20E7D4, 0x3D3A4D85, 0x075C4E35, 0x77C97FBD, 0x16800911, 0x63FA9357, + 0x7727B0CB, 0x24CF0FE3, 0x0B587EF3, 0x0CD5354A, 0x2E376EFA, 0x0B0C94E5, 0x47F5F70A, 0x7FA04F19, 0x18C0FA00, + 0x6C7A7178, 0x2C8BDAA8, 0x12375435, 0x4E9363FB, 0x12E7B7AD, 0x4FEE48C4, 0x3F85E6E6, 0x58B44BA9, 0x3FCAEC41, + 0x392E534E, 0x4B5F553A, 0x0E45EB3C, 0x0E00E83E, 0x4E896E1A, 0x35BCAF71, 0x48CA1C47, 0x0CAA55EE, 0x72F6FCF6, + 0x50266A7D, 0x0473D5AC, 0x09770608, 0x3420FDD4, 0x7B9B8677, 0x2E4615EB, 0x3F797CC7, 0x0870BBC1, 0x5C7D84E6, + 0x4A8611AC, 0x5066B2CB, 0x5C1DD3FF, 0x63470BAC, 0x3CE12443, 0x08A9AEA7, 0x757E5FE2, 0x0B74883F, 0x1B916654, + 0x456CA8A6, 0x4AFA6F25, 0x7445B1FE, 0x053794E8, 0x0428C273, 0x3FA50738, 0x137D8024, 0x1229AAB1, 0x0E2E7552, + 0x493A2F95, 0x5AF3C6F9, 0x1AD8CB41, 0x3C312C8C, 0x2B1A3176, 0x1F4CA0ED, 0x45A83294, 0x5F3B2F4A, 0x1AE82764, + 0x73EE487F, 0x1EB4AC11 +}; + u32 func_E0200000(s32 arg0) { s32 temp_v0 = D_E0200690 * 4; @@ -12,7 +39,7 @@ u32 func_E0200000(s32 arg0) { } s32 func_E0200044(s32 arg0, s32 arg1) { - s32 temp_v0 = D_E0200734[arg1 - ((arg1 / 128) * 128)]; + s32 temp_v0 = D_E0200734[arg1 % ARRAY_COUNT(D_E0200734)]; if (temp_v0 < 0) { temp_v0 = -temp_v0; diff --git a/src/325EE0.c b/src/325EE0.c deleted file mode 100644 index a877b7322c..0000000000 --- a/src/325EE0.c +++ /dev/null @@ -1,81 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "325EE0", func_E0200410); - -INCLUDE_ASM(s32, "325EE0", func_E0200420); - -INCLUDE_ASM(s32, "325EE0", func_E0200430); - -INCLUDE_ASM(s32, "325EE0", func_E0200440); - -INCLUDE_ASM(s32, "325EE0", func_E0200450); - -INCLUDE_ASM(s32, "325EE0", func_E0200460); - -INCLUDE_ASM(s32, "325EE0", func_E0200470); - -INCLUDE_ASM(s32, "325EE0", func_E0200480); - -INCLUDE_ASM(s32, "325EE0", func_E0200490); - -INCLUDE_ASM(s32, "325EE0", func_E02004A0); - -INCLUDE_ASM(s32, "325EE0", func_E02004B0); - -INCLUDE_ASM(s32, "325EE0", func_E02004C0); - -INCLUDE_ASM(s32, "325EE0", func_E02004D0); - -INCLUDE_ASM(s32, "325EE0", func_E02004E0); - -INCLUDE_ASM(s32, "325EE0", func_E02004F0); - -INCLUDE_ASM(s32, "325EE0", func_E0200500); - -INCLUDE_ASM(s32, "325EE0", func_E0200510); - -INCLUDE_ASM(s32, "325EE0", func_E0200520); - -INCLUDE_ASM(s32, "325EE0", func_E0200530); - -INCLUDE_ASM(s32, "325EE0", func_E0200540); - -INCLUDE_ASM(s32, "325EE0", func_E0200550); - -INCLUDE_ASM(s32, "325EE0", func_E0200560); - -INCLUDE_ASM(s32, "325EE0", func_E0200570); - -INCLUDE_ASM(s32, "325EE0", func_E0200580); - -INCLUDE_ASM(s32, "325EE0", func_E0200590); - -INCLUDE_ASM(s32, "325EE0", func_E02005A0); - -INCLUDE_ASM(s32, "325EE0", func_E02005B0); - -INCLUDE_ASM(s32, "325EE0", func_E02005C0); - -INCLUDE_ASM(s32, "325EE0", func_E02005D0); - -INCLUDE_ASM(s32, "325EE0", func_E02005E0); - -INCLUDE_ASM(s32, "325EE0", func_E02005F0); - -INCLUDE_ASM(s32, "325EE0", func_E0200600); - -INCLUDE_ASM(s32, "325EE0", func_E0200610); - -INCLUDE_ASM(s32, "325EE0", func_E0200620); - -INCLUDE_ASM(s32, "325EE0", func_E0200630); - -INCLUDE_ASM(s32, "325EE0", func_E0200640); - -INCLUDE_ASM(s32, "325EE0", func_E0200650); - -INCLUDE_ASM(s32, "325EE0", func_E0200660); - -INCLUDE_ASM(s32, "325EE0", func_E0200670); - -INCLUDE_ASM(s32, "325EE0", func_E0200680); diff --git a/src/3D67C0.c b/src/3D67C0.c index dee7984625..ecc469beea 100644 --- a/src/3D67C0.c +++ b/src/3D67C0.c @@ -29,17 +29,17 @@ void func_E00D8288(s32 l, s32 r, s32 t, s32 b) { b = 0; } - if (l > 319) { - l = 319; + if (l > SCREEN_WIDTH - 1) { + l = SCREEN_WIDTH - 1; } - if (r > 239) { - r = 239; + if (r > SCREEN_HEIGHT - 1) { + r = SCREEN_HEIGHT - 1; } - if (t > 319) { - t = 319; + if (t > SCREEN_WIDTH - 1) { + t = SCREEN_WIDTH - 1; } - if (b > 239) { - b = 239; + if (b > SCREEN_HEIGHT - 1) { + b = SCREEN_HEIGHT - 1; } gDPFillRectangle(gMasterGfxPos++, l, r, t, b); diff --git a/src/43F0.c b/src/43F0.c index e88f5106ee..9908eb9085 100644 --- a/src/43F0.c +++ b/src/43F0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "nu/nusys.h" s32 D_80074270 = 0; @@ -224,7 +225,7 @@ void dma_write_block(s32 dramAddr, s32 devAddr, s32 size) { osIoMesg.devAddr = devAddr; osIoMesg.size = size; - osEPiStartDma(carthandle, &osIoMesg, 1); + osEPiStartDma(nuPiCartHandle, &osIoMesg, 1); osRecvMesg(&osMesgQueue, &osMesg, 1); } diff --git a/src/7B440.c b/src/7B440.c index 0204fc57d0..bbb2d93f0d 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -179,4 +179,60 @@ void game_input_to_move_vector(f32* arg0, f32* arg1) { *arg1 = temp1; } +// tail merge crap +#ifdef NON_MATCHING +void func_800E24F8(void) { + Shadow* playerShadow = get_shadow_by_index(gPlayerStatus.shadowID); + Camera* camera = &gCameras[0]; + f32 x = playerShadow->rotation.x + 180.0; + f32 z = playerShadow->rotation.z + 180.0; + + if (x != 0.0f || z != 0.0f) { + switch (gPlayerStatus.actionState) { + case 3: + case 8: + camera->unk_49C = 32.0f; + break; + case 1: + case 2: + if (camera->targetScreenCoords[1] < 130) { + camera->unk_49C = 3.0f; + return; + } + + if (D_8010C9A0++ > 10) { + D_8010C9A0 = 10; + camera->unk_49C -= 2.0f; + if (camera->unk_49C < 3.0f) { + camera->unk_49C = 3.0f; + } + } + break; + case 17: + camera->unk_49C = 3.0f; + break; + default: + D_8010C9A0 = 0; + camera->unk_49C -= 2.0f; + if (camera->unk_49C < 3.0f) { + camera->unk_49C = 3.0f; + } + break; + } + } else { + switch (gPlayerStatus.actionState) { + case 1: + case 2: + case 3: + case 0x11: + camera->unk_49C = 7.2f; + break; + default: + camera->unk_49C = 24.0f; + break; + } + } +} +#else INCLUDE_ASM(s32, "7B440", func_800E24F8); +#endif diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 416e4448f6..f68f398d5e 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -1,5 +1,12 @@ #include "common.h" +extern s32 D_800F7FA8; +extern s32 D_800F7F80[10]; + +void set_hud_element_script(s32, s32); +void clear_hud_element_flags(s32, s32); +void draw_hud_element_2(s32); + void clear_player_data(void) { PlayerData* playerData = &gPlayerData; s32 i; @@ -385,7 +392,51 @@ void initialize_status_menu(void) { func_800F0D5C(); } +// close but maybe just regalloc remaining? +#ifdef NON_MATCHING +void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) { + s8 digits[4]; + s32 i; + s32 y2; + s32 keepDrawing; + s32 digit; + s32 place; + + set_hud_element_script(iconID, D_800F7FA8); + x += 8; + y2 = y + 8; + set_hud_element_render_pos(iconID, x, y + 7); + clear_hud_element_flags(iconID, 2); + draw_hud_element_2(iconID); + + // Write each digit of the input number into the digits array + for (i = 0; i < numDigits; i++) { + digit = value / 10; + place = (digit) * 10; + digit = value - place; + digits[(numDigits - i) - 1] = digit; + value /= 10; + } + + x += 13; + keepDrawing = FALSE; + + for (i = 0; i < numDigits; i++, x += 8) { + digit = digits[i]; + + // Once we have encountered our first non-zero digit, we need to keep drawing the remaining digits + if (digit != 0 || keepDrawing || (i == numDigits - 1)) { + keepDrawing = TRUE; + set_hud_element_script(iconID, D_800F7F80[digit]); + set_hud_element_render_pos(iconID, x, y2); + clear_hud_element_flags(iconID, 2); + draw_hud_element_2(iconID); + } + } +} +#else INCLUDE_ASM(s32, "80850_len_3060", status_menu_draw_number); +#endif INCLUDE_ASM(s32, "80850_len_3060", status_menu_draw_stat); @@ -822,262 +873,248 @@ void reset_status_menu(void) { copy_world_hud_element_ref_to_battle(uiStatus->iconIndexC, uiStatus->iconIndexC); } +// Weird order of loading stuff #ifdef NON_MATCHING -// uses a jumptable, which we need .rodata support for. -// Somewhat close. Needs work. -/* -s32 is_ability_active(s32 arg0) { - s32 iVar2; - u32 uVar3; - s32 iVar5; - s32 piVar6; +s32 is_ability_active(Ability ability) { + s32 abilityMoveID; + PlayerData* playerData = &gPlayerData; + s32 attackFXArray[6]; + s32 ret; + s32 attackFXIndex; + s32 badgeMoveID; s32 i; - s32 local_20[6]; - s32 badge; - player_data* playerData = &gPlayerData; - s32 iVar7 = 0; - u32 uVar4; - iVar5 = 0; - //iVar7 = 0; + ret = 0; + attackFXIndex = 0; - for (i = 5; i >= 0; i--) { - local_20[i] = 0; + for (i = 0; i < ARRAY_COUNT(attackFXArray); i++) { + attackFXArray[i] = 0; } - if ((gGameStatusPtr->unk_7E & 1) == 0) { - iVar2 = 0; - iVar7 = 0; - piVar6 = 0; - for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) { - s32 index = i; - badge = playerData->equippedBadges[index]; - if (playerData->equippedBadges[index] != 0) { - uVar4 = gItemTable[badge].moveID; - } - switch (arg0) { - case 0: - uVar3 = 0x4c; - break; - default: - continue; - case 2: - uVar3 = 0x40; - break; - case 3: - uVar3 = 0x4d; - break; - case 4: - uVar3 = 0x52; - break; - case 5: - uVar3 = 0x35; - break; - case 6: - if (uVar4 == 0x53) { - iVar7++; - } - if (playerData->hasActionCommands != 0) { - iVar7++; - } - continue; - case 7: - uVar3 = 0x41; - break; - case 8: - uVar3 = 0x42; - break; - case 9: - uVar3 = 0x5a; - break; - case 10: - uVar3 = 0x3c; - break; - case 0xb: - uVar3 = 0x4e; - break; - case 0xc: - uVar3 = 0x5b; - break; - case 0xd: - uVar3 = 0x3d; - break; - case 0xe: - uVar3 = 0x43; - break; - case 0xf: - if (uVar4 == 0x54) { - local_20[piVar6] = 1; - piVar6++; - iVar5++; - iVar7 = -1; - } - if (uVar4 == 0x55) { - local_20[piVar6] = 2; - piVar6++; - iVar5++; - iVar7 = -1; - } - if (uVar4 == 0x56) { - local_20[piVar6] = 3; - piVar6++; - iVar5++; - iVar7 = -1; - } - if (uVar4 == 0x57) { - local_20[piVar6] = 4; - piVar6++; - iVar5++; - iVar7 = -1; - } - if (uVar4 == 0x58) { - local_20[piVar6] = 5; - piVar6++; - iVar5++; - iVar7 = -1; - } - if (uVar4 == 0x59) { - local_20[piVar6] = 6; - piVar6++; - iVar5++; - iVar7 = -1; - } - continue; - case 0x10: - uVar3 = 0x5c; - break; - case 0x11: - uVar3 = 0x5d; - break; - case 0x12: - uVar3 = 0x5e; - break; - case 0x13: - uVar3 = 0x44; - break; - case 0x14: - uVar3 = 0x5f; - break; - case 0x15: - uVar3 = 0x60; - break; - case 0x16: - uVar3 = 0x4f; - break; - case 0x17: - uVar3 = 0x61; - break; - case 0x18: - uVar3 = 0x62; - break; - case 0x19: - uVar3 = 99; - break; - case 0x1b: - uVar3 = 0x45; - break; - case 0x1c: - uVar3 = 0x3b; - break; - case 0x1d: - uVar3 = 0x6e; - break; - case 0x1e: - uVar3 = 100; - break; - case 0x1f: - uVar3 = 0x65; - break; - case 0x20: - uVar3 = 0x46; - break; - case 0x21: - uVar3 = 0x47; - break; - case 0x22: - uVar3 = 0x3e; - break; - case 0x23: - uVar3 = 0x48; - break; - case 0x24: - uVar3 = 0x66; - break; - case 0x25: - uVar3 = 0x49; - break; - case 0x26: - uVar3 = 0x67; - break; - case 0x27: - uVar3 = 0x6d; - break; - case 0x28: - uVar3 = 0x6a; - break; - case 0x29: - uVar3 = 0x6c; - break; - case 0x2a: - uVar3 = 0x50; - break; - case 0x1a: - uVar3 = 0x38; - break; - case 0x2b: - uVar3 = 0x68; - break; - case 0x2c: - uVar3 = 0x69; - break; - case 0x2d: - uVar3 = 0x6b; - break; - case 0x2e: - uVar3 = 0x6f; - break; - case 0x2f: - uVar3 = 0x70; - break; - case 0x30: - uVar3 = 0x71; - break; - case 0x31: - uVar3 = 0x72; - break; - case 0x32: - uVar3 = 0x73; - break; - case 0x33: - uVar3 = 0x33; - break; - case 0x34: - uVar3 = 0x74; - break; - case 0x35: - uVar3 = 0x75; - break; - case 0x36: - uVar3 = 0x76; - break; - case 0x37: - uVar3 = 0x4a; - } - if (uVar4 == uVar3) { - iVar7++; - } - } - if (iVar7 < 0) { - iVar7 = local_20[rand_int(iVar5 - 1)]; - } - return iVar7; + if (gGameStatusPtr->peachFlags & 1) { + return 0; } + + + for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) { + s32 b = playerData->equippedBadges[i]; + + if (b != 0) { + badgeMoveID = gItemTable[b].moveID; + } + + switch (ability) { + default: + continue; + case ABILITY_DODGE_MASTER: + abilityMoveID = 0x4c; + break; + case ABILITY_SPIKE_SHIELD: + abilityMoveID = 0x40; + break; + case ABILITY_FIRST_ATTACK: + abilityMoveID = 0x4d; + break; + case ABILITY_HP_PLUS: + abilityMoveID = 0x52; + break; + case ABILITY_DOUBLE_DIP: + abilityMoveID = 0x35; + break; + case ABILITY_MYSTERY_SCROLL: + if (badgeMoveID == 0x53) { + ret++; + } + if (playerData->hasActionCommands) { + ret++; + } + continue; + case ABILITY_FIRE_SHIELD: + abilityMoveID = 0x41; + break; + case ABILITY_PRETTY_LUCKY: + abilityMoveID = 0x42; + break; + case ABILITY_HP_DRAIN: + abilityMoveID = 0x5a; + break; + case ABILITY_ALL_OR_NOTHING: + abilityMoveID = 0x3c; + break; + case ABILITY_SLOW_GO: + abilityMoveID = 0x4e; + break; + case ABILITY_FP_PLUS: + abilityMoveID = 0x5b; + break; + case ABILITY_ICE_POWER: + abilityMoveID = 0x3d; + break; + case ABILITY_FEELING_FINE: + abilityMoveID = 0x43; + break; + case ABILITY_ATTACK_F_X: + if (badgeMoveID == 0x54) { + attackFXArray[attackFXIndex++] = 1; + ret = -1; + } + if (badgeMoveID == 0x55) { + attackFXArray[attackFXIndex++] = 2; + ret = -1; + } + if (badgeMoveID == 0x56) { + attackFXArray[attackFXIndex++] = 3; + ret = -1; + } + if (badgeMoveID == 0x57) { + attackFXArray[attackFXIndex++] = 4; + ret = -1; + } + if (badgeMoveID == 0x58) { + attackFXArray[attackFXIndex++] = 5; + ret = -1; + } + if (badgeMoveID == 0x59) { + attackFXArray[attackFXIndex++] = 6; + ret = -1; + } + continue; + case ABILITY_MONEY_MONEY: + abilityMoveID = 0x5c; + break; + case ABILITY_CHILL_OUT: + abilityMoveID = 0x5d; + break; + case ABILITY_HAPPY_HEART: + abilityMoveID = 0x5e; + break; + case ABILITY_ZAP_TAP: + abilityMoveID = 0x44; + break; + case ABILITY_MEGA_RUSH: + abilityMoveID = 0x5f; + break; + case ABILITY_BERSERKER: + abilityMoveID = 0x60; + break; + case ABILITY_RIGHT_ON: + abilityMoveID = 0x4f; + break; + case ABILITY_RUNAWAY_PAY: + abilityMoveID = 0x61; + break; + case ABILITY_FLOWER_SAVER: + abilityMoveID = 0x62; + break; + case ABILITY_PAY_OFF: + abilityMoveID = 99; + break; + case ABILITY_DEFEND_PLUS: + abilityMoveID = 0x45; + break; + case ABILITY_POWER_PLUS: + abilityMoveID = 0x3b; + break; + case ABILITY_REFUND: + abilityMoveID = 0x6e; + break; + case ABILITY_POWER_RUSH: + abilityMoveID = 100; + break; + case ABILITY_CRAZY_HEART: + abilityMoveID = 0x65; + break; + case ABILITY_LAST_STAND: + abilityMoveID = 0x46; + break; + case ABILITY_CLOSE_CALL: + abilityMoveID = 0x47; + break; + case ABILITY_P_UP_D_DOWN: + abilityMoveID = 0x3e; + break; + case ABILITY_LUCKY_DAY: + abilityMoveID = 0x48; + break; + case ABILITY_MEGA_HP_DRAIN: + abilityMoveID = 0x66; + break; + case ABILITY_P_DOWN_D_UP: + abilityMoveID = 0x49; + break; + case ABILITY_FLOWER_FANATIC: + abilityMoveID = 0x67; + break; + case ABILITY_SPEEDY_SPIN: + abilityMoveID = 0x6d; + break; + case ABILITY_SPIN_ATTACK: + abilityMoveID = 0x6a; + break; + case ABILITY_I_SPY: + abilityMoveID = 0x6c; + break; + case ABILITY_BUMP_ATTACK: + abilityMoveID = 0x50; + break; + case ABILITY_QUICK_CHANGE: + abilityMoveID = 0x38; + break; + case ABILITY_HEART_FINDER: + abilityMoveID = 0x68; + break; + case ABILITY_FLOWER_FINDER: + abilityMoveID = 0x69; + break; + case ABILITY_DIZZY_ATTACK: + abilityMoveID = 0x6b; + break; + case ABILITY_FINAL_GOOMPA: + abilityMoveID = 0x6f; + break; + case ABILITY_FINAL_BOMBOMB: + abilityMoveID = 0x70; + break; + case ABILITY_DEEP_FOCUS: + abilityMoveID = 0x71; + break; + case ABILITY_SUPER_FOCUS: + abilityMoveID = 0x72; + break; + case ABILITY_KAIDEN: + abilityMoveID = 0x73; + break; + case ABILITY_DAMAGE_DODGE: + abilityMoveID = 0x33; + break; + case ABILITY_HAPPY_FLOWER: + abilityMoveID = 0x74; + break; + case ABILITY_GROUP_FOCUS: + abilityMoveID = 0x75; + break; + case ABILITY_PEEKABOO: + abilityMoveID = 0x76; + break; + case ABILITY_HEALTHY_HEALTHY: + abilityMoveID = 0x4a; + break; + } + if (badgeMoveID == abilityMoveID) { + ret++; + } + } + + if (ret < 0) { + ret = attackFXArray[rand_int(attackFXIndex - 1)]; + } + return ret; } -*/ #else -INCLUDE_ASM(s32, "80850_len_3060", is_ability_active, s32 arg0); +INCLUDE_ASM(s32, "80850_len_3060", is_ability_active); #endif + s32 is_partner_ability_active(void) { return 0; } diff --git a/src/8e790_len_2850.c b/src/8e790_len_2850.c index 5420de8fa9..21af3b7006 100644 --- a/src/8e790_len_2850.c +++ b/src/8e790_len_2850.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(void, "8e790_len_2850", draw_box, s32 flags, s32 windowStyle, s16 posX, s16 posY, s32 posZ, s32 width, +INCLUDE_ASM(void, "8e790_len_2850", draw_box, s32 flags, s32 windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, s32 opacity, s32 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(s32),s32 drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, Matrix4f* outMtx); diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index cdad21925a..de6f0f608a 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -11,13 +11,6 @@ typedef struct Fog { /* 0x18 */ s32 endDistance; } Fog; // size = 0x1C -typedef struct RenderTaskEntry { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ void* appendGfxArg; - /* 0x0C */ void (*appendGfx)(void*); -} RenderTaskEntry; // size = 0x10 - typedef struct GameMode { /* 0x00 */ u16 flags; /* 0x04 */ void (*init)(void); @@ -863,10 +856,23 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", create_shadow_from_data); INCLUDE_ASM(s32, "a5dd0_len_114e0", MakeEntity, ScriptInstance* script, s32 isInitialCall); - INCLUDE_ASM(s32, "a5dd0_len_114e0", SetEntityCullMode); -INCLUDE_ASM(s32, "a5dd0_len_114e0", UseDynamicShadow); +ApiStatus UseDynamicShadow(ScriptInstance* script, s32 isInitialCall) { + Entity* entity = get_entity_by_index(gLastCreatedEntityIndex); + + if (get_variable(script, *script->ptrReadPos)) { + Shadow* shadow; + + entity->flags |= 4; + shadow = get_shadow_by_index(entity->shadowIndex); + shadow->flags |= 0x400000; + } else { + entity->flags &= ~4; + } + + return ApiStatus_DONE2; +} ApiStatus AssignScript(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/move/hammer_charge_0/74F130.c b/src/battle/move/hammer_charge_0/74F130.c index b520f18bf5..58670f6611 100644 --- a/src/battle/move/hammer_charge_0/74F130.c +++ b/src/battle/move/hammer_charge_0/74F130.c @@ -17,10 +17,10 @@ ApiStatus func_802A10C8_74F1F8(ScriptInstance* script, s32 isInitialCall) { s32 var3 = get_variable(script, *args++); playFX_56(0, var1, var2, var3, 1.0f, 60); - battleStatus->hammerCharge += 1; + battleStatus->hammerCharge++; if (battleStatus->hammerCharge > 99) { - (* &battleStatus)->hammerCharge = 99; // TODO: macro? + battleStatus->hammerCharge = 99; } battleStatus->jumpCharge = 0; diff --git a/src/battle/move/jump_charge_0/74D570.c b/src/battle/move/jump_charge_0/74D570.c index a3a65f51e2..7e04418b6c 100644 --- a/src/battle/move/jump_charge_0/74D570.c +++ b/src/battle/move/jump_charge_0/74D570.c @@ -15,10 +15,10 @@ ApiStatus func_802A1108_74D678(ScriptInstance* script, s32 isInitialCall) { s32 var3 = get_variable(script, *args++); playFX_56(0, var1, var2, var3, 1.0f, 60); - battleStatus->jumpCharge += 1; + battleStatus->jumpCharge++; if (battleStatus->jumpCharge > 99) { - (* &battleStatus)->jumpCharge = 99; // TODO: macro? + battleStatus->jumpCharge = 99; } battleStatus->hammerCharge = 0; diff --git a/src/curtains.c b/src/curtains.c index b9f56cabb0..697c767c90 100644 --- a/src/curtains.c +++ b/src/curtains.c @@ -1,6 +1,7 @@ #include "common.h" -#include "no_controller.png.h" +#include "ui/no_controller.png.h" #include "ld_addrs.h" +#include "nu/nusys.h" extern s32 D_80076078; extern s32 D_800760C0; @@ -17,7 +18,7 @@ Gfx D_80077140[] = { gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), gsDPSetRenderMode(G_RM_XLU_SURF, G_RM_XLU_SURF2), gsDPSetTextureLUT(G_TT_NONE), - gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, no_controller_png_width, no_controller_png), + gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, ui_no_controller_png_width, ui_no_controller_png), gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 7, G_TX_NOLOD), gsDPLoadSync(), @@ -66,7 +67,7 @@ void render_curtains(void) { s8 rgb; gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C)); + gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); gSPDisplayList(gMasterGfxPos++, &D_800760C0); guFrustumF(m.m[0], -80.0f, 80.0f, -60.0f, 60.0f, 160.0f, 640.0f, 1.0f); diff --git a/src/is_debug.c b/src/is_debug.c index 1012ecaab7..83108d2d3f 100644 --- a/src/is_debug.c +++ b/src/is_debug.c @@ -1,5 +1,6 @@ #include "common.h" #include "stdlib/stdarg.h" +#include "nu/nusys.h" typedef struct { /* 0x00 */ u32 magic; @@ -15,9 +16,9 @@ typedef struct { u32 is_debug_print(void* arg0, const unsigned char* str, s32 count); void is_debug_init(void) { - osEPiWriteIo(carthandle, (u32) &gISVDbgPrnAdrs->put, 0); - osEPiWriteIo(carthandle, (u32) &gISVDbgPrnAdrs->get, 0); - osEPiWriteIo(carthandle, (u32) &gISVDbgPrnAdrs->magic, ASCII_TO_U32('I', 'S', '6', '4')); + osEPiWriteIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->put, 0); + osEPiWriteIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->get, 0); + osEPiWriteIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->magic, ASCII_TO_U32('I', 'S', '6', '4')); } void printf(const char* fmt, ...) { @@ -47,13 +48,13 @@ u32 is_debug_print(void* arg0, const unsigned char* str, s32 count) { s32 start; s32 end; - osEPiReadIo(carthandle, (u32) &gISVDbgPrnAdrs->magic, &data); + osEPiReadIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->magic, &data); if (data != ASCII_TO_U32('I', 'S', '6', '4')) { return 1; } - osEPiReadIo(carthandle, (u32) &gISVDbgPrnAdrs->get, &data); + osEPiReadIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->get, &data); pos = data; - osEPiReadIo(carthandle, (u32) &gISVDbgPrnAdrs->put, &data); + osEPiReadIo(nuPiCartHandle, (u32) &gISVDbgPrnAdrs->put, &data); start = data; end = start + count; if (end >= 0xffe0) { @@ -71,8 +72,8 @@ u32 is_debug_print(void* arg0, const unsigned char* str, s32 count) { u32 addr = (u32) &gISVDbgPrnAdrs->data + (start & 0xffffffc); s32 shift = ((3 - (start & 3)) * 8); - osEPiReadIo(carthandle, addr, &data); - osEPiWriteIo(carthandle, addr, (data & ~(0xff << shift)) | (*str << shift)); + osEPiReadIo(nuPiCartHandle, addr, &data); + osEPiWriteIo(nuPiCartHandle, addr, (data & ~(0xff << shift)) | (*str << shift)); start++; if (start >= 0xffe0) { @@ -82,7 +83,7 @@ u32 is_debug_print(void* arg0, const unsigned char* str, s32 count) { count--; str++; } - osEPiWriteIo(carthandle, (u32)&gISVDbgPrnAdrs->put, start); + osEPiWriteIo(nuPiCartHandle, (u32)&gISVDbgPrnAdrs->put, start); return 1; } diff --git a/src/jp/1060.c b/src/jp/1060.c index 520f827f75..21797e7f5d 100644 --- a/src/jp/1060.c +++ b/src/jp/1060.c @@ -1,12 +1,13 @@ #include "common.h" #include "stdlib/stdarg.h" +#include "nu/nusys.h" // TODO: use src/is_debug.c instead as this file is identical between versions u32 func_80025D74(void* arg0, const unsigned char* str, s32 count); void func_80025C60(void) { - OSPiHandle** handle = &carthandle; + OSPiHandle** handle = &nuPiCartHandle; osEPiWriteIo(*handle, 0xB3FF0014, 0); osEPiWriteIo(*handle, 0xB3FF0004, 0); @@ -40,13 +41,13 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) { s32 start; s32 end; - osEPiReadIo(carthandle, 0xB3FF0000, &data); + osEPiReadIo(nuPiCartHandle, 0xB3FF0000, &data); if (data != ASCII_TO_U32('I', 'S', '6', '4')) { return 1; } - osEPiReadIo(carthandle, 0xB3FF0004, &data); + osEPiReadIo(nuPiCartHandle, 0xB3FF0004, &data); pos = data; - osEPiReadIo(carthandle, 0xB3FF0014, &data); + osEPiReadIo(nuPiCartHandle, 0xB3FF0014, &data); start = data; end = start + count; if (end >= 0xffe0) { @@ -64,8 +65,8 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) { u32 addr = 0xB3FF0020 + (start & 0xffffffc); s32 shift = ((3 - (start & 3)) * 8); - osEPiReadIo(carthandle, addr, &data); - osEPiWriteIo(carthandle, addr, (data & ~(0xff << shift)) | (*str << shift)); + osEPiReadIo(nuPiCartHandle, addr, &data); + osEPiWriteIo(nuPiCartHandle, addr, (data & ~(0xff << shift)) | (*str << shift)); start++; if (start >= 0xffe0) { @@ -75,7 +76,7 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) { count--; str++; } - osEPiWriteIo(carthandle, 0xB3FF0014, start); + osEPiWriteIo(nuPiCartHandle, 0xB3FF0014, start); return 1; } diff --git a/src/main_loop.c b/src/main_loop.c index ba21355055..1817e61786 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -232,7 +232,7 @@ void gfx_draw_frame(void) { nuGfxTaskStart(gDisplayContext->mainGfx, (u32)(gMasterGfxPos - gDisplayContext->mainGfx) * 8, NU_GFX_UCODE_F3DEX2, NU_SC_TASK_LODABLE | NU_SC_SWAPBUFFER); gCurrentDisplayContextIndex = gCurrentDisplayContextIndex ^ 1; - func_8002C890(D_8009A64C, 0x140, 0xF0); + func_8002C890(nuGfxCfb_ptr, 0x140, 0xF0); } void load_engine_data(void) { @@ -293,7 +293,7 @@ void load_engine_data(void) { initialize_curtains(); poll_rumble(); - for (i = 0; i < 4; i++) { + for (i = 0; i < ARRAY_COUNT(gGameStatusPtr->unk_50); i++) { gGameStatusPtr->unk_50[i] = 3; gGameStatusPtr->unk_48[i] = 12; } @@ -350,8 +350,8 @@ void gfx_init_state(void) { gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(D_80074210)); } -s32 func_800271FC(const u16* framebuf1, const u16* framebuf2, s32 x, s32 y, u8* out) { - s32 pixel = (x * SCREEN_WIDTH) + y; +s32 func_800271FC(const u16* framebuf1, const u16* framebuf2, s32 y, s32 x, u8* out) { + s32 pixel = SCREEN_WIDTH * y + x; out[3] = (framebuf2[pixel] >> 2) & 0xF; out[0] = framebuf1[pixel] >> 11; // red @@ -359,51 +359,39 @@ s32 func_800271FC(const u16* framebuf1, const u16* framebuf2, s32 x, s32 y, u8* out[2] = (framebuf1[pixel] >> 1) & 0x1F; // blue } -INCLUDE_ASM(s32, "main_loop", func_8002725C); +void func_8002725C(u8*, u32, u16*); +INCLUDE_ASM(void, "main_loop", func_8002725C, u8* arg0, u32 arg1, u16* arg2); INCLUDE_ASM(s32, "main_loop", func_80027600); INCLUDE_ASM(s32, "main_loop", func_80027774); -// alex: mystery t0=SCREEN_WIDTH temp and weirdness with the `pixel` calculation -#ifdef NON_MATCHING -void func_800279B4(const u16* framebuf1, u16* framebuf2, u16* arg2) { - s32 x; +void func_800279B4(u16* arg0, u16* arg1, u16* arg2) { + u8 filterBuf[0x18]; + u8 sp30[4]; s32 y; - s32 subroutine_argE; - s32 subroutine_arg7; - s32 subroutine_arg8; - s32 subroutine_arg9; - s32 subroutine_argA; - s32 subroutine_argB; - s32 subroutine_argC; - s32 subroutine_argF; + s32 x; for (y = 1; y < SCREEN_HEIGHT - 1; y++) { for (x = 2; x < SCREEN_WIDTH - 2; x++) { - s32 pixel = (subroutine_argF + x) * 2; + s32 pixel = SCREEN_WIDTH * y + x; - // Wii U VC changes this condition to FALSE to fix pause menu lag - if (((framebuf2[pixel] >> 2) & 0xF) < 8) { - func_800271FC(framebuf1, framebuf2, y - 1, x - 1, &subroutine_argE); - func_800271FC(framebuf1, framebuf2, y - 1, x + 1, &subroutine_arg7); - func_800271FC(framebuf1, framebuf2, y, x - 2, &subroutine_arg8); - func_800271FC(framebuf1, framebuf2, y, x + 2, &subroutine_arg9); - func_800271FC(framebuf1, framebuf2, y + 1, x - 1, &subroutine_argA); - func_800271FC(framebuf1, framebuf2, y + 1, x + 1, &subroutine_argB); - func_800271FC(framebuf1, framebuf2, y, x, &subroutine_argC); - - func_8002725C(&subroutine_argE, (subroutine_argC << 24) | (subroutine_argC << 16) | (subroutine_argC << 8) | subroutine_argC, &framebuf2[pixel]); + if (((arg1[pixel] >> 2) & 0xF) < 8) { + func_800271FC(arg0, arg1, y - 1, x - 1, &filterBuf[0x00]); + func_800271FC(arg0, arg1, y - 1, x + 1, &filterBuf[0x04]); + func_800271FC(arg0, arg1, y, x - 2, &filterBuf[0x08]); + func_800271FC(arg0, arg1, y, x + 2, &filterBuf[0x0C]); + func_800271FC(arg0, arg1, y + 1, x - 1, &filterBuf[0x10]); + func_800271FC(arg0, arg1, y + 1, x + 1, &filterBuf[0x14]); + func_800271FC(arg0, arg1, y, x, &sp30); + func_8002725C(&filterBuf, (sp30[0] << 24) | (sp30[1] << 16) | (sp30[2] << 8) | sp30[3], &arg2[pixel]); } else { // Edge - framebuf2[pixel] = framebuf1[pixel] | 1; + arg2[pixel] = arg0[pixel] | 1; } } } } -#else -INCLUDE_ASM(s32, "main_loop", func_800279B4); -#endif void func_80027BAC(s32 arg0, s32 arg1) { s32 i; @@ -454,7 +442,7 @@ void gfx_draw_background(void) { switch (bgFlags) { case 0x10: gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_8009A658[1]); + gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb[1]); gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); gDPSetBlendColor(gMasterGfxPos++, 0x80, 0x80, 0x80, 0xFF); gDPSetPrimDepth(gMasterGfxPos++, -1, -1); @@ -467,7 +455,7 @@ void gfx_draw_background(void) { gGameStatusPtr->enableBackground |= 0x20; break; case 0x20: - func_800279B4(D_8009A658[0], D_8009A658[1], nuGfxZBuffer); + func_800279B4(nuGfxCfb[0], nuGfxCfb[1], nuGfxZBuffer); D_800741F8 = 0; gGameStatusPtr->enableBackground &= ~0xF0; gGameStatusPtr->enableBackground |= 0x30; @@ -481,9 +469,9 @@ void gfx_draw_background(void) { gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); gDPSetCycleType(gMasterGfxPos++, G_CYC_FILL); gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_8009A64C); + gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr); gDPSetFillColor(gMasterGfxPos++, 0x00010001); - gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, 239); + gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); gDPSetTexturePersp(gMasterGfxPos++, G_TP_NONE); gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); @@ -512,7 +500,7 @@ void gfx_draw_background(void) { break; default: if (gOverrideFlags & 8) { - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C)); + gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); return; } @@ -521,9 +509,9 @@ void gfx_draw_background(void) { gDPSetRenderMode(gMasterGfxPos++, G_RM_NOOP, G_RM_NOOP2); gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, OS_PHYSICAL_TO_K0(nuGfxZBuffer)); gDPSetFillColor(gMasterGfxPos++, 0xFFFCFFFC); - gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, 239); + gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C)); + gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); gDPSetFillColor(gMasterGfxPos++, PACK_FILL_COLOR(camera->bgColor[0], camera->bgColor[1], camera->bgColor[2], 1)); backgroundMinW = gGameStatusPtr->backgroundMinW; @@ -593,7 +581,7 @@ void gfx_draw_background(void) { gDPPipeSync(gMasterGfxPos++); if (backgroundMinH > 0) { - gDPFillRectangle(gMasterGfxPos++, 0, 0, 319, backgroundMinH - 1); + gDPFillRectangle(gMasterGfxPos++, 0, 0, SCREEN_WIDTH - 1, backgroundMinH - 1); gDPNoOp(gMasterGfxPos++); } @@ -602,13 +590,13 @@ void gfx_draw_background(void) { gDPNoOp(gMasterGfxPos++); } - if (backgroundSumW < 0x140) { - gDPFillRectangle(gMasterGfxPos++, backgroundSumW, backgroundMinH, 319, backgroundSumH - 1); + if (backgroundSumW < SCREEN_WIDTH) { + gDPFillRectangle(gMasterGfxPos++, backgroundSumW, backgroundMinH, SCREEN_WIDTH - 1, backgroundSumH - 1); gDPNoOp(gMasterGfxPos++); } if (backgroundSumH < 0xF0) { - gDPFillRectangle(gMasterGfxPos++, 0, backgroundSumH, 319, 239); + gDPFillRectangle(gMasterGfxPos++, 0, backgroundSumH, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); gDPNoOp(gMasterGfxPos++); } break; diff --git a/src/os/39cb0_len_100.c b/src/os/39cb0_len_100.c index c35d79c913..8efe33863e 100644 --- a/src/os/39cb0_len_100.c +++ b/src/os/39cb0_len_100.c @@ -21,7 +21,7 @@ void boot_idle(void) { nuPiInit(); nuScCreateScheduler(OS_VI_NTSC_LAN1, 1); osViSetSpecialFeatures(OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF | OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON); - osCreateThread(&D_800A4420, NU_MAIN_THREAD_ID, boot_main, NULL, &D_800B8590, NU_MAIN_THREAD_PRI); + osCreateThread(&D_800A4420, NU_MAIN_THREAD_ID, boot_main, NULL, &nuYieldBuf, NU_MAIN_THREAD_PRI); osStartThread(&D_800A4420); osSetThreadPri(&D_800A4270, NU_IDLE_THREAD_PRI); diff --git a/src/os/3b710_len_40.c b/src/os/3b710_len_40.c deleted file mode 100644 index 966bd54957..0000000000 --- a/src/os/3b710_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/3b710_len_40", nuGfxSwapCfbFuncSet); diff --git a/src/os/3b770_len_80.c b/src/os/3b770_len_80.c deleted file mode 100644 index dedbd4c15d..0000000000 --- a/src/os/3b770_len_80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/3b770_len_80", nuGfxRetraceWait); diff --git a/src/os/3b7f0_len_120.c b/src/os/3b7f0_len_120.c deleted file mode 100644 index bd57a43285..0000000000 --- a/src/os/3b7f0_len_120.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/3b7f0_len_120", nuSiCallBackAdd); - -INCLUDE_ASM(s32, "os/3b7f0_len_120", nuSiCallBackRemove); diff --git a/src/os/nuContMgr.c b/src/os/nuContMgr.c deleted file mode 100644 index 59773cb927..0000000000 --- a/src/os/nuContMgr.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "common.h" -#include "nu/nusys.h" - -s32 contRetrace(); -s32 contReadData(); -s32 contReadNW(); -s32 contQuery(); - -u32 D_80093D20 = 0; - -UNK_FUN_PTR(D_80093D24[4]) = { - contRetrace, - contReadData, - contReadNW, - contQuery, -}; - -s32 D_80093D34 = 0; - -NUCallBackList nuContCallBack = { - NULL, - D_80093D24, - 0x100, - 0, -}; - -INCLUDE_ASM(u8, "os/nuContMgr", nuContMgrInit); - -INCLUDE_ASM(void, "os/nuContMgr", nuContMgrRemove); - -INCLUDE_ASM(void, "os/nuContMgr", nuContDataClose); - -INCLUDE_ASM(void, "os/nuContMgr", nuContDataOpen); - -INCLUDE_ASM(s32, "os/nuContMgr", contRetrace); - -INCLUDE_ASM(s32, "os/nuContMgr", contReadData); - -INCLUDE_ASM(s32, "os/nuContMgr", contReadNW); - -INCLUDE_ASM(s32, "os/nuContMgr", contQuery); - -INCLUDE_ASM(void, "os/nuContMgr", nuContDataLock); - -INCLUDE_ASM(void, "os/nuContMgr", nuContDataUnLock); diff --git a/src/os/nusys/3B4A0.c b/src/os/nusys/3B4A0.c deleted file mode 100644 index 161cae01ed..0000000000 --- a/src/os/nusys/3B4A0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "nu/nusys.h" - -void nuContRmbForceStop(void) { - nuSiSendMesg(NU_CONT_RMB_FORCESTOP_MSG, NULL); -} - -void nuContRmbForceStopEnd(void) { - nuSiSendMesg(NU_CONT_RMB_FORCESTOPEND_MSG, NULL); -} - -INCLUDE_ASM(void, "os/nusys/3B4A0", nuPiReadRomOverlay, NUPiOverlaySegment* segment); diff --git a/src/os/nusys/7e40_len_3f0.c b/src/os/nusys/7e40_len_3f0.c deleted file mode 100644 index e4937f936d..0000000000 --- a/src/os/nusys/7e40_len_3f0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -s32 D_800773F0 = 1; -s32 D_800773F4 = 0; -s32 D_800773F8 = 0; -s32 D_800773FC = 0; - -INCLUDE_ASM(s32, "os/nusys/7e40_len_3f0", nuGfxTaskMgr); - -INCLUDE_ASM(s32, "os/nusys/7e40_len_3f0", nuGfxTaskMgrInit); - -INCLUDE_ASM(s32, "os/nusys/7e40_len_3f0", nuGfxTaskStart); diff --git a/src/os/nusys/nuContDataLock.c b/src/os/nusys/nuContDataLock.c new file mode 100644 index 0000000000..e2a1749572 --- /dev/null +++ b/src/os/nusys/nuContDataLock.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuContDataLock(void) { + OSIntMask mask = osSetIntMask(OS_IM_NONE); + + nuContDataLockKey = NU_CONT_DATA_LOCK; + osSetIntMask(mask); +} + +void nuContDataUnLock(void) { + OSIntMask mask = osSetIntMask(OS_IM_NONE); + + nuContDataLockKey = NU_CONT_DATA_UNLOCK; + osSetIntMask(mask); +} diff --git a/src/os/nusys/nuContMgr.c b/src/os/nusys/nuContMgr.c new file mode 100644 index 0000000000..292aa90f63 --- /dev/null +++ b/src/os/nusys/nuContMgr.c @@ -0,0 +1,96 @@ +#include "common.h" +#include "nu/nusys.h" + +s32 contRetrace(); +s32 contReadData(); +s32 contReadNW(); +s32 contQuery(); + +u32 D_80093D20 = 0; + +UNK_FUN_PTR(D_80093D24[4]) = { + contRetrace, + contReadData, + contReadNW, + contQuery, +}; + +s32 D_80093D34 = 0; + +NUCallBackList nuContCallBack = { + NULL, + D_80093D24, + 0x100, + 0, +}; + +extern OSMesg nuContWaitMesgBuf; +extern OSMesg nuContDataMutexBuf; +extern OSMesgQueue nuContDataMutexQ; + +u8 nuContMgrInit(void) { + s32 i; + u8 pattern; + u8 bitmask; + + nuContDataUnLock(); + osCreateMesgQueue(&nuContWaitMesgQ, &nuContWaitMesgBuf, 1); + osCreateMesgQueue(&nuContDataMutexQ, &nuContDataMutexBuf, 1); + nuSiCallBackAdd(&nuContCallBack); + nuContQueryRead(); + + nuContNum = 0; + bitmask = 1; + pattern = 0; + + for (i = 0; i < NU_CONT_MAXCONTROLLERS; i++) { + if (nuContStatus[i].errno != 0) { + continue; + } + + if ((nuContStatus[i].type & CONT_TYPE_MASK) == CONT_TYPE_NORMAL) { + nuContNum++; + pattern |= bitmask; + } + bitmask <<= 1; + } + + return pattern; +} + +void nuContMgrRemove(void) { + nuSiCallBackRemove(&nuContCallBack); +} + +void nuContDataClose(void) { + osSendMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); + +} + +void nuContDataOpen(void) { + osRecvMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); +} + +INCLUDE_ASM(s32, "os/nusys/nuContMgr", contRetrace); + +INCLUDE_ASM(s32, "os/nusys/nuContMgr", contReadData); + +INCLUDE_ASM(s32, "os/nusys/nuContMgr", contReadNW); + +// nuContStatus needs to be declared in this file. +#ifdef NON_MATCHING +s32 contQuery(void) { + s32 ret = osContStartQuery(&nuSiMesgQ); + + if (ret != 0) { + return ret; + } + + osRecvMesg(&nuSiMesgQ, NULL, OS_MESG_BLOCK); + osContGetQuery(nuContStatus); + + return ret; +} +#else +INCLUDE_ASM(s32, "os/nusys/nuContMgr", contQuery); +#endif diff --git a/src/os/nusys/nuContRmbForceStop.c b/src/os/nusys/nuContRmbForceStop.c new file mode 100644 index 0000000000..10a0d6a9b1 --- /dev/null +++ b/src/os/nusys/nuContRmbForceStop.c @@ -0,0 +1,6 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuContRmbForceStop(void) { + nuSiSendMesg(NU_CONT_RMB_FORCESTOP_MSG, NULL); +} diff --git a/src/os/nusys/nuContRmbForceStopEnd.c b/src/os/nusys/nuContRmbForceStopEnd.c new file mode 100644 index 0000000000..20bafc6a2f --- /dev/null +++ b/src/os/nusys/nuContRmbForceStopEnd.c @@ -0,0 +1,6 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuContRmbForceStopEnd(void) { + nuSiSendMesg(NU_CONT_RMB_FORCESTOPEND_MSG, NULL); +} diff --git a/src/os/nusys/nuContRmbModeSet.c b/src/os/nusys/nuContRmbModeSet.c index c9d28a8243..c4916d55c1 100644 --- a/src/os/nusys/nuContRmbModeSet.c +++ b/src/os/nusys/nuContRmbModeSet.c @@ -1,3 +1,27 @@ #include "common.h" +#include "nu/nusys.h" -INCLUDE_ASM(s32, "os/nusys/nuContRmbModeSet", nuContRmbModeSet); +void nuContRmbModeSet(u32 contNo, u8 mode) { + OSIntMask mask = osSetIntMask(OS_IM_NONE); + s32 forceStop = nuContRmbCtl[contNo].mode & NU_CONT_RMB_MODE_PAUSE; + + switch (mode) { + case NU_CONT_RMB_MODE_DISABLE: + nuContRmbCtl[contNo].mode = mode | forceStop; + break; + case NU_CONT_RMB_MODE_ENABLE: + if (nuContRmbCtl[contNo].type == NU_CONT_PAK_TYPE_RUMBLE) { + nuContRmbCtl[contNo].mode = mode | forceStop; + } + break; + case NU_CONT_RMB_MODE_AUTORUN: + nuContRmbCtl[contNo].mode = mode | forceStop; + if (nuContRmbCtl[contNo].type == NU_CONT_PAK_TYPE_RUMBLE) { + nuContRmbCtl[contNo].autorun = NU_CONT_RMB_AUTO_FIND; + } else { + nuContRmbCtl[contNo].autorun = NU_CONT_RMB_AUTO_SEARCH; + } + break; + } + osSetIntMask(mask); +} diff --git a/src/os/nusys/nuGfxInit.c b/src/os/nusys/nuGfxInit.c index fafd2836ac..1738146f8a 100644 --- a/src/os/nusys/nuGfxInit.c +++ b/src/os/nusys/nuGfxInit.c @@ -2,8 +2,7 @@ #include "nu/nusys.h" extern u16* FrameBuf[3]; -extern UNK_PTR D_8009A610; -extern UNK_PTR D_80093BA0; +extern UNK_PTR nugfx_ucode; extern Gfx rdpstateinit_dl[]; void nuGfxInitEX2(void) { @@ -14,11 +13,10 @@ void nuGfxInitEX2(void) { nuGfxSetCfb(FrameBuf, NU_GFX_FRAMEBUFFER_NUM); nuGfxSetZBuffer((u16*) NU_GFX_ZBUFFER_ADDR); nuGfxSwapCfbFuncSet(nuGfxSwapCfb); - D_8009A610 = &D_80093BA0; + nuGfxUcode = &nugfx_ucode; nuGfxTaskMgrInit(); ptr = gfx; - // TODO: Verify that this macro call works in PM64. gSPDisplayList(ptr++, OS_K0_TO_PHYSICAL(&rdpstateinit_dl)); gDPFullSync(ptr++); gSPEndDisplayList(ptr++); diff --git a/src/os/nusys/nuGfxRetraceWait.c b/src/os/nusys/nuGfxRetraceWait.c new file mode 100644 index 0000000000..1c5ca660c6 --- /dev/null +++ b/src/os/nusys/nuGfxRetraceWait.c @@ -0,0 +1,19 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuGfxRetraceWait(u32 retrace_num) { + NUScClient client; + OSMesg mesgBuf; + OSMesgQueue mesgQ; + + osCreateMesgQueue(&mesgQ, &mesgBuf, 1); + + nuScAddClient(&client, &mesgQ , NU_SC_RETRACE_MSG); + + while(retrace_num) { + osRecvMesg(&mesgQ, NULL, OS_MESG_BLOCK); + retrace_num--; + } + + nuScRemoveClient(&client); +} diff --git a/src/os/nusys/nuGfxSetCfb.c b/src/os/nusys/nuGfxSetCfb.c index 74e84166f5..1eee349f9c 100644 --- a/src/os/nusys/nuGfxSetCfb.c +++ b/src/os/nusys/nuGfxSetCfb.c @@ -1,3 +1,36 @@ #include "common.h" +#include "nu/nusys.h" -INCLUDE_ASM(void, "os/nusys/nuGfxSetCfb", nuGfxSetCfb); +void nuGfxSetCfb(u16** framebuf, u32 framebufnum) { + u32 i; + + nuGfxCfb = framebuf; + nuGfxCfbNum = framebufnum; + nuGfxCfbCounter = 0; + nuGfxCfb_ptr = nuGfxCfb[0]; + + nuGfxRetraceWait(1); + nuScSetFrameBufferNum(framebufnum); + + if(framebufnum > 1) { + s32 i; + + for (i = 0; i < framebufnum - 1; i++) { + if (nuGfxCfb[i] != nuGfxCfb[i+1]) { + break; + } + } + + if (i == framebufnum - 1) { + nuScSetFrameBufferNum(1); + } else { + for (i = 0; i < framebufnum; i++) { + if (osViGetCurrentFramebuffer() != nuGfxCfb[i]) { + nuGfxCfbCounter = i; + nuGfxCfb_ptr = nuGfxCfb[i]; + break; + } + } + } + } +} diff --git a/src/os/3b750_len_20.c b/src/os/nusys/nuGfxSwapCfb.c similarity index 100% rename from src/os/3b750_len_20.c rename to src/os/nusys/nuGfxSwapCfb.c diff --git a/src/os/nusys/nuGfxSwapCfbFuncSet.c b/src/os/nusys/nuGfxSwapCfbFuncSet.c new file mode 100644 index 0000000000..e08c8d6e3b --- /dev/null +++ b/src/os/nusys/nuGfxSwapCfbFuncSet.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuGfxSwapCfbFuncSet(NUGfxSwapCfbFunc func) { + OSIntMask mask = osSetIntMask(OS_IM_NONE); + + nuGfxSwapCfbFunc = func; + osSetIntMask(mask); +} diff --git a/src/os/nusys/nuGfxTaskMgr.c b/src/os/nusys/nuGfxTaskMgr.c new file mode 100644 index 0000000000..694f7a7b21 --- /dev/null +++ b/src/os/nusys/nuGfxTaskMgr.c @@ -0,0 +1,123 @@ +#include "common.h" +#include "nu/nusys.h" + +u32 nuGfxCfbNum = 1; +NUGfxSwapCfbFunc nuGfxSwapCfbFunc = NULL; +NUGfxTaskEndFunc nuGfxTaskEndFunc = NULL; +u16 beforeFlag = 0; + +extern OSMesg D_8009E6D0[NU_GFX_TASKMGR_MESGS]; +extern OSMesgQueue D_800DAC90; +extern NUScTask* nuGfxTask_ptr; +extern s16 taskDoneMsg; +extern s16 swapBufMsg; +extern OSThread GfxTaskMgrThread; +extern NUScTask nuGfxTask[NU_GFX_TASK_NUM]; +extern s32 D_800DA040; +extern s32 D_800B91D0; +extern s32 D_800D91D0; +extern void D_800D9780; +extern u32 nuGfxCfbCounter; +extern OSMesgQueue D_800DA47C; + +void nuGfxTaskMgr(void) { + NUScTask* task; + s16* msg; + OSIntMask mask; + + osCreateMesgQueue(&D_800DAC90, &D_8009E6D0[0], NU_GFX_MESGS); + + while (TRUE) { + osRecvMesg(&D_800DAC90, (OSMesg*)&task, OS_MESG_BLOCK); + msg = task->msg; + + switch (*msg) { + case NU_SC_SWAPBUFFER_MSG: + if (nuGfxSwapCfbFunc != NULL) { + nuGfxSwapCfbFunc(task); + } + if (nuGfxDisplay & NU_GFX_DISPLAY_ON_TRIGGER) { + osViBlack(FALSE); + nuGfxDisplay = NU_GFX_DISPLAY_ON; + } + mask = osSetIntMask(OS_IM_NONE); + nuGfxTaskSpool--; + osSetIntMask(mask); + break; + case NU_SC_GTASKEND_MSG: + if (nuGfxTaskEndFunc != NULL) { + nuGfxTaskEndFunc(task); + } + mask = osSetIntMask(OS_IM_NONE); + nuGfxTaskSpool--; + osSetIntMask(mask); + break; + } + } +} + +void nuGfxTaskMgrInit(void) { + u32 i; + + taskDoneMsg = NU_SC_GTASKEND_MSG; + swapBufMsg = NU_SC_SWAPBUFFER_MSG; + nuGfxTaskSpool = 0; + nuGfxDisplayOff(); + osCreateThread(&GfxTaskMgrThread, NU_GFX_TASKMGR_THREAD_ID, nuGfxTaskMgr, NULL, &D_8009E6D0, NU_GFX_TASKMGR_THREAD_PRI); + osStartThread(&GfxTaskMgrThread); + + for (i = 0; i < NU_GFX_TASK_NUM; i++) { + nuGfxTask[i].next = &nuGfxTask[i + 1]; + nuGfxTask[i].msgQ = &D_800DAC90; + nuGfxTask[i].list.t.type = M_GFXTASK; + nuGfxTask[i].list.t.flags = 0; + dma_copy((u8* )0xB0000B70, (u8* )0xB0000C70, &D_800D9780); + nuGfxTask[i].list.t.ucode_boot = &D_800D9780; + nuGfxTask[i].list.t.ucode_boot_size = 0x100; + nuGfxTask[i].list.t.ucode_size = SP_UCODE_SIZE; + nuGfxTask[i].list.t.ucode_data_size = SP_UCODE_DATA_SIZE; + nuGfxTask[i].list.t.dram_stack = &D_800DA040; + nuGfxTask[i].list.t.dram_stack_size = SP_DRAM_STACK_SIZE8; + nuGfxTask[i].list.t.output_buff = &D_800B91D0; + nuGfxTask[i].list.t.output_buff_size = &D_800D91D0; + nuGfxTask[i].list.t.yield_data_ptr = &nuYieldBuf; + nuGfxTask[i].list.t.yield_data_size = NU_GFX_YIELD_BUF_SIZE; + } + + nuGfxTask[NU_GFX_TASK_NUM - 1].next = &nuGfxTask[0]; + nuGfxTask_ptr = &nuGfxTask[0]; +} + +void nuGfxTaskStart(Gfx* gfxList_ptr, u32 gfxListSize, u32 ucode, u32 flag) { + u32 mask; + + nuGfxTask_ptr->list.t.data_ptr = (u64*) gfxList_ptr; + nuGfxTask_ptr->list.t.data_size = gfxListSize; + nuGfxTask_ptr->list.t.flags = flag >> 16; + nuGfxTask_ptr->list.t.ucode = nuGfxUcode[ucode].ucode; + nuGfxTask_ptr->list.t.ucode_data = nuGfxUcode[ucode].ucode_data; + nuGfxTask_ptr->flags = flag & 0xFFFF; + nuGfxTask_ptr->framebuffer = nuGfxCfb_ptr; + + if (beforeFlag & NU_SC_UCODE_XBUS) { + beforeFlag ^= NU_SC_UCODE_XBUS; + nuGfxTask_ptr->list.t.flags |= OS_TASK_DP_WAIT; + } + + beforeFlag = flag; + + if (flag & NU_SC_SWAPBUFFER) { + nuGfxTask_ptr->msg = (void*) &swapBufMsg; + nuGfxCfbCounter = (nuGfxCfbCounter + 1) % nuGfxCfbNum; + nuGfxCfb_ptr = nuGfxCfb[nuGfxCfbCounter]; + } else { + nuGfxTask_ptr->msg = (void*) &taskDoneMsg; + } + + mask = osSetIntMask(OS_IM_NONE); + nuGfxTaskSpool++; + osSetIntMask(mask); + osWritebackDCacheAll(); + osSendMesg(&D_800DA47C, (void*) nuGfxTask_ptr, OS_MESG_BLOCK); + nuGfxTask_ptr = nuGfxTask_ptr->next; +} diff --git a/src/os/nusys/nuGfxThread.c b/src/os/nusys/nuGfxThread.c index c9233554d4..2f0f225b11 100644 --- a/src/os/nusys/nuGfxThread.c +++ b/src/os/nusys/nuGfxThread.c @@ -1,14 +1,39 @@ #include "common.h" #include "nu/nusys.h" -void nuGfxThread2(void); +void gfxThread(void); -extern s32 D_800AE6D0; +extern s32 nuContWaitMesgBuf; extern OSThread D_800B1B90; +extern OSMesg nuGfxMesgBuf[NU_GFX_MESGS]; +extern OSMesgQueue nuGfxMesgQ; void nuGfxThreadStart(void) { - osCreateThread(&D_800B1B90, 4, nuGfxThread2, NULL, &D_800AE6D0, NU_GFX_THREAD_PRI); + osCreateThread(&D_800B1B90, 4, gfxThread, NULL, &nuContWaitMesgBuf, NU_GFX_THREAD_PRI); osStartThread(&D_800B1B90); } -INCLUDE_ASM(void, "os/nusys/nuGfxThread", nuGfxThread2); +void gfxThread(void) { + NUScClient gfxClient; + NUScMsg* mesgType; + + osCreateMesgQueue(&nuGfxMesgQ, &nuGfxMesgBuf, NU_GFX_MESGS); + nuScAddClient(&gfxClient, &nuGfxMesgQ, NU_SC_RETRACE_MSG | NU_SC_PRENMI_MSG); + + while (TRUE) { + osRecvMesg(&nuGfxMesgQ, &mesgType, OS_MESG_BLOCK); + + switch (*mesgType) { + case NU_SC_RETRACE_MSG: + if (nuGfxFunc != NULL) { + (*nuGfxFunc)(nuGfxTaskSpool); + } + break; + case NU_SC_PRENMI_MSG: + if (nuGfxPreNMIFunc != NULL) { + (*nuGfxPreNMIFunc)(); + } + break; + } + } +} diff --git a/src/os/nusys/nuPiInit.c b/src/os/nusys/nuPiInit.c index bf4011e9d5..93846f4db1 100644 --- a/src/os/nusys/nuPiInit.c +++ b/src/os/nusys/nuPiInit.c @@ -6,5 +6,5 @@ extern OSMesg D_800AC5E8[NU_PI_MESG_NUM]; void nuPiInit(void) { osCreatePiManager(OS_PRIORITY_PIMGR, &D_800AC5D0, D_800AC5E8, NU_PI_MESG_NUM); - carthandle = osCartRomInit(); + nuPiCartHandle = osCartRomInit(); } diff --git a/src/os/nusys/nuPiReadRom.c b/src/os/nusys/nuPiReadRom.c index 321a3ea339..2125feea97 100644 --- a/src/os/nusys/nuPiReadRom.c +++ b/src/os/nusys/nuPiReadRom.c @@ -25,7 +25,7 @@ void nuPiReadRom(u32 rom_addr, void* buf_ptr, u32 size) { ioMesg.devAddr = rom_addr; ioMesg.size = mesgSize; - osEPiStartDma(carthandle, &ioMesg, OS_READ); + osEPiStartDma(nuPiCartHandle, &ioMesg, OS_READ); osRecvMesg(&queue, &mesg, OS_MESG_BLOCK); rom_addr += mesgSize; diff --git a/src/os/nusys/nuPiReadRomOverlay.c b/src/os/nusys/nuPiReadRomOverlay.c new file mode 100644 index 0000000000..d8497a876b --- /dev/null +++ b/src/os/nusys/nuPiReadRomOverlay.c @@ -0,0 +1,48 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuPiReadRomOverlay(NUPiOverlaySegment* segment) { + OSIoMesg dmaIoMesgBuf; + OSMesgQueue dmaMesgQ; + OSMesg dmaMesgBuf; + u32 readSize; + u8* romAddr; + u32 size; + s32 clearBSS = TRUE; + void* bufPtr; + + osCreateMesgQueue(&dmaMesgQ, &dmaMesgBuf, 1); + dmaIoMesgBuf.hdr.pri = OS_MESG_PRI_NORMAL; + dmaIoMesgBuf.hdr.retQueue = &dmaMesgQ; + + osInvalDCache(segment->dataStart, segment->dataEnd - segment->dataStart); + osInvalICache(segment->textStart, segment->textEnd - segment->textStart); + + romAddr = segment->romStart; + size = segment->romEnd - romAddr; + bufPtr = segment->ramStart; + + while (size != 0) { + if (size > NU_PI_CART_BLOCK_READ_SIZE) { + readSize = NU_PI_CART_BLOCK_READ_SIZE; + } else { + readSize = size; + } + + dmaIoMesgBuf.dramAddr = bufPtr; + dmaIoMesgBuf.devAddr = (u32)romAddr; + dmaIoMesgBuf.size = readSize; + + osEPiStartDma(nuPiCartHandle, &dmaIoMesgBuf, OS_READ); + + if (clearBSS) { + bzero(segment->bssStart, segment->bssEnd - segment->bssStart); + clearBSS = FALSE; + } + + osRecvMesg(&dmaMesgQ, &dmaMesgBuf, OS_MESG_BLOCK); + romAddr += readSize; + bufPtr = (void*)((u8*)bufPtr + readSize); + size -= readSize; + } +} diff --git a/src/os/nusys/nuSiCallBackAdd.c b/src/os/nusys/nuSiCallBackAdd.c new file mode 100644 index 0000000000..3b53a59600 --- /dev/null +++ b/src/os/nusys/nuSiCallBackAdd.c @@ -0,0 +1,23 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuSiCallBackAdd(NUCallBackList* list) { + OSIntMask mask; + NUCallBackList** siCallBackListPtr = &nuSiCallBackList; + u32 i; + + while (*siCallBackListPtr != NULL) { + if ((*siCallBackListPtr)->majorNo == list->majorNo) { + return; + } + siCallBackListPtr = &(*siCallBackListPtr)->next; + } + + for (i = 1; list->func[i] != NULL; i++); + + mask = osSetIntMask(OS_IM_NONE); + *siCallBackListPtr = list; + list->next = NULL; + list->funcNum = i; + osSetIntMask(mask); +} diff --git a/src/os/nusys/nuSiCallBackRemove.c b/src/os/nusys/nuSiCallBackRemove.c new file mode 100644 index 0000000000..eb27fab11d --- /dev/null +++ b/src/os/nusys/nuSiCallBackRemove.c @@ -0,0 +1,18 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuSiCallBackRemove(NUCallBackList* list) { + OSIntMask mask; + NUCallBackList** siCallBackListPtr = &nuSiCallBackList; + + while (*siCallBackListPtr) { + if ((*siCallBackListPtr)->next == list) { + mask = osSetIntMask(OS_IM_NONE); + (*siCallBackListPtr)->next = list->next; + list->next = NULL; + osSetIntMask(mask); + break; + } + siCallBackListPtr = &(*siCallBackListPtr)->next; + } +} diff --git a/src/os/nusys/nuSiMgr.c b/src/os/nusys/nuSiMgr.c index 5efdf93fb9..2f6adc3e6c 100644 --- a/src/os/nusys/nuSiMgr.c +++ b/src/os/nusys/nuSiMgr.c @@ -1,16 +1,111 @@ #include "common.h" #include "nu/nusys.h" -s32 D_80077400[] = {0, 0, 0, 0}; +NUCallBackList* nuSiCallBackList = NULL; -INCLUDE_ASM(u8, "os/nusys/nuSiMgr", nuSiMgrInit); +extern OSMesg nuSiMesgBuf[8]; +extern OSThread siMgrThread; +extern s32 D_800A08C0; -INCLUDE_ASM(s32, "os/nusys/nuSiMgr", nuSiSendMesg, NUScMsg mesg, void* dataPtr); +static void nuSiMgrThread(void* arg); + +u8 nuSiMgrInit(void) { + u8 pattern; + OSContStatus status[NU_CONT_MAXCONTROLLERS]; + u32 i; + + osCreateMesgQueue(&nuSiMesgQ, &nuSiMesgBuf, ARRAY_COUNT(nuSiMesgBuf)); + osSetEventMesg(OS_EVENT_SI, &nuSiMesgQ, NULL); + osContInit(&nuSiMesgQ, &pattern, &status[0]); + + for (i = 0; i < ARRAY_COUNT(status); i++) { + if (((pattern >> i) & 1) && (status[i].errno == 0) && ((status[i].type & 0x1F07) != 5)) { + pattern &= ~(1 << i); + } + } + + osCreateThread(&siMgrThread, NU_SI_THREAD_ID, nuSiMgrThread, NULL, &D_800A08C0, NU_SI_THREAD_PRI); + osStartThread(&siMgrThread); + return pattern; +} + +s32 nuSiSendMesg(NUScMsg mesg, void* dataPtr) { + OSMesg rtnMesgBuf; + OSMesgQueue rtnMesgQ; + NUSiCommonMesg siCommonMesg; + + siCommonMesg.mesg = mesg; + siCommonMesg.dataPtr = dataPtr; + siCommonMesg.rtnMesgQ = &rtnMesgQ; + + osCreateMesgQueue(&rtnMesgQ, &rtnMesgBuf, 1); + + osSendMesg(&nuSiMgrMesgQ, &siCommonMesg, OS_MESG_BLOCK); + osRecvMesg(&rtnMesgQ, NULL, OS_MESG_BLOCK); + + return siCommonMesg.error; +} void nuSiMgrStop(void) { nuSiSendMesg(NU_SI_STOP_MGR_MSG, NULL); } -INCLUDE_ASM(void, "os/nusys/nuSiMgr", nuSiMgrRestart); +void nuSiMgrRestart(void) { + osStartThread(&siMgrThread); +} -INCLUDE_ASM(s32, "os/nusys/nuSiMgr", nuSiMgrThread); +void nuSiMgrThread(void* arg) { + NUScClient siClient; + OSMesg siMgrMesgBuf[NU_SI_MESG_MAX]; + NUSiCommonMesg* siMesg; + NUCallBackList** siCallBackListPtr; + s32 temp; + u16 majorNo; + u16 minorNo; + + osCreateMesgQueue(&nuSiMgrMesgQ, &siMgrMesgBuf, NU_SI_MESG_MAX); + nuScAddClient(&siClient, &nuSiMgrMesgQ, NU_SC_RETRACE_MSG); + + while (TRUE) { + osRecvMesg(&nuSiMgrMesgQ, &siMesg, OS_MESG_BLOCK); + + siCallBackListPtr = &nuSiCallBackList; + + switch (siMesg->mesg) { + case NU_SC_RETRACE_MSG: + while (*siCallBackListPtr) { + if ((*siCallBackListPtr)->func[0]){ + temp = (*((*siCallBackListPtr)->func[0]))(siMesg); + } + if (temp != 0) { + break; + } + siCallBackListPtr = &(*siCallBackListPtr)->next; + } + break; + case NU_SI_STOP_MGR_MSG: + osSendMesg(siMesg->rtnMesgQ, NULL, OS_MESG_BLOCK); + nuScResetClientMesgType(&siClient, 0); + osStopThread(NULL); + nuScResetClientMesgType(&siClient, NU_SC_RETRACE_MSG); + break; + default: + majorNo = siMesg->mesg & NU_SI_MSG_MAJOR_NO_MASK; + minorNo = siMesg->mesg & NU_SI_MSG_MINOR_NO_MASK; + + while (*siCallBackListPtr) { + if ((*siCallBackListPtr)->majorNo == majorNo) { + if ((*siCallBackListPtr)->funcNum > minorNo) { + siMesg->error = (*((*siCallBackListPtr)->func[minorNo]))(siMesg); + } + if (siMesg->rtnMesgQ != NULL) { + osSendMesg(siMesg->rtnMesgQ, NULL, OS_MESG_BLOCK); + } + break; + } + siCallBackListPtr = &(*siCallBackListPtr)->next; + } + break; + } + } +} diff --git a/src/state_battle.c b/src/state_battle.c index 5de246f006..2f9d4e6694 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -44,7 +44,7 @@ void state_step_battle(void) { u32 unk_47B; if (D_800A0900 == 5) { - if (D_8009A658[1] != D_8009A64C) { + if (nuGfxCfb[1] != nuGfxCfb_ptr) { return; } D_800A0900--; diff --git a/src/state_pause.c b/src/state_pause.c index e6dc7450f8..7778abc0f1 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -34,7 +34,7 @@ void state_step_pause(void) { update_npcs(); update_player(); update_effects(); - if (D_8009A658[1] == D_8009A64C) { + if (nuGfxCfb[1] == nuGfxCfb_ptr) { D_800A0920 = 4; D_800A0921 = 2; gOverrideFlags |= 0x8; diff --git a/src/world/action/16.c b/src/world/action/16.c index ee22460b89..8a87334fef 100644 --- a/src/world/action/16.c +++ b/src/world/action/16.c @@ -1,68 +1,56 @@ #include "common.h" -void sin_cos_rad(f32, f32*, f32*); -f32 func_800E34D8(void); -f32 player_check_collision_below(f32 length, s32* hitColliderID); // player_check_collision_below -s32 get_collider_type_by_id(s32 colliderID); - extern f32 D_802B6240; // bss? angle to lastGoodPosition -// Float problems near get_xz_dist_to_player; almost matching otherwise -#ifndef NON_MATCHING -INCLUDE_ASM(void, "world/action/16", func_802B6000_E287F0, void); -#else void func_802B6000_E287F0(void) { + PlayerStatus* playerStatus = &gPlayerStatus; f32 dx; f32 dy; f32 speed; - f32 angleRad; - if (gPlayerStatus.flags & 0x80000000) { - Camera* cameras = gCameras; - - gPlayerStatus.flags &= ~0x80000000; + if (playerStatus->flags & 0x80000000) { + playerStatus->flags &= ~0x80000000; suggest_player_anim_setUnkFlag(0x10017); - cameras[0].moveFlags |= 1; + playerStatus->flags |= 8; + playerStatus->fallState = 0; + playerStatus->gravityIntegrator[0] = 18.3473f; + playerStatus->gravityIntegrator[1] = -3.738f; + playerStatus->gravityIntegrator[2] = 0.8059f; + playerStatus->gravityIntegrator[3] = -0.0987f; - gPlayerStatus.fallState = 0; - gPlayerStatus.gravityIntegrator[0] = 18.3473f; - gPlayerStatus.gravityIntegrator[1] = -3.738f; - gPlayerStatus.gravityIntegrator[2] = 0.8059f; - gPlayerStatus.gravityIntegrator[3] = -0.0987f; - gPlayerStatus.flags |= 8; + gCameras[0].moveFlags |= 1; - D_802B6240 = atan2(gPlayerStatus.position.x, gPlayerStatus.position.z, gPlayerStatus.lastGoodPosition.x, - gPlayerStatus.lastGoodPosition.z); - gPlayerStatus.currentSpeed = get_xz_dist_to_player(gPlayerStatus.lastGoodPosition.x, gPlayerStatus.lastGoodPosition.z) / 18.0f; + D_802B6240 = atan2(playerStatus->position.x, playerStatus->position.z, playerStatus->lastGoodPosition.x, + playerStatus->lastGoodPosition.z); + playerStatus->currentSpeed = get_xz_dist_to_player(playerStatus->lastGoodPosition.x, playerStatus->lastGoodPosition.z) / 18.0f; } - angleRad = (D_802B6240 * TAU) / 360.0f; - sin_cos_rad(angleRad, &dx, &dy); + sin_cos_rad((D_802B6240 * TAU) / 360.0f, &dx, &dy); - speed = gPlayerStatus.currentSpeed; + speed = playerStatus->currentSpeed; - if (gPlayerStatus.flags & 0x40000) { + if (playerStatus->flags & 0x40000) { speed *= 0.5f; } - gPlayerStatus.position.x += speed * dx; - gPlayerStatus.position.z -= speed * dy; + playerStatus->position.x += speed * dx; + playerStatus->position.z -= speed * dy; - if (gPlayerStatus.fallState == 0) { + if (playerStatus->fallState == 0) { integrate_gravity(); - gPlayerStatus.position.y += gPlayerStatus.gravityIntegrator[0]; + playerStatus->position.y += playerStatus->gravityIntegrator[0]; - if (gPlayerStatus.gravityIntegrator[0] < 0.0f) { - gPlayerStatus.fallState = 1; // Now start checking for floor - gPlayerStatus.flags |= 4; + if (playerStatus->gravityIntegrator[0] < 0.0f) { + playerStatus->fallState = 1; // Now start checking for floor + playerStatus->flags |= 4; } } else { s32 colliderID; - gPlayerStatus.position.y = player_check_collision_below(func_800E34D8(), &colliderID); + playerStatus->position.y = player_check_collision_below(func_800E34D8(), &colliderID); if (colliderID >= 0) { colliderID = get_collider_type_by_id(colliderID); // what @@ -70,4 +58,3 @@ void func_802B6000_E287F0(void) { } } } -#endif diff --git a/src/world/action/18.c b/src/world/action/18.c index 3936825c49..c38f497464 100644 --- a/src/world/action/18.c +++ b/src/world/action/18.c @@ -63,7 +63,7 @@ void func_802B6198_E24768(void) { if (!(gGameStatusPtr->peachFlags & 0x10)) { suggest_player_anim_clearUnkFlag((D_802B6300_E248D0)[gGameStatusPtr->peachAnimIdx]); } else { - suggest_player_anim_clearUnkFlag(0xD000D); // dood + suggest_player_anim_clearUnkFlag(0xD000D); // doood } } else { peach_set_disguise_anim(world_actions_peachDisguises[gPlayerStatus.peachDisguise].unk_04); diff --git a/src/world/action/walk.c b/src/world/action/walk.c index 295125258f..1963bc552b 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -9,6 +9,40 @@ INCLUDE_ASM(void, "world/action/walk", func_802B6288_E23968, void); // same as func_802B6198_E24768 but requires data stuff INCLUDE_ASM(void, "world/action/walk", func_802B6550_E23C30, void); -INCLUDE_ASM(void, "world/action/walk", func_802B65E8_E23CC8, void); +void func_802B65E8_E23CC8(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + f32 magnitude; + f32 angle; + + if (playerStatus->flags & 0x80000000) { + playerStatus->flags &= ~0x80000000; + playerStatus->unk_60 = 0; + if (!(playerStatus->flags & 0x4000)) { + playerStatus->currentSpeed = playerStatus->walkSpeed; + } + func_802B6550_E23C30(); + } + + if (playerStatus->flags & 0x4000) { + playerStatus->targetYaw = playerStatus->heading; + try_player_footstep_sounds(8); + return; + } + player_input_to_move_vector(&angle, &magnitude); + phys_update_interact_collider(); + + if (magnitude == 0.0f) { + set_action_state(ACTION_STATE_IDLE); + return; + } + + playerStatus->targetYaw = angle; + if (gGameStatusPtr->peachAnimIdx == 0 && sqrtf(SQ(playerStatus->stickAxis[0]) + SQ(playerStatus->stickAxis[1])) > 55.0f) { + set_action_state(ACTION_STATE_RUN); + return; + } + + try_player_footstep_sounds(8); +} INCLUDE_ASM(void, "world/action/walk", func_802B6738_E23E18, void); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 8e685ec8a1..4b27703b58 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -3124,7 +3124,7 @@ ApiStatus N(func_80241DF8_95CFF8)(ScriptInstance* script, s32 isInitialCall) { if (effectPtr->unk_18 <= 0) { effectPtr->unk_18 = 0; - remove_effect(N(D_8024DFE0), effectPtr); + remove_effect(N(D_8024DFE0)); free_generic_entity(N(D_8024DFC0)); return ApiStatus_DONE2; } diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index f043160172..31c690509c 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -3237,7 +3237,7 @@ ApiStatus N(func_80240C88_969E48)(ScriptInstance* script, s32 isInitialCall) { if (effectPtr->unk_18 <= 0) { effectPtr->unk_18 = 0; - remove_effect(N(D_8024EFC0), effectPtr); + remove_effect(N(D_8024EFC0)); free_generic_entity(gPauseMenuCursorPosY); return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_10/CB96B0.c b/src/world/area_flo/flo_10/CB96B0.c index 08d22bd0fd..d466f0b2ff 100644 --- a/src/world/area_flo/flo_10/CB96B0.c +++ b/src/world/area_flo/flo_10/CB96B0.c @@ -1,4 +1,5 @@ #include "flo_10.h" +#include "nu/nusys.h" extern u16* nuGfxZBuffer; @@ -68,7 +69,7 @@ void N(func_802404B0_CB96B0)(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } subroutine_arg5 = phi_s4 / 6; subroutine_arg4 = phi_s4 / 6; - subroutine_arg6 = D_8009A64C; + subroutine_arg6 = nuGfxCfb_ptr; for (i = 0; i < subroutine_arg4; i++) { phi_s5 = arg1 - ((i + 1) * 6); @@ -300,7 +301,7 @@ void N(func_80240A98_CB9C98)(void) { gSPDisplayList(gMasterGfxPos++, model->modelNode->displayData->displayList); gDPPipeSync(gMasterGfxPos++); - gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(D_8009A64C)); + gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, osVirtualToPhysical(nuGfxCfb_ptr)); gDPSetDepthSource(gMasterGfxPos++, G_ZS_PRIM); gDPSetPrimDepth(gMasterGfxPos++, 32734, 0); gDPSetRenderMode(gMasterGfxPos++, G_RM_ZB_XLU_DECAL, G_RM_ZB_XLU_DECAL2); diff --git a/tools/asm_sizes.py b/tools/asm_sizes.py index 0047a9c2aa..c8d6962a75 100755 --- a/tools/asm_sizes.py +++ b/tools/asm_sizes.py @@ -3,7 +3,7 @@ import glob import os -print_funcs = False +print_funcs = True sizes = {} diff --git a/tools/build/configure.py b/tools/build/configure.py index 4e9f8be197..5eb28ca2b3 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -184,7 +184,7 @@ class Configure: modes = ["ld"] if assets: modes.extend(["bin", "Yay0", "img", "pm_map_data", "pm_msg", "pm_npc_sprites", "pm_charset", - "pm_charset_palettes", "pm_effects"]) + "pm_charset_palettes", "pm_effect_loads", "pm_effect_shims"]) if code: modes.extend(["code", "c", "data", "rodata"]) @@ -546,7 +546,7 @@ class Configure: build(entry.object_path.with_suffix(""), palettes, "pm_charset_palettes") build(entry.object_path, [entry.object_path.with_suffix("")], "bin") - elif seg.type == "pm_effects": + elif seg.type in ["pm_effect_loads", "pm_effect_shims"]: build(entry.object_path, entry.src_paths, "as") elif seg.type == "linker" or seg.type == "linker_offset": pass diff --git a/tools/m2ctx.py b/tools/m2ctx.py index 9ab67d1ab3..892ee5bac5 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -26,7 +26,8 @@ def get_c_file(directory): def import_c_file(in_file): in_file = os.path.relpath(in_file, root_dir) - cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-Iver/current/build/include" ,"-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file] + cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-Iver/current/build/include" ,"-D_LANGUAGE_C", + "-ffreestanding", "-DF3DEX_GBI_2", "-DSCRIPT(...)={}", in_file] try: return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8") except subprocess.CalledProcessError: diff --git a/tools/splat_ext/pm_effects.py b/tools/splat_ext/pm_effect_loads.py similarity index 95% rename from tools/splat_ext/pm_effects.py rename to tools/splat_ext/pm_effect_loads.py index 9d9900e1b5..e50070d3b6 100644 --- a/tools/splat_ext/pm_effects.py +++ b/tools/splat_ext/pm_effect_loads.py @@ -3,7 +3,7 @@ from segtypes.n64.segment import N64Segment from util import options import yaml -class N64SegPm_effects(N64Segment): +class N64SegPm_effect_loads(N64Segment): effects = [] @staticmethod @@ -55,7 +55,7 @@ glabel {name} def split(self, rom_bytes): for i, effect in enumerate(self.effects): - effect_asm = N64SegPm_effects.get_effect_asm(i, effect) + effect_asm = N64SegPm_effect_loads.get_effect_asm(i, effect) self.effect_path("").parent.mkdir(parents=True, exist_ok=True) diff --git a/tools/splat_ext/pm_effect_shims.py b/tools/splat_ext/pm_effect_shims.py new file mode 100644 index 0000000000..0b346177ea --- /dev/null +++ b/tools/splat_ext/pm_effect_shims.py @@ -0,0 +1,58 @@ +from yaml.loader import Loader +from segtypes.n64.segment import N64Segment +from util import options +import yaml + +class N64SegPm_effect_shims(N64Segment): + shims = [] + + @staticmethod + def get_shim_asm(index, name): + return f""".include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .text, "ax" + +glabel {name} +/* 0 3C01E020 */ lui $at, %hi(effectFuncs + 0x{index * 4:X}) +/* 4 8C210694 */ lw $at, %lo(effectFuncs + 0x{index * 4:X})($at) +/* 8 00200008 */ jr $at +/* C 00000000 */ nop +""" + + def shim_path(self, shim): + return options.get_build_path() / "asm" / "effect_shims" / f"{shim}.s" + + def __init__(self, rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yml): + super().__init__(rom_start, rom_end, type, name, vram_start, extract, given_subalign, given_is_overlay, given_dir, args, yml) + + with open(options.get_asm_path() / ".." / "effect_shims.yaml") as f: + self.shims = yaml.load(f.read(), Loader=yaml.SafeLoader) + + def split(self, rom_bytes): + for i, shim in enumerate(self.shims): + shim_asm = N64SegPm_effect_shims.get_shim_asm(i, shim) + + self.shim_path("").parent.mkdir(parents=True, exist_ok=True) + + with open(self.shim_path(shim), "w") as f: + f.write(shim_asm) + + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry + + ret = [] + + for shim in self.shims: + ret.append(LinkerEntry( + self, + [self.shim_path(shim)], + self.shim_path(shim), + ".text" + )) + + return ret diff --git a/ver/jp/asm/nonmatchings/25BB0/func_8004AAB8.s b/ver/jp/asm/nonmatchings/25BB0/func_8004AAB8.s index daf5f2d1aa..12bdfa36f2 100644 --- a/ver/jp/asm/nonmatchings/25BB0/func_8004AAB8.s +++ b/ver/jp/asm/nonmatchings/25BB0/func_8004AAB8.s @@ -267,8 +267,8 @@ glabel func_8004AAB8 /* 26278 8004AE78 AE22000C */ sw $v0, 0xc($s1) /* 2627C 8004AE7C AC830000 */ sw $v1, ($a0) /* 26280 8004AE80 A0A00002 */ sb $zero, 2($a1) -/* 26284 8004AE84 3C04800A */ lui $a0, %hi(carthandle) -/* 26288 8004AE88 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 26284 8004AE84 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 26288 8004AE88 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 2628C 8004AE8C 3C02800A */ lui $v0, %hi(D_800A1450) /* 26290 8004AE90 24421450 */ addiu $v0, $v0, %lo(D_800A1450) /* 26294 8004AE94 ACA20004 */ sw $v0, 4($a1) diff --git a/ver/jp/asm/nonmatchings/3A500/func_8005F100.s b/ver/jp/asm/nonmatchings/3A500/func_8005F100.s index ebb19d8aa7..3647f35155 100644 --- a/ver/jp/asm/nonmatchings/3A500/func_8005F100.s +++ b/ver/jp/asm/nonmatchings/3A500/func_8005F100.s @@ -14,7 +14,7 @@ glabel func_8005F100 /* 3A524 8005F124 0C0183B8 */ jal func_80060EE0 /* 3A528 8005F128 00000000 */ nop /* 3A52C 8005F12C 8FBF0010 */ lw $ra, 0x10($sp) -/* 3A530 8005F130 3C01800A */ lui $at, %hi(carthandle) -/* 3A534 8005F134 AC22A618 */ sw $v0, %lo(carthandle)($at) +/* 3A530 8005F130 3C01800A */ lui $at, %hi(nuPiCartHandle) +/* 3A534 8005F134 AC22A618 */ sw $v0, %lo(nuPiCartHandle)($at) /* 3A538 8005F138 03E00008 */ jr $ra /* 3A53C 8005F13C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/jp/asm/nonmatchings/3A500/func_8005F140.s b/ver/jp/asm/nonmatchings/3A500/func_8005F140.s index 976e544388..cdc03d5698 100644 --- a/ver/jp/asm/nonmatchings/3A500/func_8005F140.s +++ b/ver/jp/asm/nonmatchings/3A500/func_8005F140.s @@ -33,8 +33,8 @@ glabel func_8005F140 /* 3A5AC 8005F1AC 24104000 */ addiu $s0, $zero, 0x4000 .L8005F1B0: /* 3A5B0 8005F1B0 27A50010 */ addiu $a1, $sp, 0x10 -/* 3A5B4 8005F1B4 3C04800A */ lui $a0, %hi(carthandle) -/* 3A5B8 8005F1B8 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 3A5B4 8005F1B4 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 3A5B8 8005F1B8 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 3A5BC 8005F1BC 0000302D */ daddu $a2, $zero, $zero /* 3A5C0 8005F1C0 AFB20018 */ sw $s2, 0x18($sp) /* 3A5C4 8005F1C4 AFB3001C */ sw $s3, 0x1c($sp) diff --git a/ver/jp/asm/nonmatchings/42B0/func_80029820.s b/ver/jp/asm/nonmatchings/42B0/func_80029820.s index fb7f67c09b..ff44d46926 100644 --- a/ver/jp/asm/nonmatchings/42B0/func_80029820.s +++ b/ver/jp/asm/nonmatchings/42B0/func_80029820.s @@ -21,8 +21,8 @@ glabel func_80029820 /* 4C60 80029860 0C019554 */ jal func_80065550 /* 4C64 80029864 24060001 */ addiu $a2, $zero, 1 /* 4C68 80029868 27A50010 */ addiu $a1, $sp, 0x10 -/* 4C6C 8002986C 3C04800A */ lui $a0, %hi(carthandle) -/* 4C70 80029870 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 4C6C 8002986C 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 4C70 80029870 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 4C74 80029874 24060001 */ addiu $a2, $zero, 1 /* 4C78 80029878 A3A00012 */ sb $zero, 0x12($sp) /* 4C7C 8002987C AFB00014 */ sw $s0, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/7E00/func_8002CA00.s b/ver/jp/asm/nonmatchings/7E00/func_8002CA00.s index 621e2408c5..bbb27bcb84 100644 --- a/ver/jp/asm/nonmatchings/7E00/func_8002CA00.s +++ b/ver/jp/asm/nonmatchings/7E00/func_8002CA00.s @@ -16,8 +16,8 @@ glabel func_8002CA00 /* 7E2C 8002CA2C 0000802D */ daddu $s0, $zero, $zero /* 7E30 8002CA30 3C05B000 */ lui $a1, 0xb000 /* 7E34 8002CA34 34A50D10 */ ori $a1, $a1, 0xd10 -/* 7E38 8002CA38 3C04800A */ lui $a0, %hi(carthandle) -/* 7E3C 8002CA3C 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 7E38 8002CA38 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 7E3C 8002CA3C 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 7E40 8002CA40 27A60010 */ addiu $a2, $sp, 0x10 /* 7E44 8002CA44 AFB20020 */ sw $s2, 0x20($sp) /* 7E48 8002CA48 0200902D */ daddu $s2, $s0, $zero @@ -41,8 +41,8 @@ glabel func_8002CA00 /* 7E90 8002CA90 0060B82D */ daddu $s7, $v1, $zero .L8002CA94: /* 7E94 8002CA94 0220282D */ daddu $a1, $s1, $zero -/* 7E98 8002CA98 3C04800A */ lui $a0, %hi(carthandle) -/* 7E9C 8002CA9C 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 7E98 8002CA98 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 7E9C 8002CA9C 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 7EA0 8002CAA0 0280F809 */ jalr $s4 /* 7EA4 8002CAA4 27A60010 */ addiu $a2, $sp, 0x10 /* 7EA8 8002CAA8 8FA30010 */ lw $v1, 0x10($sp) @@ -96,8 +96,8 @@ glabel func_8002CA00 /* 7F58 8002CB58 3C05B000 */ lui $a1, 0xb000 /* 7F5C 8002CB5C 34A50E38 */ ori $a1, $a1, 0xe38 /* 7F60 8002CB60 27A60014 */ addiu $a2, $sp, 0x14 -/* 7F64 8002CB64 3C04800A */ lui $a0, %hi(carthandle) -/* 7F68 8002CB68 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 7F64 8002CB64 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 7F68 8002CB68 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 7F6C 8002CB6C 3C148006 */ lui $s4, %hi(osEPiReadIo) /* 7F70 8002CB70 26940D90 */ addiu $s4, $s4, %lo(osEPiReadIo) /* 7F74 8002CB74 0280F809 */ jalr $s4 @@ -114,8 +114,8 @@ glabel func_8002CA00 /* 7FA0 8002CBA0 0060B82D */ daddu $s7, $v1, $zero .L8002CBA4: /* 7FA4 8002CBA4 0220282D */ daddu $a1, $s1, $zero -/* 7FA8 8002CBA8 3C04800A */ lui $a0, %hi(carthandle) -/* 7FAC 8002CBAC 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 7FA8 8002CBA8 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 7FAC 8002CBAC 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 7FB0 8002CBB0 0280F809 */ jalr $s4 /* 7FB4 8002CBB4 27A60014 */ addiu $a2, $sp, 0x14 /* 7FB8 8002CBB8 8FA30014 */ lw $v1, 0x14($sp) diff --git a/ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD90.s b/ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD90.s index 333a6547c1..c24ce612ad 100644 --- a/ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD90.s +++ b/ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD90.s @@ -40,8 +40,8 @@ glabel func_8005FD90 /* 3B218 8005FE18 24104000 */ addiu $s0, $zero, 0x4000 .L8005FE1C: /* 3B21C 8005FE1C 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B220 8005FE20 3C04800A */ lui $a0, %hi(carthandle) -/* 3B224 8005FE24 8C84A618 */ lw $a0, %lo(carthandle)($a0) +/* 3B220 8005FE20 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 3B224 8005FE24 8C84A618 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 3B228 8005FE28 0000302D */ daddu $a2, $zero, $zero /* 3B22C 8005FE2C AFB30018 */ sw $s3, 0x18($sp) /* 3B230 8005FE30 AFB2001C */ sw $s2, 0x1c($sp) diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index ba93b38f99..182dbb6372 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -3,4 +3,4 @@ nuContRmbForceStop = 0x8005FD50; // type:func osEPiWriteIo = 0x80060D30; // type:func rom:0x3C130 osEPiReadIo = 0x80060D90; // type:func rom:0x3C190 _Printf = 0x80064A70; // type:func rom:0x3FE70 -carthandle = 0x8009A618; // +nuPiCartHandle = 0x8009A618; // diff --git a/ver/jp/undefined_syms_auto.txt b/ver/jp/undefined_syms_auto.txt index 63d4f0fff1..c3a23ee50d 100644 --- a/ver/jp/undefined_syms_auto.txt +++ b/ver/jp/undefined_syms_auto.txt @@ -1,4 +1,4 @@ -carthandle = 0x8009A618; +nuPiCartHandle = 0x8009A618; D_8009A590 = 0x8009A590; D_800B6570 = 0x800B6570; D_8005E560 = 0x8005E560; diff --git a/ver/us/asm/data/326160.data.s b/ver/us/asm/data/326160.data.s deleted file mode 100644 index 179712c40c..0000000000 --- a/ver/us/asm/data/326160.data.s +++ /dev/null @@ -1,129 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_E0200690 -.word 0x1E6D3457 - -glabel D_E0200694 -.word guRotateF - -glabel D_E0200698 -.word guTranslateF - -glabel D_E020069C -.word guTranslate - -glabel D_E02006A0 -.word guScaleF - -glabel D_E02006A4 -.word guMtxCatF - -glabel D_E02006A8 -.word guMtxF2L - -glabel D_E02006AC -.word guMtxL2F - -glabel D_E02006B0 -.word queue_render_task - -glabel D_E02006B4 -.word func_8005A2BC - -glabel D_E02006B8 -.word remove_effect - -glabel D_E02006BC -.word general_heap_malloc - -glabel D_E02006C0 -.word mem_clear - -glabel D_E02006C4 -.word 0x00000000 - -glabel D_E02006C8 -.word rand_int - -glabel D_E02006CC -.word clamp_angle - -glabel D_E02006D0 -.word sin_deg - -glabel D_E02006D4 -.word cos_deg - -glabel D_E02006D8 -.word atan2 - -glabel D_E02006DC -.word npc_raycast_down_sides - -glabel D_E02006E0 -.word load_effect - -glabel D_E02006E4 -.word sqrtf - -glabel D_E02006E8 -.word mdl_draw_hidden_panel_surface - -glabel D_E02006EC -.word func_8011CFBC - -glabel D_E02006F0 -.word guPerspectiveF - -glabel D_E02006F4 -.word guMtxIdentF - -glabel D_E02006F8 -.word transform_point - -glabel D_E02006FC -.word guLookAtHiliteF - -glabel D_E0200700 -.word set_screen_overlay_params_back - -glabel D_E0200704 -.word set_screen_overlay_center - -glabel D_E0200708 -.word set_screen_overlay_center_worldpos - -glabel D_E020070C -.word mdl_get_next_texture_address - -glabel D_E0200710 -.word guPositionF - -glabel D_E0200714 -.word guOrthoF - -glabel D_E0200718 -.word guFrustumF - -glabel D_E020071C -.word func_80138D88 - -glabel D_E0200720 -.word draw_box - -glabel D_E0200724 -.word draw_string - -glabel D_E0200728 -.word get_string_width - -glabel D_E020072C -.word get_background_color_blend - -glabel D_E0200730 -.word sfx_play_sound_at_position - -glabel D_E0200734 -.word 0x100B2AF5, 0x45B59924, 0x35094B45, 0x4ABFA67A, 0x164F5371, 0x7B195845, 0x58562A56, 0x25733D41, 0x48008107, 0x0E004F28, 0x6963B8AD, 0x5B82AB71, 0x6BC1F51B, 0x3D947816, 0x39705175, 0x44409A59, 0x0ED99067, 0x5F70B6F8, 0x3225AEEE, 0x08B5E97C, 0x2CDE7594, 0x5E9E5B7D, 0x5B2A2888, 0x107F0F50, 0x58FBC53B, 0x65F69F19, 0x3AF6CEF3, 0x15C3894F, 0x4C931A2C, 0x39A897E9, 0x5945BB8C, 0x5C9E4521, 0x7F5E310D, 0x0E4F06D2, 0x275DEB9C, 0x15AD847F, 0x09685F17, 0x7FB415F2, 0x3B20C1C0, 0x5168E01E, 0x0DB4651A, 0x24847A6D, 0x2CEB8B8F, 0x79765A35, 0x6218F283, 0x665BDD04, 0x3DB6F48F, 0x70F282EB, 0x45CC93FC, 0x6FDCA37D, 0x79A86C67, 0x72AB0990, 0x4E7AFEFA, 0x54D294F0, 0x032A18E0, 0x2776C435, 0x3AC93409, 0x3E20E7D4, 0x3D3A4D85, 0x075C4E35, 0x77C97FBD, 0x16800911, 0x63FA9357, 0x7727B0CB, 0x24CF0FE3, 0x0B587EF3, 0x0CD5354A, 0x2E376EFA, 0x0B0C94E5, 0x47F5F70A, 0x7FA04F19, 0x18C0FA00, 0x6C7A7178, 0x2C8BDAA8, 0x12375435, 0x4E9363FB, 0x12E7B7AD, 0x4FEE48C4, 0x3F85E6E6, 0x58B44BA9, 0x3FCAEC41, 0x392E534E, 0x4B5F553A, 0x0E45EB3C, 0x0E00E83E, 0x4E896E1A, 0x35BCAF71, 0x48CA1C47, 0x0CAA55EE, 0x72F6FCF6, 0x50266A7D, 0x0473D5AC, 0x09770608, 0x3420FDD4, 0x7B9B8677, 0x2E4615EB, 0x3F797CC7, 0x0870BBC1, 0x5C7D84E6, 0x4A8611AC, 0x5066B2CB, 0x5C1DD3FF, 0x63470BAC, 0x3CE12443, 0x08A9AEA7, 0x757E5FE2, 0x0B74883F, 0x1B916654, 0x456CA8A6, 0x4AFA6F25, 0x7445B1FE, 0x053794E8, 0x0428C273, 0x3FA50738, 0x137D8024, 0x1229AAB1, 0x0E2E7552, 0x493A2F95, 0x5AF3C6F9, 0x1AD8CB41, 0x3C312C8C, 0x2B1A3176, 0x1F4CA0ED, 0x45A83294, 0x5F3B2F4A, 0x1AE82764, 0x73EE487F, 0x1EB4AC11, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/6EAC0.data.s b/ver/us/asm/data/6EAC0.data.s index b0b571b5c8..7c1da977a1 100644 --- a/ver/us/asm/data/6EAC0.data.s +++ b/ver/us/asm/data/6EAC0.data.s @@ -17,7 +17,7 @@ glabel D_80093B84 glabel D_80093B94 .word D_80093B84, 0x00000000, 0x00000000 -glabel D_80093BA0 +glabel nugfx_ucode .word 0x80096030, 0x80097660 glabel FrameBuf diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_draw_ui.s b/ver/us/asm/nonmatchings/16c8e0/btl_draw_ui.s index 5e19bc5414..18663813ee 100644 --- a/ver/us/asm/nonmatchings/16c8e0/btl_draw_ui.s +++ b/ver/us/asm/nonmatchings/16c8e0/btl_draw_ui.s @@ -3,6 +3,7 @@ .section .rodata +.balign 8 glabel jtbl_8029C9F8 .word L8023EB20_16D400, L8023EC10_16D4F0, L8023EC40_16D520, L8023ED00_16D5E0, L8023EB60_16D440, L8023EB70_16D450, L8023EB30_16D410, L8023EB40_16D420, L8023EB50_16D430, L8023EB80_16D460, L8023EB90_16D470, L8023EBA0_16D480, L8023EBB0_16D490, L8023EBC0_16D4A0, L8023EBE0_16D4C0, L8023EBD0_16D4B0, L8023EBF0_16D4D0, L8023EC00_16D4E0, L8023EC70_16D550, L8023EC60_16D540, L8023EC50_16D530, L8023EC20_16D500, L8023EC30_16D510, L8023ECB0_16D590, L8023ECC0_16D5A0, L8023EC80_16D560, L8023ECD0_16D5B0, L8023ECE0_16D5C0, L8023ECA0_16D580, L8023ECF0_16D5D0, L8023ED38_16D618, L8023EC90_16D570, L8023ED20_16D600, L8023ED10_16D5F0, L8023ED30_16D610, 0 diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_restore_world_cameras.s b/ver/us/asm/nonmatchings/16c8e0/btl_restore_world_cameras.s deleted file mode 100644 index 11516ca026..0000000000 --- a/ver/us/asm/nonmatchings/16c8e0/btl_restore_world_cameras.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_restore_world_cameras -/* 16F388 80240AA8 3C088011 */ lui $t0, %hi(gPlayerStatus) -/* 16F38C 80240AAC 2508EFC8 */ addiu $t0, $t0, %lo(gPlayerStatus) -/* 16F390 80240AB0 0000382D */ daddu $a3, $zero, $zero -/* 16F394 80240AB4 3C04802A */ lui $a0, %hi(D_8029DA50) -/* 16F398 80240AB8 2484DA50 */ addiu $a0, $a0, %lo(D_8029DA50) -/* 16F39C 80240ABC 3C06800B */ lui $a2, %hi(gCameras) -/* 16F3A0 80240AC0 24C61D80 */ addiu $a2, $a2, %lo(gCameras) -.L80240AC4: -/* 16F3A4 80240AC4 00C0182D */ daddu $v1, $a2, $zero -/* 16F3A8 80240AC8 0080102D */ daddu $v0, $a0, $zero -/* 16F3AC 80240ACC 24850550 */ addiu $a1, $a0, 0x550 -.L80240AD0: -/* 16F3B0 80240AD0 8C490000 */ lw $t1, ($v0) -/* 16F3B4 80240AD4 8C4A0004 */ lw $t2, 4($v0) -/* 16F3B8 80240AD8 8C4B0008 */ lw $t3, 8($v0) -/* 16F3BC 80240ADC 8C4C000C */ lw $t4, 0xc($v0) -/* 16F3C0 80240AE0 AC690000 */ sw $t1, ($v1) -/* 16F3C4 80240AE4 AC6A0004 */ sw $t2, 4($v1) -/* 16F3C8 80240AE8 AC6B0008 */ sw $t3, 8($v1) -/* 16F3CC 80240AEC AC6C000C */ sw $t4, 0xc($v1) -/* 16F3D0 80240AF0 24420010 */ addiu $v0, $v0, 0x10 -/* 16F3D4 80240AF4 1445FFF6 */ bne $v0, $a1, .L80240AD0 -/* 16F3D8 80240AF8 24630010 */ addiu $v1, $v1, 0x10 -/* 16F3DC 80240AFC 8C490000 */ lw $t1, ($v0) -/* 16F3E0 80240B00 8C4A0004 */ lw $t2, 4($v0) -/* 16F3E4 80240B04 AC690000 */ sw $t1, ($v1) -/* 16F3E8 80240B08 AC6A0004 */ sw $t2, 4($v1) -/* 16F3EC 80240B0C 24840558 */ addiu $a0, $a0, 0x558 -/* 16F3F0 80240B10 24E70001 */ addiu $a3, $a3, 1 -/* 16F3F4 80240B14 28E20004 */ slti $v0, $a3, 4 -/* 16F3F8 80240B18 1440FFEA */ bnez $v0, .L80240AC4 -/* 16F3FC 80240B1C 24C60558 */ addiu $a2, $a2, 0x558 -/* 16F400 80240B20 3C01802A */ lui $at, %hi(D_8029EFB0) -/* 16F404 80240B24 C420EFB0 */ lwc1 $f0, %lo(D_8029EFB0)($at) -/* 16F408 80240B28 3C01802A */ lui $at, %hi(D_8029EFB4) -/* 16F40C 80240B2C C422EFB4 */ lwc1 $f2, %lo(D_8029EFB4)($at) -/* 16F410 80240B30 3C01802A */ lui $at, %hi(D_8029EFB8) -/* 16F414 80240B34 C424EFB8 */ lwc1 $f4, %lo(D_8029EFB8)($at) -/* 16F418 80240B38 3C02802A */ lui $v0, %hi(D_8029DA34) -/* 16F41C 80240B3C 8C42DA34 */ lw $v0, %lo(D_8029DA34)($v0) -/* 16F420 80240B40 3C018007 */ lui $at, %hi(gCurrentCameraID) -/* 16F424 80240B44 AC207410 */ sw $zero, %lo(gCurrentCameraID)($at) -/* 16F428 80240B48 30420080 */ andi $v0, $v0, 0x80 -/* 16F42C 80240B4C E5000028 */ swc1 $f0, 0x28($t0) -/* 16F430 80240B50 E502002C */ swc1 $f2, 0x2c($t0) -/* 16F434 80240B54 10400007 */ beqz $v0, .L80240B74 -/* 16F438 80240B58 E5040030 */ swc1 $f4, 0x30($t0) -/* 16F43C 80240B5C 3C03800A */ lui $v1, %hi(gOverrideFlags) -/* 16F440 80240B60 2463A650 */ addiu $v1, $v1, %lo(gOverrideFlags) -/* 16F444 80240B64 8C620000 */ lw $v0, ($v1) -/* 16F448 80240B68 34420080 */ ori $v0, $v0, 0x80 -/* 16F44C 80240B6C 080902E3 */ j .L80240B8C -/* 16F450 80240B70 AC620000 */ sw $v0, ($v1) -.L80240B74: -/* 16F454 80240B74 3C02800A */ lui $v0, %hi(gOverrideFlags) -/* 16F458 80240B78 2442A650 */ addiu $v0, $v0, %lo(gOverrideFlags) -/* 16F45C 80240B7C 8C430000 */ lw $v1, ($v0) -/* 16F460 80240B80 2404FF7F */ addiu $a0, $zero, -0x81 -/* 16F464 80240B84 00641824 */ and $v1, $v1, $a0 -/* 16F468 80240B88 AC430000 */ sw $v1, ($v0) -.L80240B8C: -/* 16F46C 80240B8C 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) -/* 16F470 80240B90 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) -/* 16F474 80240B94 30420040 */ andi $v0, $v0, 0x40 -/* 16F478 80240B98 10400006 */ beqz $v0, .L80240BB4 -/* 16F47C 80240B9C 00000000 */ nop -/* 16F480 80240BA0 3C03802A */ lui $v1, %hi(D_8029DA33) -/* 16F484 80240BA4 9063DA33 */ lbu $v1, %lo(D_8029DA33)($v1) -/* 16F488 80240BA8 3C028011 */ lui $v0, %hi(gPlayerData) -/* 16F48C 80240BAC 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 16F490 80240BB0 A0430012 */ sb $v1, 0x12($v0) -.L80240BB4: -/* 16F494 80240BB4 03E00008 */ jr $ra -/* 16F498 80240BB8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_save_world_cameras.s b/ver/us/asm/nonmatchings/16c8e0/btl_save_world_cameras.s deleted file mode 100644 index 8b59aa2d84..0000000000 --- a/ver/us/asm/nonmatchings/16c8e0/btl_save_world_cameras.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_save_world_cameras -/* 16F2D4 802409F4 3C088011 */ lui $t0, %hi(gPlayerStatus) -/* 16F2D8 802409F8 2508EFC8 */ addiu $t0, $t0, %lo(gPlayerStatus) -/* 16F2DC 802409FC 0000382D */ daddu $a3, $zero, $zero -/* 16F2E0 80240A00 3C04800B */ lui $a0, %hi(gCameras) -/* 16F2E4 80240A04 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 16F2E8 80240A08 3C06802A */ lui $a2, %hi(D_8029DA50) -/* 16F2EC 80240A0C 24C6DA50 */ addiu $a2, $a2, %lo(D_8029DA50) -.L80240A10: -/* 16F2F0 80240A10 00C0182D */ daddu $v1, $a2, $zero -/* 16F2F4 80240A14 0080102D */ daddu $v0, $a0, $zero -/* 16F2F8 80240A18 24850550 */ addiu $a1, $a0, 0x550 -.L80240A1C: -/* 16F2FC 80240A1C 8C490000 */ lw $t1, ($v0) -/* 16F300 80240A20 8C4A0004 */ lw $t2, 4($v0) -/* 16F304 80240A24 8C4B0008 */ lw $t3, 8($v0) -/* 16F308 80240A28 8C4C000C */ lw $t4, 0xc($v0) -/* 16F30C 80240A2C AC690000 */ sw $t1, ($v1) -/* 16F310 80240A30 AC6A0004 */ sw $t2, 4($v1) -/* 16F314 80240A34 AC6B0008 */ sw $t3, 8($v1) -/* 16F318 80240A38 AC6C000C */ sw $t4, 0xc($v1) -/* 16F31C 80240A3C 24420010 */ addiu $v0, $v0, 0x10 -/* 16F320 80240A40 1445FFF6 */ bne $v0, $a1, .L80240A1C -/* 16F324 80240A44 24630010 */ addiu $v1, $v1, 0x10 -/* 16F328 80240A48 8C490000 */ lw $t1, ($v0) -/* 16F32C 80240A4C 8C4A0004 */ lw $t2, 4($v0) -/* 16F330 80240A50 AC690000 */ sw $t1, ($v1) -/* 16F334 80240A54 AC6A0004 */ sw $t2, 4($v1) -/* 16F338 80240A58 24840558 */ addiu $a0, $a0, 0x558 -/* 16F33C 80240A5C 24E70001 */ addiu $a3, $a3, 1 -/* 16F340 80240A60 28E20004 */ slti $v0, $a3, 4 -/* 16F344 80240A64 1440FFEA */ bnez $v0, .L80240A10 -/* 16F348 80240A68 24C60558 */ addiu $a2, $a2, 0x558 -/* 16F34C 80240A6C C5000028 */ lwc1 $f0, 0x28($t0) -/* 16F350 80240A70 C502002C */ lwc1 $f2, 0x2c($t0) -/* 16F354 80240A74 C5040030 */ lwc1 $f4, 0x30($t0) -/* 16F358 80240A78 3C01C47A */ lui $at, 0xc47a -/* 16F35C 80240A7C 44813000 */ mtc1 $at, $f6 -/* 16F360 80240A80 AD000028 */ sw $zero, 0x28($t0) -/* 16F364 80240A84 AD000030 */ sw $zero, 0x30($t0) -/* 16F368 80240A88 3C01802A */ lui $at, %hi(D_8029EFB0) -/* 16F36C 80240A8C E420EFB0 */ swc1 $f0, %lo(D_8029EFB0)($at) -/* 16F370 80240A90 3C01802A */ lui $at, %hi(D_8029EFB4) -/* 16F374 80240A94 E422EFB4 */ swc1 $f2, %lo(D_8029EFB4)($at) -/* 16F378 80240A98 3C01802A */ lui $at, %hi(D_8029EFB8) -/* 16F37C 80240A9C E424EFB8 */ swc1 $f4, %lo(D_8029EFB8)($at) -/* 16F380 80240AA0 03E00008 */ jr $ra -/* 16F384 80240AA4 E506002C */ swc1 $f6, 0x2c($t0) diff --git a/ver/us/asm/nonmatchings/16c8e0/btl_update.s b/ver/us/asm/nonmatchings/16c8e0/btl_update.s deleted file mode 100644 index 7afd5bd0eb..0000000000 --- a/ver/us/asm/nonmatchings/16c8e0/btl_update.s +++ /dev/null @@ -1,466 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_8029C960 -.word L8023EA64_16D344, L8023EA64_16D344, L8023E5CC_16CEAC, L8023E6BC_16CF9C, L8023E6FC_16CFDC, L8023E7AC_16D08C, L8023E60C_16CEEC, L8023E61C_16CEFC, L8023E5DC_16CEBC, L8023E5EC_16CECC, L8023E5FC_16CEDC, L8023E62C_16CF0C, L8023E63C_16CF1C, L8023E64C_16CF2C, L8023E65C_16CF3C, L8023E66C_16CF4C, L8023E68C_16CF6C, L8023E67C_16CF5C, L8023E69C_16CF7C, L8023E6AC_16CF8C, L8023E71C_16CFFC, L8023E70C_16CFEC, L8023E6EC_16CFCC, L8023E6CC_16CFAC, L8023E6DC_16CFBC, L8023E75C_16D03C, L8023E76C_16D04C, L8023E72C_16D00C, L8023E77C_16D05C, L8023E78C_16D06C, L8023E74C_16D02C, L8023E79C_16D07C, L8023E7E4_16D0C4, L8023E73C_16D01C, L8023E7CC_16D0AC, L8023E7BC_16D09C, L8023E7DC_16D0BC, 0 - -.section .text - -glabel btl_update -/* 16CD18 8023E438 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 16CD1C 8023E43C AFB00028 */ sw $s0, 0x28($sp) -/* 16CD20 8023E440 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 16CD24 8023E444 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 16CD28 8023E448 2402FFFF */ addiu $v0, $zero, -1 -/* 16CD2C 8023E44C AFBF0034 */ sw $ra, 0x34($sp) -/* 16CD30 8023E450 AFB20030 */ sw $s2, 0x30($sp) -/* 16CD34 8023E454 AFB1002C */ sw $s1, 0x2c($sp) -/* 16CD38 8023E458 8E040224 */ lw $a0, 0x224($s0) -/* 16CD3C 8023E45C 8E1200DC */ lw $s2, 0xdc($s0) -/* 16CD40 8023E460 10820028 */ beq $a0, $v0, .L8023E504 -/* 16CD44 8023E464 3C030008 */ lui $v1, 8 -/* 16CD48 8023E468 8E020000 */ lw $v0, ($s0) -/* 16CD4C 8023E46C 00431024 */ and $v0, $v0, $v1 -/* 16CD50 8023E470 10400014 */ beqz $v0, .L8023E4C4 -/* 16CD54 8023E474 00000000 */ nop -/* 16CD58 8023E478 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 16CD5C 8023E47C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 16CD60 8023E480 80620081 */ lb $v0, 0x81($v1) -/* 16CD64 8023E484 1040000F */ beqz $v0, .L8023E4C4 -/* 16CD68 8023E488 00000000 */ nop -/* 16CD6C 8023E48C 8C620004 */ lw $v0, 4($v1) -/* 16CD70 8023E490 00441024 */ and $v0, $v0, $a0 -/* 16CD74 8023E494 AE020210 */ sw $v0, 0x210($s0) -/* 16CD78 8023E498 8C620014 */ lw $v0, 0x14($v1) -/* 16CD7C 8023E49C 00441024 */ and $v0, $v0, $a0 -/* 16CD80 8023E4A0 AE020214 */ sw $v0, 0x214($s0) -/* 16CD84 8023E4A4 8C620024 */ lw $v0, 0x24($v1) -/* 16CD88 8023E4A8 00441024 */ and $v0, $v0, $a0 -/* 16CD8C 8023E4AC AE020218 */ sw $v0, 0x218($s0) -/* 16CD90 8023E4B0 80620041 */ lb $v0, 0x41($v1) -/* 16CD94 8023E4B4 AE02021C */ sw $v0, 0x21c($s0) -/* 16CD98 8023E4B8 80620045 */ lb $v0, 0x45($v1) -/* 16CD9C 8023E4BC 0808F941 */ j .L8023E504 -/* 16CDA0 8023E4C0 AE020220 */ sw $v0, 0x220($s0) -.L8023E4C4: -/* 16CDA4 8023E4C4 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* 16CDA8 8023E4C8 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* 16CDAC 8023E4CC 8E030224 */ lw $v1, 0x224($s0) -/* 16CDB0 8023E4D0 8C820000 */ lw $v0, ($a0) -/* 16CDB4 8023E4D4 00431024 */ and $v0, $v0, $v1 -/* 16CDB8 8023E4D8 AE020210 */ sw $v0, 0x210($s0) -/* 16CDBC 8023E4DC 8C820010 */ lw $v0, 0x10($a0) -/* 16CDC0 8023E4E0 00431024 */ and $v0, $v0, $v1 -/* 16CDC4 8023E4E4 AE020214 */ sw $v0, 0x214($s0) -/* 16CDC8 8023E4E8 8C820020 */ lw $v0, 0x20($a0) -/* 16CDCC 8023E4EC 00431024 */ and $v0, $v0, $v1 -/* 16CDD0 8023E4F0 AE020218 */ sw $v0, 0x218($s0) -/* 16CDD4 8023E4F4 80820040 */ lb $v0, 0x40($a0) -/* 16CDD8 8023E4F8 AE02021C */ sw $v0, 0x21c($s0) -/* 16CDDC 8023E4FC 80820044 */ lb $v0, 0x44($a0) -/* 16CDE0 8023E500 AE020220 */ sw $v0, 0x220($s0) -.L8023E504: -/* 16CDE4 8023E504 27A40010 */ addiu $a0, $sp, 0x10 -/* 16CDE8 8023E508 0C08F800 */ jal get_dpad_input_radial -/* 16CDEC 8023E50C 27A50014 */ addiu $a1, $sp, 0x14 -/* 16CDF0 8023E510 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 16CDF4 8023E514 82020431 */ lb $v0, 0x431($s0) -/* 16CDF8 8023E518 8E030214 */ lw $v1, 0x214($s0) -/* 16CDFC 8023E51C 4600010D */ trunc.w.s $f4, $f0 -/* 16CE00 8023E520 E6040228 */ swc1 $f4, 0x228($s0) -/* 16CE04 8023E524 00021080 */ sll $v0, $v0, 2 -/* 16CE08 8023E528 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 16CE0C 8023E52C 02021021 */ addu $v0, $s0, $v0 -/* 16CE10 8023E530 4600010D */ trunc.w.s $f4, $f0 -/* 16CE14 8023E534 E604022C */ swc1 $f4, 0x22c($s0) -/* 16CE18 8023E538 AC430330 */ sw $v1, 0x330($v0) -/* 16CE1C 8023E53C 82020431 */ lb $v0, 0x431($s0) -/* 16CE20 8023E540 8E030210 */ lw $v1, 0x210($s0) -/* 16CE24 8023E544 00021080 */ sll $v0, $v0, 2 -/* 16CE28 8023E548 02021021 */ addu $v0, $s0, $v0 -/* 16CE2C 8023E54C AC430230 */ sw $v1, 0x230($v0) -/* 16CE30 8023E550 92020431 */ lbu $v0, 0x431($s0) -/* 16CE34 8023E554 24420001 */ addiu $v0, $v0, 1 -/* 16CE38 8023E558 A2020431 */ sb $v0, 0x431($s0) -/* 16CE3C 8023E55C 00021600 */ sll $v0, $v0, 0x18 -/* 16CE40 8023E560 00021603 */ sra $v0, $v0, 0x18 -/* 16CE44 8023E564 28420040 */ slti $v0, $v0, 0x40 -/* 16CE48 8023E568 50400001 */ beql $v0, $zero, .L8023E570 -/* 16CE4C 8023E56C A2000431 */ sb $zero, 0x431($s0) -.L8023E570: -/* 16CE50 8023E570 8E0200B4 */ lw $v0, 0xb4($s0) -/* 16CE54 8023E574 10400003 */ beqz $v0, .L8023E584 -/* 16CE58 8023E578 00000000 */ nop -/* 16CE5C 8023E57C 0040F809 */ jalr $v0 -/* 16CE60 8023E580 00000000 */ nop -.L8023E584: -/* 16CE64 8023E584 82030095 */ lb $v1, 0x95($s0) -/* 16CE68 8023E588 10600005 */ beqz $v1, .L8023E5A0 -/* 16CE6C 8023E58C 24110001 */ addiu $s1, $zero, 1 -/* 16CE70 8023E590 3C02800E */ lui $v0, %hi(gBattleState) -/* 16CE74 8023E594 8C42C068 */ lw $v0, %lo(gBattleState)($v0) -/* 16CE78 8023E598 10620092 */ beq $v1, $v0, L8023E7E4_16D0C4 -/* 16CE7C 8023E59C 00000000 */ nop -.L8023E5A0: -/* 16CE80 8023E5A0 3C02800E */ lui $v0, %hi(gBattleState) -/* 16CE84 8023E5A4 8C42C068 */ lw $v0, %lo(gBattleState)($v0) -/* 16CE88 8023E5A8 24430001 */ addiu $v1, $v0, 1 -/* 16CE8C 8023E5AC 2C620025 */ sltiu $v0, $v1, 0x25 -/* 16CE90 8023E5B0 1040008C */ beqz $v0, L8023E7E4_16D0C4 -/* 16CE94 8023E5B4 00031080 */ sll $v0, $v1, 2 -/* 16CE98 8023E5B8 3C01802A */ lui $at, %hi(jtbl_8029C960) -/* 16CE9C 8023E5BC 00220821 */ addu $at, $at, $v0 -/* 16CEA0 8023E5C0 8C22C960 */ lw $v0, %lo(jtbl_8029C960)($at) -/* 16CEA4 8023E5C4 00400008 */ jr $v0 -/* 16CEA8 8023E5C8 00000000 */ nop -glabel L8023E5CC_16CEAC -/* 16CEAC 8023E5CC 0C090486 */ jal btl_state_update_normal_start -/* 16CEB0 8023E5D0 0000882D */ daddu $s1, $zero, $zero -/* 16CEB4 8023E5D4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CEB8 8023E5D8 00000000 */ nop -glabel L8023E5DC_16CEBC -/* 16CEBC 8023E5DC 0C090809 */ jal btl_state_update_begin_player_turn -/* 16CEC0 8023E5E0 00000000 */ nop -/* 16CEC4 8023E5E4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CEC8 8023E5E8 00000000 */ nop -glabel L8023E5EC_16CECC -/* 16CECC 8023E5EC 0C090AEC */ jal btl_state_update_begin_partner_turn -/* 16CED0 8023E5F0 00000000 */ nop -/* 16CED4 8023E5F4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CED8 8023E5F8 00000000 */ nop -glabel L8023E5FC_16CEDC -/* 16CEDC 8023E5FC 0C090BF8 */ jal func_80242FE0 -/* 16CEE0 8023E600 00000000 */ nop -/* 16CEE4 8023E604 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CEE8 8023E608 00000000 */ nop -glabel L8023E60C_16CEEC -/* 16CEEC 8023E60C 0C0906C5 */ jal btl_state_update_begin_turn -/* 16CEF0 8023E610 00000000 */ nop -/* 16CEF4 8023E614 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CEF8 8023E618 00000000 */ nop -glabel L8023E61C_16CEFC -/* 16CEFC 8023E61C 0C090E76 */ jal btl_state_update_end_turn -/* 16CF00 8023E620 00000000 */ nop -/* 16CF04 8023E624 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF08 8023E628 00000000 */ nop -glabel L8023E62C_16CF0C -/* 16CF0C 8023E62C 0C090AB2 */ jal btl_state_update_switch_to_player -/* 16CF10 8023E630 00000000 */ nop -/* 16CF14 8023E634 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF18 8023E638 00000000 */ nop -glabel L8023E63C_16CF1C -/* 16CF1C 8023E63C 0C090BC0 */ jal btl_state_update_switch_to_partner -/* 16CF20 8023E640 00000000 */ nop -/* 16CF24 8023E644 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF28 8023E648 00000000 */ nop -glabel L8023E64C_16CF2C -/* 16CF2C 8023E64C 0C090E46 */ jal btl_state_update_prepare_menu -/* 16CF30 8023E650 00000000 */ nop -/* 16CF34 8023E654 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF38 8023E658 00000000 */ nop -glabel L8023E65C_16CF3C -/* 16CF3C 8023E65C 0C0A9662 */ jal btl_state_update_player_menu -/* 16CF40 8023E660 00000000 */ nop -/* 16CF44 8023E664 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF48 8023E668 00000000 */ nop -glabel L8023E66C_16CF4C -/* 16CF4C 8023E66C 0C0AA072 */ jal btl_state_update_partner_menu -/* 16CF50 8023E670 00000000 */ nop -/* 16CF54 8023E674 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF58 8023E678 00000000 */ nop -glabel L8023E67C_16CF5C -/* 16CF5C 8023E67C 0C0AA82E */ jal btl_state_update_twink_menu -/* 16CF60 8023E680 00000000 */ nop -/* 16CF64 8023E684 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF68 8023E688 00000000 */ nop -glabel L8023E68C_16CF6C -/* 16CF6C 8023E68C 0C0AA6D1 */ jal btl_state_update_peach_menu -/* 16CF70 8023E690 00000000 */ nop -/* 16CF74 8023E694 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF78 8023E698 00000000 */ nop -glabel L8023E69C_16CF7C -/* 16CF7C 8023E69C 0C0AA9A2 */ jal btl_state_update_select_target -/* 16CF80 8023E6A0 00000000 */ nop -/* 16CF84 8023E6A4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF88 8023E6A8 00000000 */ nop -glabel L8023E6AC_16CF8C -/* 16CF8C 8023E6AC 0C0916B4 */ jal btl_state_update_player_move -/* 16CF90 8023E6B0 00000000 */ nop -/* 16CF94 8023E6B4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CF98 8023E6B8 00000000 */ nop -glabel L8023E6BC_16CF9C -/* 16CF9C 8023E6BC 0C091EC1 */ jal btl_state_update_first_strike -/* 16CFA0 8023E6C0 00000000 */ nop -/* 16CFA4 8023E6C4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CFA8 8023E6C8 00000000 */ nop -glabel L8023E6CC_16CFAC -/* 16CFAC 8023E6CC 0C091914 */ jal btl_state_update_end_player_turn -/* 16CFB0 8023E6D0 00000000 */ nop -/* 16CFB4 8023E6D4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CFB8 8023E6D8 00000000 */ nop -glabel L8023E6DC_16CFBC -/* 16CFBC 8023E6DC 0C091C87 */ jal btl_state_update_end_partner_turn -/* 16CFC0 8023E6E0 00000000 */ nop -/* 16CFC4 8023E6E4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CFC8 8023E6E8 00000000 */ nop -glabel L8023E6EC_16CFCC -/* 16CFCC 8023E6EC 0C091D5C */ jal btl_state_update_enemy_move -/* 16CFD0 8023E6F0 00000000 */ nop -/* 16CFD4 8023E6F4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CFD8 8023E6F8 00000000 */ nop -glabel L8023E6FC_16CFDC -/* 16CFDC 8023E6FC 0C092064 */ jal btl_state_update_partner_striking_first -/* 16CFE0 8023E700 00000000 */ nop -/* 16CFE4 8023E704 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CFE8 8023E708 00000000 */ nop -glabel L8023E70C_16CFEC -/* 16CFEC 8023E70C 0C091CAB */ jal btl_state_update_next_enemy -/* 16CFF0 8023E710 00000000 */ nop -/* 16CFF4 8023E714 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16CFF8 8023E718 00000000 */ nop -glabel L8023E71C_16CFFC -/* 16CFFC 8023E71C 0C091ACD */ jal btl_state_update_partner_move -/* 16D000 8023E720 00000000 */ nop -/* 16D004 8023E724 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D008 8023E728 00000000 */ nop -glabel L8023E72C_16D00C -/* 16D00C 8023E72C 0C091002 */ jal btl_state_update_victory -/* 16D010 8023E730 00000000 */ nop -/* 16D014 8023E734 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D018 8023E738 00000000 */ nop -glabel L8023E73C_16D01C -/* 16D01C 8023E73C 0C091294 */ jal btl_state_update_end_battle -/* 16D020 8023E740 00000000 */ nop -/* 16D024 8023E744 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D028 8023E748 00000000 */ nop -glabel L8023E74C_16D02C -/* 16D02C 8023E74C 0C0915BE */ jal btl_state_update_change_partner -/* 16D030 8023E750 00000000 */ nop -/* 16D034 8023E754 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D038 8023E758 00000000 */ nop -glabel L8023E75C_16D03C -/* 16D03C 8023E75C 0C0913C0 */ jal btl_state_update_run_away -/* 16D040 8023E760 00000000 */ nop -/* 16D044 8023E764 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D048 8023E768 00000000 */ nop -glabel L8023E76C_16D04C -/* 16D04C 8023E76C 0C09138E */ jal btl_state_update_defend -/* 16D050 8023E770 00000000 */ nop -/* 16D054 8023E774 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D058 8023E778 00000000 */ nop -glabel L8023E77C_16D05C -/* 16D05C 8023E77C 0C091510 */ jal btl_state_update_defeat -/* 16D060 8023E780 00000000 */ nop -/* 16D064 8023E784 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D068 8023E788 00000000 */ nop -glabel L8023E78C_16D06C -/* 16D06C 8023E78C 0C090FF7 */ jal btl_state_update_1C -/* 16D070 8023E790 00000000 */ nop -/* 16D074 8023E794 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D078 8023E798 00000000 */ nop -glabel L8023E79C_16D07C -/* 16D07C 8023E79C 0C0911C4 */ jal btl_state_update_end_training_battle -/* 16D080 8023E7A0 00000000 */ nop -/* 16D084 8023E7A4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D088 8023E7A8 00000000 */ nop -glabel L8023E7AC_16D08C -/* 16D08C 8023E7AC 0C092198 */ jal btl_state_update_enemy_striking_first -/* 16D090 8023E7B0 00000000 */ nop -/* 16D094 8023E7B4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D098 8023E7B8 00000000 */ nop -glabel L8023E7BC_16D09C -/* 16D09C 8023E7BC 0C0AACCC */ jal btl_state_update_22 -/* 16D0A0 8023E7C0 00000000 */ nop -/* 16D0A4 8023E7C4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D0A8 8023E7C8 00000000 */ nop -glabel L8023E7CC_16D0AC -/* 16D0AC 8023E7CC 0C097864 */ jal btl_state_update_celebration -/* 16D0B0 8023E7D0 00000000 */ nop -/* 16D0B4 8023E7D4 0808F9F9 */ j L8023E7E4_16D0C4 -/* 16D0B8 8023E7D8 00000000 */ nop -glabel L8023E7DC_16D0BC -/* 16D0BC 8023E7DC 0C0922C2 */ jal btl_state_update_end_demo_battle -/* 16D0C0 8023E7E0 0000882D */ daddu $s1, $zero, $zero -glabel L8023E7E4_16D0C4 -/* 16D0C4 8023E7E4 96020090 */ lhu $v0, 0x90($s0) -/* 16D0C8 8023E7E8 24030028 */ addiu $v1, $zero, 0x28 -/* 16D0CC 8023E7EC 24420001 */ addiu $v0, $v0, 1 -/* 16D0D0 8023E7F0 A6020090 */ sh $v0, 0x90($s0) -/* 16D0D4 8023E7F4 00021400 */ sll $v0, $v0, 0x10 -/* 16D0D8 8023E7F8 00021403 */ sra $v0, $v0, 0x10 -/* 16D0DC 8023E7FC 14430003 */ bne $v0, $v1, .L8023E80C -/* 16D0E0 8023E800 00000000 */ nop -/* 16D0E4 8023E804 0C093DF2 */ jal func_8024F7C8 -/* 16D0E8 8023E808 00000000 */ nop -.L8023E80C: -/* 16D0EC 8023E80C 0C0999A1 */ jal func_80266684 -/* 16D0F0 8023E810 00000000 */ nop -/* 16D0F4 8023E814 0C099A5E */ jal func_80266978 -/* 16D0F8 8023E818 00000000 */ nop -/* 16D0FC 8023E81C 0C099AC5 */ jal func_80266B14 -/* 16D100 8023E820 00000000 */ nop -/* 16D104 8023E824 0C093B92 */ jal func_8024EE48 -/* 16D108 8023E828 00000000 */ nop -/* 16D10C 8023E82C 0C08F901 */ jal update_actor_shadows -/* 16D110 8023E830 00000000 */ nop -/* 16D114 8023E834 82030432 */ lb $v1, 0x432($s0) -/* 16D118 8023E838 2402FFFE */ addiu $v0, $zero, -2 -/* 16D11C 8023E83C 10620089 */ beq $v1, $v0, L8023EA64_16D344 -/* 16D120 8023E840 27A50018 */ addiu $a1, $sp, 0x18 -/* 16D124 8023E844 24040001 */ addiu $a0, $zero, 1 -/* 16D128 8023E848 0C04DF70 */ jal get_screen_overlay_params -/* 16D12C 8023E84C 27A6001C */ addiu $a2, $sp, 0x1c -/* 16D130 8023E850 82020432 */ lb $v0, 0x432($s0) -/* 16D134 8023E854 1840002C */ blez $v0, .L8023E908 -/* 16D138 8023E858 24040001 */ addiu $a0, $zero, 1 -/* 16D13C 8023E85C 0000282D */ daddu $a1, $zero, $zero -/* 16D140 8023E860 00A0302D */ daddu $a2, $a1, $zero -/* 16D144 8023E864 0C04DF84 */ jal set_screen_overlay_color -/* 16D148 8023E868 00A0382D */ daddu $a3, $a1, $zero -/* 16D14C 8023E86C 16400003 */ bnez $s2, .L8023E87C -/* 16D150 8023E870 00000000 */ nop -/* 16D154 8023E874 0808FA56 */ j .L8023E958 -/* 16D158 8023E878 3C054357 */ lui $a1, 0x4357 -.L8023E87C: -/* 16D15C 8023E87C 3C028011 */ lui $v0, %hi(gPlayerData) -/* 16D160 8023E880 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 16D164 8023E884 80430012 */ lb $v1, 0x12($v0) -/* 16D168 8023E888 24020006 */ addiu $v0, $zero, 6 -/* 16D16C 8023E88C 1462000F */ bne $v1, $v0, .L8023E8CC -/* 16D170 8023E890 00000000 */ nop -/* 16D174 8023E894 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 16D178 8023E898 3C014120 */ lui $at, 0x4120 -/* 16D17C 8023E89C 44811000 */ mtc1 $at, $f2 -/* 16D180 8023E8A0 00000000 */ nop -/* 16D184 8023E8A4 46020001 */ sub.s $f0, $f0, $f2 -/* 16D188 8023E8A8 44801000 */ mtc1 $zero, $f2 -/* 16D18C 8023E8AC 00000000 */ nop -/* 16D190 8023E8B0 4602003C */ c.lt.s $f0, $f2 -/* 16D194 8023E8B4 00000000 */ nop -/* 16D198 8023E8B8 45000002 */ bc1f .L8023E8C4 -/* 16D19C 8023E8BC E7A0001C */ swc1 $f0, 0x1c($sp) -/* 16D1A0 8023E8C0 E7A2001C */ swc1 $f2, 0x1c($sp) -.L8023E8C4: -/* 16D1A4 8023E8C4 0808FA56 */ j .L8023E958 -/* 16D1A8 8023E8C8 8FA5001C */ lw $a1, 0x1c($sp) -.L8023E8CC: -/* 16D1AC 8023E8CC C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 16D1B0 8023E8D0 3C014120 */ lui $at, 0x4120 -/* 16D1B4 8023E8D4 44811000 */ mtc1 $at, $f2 -/* 16D1B8 8023E8D8 00000000 */ nop -/* 16D1BC 8023E8DC 46020000 */ add.s $f0, $f0, $f2 -/* 16D1C0 8023E8E0 3C014357 */ lui $at, 0x4357 -/* 16D1C4 8023E8E4 44811000 */ mtc1 $at, $f2 -/* 16D1C8 8023E8E8 00000000 */ nop -/* 16D1CC 8023E8EC 4600103C */ c.lt.s $f2, $f0 -/* 16D1D0 8023E8F0 00000000 */ nop -/* 16D1D4 8023E8F4 45000002 */ bc1f .L8023E900 -/* 16D1D8 8023E8F8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 16D1DC 8023E8FC E7A2001C */ swc1 $f2, 0x1c($sp) -.L8023E900: -/* 16D1E0 8023E900 0808FA56 */ j .L8023E958 -/* 16D1E4 8023E904 8FA5001C */ lw $a1, 0x1c($sp) -.L8023E908: -/* 16D1E8 8023E908 04410015 */ bgez $v0, .L8023E960 -/* 16D1EC 8023E90C 00000000 */ nop -/* 16D1F0 8023E910 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 16D1F4 8023E914 3C014120 */ lui $at, 0x4120 -/* 16D1F8 8023E918 44810000 */ mtc1 $at, $f0 -/* 16D1FC 8023E91C 00000000 */ nop -/* 16D200 8023E920 46001081 */ sub.s $f2, $f2, $f0 -/* 16D204 8023E924 44800000 */ mtc1 $zero, $f0 -/* 16D208 8023E928 00000000 */ nop -/* 16D20C 8023E92C 4600103C */ c.lt.s $f2, $f0 -/* 16D210 8023E930 00000000 */ nop -/* 16D214 8023E934 45000007 */ bc1f .L8023E954 -/* 16D218 8023E938 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 16D21C 8023E93C 3C05BF80 */ lui $a1, 0xbf80 -/* 16D220 8023E940 240400FF */ addiu $a0, $zero, 0xff -/* 16D224 8023E944 0C04DF69 */ jal set_screen_overlay_params_back -/* 16D228 8023E948 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 16D22C 8023E94C 0808FA58 */ j .L8023E960 -/* 16D230 8023E950 A2000432 */ sb $zero, 0x432($s0) -.L8023E954: -/* 16D234 8023E954 44051000 */ mfc1 $a1, $f2 -.L8023E958: -/* 16D238 8023E958 0C04DF69 */ jal set_screen_overlay_params_back -/* 16D23C 8023E95C 0000202D */ daddu $a0, $zero, $zero -.L8023E960: -/* 16D240 8023E960 16200005 */ bnez $s1, .L8023E978 -/* 16D244 8023E964 2402FFFF */ addiu $v0, $zero, -1 -/* 16D248 8023E968 3C038028 */ lui $v1, %hi(D_802809F6) -/* 16D24C 8023E96C 846309F6 */ lh $v1, %lo(D_802809F6)($v1) -/* 16D250 8023E970 1062003C */ beq $v1, $v0, L8023EA64_16D344 -/* 16D254 8023E974 00000000 */ nop -.L8023E978: -/* 16D258 8023E978 3C108028 */ lui $s0, %hi(D_802809F6) -/* 16D25C 8023E97C 261009F6 */ addiu $s0, $s0, %lo(D_802809F6) -/* 16D260 8023E980 2402FFFF */ addiu $v0, $zero, -1 -/* 16D264 8023E984 86040000 */ lh $a0, ($s0) -/* 16D268 8023E988 96030000 */ lhu $v1, ($s0) -/* 16D26C 8023E98C 14820014 */ bne $a0, $v0, .L8023E9E0 -/* 16D270 8023E990 240500FF */ addiu $a1, $zero, 0xff -/* 16D274 8023E994 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 16D278 8023E998 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 16D27C 8023E99C 80430071 */ lb $v1, 0x71($v0) -/* 16D280 8023E9A0 24020002 */ addiu $v0, $zero, 2 -/* 16D284 8023E9A4 1462002F */ bne $v1, $v0, L8023EA64_16D344 -/* 16D288 8023E9A8 27A50020 */ addiu $a1, $sp, 0x20 -/* 16D28C 8023E9AC 0000202D */ daddu $a0, $zero, $zero -/* 16D290 8023E9B0 0C04DF70 */ jal get_screen_overlay_params -/* 16D294 8023E9B4 27A60024 */ addiu $a2, $sp, 0x24 -/* 16D298 8023E9B8 93A30020 */ lbu $v1, 0x20($sp) -/* 16D29C 8023E9BC 240200FF */ addiu $v0, $zero, 0xff -/* 16D2A0 8023E9C0 14620028 */ bne $v1, $v0, L8023EA64_16D344 -/* 16D2A4 8023E9C4 00000000 */ nop -/* 16D2A8 8023E9C8 A6000000 */ sh $zero, ($s0) -/* 16D2AC 8023E9CC 0000202D */ daddu $a0, $zero, $zero -/* 16D2B0 8023E9D0 0C04DF62 */ jal set_screen_overlay_params_front -/* 16D2B4 8023E9D4 0000282D */ daddu $a1, $zero, $zero -/* 16D2B8 8023E9D8 0808FA99 */ j L8023EA64_16D344 -/* 16D2BC 8023E9DC 00000000 */ nop -.L8023E9E0: -/* 16D2C0 8023E9E0 1485000A */ bne $a0, $a1, .L8023EA0C -/* 16D2C4 8023E9E4 2462000A */ addiu $v0, $v1, 0xa -/* 16D2C8 8023E9E8 3C03800E */ lui $v1, %hi(gBattleState) -/* 16D2CC 8023E9EC 8C63C068 */ lw $v1, %lo(gBattleState)($v1) -/* 16D2D0 8023E9F0 24020023 */ addiu $v0, $zero, 0x23 -/* 16D2D4 8023E9F4 1062001B */ beq $v1, $v0, L8023EA64_16D344 -/* 16D2D8 8023E9F8 00000000 */ nop -/* 16D2DC 8023E9FC 0C090464 */ jal btl_set_state -/* 16D2E0 8023EA00 0040202D */ daddu $a0, $v0, $zero -/* 16D2E4 8023EA04 0808FA99 */ j L8023EA64_16D344 -/* 16D2E8 8023EA08 00000000 */ nop -.L8023EA0C: -/* 16D2EC 8023EA0C A6020000 */ sh $v0, ($s0) -/* 16D2F0 8023EA10 00021400 */ sll $v0, $v0, 0x10 -/* 16D2F4 8023EA14 00021403 */ sra $v0, $v0, 0x10 -/* 16D2F8 8023EA18 28420100 */ slti $v0, $v0, 0x100 -/* 16D2FC 8023EA1C 50400001 */ beql $v0, $zero, .L8023EA24 -/* 16D300 8023EA20 A6050000 */ sh $a1, ($s0) -.L8023EA24: -/* 16D304 8023EA24 86020000 */ lh $v0, ($s0) -/* 16D308 8023EA28 44822000 */ mtc1 $v0, $f4 -/* 16D30C 8023EA2C 00000000 */ nop -/* 16D310 8023EA30 46802120 */ cvt.s.w $f4, $f4 -/* 16D314 8023EA34 44052000 */ mfc1 $a1, $f4 -/* 16D318 8023EA38 0C04DF62 */ jal set_screen_overlay_params_front -/* 16D31C 8023EA3C 0000202D */ daddu $a0, $zero, $zero -/* 16D320 8023EA40 0000202D */ daddu $a0, $zero, $zero -/* 16D324 8023EA44 240500D0 */ addiu $a1, $zero, 0xd0 -/* 16D328 8023EA48 00A0302D */ daddu $a2, $a1, $zero -/* 16D32C 8023EA4C 0C04DF84 */ jal set_screen_overlay_color -/* 16D330 8023EA50 00A0382D */ daddu $a3, $a1, $zero -/* 16D334 8023EA54 0C00CDF4 */ jal intro_logos_set_fade_alpha -/* 16D338 8023EA58 240400FF */ addiu $a0, $zero, 0xff -/* 16D33C 8023EA5C 0C00CDF8 */ jal intro_logos_set_fade_color -/* 16D340 8023EA60 240400E0 */ addiu $a0, $zero, 0xe0 -glabel L8023EA64_16D344 -/* 16D344 8023EA64 8FBF0034 */ lw $ra, 0x34($sp) -/* 16D348 8023EA68 8FB20030 */ lw $s2, 0x30($sp) -/* 16D34C 8023EA6C 8FB1002C */ lw $s1, 0x2c($sp) -/* 16D350 8023EA70 8FB00028 */ lw $s0, 0x28($sp) -/* 16D354 8023EA74 03E00008 */ jr $ra -/* 16D358 8023EA78 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/16c8e0/func_8023ED5C.s b/ver/us/asm/nonmatchings/16c8e0/func_8023ED5C.s deleted file mode 100644 index 4bfa883761..0000000000 --- a/ver/us/asm/nonmatchings/16c8e0/func_8023ED5C.s +++ /dev/null @@ -1,205 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8023ED5C -/* 16D63C 8023ED5C 3C02800E */ lui $v0, %hi(gBattleState) -/* 16D640 8023ED60 8C42C068 */ lw $v0, %lo(gBattleState)($v0) -/* 16D644 8023ED64 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 16D648 8023ED68 AFB40030 */ sw $s4, 0x30($sp) -/* 16D64C 8023ED6C 3C14800E */ lui $s4, %hi(gBattleStatus) -/* 16D650 8023ED70 2694C070 */ addiu $s4, $s4, %lo(gBattleStatus) -/* 16D654 8023ED74 AFB00020 */ sw $s0, 0x20($sp) -/* 16D658 8023ED78 27B00010 */ addiu $s0, $sp, 0x10 -/* 16D65C 8023ED7C AFBF0040 */ sw $ra, 0x40($sp) -/* 16D660 8023ED80 AFB7003C */ sw $s7, 0x3c($sp) -/* 16D664 8023ED84 AFB60038 */ sw $s6, 0x38($sp) -/* 16D668 8023ED88 AFB50034 */ sw $s5, 0x34($sp) -/* 16D66C 8023ED8C AFB3002C */ sw $s3, 0x2c($sp) -/* 16D670 8023ED90 AFB20028 */ sw $s2, 0x28($sp) -/* 16D674 8023ED94 104000A7 */ beqz $v0, .L8023F034 -/* 16D678 8023ED98 AFB10024 */ sw $s1, 0x24($sp) -/* 16D67C 8023ED9C 0C093BAA */ jal func_8024EEA8 -/* 16D680 8023EDA0 00000000 */ nop -/* 16D684 8023EDA4 8E8200B8 */ lw $v0, 0xb8($s4) -/* 16D688 8023EDA8 10400003 */ beqz $v0, .L8023EDB8 -/* 16D68C 8023EDAC 00000000 */ nop -/* 16D690 8023EDB0 0040F809 */ jalr $v0 -/* 16D694 8023EDB4 00000000 */ nop -.L8023EDB8: -/* 16D698 8023EDB8 8E820000 */ lw $v0, ($s4) -/* 16D69C 8023EDBC 30420001 */ andi $v0, $v0, 1 -/* 16D6A0 8023EDC0 1040009C */ beqz $v0, .L8023F034 -/* 16D6A4 8023EDC4 00000000 */ nop -/* 16D6A8 8023EDC8 0C0957F6 */ jal func_80255FD8 -/* 16D6AC 8023EDCC 00000000 */ nop -/* 16D6B0 8023EDD0 3C02800A */ lui $v0, %hi(gCurrentCamID) -/* 16D6B4 8023EDD4 9442A634 */ lhu $v0, %lo(gCurrentCamID)($v0) -/* 16D6B8 8023EDD8 2442FFFF */ addiu $v0, $v0, -1 -/* 16D6BC 8023EDDC 2C420002 */ sltiu $v0, $v0, 2 -/* 16D6C0 8023EDE0 10400094 */ beqz $v0, .L8023F034 -/* 16D6C4 8023EDE4 0000902D */ daddu $s2, $zero, $zero -/* 16D6C8 8023EDE8 3C178025 */ lui $s7, %hi(func_80257B28) -/* 16D6CC 8023EDEC 26F77B28 */ addiu $s7, $s7, %lo(func_80257B28) -/* 16D6D0 8023EDF0 3C161000 */ lui $s6, 0x1000 -/* 16D6D4 8023EDF4 3C158025 */ lui $s5, %hi(func_8025595C) -/* 16D6D8 8023EDF8 26B5595C */ addiu $s5, $s5, %lo(func_8025595C) -/* 16D6DC 8023EDFC 0280982D */ daddu $s3, $s4, $zero -.L8023EE00: -/* 16D6E0 8023EE00 8E7100E0 */ lw $s1, 0xe0($s3) -/* 16D6E4 8023EE04 5220002A */ beql $s1, $zero, .L8023EEB0 -/* 16D6E8 8023EE08 26520001 */ addiu $s2, $s2, 1 -/* 16D6EC 8023EE0C 8E220000 */ lw $v0, ($s1) -/* 16D6F0 8023EE10 30420001 */ andi $v0, $v0, 1 -/* 16D6F4 8023EE14 54400026 */ bnel $v0, $zero, .L8023EEB0 -/* 16D6F8 8023EE18 26520001 */ addiu $s2, $s2, 1 -/* 16D6FC 8023EE1C AE120008 */ sw $s2, 8($s0) -/* 16D700 8023EE20 AE17000C */ sw $s7, 0xc($s0) -/* 16D704 8023EE24 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D708 8023EE28 4600008D */ trunc.w.s $f2, $f0 -/* 16D70C 8023EE2C E6020004 */ swc1 $f2, 4($s0) -/* 16D710 8023EE30 86220434 */ lh $v0, 0x434($s1) -/* 16D714 8023EE34 0200202D */ daddu $a0, $s0, $zero -/* 16D718 8023EE38 0C047644 */ jal queue_render_task -/* 16D71C 8023EE3C AE020000 */ sw $v0, ($s0) -/* 16D720 8023EE40 8E220000 */ lw $v0, ($s1) -/* 16D724 8023EE44 00561024 */ and $v0, $v0, $s6 -/* 16D728 8023EE48 10400009 */ beqz $v0, .L8023EE70 -/* 16D72C 8023EE4C 24020022 */ addiu $v0, $zero, 0x22 -/* 16D730 8023EE50 AE110008 */ sw $s1, 8($s0) -/* 16D734 8023EE54 AE15000C */ sw $s5, 0xc($s0) -/* 16D738 8023EE58 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D73C 8023EE5C AE020000 */ sw $v0, ($s0) -/* 16D740 8023EE60 4600008D */ trunc.w.s $f2, $f0 -/* 16D744 8023EE64 E6020004 */ swc1 $f2, 4($s0) -/* 16D748 8023EE68 0C047644 */ jal queue_render_task -/* 16D74C 8023EE6C 0200202D */ daddu $a0, $s0, $zero -.L8023EE70: -/* 16D750 8023EE70 92820092 */ lbu $v0, 0x92($s4) -/* 16D754 8023EE74 30420001 */ andi $v0, $v0, 1 -/* 16D758 8023EE78 5040000D */ beql $v0, $zero, .L8023EEB0 -/* 16D75C 8023EE7C 26520001 */ addiu $s2, $s2, 1 -/* 16D760 8023EE80 3C028025 */ lui $v0, %hi(func_80257B68) -/* 16D764 8023EE84 24427B68 */ addiu $v0, $v0, %lo(func_80257B68) -/* 16D768 8023EE88 AE110008 */ sw $s1, 8($s0) -/* 16D76C 8023EE8C AE02000C */ sw $v0, 0xc($s0) -/* 16D770 8023EE90 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D774 8023EE94 4600008D */ trunc.w.s $f2, $f0 -/* 16D778 8023EE98 E6020004 */ swc1 $f2, 4($s0) -/* 16D77C 8023EE9C 86220434 */ lh $v0, 0x434($s1) -/* 16D780 8023EEA0 0200202D */ daddu $a0, $s0, $zero -/* 16D784 8023EEA4 0C047644 */ jal queue_render_task -/* 16D788 8023EEA8 AE020000 */ sw $v0, ($s0) -/* 16D78C 8023EEAC 26520001 */ addiu $s2, $s2, 1 -.L8023EEB0: -/* 16D790 8023EEB0 2A420018 */ slti $v0, $s2, 0x18 -/* 16D794 8023EEB4 1440FFD2 */ bnez $v0, .L8023EE00 -/* 16D798 8023EEB8 26730004 */ addiu $s3, $s3, 4 -/* 16D79C 8023EEBC 8E9100DC */ lw $s1, 0xdc($s4) -/* 16D7A0 8023EEC0 1220002D */ beqz $s1, .L8023EF78 -/* 16D7A4 8023EEC4 00000000 */ nop -/* 16D7A8 8023EEC8 8E220000 */ lw $v0, ($s1) -/* 16D7AC 8023EECC 30420001 */ andi $v0, $v0, 1 -/* 16D7B0 8023EED0 14400029 */ bnez $v0, .L8023EF78 -/* 16D7B4 8023EED4 0200202D */ daddu $a0, $s0, $zero -/* 16D7B8 8023EED8 3C028025 */ lui $v0, %hi(func_80257B48) -/* 16D7BC 8023EEDC 24427B48 */ addiu $v0, $v0, %lo(func_80257B48) -/* 16D7C0 8023EEE0 AE000008 */ sw $zero, 8($s0) -/* 16D7C4 8023EEE4 AE02000C */ sw $v0, 0xc($s0) -/* 16D7C8 8023EEE8 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D7CC 8023EEEC 4600008D */ trunc.w.s $f2, $f0 -/* 16D7D0 8023EEF0 E6020004 */ swc1 $f2, 4($s0) -/* 16D7D4 8023EEF4 86220434 */ lh $v0, 0x434($s1) -/* 16D7D8 8023EEF8 0C047644 */ jal queue_render_task -/* 16D7DC 8023EEFC AE020000 */ sw $v0, ($s0) -/* 16D7E0 8023EF00 8E220000 */ lw $v0, ($s1) -/* 16D7E4 8023EF04 3C031000 */ lui $v1, 0x1000 -/* 16D7E8 8023EF08 00431024 */ and $v0, $v0, $v1 -/* 16D7EC 8023EF0C 1040000C */ beqz $v0, .L8023EF40 -/* 16D7F0 8023EF10 00000000 */ nop -/* 16D7F4 8023EF14 3C028025 */ lui $v0, %hi(func_8025599C) -/* 16D7F8 8023EF18 2442599C */ addiu $v0, $v0, %lo(func_8025599C) -/* 16D7FC 8023EF1C AE110008 */ sw $s1, 8($s0) -/* 16D800 8023EF20 AE02000C */ sw $v0, 0xc($s0) -/* 16D804 8023EF24 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D808 8023EF28 24020022 */ addiu $v0, $zero, 0x22 -/* 16D80C 8023EF2C AE020000 */ sw $v0, ($s0) -/* 16D810 8023EF30 4600008D */ trunc.w.s $f2, $f0 -/* 16D814 8023EF34 E6020004 */ swc1 $f2, 4($s0) -/* 16D818 8023EF38 0C047644 */ jal queue_render_task -/* 16D81C 8023EF3C 0200202D */ daddu $a0, $s0, $zero -.L8023EF40: -/* 16D820 8023EF40 92820092 */ lbu $v0, 0x92($s4) -/* 16D824 8023EF44 30420001 */ andi $v0, $v0, 1 -/* 16D828 8023EF48 1040000B */ beqz $v0, .L8023EF78 -/* 16D82C 8023EF4C 0200202D */ daddu $a0, $s0, $zero -/* 16D830 8023EF50 3C028025 */ lui $v0, %hi(func_80257B88) -/* 16D834 8023EF54 24427B88 */ addiu $v0, $v0, %lo(func_80257B88) -/* 16D838 8023EF58 AE000008 */ sw $zero, 8($s0) -/* 16D83C 8023EF5C AE02000C */ sw $v0, 0xc($s0) -/* 16D840 8023EF60 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D844 8023EF64 4600008D */ trunc.w.s $f2, $f0 -/* 16D848 8023EF68 E6020004 */ swc1 $f2, 4($s0) -/* 16D84C 8023EF6C 86220434 */ lh $v0, 0x434($s1) -/* 16D850 8023EF70 0C047644 */ jal queue_render_task -/* 16D854 8023EF74 AE020000 */ sw $v0, ($s0) -.L8023EF78: -/* 16D858 8023EF78 8E9100D8 */ lw $s1, 0xd8($s4) -/* 16D85C 8023EF7C 1220002D */ beqz $s1, .L8023F034 -/* 16D860 8023EF80 00000000 */ nop -/* 16D864 8023EF84 8E220000 */ lw $v0, ($s1) -/* 16D868 8023EF88 30420001 */ andi $v0, $v0, 1 -/* 16D86C 8023EF8C 14400029 */ bnez $v0, .L8023F034 -/* 16D870 8023EF90 0200202D */ daddu $a0, $s0, $zero -/* 16D874 8023EF94 3C028025 */ lui $v0, %hi(func_80257DA4) -/* 16D878 8023EF98 24427DA4 */ addiu $v0, $v0, %lo(func_80257DA4) -/* 16D87C 8023EF9C AE000008 */ sw $zero, 8($s0) -/* 16D880 8023EFA0 AE02000C */ sw $v0, 0xc($s0) -/* 16D884 8023EFA4 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D888 8023EFA8 4600008D */ trunc.w.s $f2, $f0 -/* 16D88C 8023EFAC E6020004 */ swc1 $f2, 4($s0) -/* 16D890 8023EFB0 86220434 */ lh $v0, 0x434($s1) -/* 16D894 8023EFB4 0C047644 */ jal queue_render_task -/* 16D898 8023EFB8 AE020000 */ sw $v0, ($s0) -/* 16D89C 8023EFBC 8E220000 */ lw $v0, ($s1) -/* 16D8A0 8023EFC0 3C031000 */ lui $v1, 0x1000 -/* 16D8A4 8023EFC4 00431024 */ and $v0, $v0, $v1 -/* 16D8A8 8023EFC8 1040000C */ beqz $v0, .L8023EFFC -/* 16D8AC 8023EFCC 00000000 */ nop -/* 16D8B0 8023EFD0 3C028025 */ lui $v0, %hi(func_80254C50) -/* 16D8B4 8023EFD4 24424C50 */ addiu $v0, $v0, %lo(func_80254C50) -/* 16D8B8 8023EFD8 AE110008 */ sw $s1, 8($s0) -/* 16D8BC 8023EFDC AE02000C */ sw $v0, 0xc($s0) -/* 16D8C0 8023EFE0 C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D8C4 8023EFE4 24020022 */ addiu $v0, $zero, 0x22 -/* 16D8C8 8023EFE8 AE020000 */ sw $v0, ($s0) -/* 16D8CC 8023EFEC 4600008D */ trunc.w.s $f2, $f0 -/* 16D8D0 8023EFF0 E6020004 */ swc1 $f2, 4($s0) -/* 16D8D4 8023EFF4 0C047644 */ jal queue_render_task -/* 16D8D8 8023EFF8 0200202D */ daddu $a0, $s0, $zero -.L8023EFFC: -/* 16D8DC 8023EFFC 92820092 */ lbu $v0, 0x92($s4) -/* 16D8E0 8023F000 30420001 */ andi $v0, $v0, 1 -/* 16D8E4 8023F004 1040000B */ beqz $v0, .L8023F034 -/* 16D8E8 8023F008 0200202D */ daddu $a0, $s0, $zero -/* 16D8EC 8023F00C 3C028026 */ lui $v0, %hi(func_80258E14) -/* 16D8F0 8023F010 24428E14 */ addiu $v0, $v0, %lo(func_80258E14) -/* 16D8F4 8023F014 AE000008 */ sw $zero, 8($s0) -/* 16D8F8 8023F018 AE02000C */ sw $v0, 0xc($s0) -/* 16D8FC 8023F01C C620014C */ lwc1 $f0, 0x14c($s1) -/* 16D900 8023F020 4600008D */ trunc.w.s $f2, $f0 -/* 16D904 8023F024 E6020004 */ swc1 $f2, 4($s0) -/* 16D908 8023F028 86220434 */ lh $v0, 0x434($s1) -/* 16D90C 8023F02C 0C047644 */ jal queue_render_task -/* 16D910 8023F030 AC820000 */ sw $v0, ($a0) -.L8023F034: -/* 16D914 8023F034 8FBF0040 */ lw $ra, 0x40($sp) -/* 16D918 8023F038 8FB7003C */ lw $s7, 0x3c($sp) -/* 16D91C 8023F03C 8FB60038 */ lw $s6, 0x38($sp) -/* 16D920 8023F040 8FB50034 */ lw $s5, 0x34($sp) -/* 16D924 8023F044 8FB40030 */ lw $s4, 0x30($sp) -/* 16D928 8023F048 8FB3002C */ lw $s3, 0x2c($sp) -/* 16D92C 8023F04C 8FB20028 */ lw $s2, 0x28($sp) -/* 16D930 8023F050 8FB10024 */ lw $s1, 0x24($sp) -/* 16D934 8023F054 8FB00020 */ lw $s0, 0x20($sp) -/* 16D938 8023F058 03E00008 */ jr $ra -/* 16D93C 8023F05C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/16c8e0/func_8023F088.s b/ver/us/asm/nonmatchings/16c8e0/func_8023F088.s index 26eebfad51..2b2fe75e72 100644 --- a/ver/us/asm/nonmatchings/16c8e0/func_8023F088.s +++ b/ver/us/asm/nonmatchings/16c8e0/func_8023F088.s @@ -831,8 +831,8 @@ glabel func_8023F088 /* 16E614 8023FD34 AE0200B4 */ sw $v0, 0xb4($s0) /* 16E618 8023FD38 3C10F700 */ lui $s0, 0xf700 /* 16E61C 8023FD3C 3C14F600 */ lui $s4, 0xf600 -/* 16E620 8023FD40 3C04800A */ lui $a0, %hi(D_8009A64C) -/* 16E624 8023FD44 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* 16E620 8023FD40 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* 16E624 8023FD44 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* 16E628 8023FD48 0220102D */ daddu $v0, $s1, $zero /* 16E62C 8023FD4C 26310008 */ addiu $s1, $s1, 8 /* 16E630 8023FD50 AFD10000 */ sw $s1, ($fp) diff --git a/ver/us/asm/nonmatchings/182B30/_remove_part_decoration.s b/ver/us/asm/nonmatchings/182B30/_remove_part_decoration.s deleted file mode 100644 index 6f9d2e515d..0000000000 --- a/ver/us/asm/nonmatchings/182B30/_remove_part_decoration.s +++ /dev/null @@ -1,94 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_8029D4B8 -.word L8025D07C_18B95C, L8025D08C_18B96C, L8025D09C_18B97C, L8025D0AC_18B98C, L8025D0BC_18B99C, L8025D0CC_18B9AC, L8025D0DC_18B9BC, L8025D0EC_18B9CC, L8025D0FC_18B9DC, L8025D10C_18B9EC, L8025D11C_18B9FC, L8025D12C_18BA0C - -.section .text - -glabel _remove_part_decoration -/* 18B91C 8025D03C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 18B920 8025D040 AFBF0018 */ sw $ra, 0x18($sp) -/* 18B924 8025D044 AFB10014 */ sw $s1, 0x14($sp) -/* 18B928 8025D048 AFB00010 */ sw $s0, 0x10($sp) -/* 18B92C 8025D04C 8C9100C0 */ lw $s1, 0xc0($a0) -/* 18B930 8025D050 00A0802D */ daddu $s0, $a1, $zero -/* 18B934 8025D054 02301021 */ addu $v0, $s1, $s0 -/* 18B938 8025D058 804308B8 */ lb $v1, 0x8b8($v0) -/* 18B93C 8025D05C 2C62000C */ sltiu $v0, $v1, 0xc -/* 18B940 8025D060 10400034 */ beqz $v0, .L8025D134 -/* 18B944 8025D064 00031080 */ sll $v0, $v1, 2 -/* 18B948 8025D068 3C01802A */ lui $at, %hi(jtbl_8029D4B8) -/* 18B94C 8025D06C 00220821 */ addu $at, $at, $v0 -/* 18B950 8025D070 8C22D4B8 */ lw $v0, %lo(jtbl_8029D4B8)($at) -/* 18B954 8025D074 00400008 */ jr $v0 -/* 18B958 8025D078 00000000 */ nop -glabel L8025D07C_18B95C -/* 18B95C 8025D07C 0C097456 */ jal func_8025D158 -/* 18B960 8025D080 0200282D */ daddu $a1, $s0, $zero -/* 18B964 8025D084 0809744E */ j .L8025D138 -/* 18B968 8025D088 02301021 */ addu $v0, $s1, $s0 -glabel L8025D08C_18B96C -/* 18B96C 8025D08C 0C0974A4 */ jal func_8025D290 -/* 18B970 8025D090 0200282D */ daddu $a1, $s0, $zero -/* 18B974 8025D094 0809744E */ j .L8025D138 -/* 18B978 8025D098 02301021 */ addu $v0, $s1, $s0 -glabel L8025D09C_18B97C -/* 18B97C 8025D09C 0C0974F1 */ jal func_8025D3C4 -/* 18B980 8025D0A0 0200282D */ daddu $a1, $s0, $zero -/* 18B984 8025D0A4 0809744E */ j .L8025D138 -/* 18B988 8025D0A8 02301021 */ addu $v0, $s1, $s0 -glabel L8025D0AC_18B98C -/* 18B98C 8025D0AC 0C097528 */ jal func_8025D4A0 -/* 18B990 8025D0B0 0200282D */ daddu $a1, $s0, $zero -/* 18B994 8025D0B4 0809744E */ j .L8025D138 -/* 18B998 8025D0B8 02301021 */ addu $v0, $s1, $s0 -glabel L8025D0BC_18B99C -/* 18B99C 8025D0BC 0C097588 */ jal func_8025D620 -/* 18B9A0 8025D0C0 0200282D */ daddu $a1, $s0, $zero -/* 18B9A4 8025D0C4 0809744E */ j .L8025D138 -/* 18B9A8 8025D0C8 02301021 */ addu $v0, $s1, $s0 -glabel L8025D0CC_18B9AC -/* 18B9AC 8025D0CC 0C0975BF */ jal func_8025D6FC -/* 18B9B0 8025D0D0 0200282D */ daddu $a1, $s0, $zero -/* 18B9B4 8025D0D4 0809744E */ j .L8025D138 -/* 18B9B8 8025D0D8 02301021 */ addu $v0, $s1, $s0 -glabel L8025D0DC_18B9BC -/* 18B9BC 8025D0DC 0C097604 */ jal func_8025D810 -/* 18B9C0 8025D0E0 0200282D */ daddu $a1, $s0, $zero -/* 18B9C4 8025D0E4 0809744E */ j .L8025D138 -/* 18B9C8 8025D0E8 02301021 */ addu $v0, $s1, $s0 -glabel L8025D0EC_18B9CC -/* 18B9CC 8025D0EC 0C09763B */ jal func_8025D8EC -/* 18B9D0 8025D0F0 0200282D */ daddu $a1, $s0, $zero -/* 18B9D4 8025D0F4 0809744E */ j .L8025D138 -/* 18B9D8 8025D0F8 02301021 */ addu $v0, $s1, $s0 -glabel L8025D0FC_18B9DC -/* 18B9DC 8025D0FC 0C097698 */ jal func_8025DA60 -/* 18B9E0 8025D100 0200282D */ daddu $a1, $s0, $zero -/* 18B9E4 8025D104 0809744E */ j .L8025D138 -/* 18B9E8 8025D108 02301021 */ addu $v0, $s1, $s0 -glabel L8025D10C_18B9EC -/* 18B9EC 8025D10C 0C0976F2 */ jal func_8025DBC8 -/* 18B9F0 8025D110 0200282D */ daddu $a1, $s0, $zero -/* 18B9F4 8025D114 0809744E */ j .L8025D138 -/* 18B9F8 8025D118 02301021 */ addu $v0, $s1, $s0 -glabel L8025D11C_18B9FC -/* 18B9FC 8025D11C 0C097750 */ jal func_8025DD40 -/* 18BA00 8025D120 0200282D */ daddu $a1, $s0, $zero -/* 18BA04 8025D124 0809744E */ j .L8025D138 -/* 18BA08 8025D128 02301021 */ addu $v0, $s1, $s0 -glabel L8025D12C_18BA0C -/* 18BA0C 8025D12C 0C0977A2 */ jal func_8025DE88 -/* 18BA10 8025D130 0200282D */ daddu $a1, $s0, $zero -.L8025D134: -/* 18BA14 8025D134 02301021 */ addu $v0, $s1, $s0 -.L8025D138: -/* 18BA18 8025D138 A04008B8 */ sb $zero, 0x8b8($v0) -/* 18BA1C 8025D13C 8FBF0018 */ lw $ra, 0x18($sp) -/* 18BA20 8025D140 8FB10014 */ lw $s1, 0x14($sp) -/* 18BA24 8025D144 8FB00010 */ lw $s0, 0x10($sp) -/* 18BA28 8025D148 03E00008 */ jr $ra -/* 18BA2C 8025D14C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D290.s b/ver/us/asm/nonmatchings/182B30/func_8025D290.s deleted file mode 100644 index aaa57ae331..0000000000 --- a/ver/us/asm/nonmatchings/182B30/func_8025D290.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8025D290 -/* 18BB70 8025D290 8C8200C0 */ lw $v0, 0xc0($a0) -/* 18BB74 8025D294 00052880 */ sll $a1, $a1, 2 -/* 18BB78 8025D298 00451021 */ addu $v0, $v0, $a1 -/* 18BB7C 8025D29C 8C4208B0 */ lw $v0, 0x8b0($v0) -/* 18BB80 8025D2A0 8C43000C */ lw $v1, 0xc($v0) -/* 18BB84 8025D2A4 24020005 */ addiu $v0, $zero, 5 -/* 18BB88 8025D2A8 03E00008 */ jr $ra -/* 18BB8C 8025D2AC AC62002C */ sw $v0, 0x2c($v1) diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D4A0.s b/ver/us/asm/nonmatchings/182B30/func_8025D4A0.s deleted file mode 100644 index a5d8c12113..0000000000 --- a/ver/us/asm/nonmatchings/182B30/func_8025D4A0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8025D4A0 -/* 18BD80 8025D4A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 18BD84 8025D4A4 AFBF0010 */ sw $ra, 0x10($sp) -/* 18BD88 8025D4A8 8C8200C0 */ lw $v0, 0xc0($a0) -/* 18BD8C 8025D4AC 00052880 */ sll $a1, $a1, 2 -/* 18BD90 8025D4B0 00451021 */ addu $v0, $v0, $a1 -/* 18BD94 8025D4B4 0C016914 */ jal remove_effect -/* 18BD98 8025D4B8 8C4408B0 */ lw $a0, 0x8b0($v0) -/* 18BD9C 8025D4BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 18BDA0 8025D4C0 03E00008 */ jr $ra -/* 18BDA4 8025D4C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D620.s b/ver/us/asm/nonmatchings/182B30/func_8025D620.s deleted file mode 100644 index 20d4b12eeb..0000000000 --- a/ver/us/asm/nonmatchings/182B30/func_8025D620.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8025D620 -/* 18BF00 8025D620 8C8200C0 */ lw $v0, 0xc0($a0) -/* 18BF04 8025D624 00052880 */ sll $a1, $a1, 2 -/* 18BF08 8025D628 00451021 */ addu $v0, $v0, $a1 -/* 18BF0C 8025D62C 8C4208B0 */ lw $v0, 0x8b0($v0) -/* 18BF10 8025D630 8C43000C */ lw $v1, 0xc($v0) -/* 18BF14 8025D634 24020005 */ addiu $v0, $zero, 5 -/* 18BF18 8025D638 03E00008 */ jr $ra -/* 18BF1C 8025D63C AC62002C */ sw $v0, 0x2c($v1) diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D6FC.s b/ver/us/asm/nonmatchings/182B30/func_8025D6FC.s deleted file mode 100644 index de0de896d5..0000000000 --- a/ver/us/asm/nonmatchings/182B30/func_8025D6FC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8025D6FC -/* 18BFDC 8025D6FC 8C8200C0 */ lw $v0, 0xc0($a0) -/* 18BFE0 8025D700 00052880 */ sll $a1, $a1, 2 -/* 18BFE4 8025D704 00451021 */ addu $v0, $v0, $a1 -/* 18BFE8 8025D708 8C4308B0 */ lw $v1, 0x8b0($v0) -/* 18BFEC 8025D70C 8C620000 */ lw $v0, ($v1) -/* 18BFF0 8025D710 34420010 */ ori $v0, $v0, 0x10 -/* 18BFF4 8025D714 03E00008 */ jr $ra -/* 18BFF8 8025D718 AC620000 */ sw $v0, ($v1) diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D810.s b/ver/us/asm/nonmatchings/182B30/func_8025D810.s deleted file mode 100644 index fc78de3a54..0000000000 --- a/ver/us/asm/nonmatchings/182B30/func_8025D810.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8025D810 -/* 18C0F0 8025D810 8C8200C0 */ lw $v0, 0xc0($a0) -/* 18C0F4 8025D814 00052880 */ sll $a1, $a1, 2 -/* 18C0F8 8025D818 00451021 */ addu $v0, $v0, $a1 -/* 18C0FC 8025D81C 8C4308B0 */ lw $v1, 0x8b0($v0) -/* 18C100 8025D820 8C620000 */ lw $v0, ($v1) -/* 18C104 8025D824 34420010 */ ori $v0, $v0, 0x10 -/* 18C108 8025D828 03E00008 */ jr $ra -/* 18C10C 8025D82C AC620000 */ sw $v0, ($v1) diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D8EC.s b/ver/us/asm/nonmatchings/182B30/func_8025D8EC.s deleted file mode 100644 index 59f06b8624..0000000000 --- a/ver/us/asm/nonmatchings/182B30/func_8025D8EC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8025D8EC -/* 18C1CC 8025D8EC 8C8200C0 */ lw $v0, 0xc0($a0) -/* 18C1D0 8025D8F0 00052880 */ sll $a1, $a1, 2 -/* 18C1D4 8025D8F4 00451021 */ addu $v0, $v0, $a1 -/* 18C1D8 8025D8F8 8C4308B0 */ lw $v1, 0x8b0($v0) -/* 18C1DC 8025D8FC 8C620000 */ lw $v0, ($v1) -/* 18C1E0 8025D900 34420010 */ ori $v0, $v0, 0x10 -/* 18C1E4 8025D904 03E00008 */ jr $ra -/* 18C1E8 8025D908 AC620000 */ sw $v0, ($v1) diff --git a/ver/us/asm/nonmatchings/190B20/inflict_status.s b/ver/us/asm/nonmatchings/190B20/inflict_status.s deleted file mode 100644 index e27e88a50b..0000000000 --- a/ver/us/asm/nonmatchings/190B20/inflict_status.s +++ /dev/null @@ -1,232 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel jtbl_8029D5E0 -.word L80266238_194B18, L80266238_194B18, L80266238_194B18, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80265F80_194860, L80266138_194A18, L8026618C_194A6C, L802661C0_194AA0, L802661F8_194AD8, 0 - -glabel jtbl_8029D620 -.word L802660E4_1949C4, L802660D0_1949B0, L802660B0_194990, L80266090_194970, L8026602C_19490C, L80266238_194B18, L80266104_1949E4, L80266124_194A04 - -.section .text - -glabel inflict_status -/* 194820 80265F40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 194824 80265F44 AFB00018 */ sw $s0, 0x18($sp) -/* 194828 80265F48 0080802D */ daddu $s0, $a0, $zero -/* 19482C 80265F4C AFB1001C */ sw $s1, 0x1c($sp) -/* 194830 80265F50 00A0882D */ daddu $s1, $a1, $zero -/* 194834 80265F54 AFB20020 */ sw $s2, 0x20($sp) -/* 194838 80265F58 00C0902D */ daddu $s2, $a2, $zero -/* 19483C 80265F5C 2E22000F */ sltiu $v0, $s1, 0xf -/* 194840 80265F60 104000B5 */ beqz $v0, L80266238_194B18 -/* 194844 80265F64 AFBF0024 */ sw $ra, 0x24($sp) -/* 194848 80265F68 00111080 */ sll $v0, $s1, 2 -/* 19484C 80265F6C 3C01802A */ lui $at, %hi(jtbl_8029D5E0) -/* 194850 80265F70 00220821 */ addu $at, $at, $v0 -/* 194854 80265F74 8C22D5E0 */ lw $v0, %lo(jtbl_8029D5E0)($at) -/* 194858 80265F78 00400008 */ jr $v0 -/* 19485C 80265F7C 00000000 */ nop -glabel L80265F80_194860 -/* 194860 80265F80 86020192 */ lh $v0, 0x192($s0) -/* 194864 80265F84 1440000E */ bnez $v0, .L80265FC0 -/* 194868 80265F88 00000000 */ nop -/* 19486C 80265F8C 0C03A752 */ jal is_ability_active -/* 194870 80265F90 2404000E */ addiu $a0, $zero, 0xe -/* 194874 80265F94 144000A9 */ bnez $v0, .L8026623C -/* 194878 80265F98 0000102D */ daddu $v0, $zero, $zero -/* 19487C 80265F9C 0C03A752 */ jal is_ability_active -/* 194880 80265FA0 24040015 */ addiu $a0, $zero, 0x15 -/* 194884 80265FA4 144000A5 */ bnez $v0, .L8026623C -/* 194888 80265FA8 0000102D */ daddu $v0, $zero, $zero -/* 19488C 80265FAC 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 194890 80265FB0 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 194894 80265FB4 8042008B */ lb $v0, 0x8b($v0) -/* 194898 80265FB8 144000A0 */ bnez $v0, .L8026623C -/* 19489C 80265FBC 0000102D */ daddu $v0, $zero, $zero -.L80265FC0: -/* 1948A0 80265FC0 86030192 */ lh $v1, 0x192($s0) -/* 1948A4 80265FC4 24020100 */ addiu $v0, $zero, 0x100 -/* 1948A8 80265FC8 1062009C */ beq $v1, $v0, .L8026623C -/* 1948AC 80265FCC 24020001 */ addiu $v0, $zero, 1 -/* 1948B0 80265FD0 82020210 */ lb $v0, 0x210($s0) -/* 1948B4 80265FD4 54510001 */ bnel $v0, $s1, .L80265FDC -/* 1948B8 80265FD8 A211021C */ sb $s1, 0x21c($s0) -.L80265FDC: -/* 1948BC 80265FDC 8E020440 */ lw $v0, 0x440($s0) -/* 1948C0 80265FE0 8C42000C */ lw $v0, 0xc($v0) -/* 1948C4 80265FE4 AC40003C */ sw $zero, 0x3c($v0) -/* 1948C8 80265FE8 00121600 */ sll $v0, $s2, 0x18 -/* 1948CC 80265FEC 00021603 */ sra $v0, $v0, 0x18 -/* 1948D0 80265FF0 2842000A */ slti $v0, $v0, 0xa -/* 1948D4 80265FF4 A2110210 */ sb $s1, 0x210($s0) -/* 1948D8 80265FF8 14400003 */ bnez $v0, .L80266008 -/* 1948DC 80265FFC A2120211 */ sb $s2, 0x211($s0) -/* 1948E0 80266000 24020009 */ addiu $v0, $zero, 9 -/* 1948E4 80266004 A2020211 */ sb $v0, 0x211($s0) -.L80266008: -/* 1948E8 80266008 2625FFFD */ addiu $a1, $s1, -3 -/* 1948EC 8026600C 2CA20008 */ sltiu $v0, $a1, 8 -/* 1948F0 80266010 10400089 */ beqz $v0, L80266238_194B18 -/* 1948F4 80266014 00051080 */ sll $v0, $a1, 2 -/* 1948F8 80266018 3C01802A */ lui $at, %hi(jtbl_8029D620) -/* 1948FC 8026601C 00220821 */ addu $at, $at, $v0 -/* 194900 80266020 8C22D620 */ lw $v0, %lo(jtbl_8029D620)($at) -/* 194904 80266024 00400008 */ jr $v0 -/* 194908 80266028 00000000 */ nop -glabel L8026602C_19490C -/* 19490C 8026602C 86030192 */ lh $v1, 0x192($s0) -/* 194910 80266030 24020100 */ addiu $v0, $zero, 0x100 -/* 194914 80266034 10620081 */ beq $v1, $v0, .L8026623C -/* 194918 80266038 24020001 */ addiu $v0, $zero, 1 -/* 19491C 8026603C 8E030228 */ lw $v1, 0x228($s0) -/* 194920 80266040 10600004 */ beqz $v1, .L80266054 -/* 194924 80266044 00000000 */ nop -/* 194928 80266048 8C620000 */ lw $v0, ($v1) -/* 19492C 8026604C 34420010 */ ori $v0, $v0, 0x10 -/* 194930 80266050 AC620000 */ sw $v0, ($v1) -.L80266054: -/* 194934 80266054 3C013F80 */ lui $at, 0x3f80 -/* 194938 80266058 44810000 */ mtc1 $at, $f0 -/* 19493C 8026605C AFA00014 */ sw $zero, 0x14($sp) -/* 194940 80266060 E7A00010 */ swc1 $f0, 0x10($sp) -/* 194944 80266064 8E050144 */ lw $a1, 0x144($s0) -/* 194948 80266068 8E060148 */ lw $a2, 0x148($s0) -/* 19494C 8026606C 8E07014C */ lw $a3, 0x14c($s0) -/* 194950 80266070 0C01CA3C */ jal playFX_81 -/* 194954 80266074 0000202D */ daddu $a0, $zero, $zero -/* 194958 80266078 86040436 */ lh $a0, 0x436($s0) -/* 19495C 8026607C 24050007 */ addiu $a1, $zero, 7 -/* 194960 80266080 0C011E08 */ jal func_80047820 -/* 194964 80266084 AE020228 */ sw $v0, 0x228($s0) -/* 194968 80266088 0809988F */ j .L8026623C -/* 19496C 8026608C 24020001 */ addiu $v0, $zero, 1 -glabel L80266090_194970 -/* 194970 80266090 0200202D */ daddu $a0, $s0, $zero -/* 194974 80266094 0C099B6B */ jal func_80266DAC -/* 194978 80266098 24050003 */ addiu $a1, $zero, 3 -/* 19497C 8026609C 86040436 */ lh $a0, 0x436($s0) -/* 194980 802660A0 0C011E08 */ jal func_80047820 -/* 194984 802660A4 24050006 */ addiu $a1, $zero, 6 -/* 194988 802660A8 0809988F */ j .L8026623C -/* 19498C 802660AC 24020001 */ addiu $v0, $zero, 1 -glabel L802660B0_194990 -/* 194990 802660B0 0200202D */ daddu $a0, $s0, $zero -/* 194994 802660B4 0C099B6B */ jal func_80266DAC -/* 194998 802660B8 24050007 */ addiu $a1, $zero, 7 -/* 19499C 802660BC 86040436 */ lh $a0, 0x436($s0) -/* 1949A0 802660C0 0C011E08 */ jal func_80047820 -/* 1949A4 802660C4 24050005 */ addiu $a1, $zero, 5 -/* 1949A8 802660C8 0809988F */ j .L8026623C -/* 1949AC 802660CC 24020001 */ addiu $v0, $zero, 1 -glabel L802660D0_1949B0 -/* 1949B0 802660D0 86040436 */ lh $a0, 0x436($s0) -/* 1949B4 802660D4 0C011E08 */ jal func_80047820 -/* 1949B8 802660D8 24050004 */ addiu $a1, $zero, 4 -/* 1949BC 802660DC 0809988F */ j .L8026623C -/* 1949C0 802660E0 24020001 */ addiu $v0, $zero, 1 -glabel L802660E4_1949C4 -/* 1949C4 802660E4 0200202D */ daddu $a0, $s0, $zero -/* 1949C8 802660E8 0C099B6B */ jal func_80266DAC -/* 1949CC 802660EC 24050005 */ addiu $a1, $zero, 5 -/* 1949D0 802660F0 86040436 */ lh $a0, 0x436($s0) -/* 1949D4 802660F4 0C011E08 */ jal func_80047820 -/* 1949D8 802660F8 24050003 */ addiu $a1, $zero, 3 -/* 1949DC 802660FC 0809988F */ j .L8026623C -/* 1949E0 80266100 24020001 */ addiu $v0, $zero, 1 -glabel L80266104_1949E4 -/* 1949E4 80266104 0200202D */ daddu $a0, $s0, $zero -/* 1949E8 80266108 0C099B6B */ jal func_80266DAC -/* 1949EC 8026610C 24050006 */ addiu $a1, $zero, 6 -/* 1949F0 80266110 86040436 */ lh $a0, 0x436($s0) -/* 1949F4 80266114 0C011E08 */ jal func_80047820 -/* 1949F8 80266118 24050009 */ addiu $a1, $zero, 9 -/* 1949FC 8026611C 0809988F */ j .L8026623C -/* 194A00 80266120 24020001 */ addiu $v0, $zero, 1 -glabel L80266124_194A04 -/* 194A04 80266124 86040436 */ lh $a0, 0x436($s0) -/* 194A08 80266128 0C011E08 */ jal func_80047820 -/* 194A0C 8026612C 2405000A */ addiu $a1, $zero, 0xa -/* 194A10 80266130 0809988F */ j .L8026623C -/* 194A14 80266134 24020001 */ addiu $v0, $zero, 1 -glabel L80266138_194A18 -/* 194A18 80266138 86030192 */ lh $v1, 0x192($s0) -/* 194A1C 8026613C 24020100 */ addiu $v0, $zero, 0x100 -/* 194A20 80266140 1062003D */ beq $v1, $v0, L80266238_194B18 -/* 194A24 80266144 00121600 */ sll $v0, $s2, 0x18 -/* 194A28 80266148 00021603 */ sra $v0, $v0, 0x18 -/* 194A2C 8026614C 2842000A */ slti $v0, $v0, 0xa -/* 194A30 80266150 A2110212 */ sb $s1, 0x212($s0) -/* 194A34 80266154 14400003 */ bnez $v0, .L80266164 -/* 194A38 80266158 A2120213 */ sb $s2, 0x213($s0) -/* 194A3C 8026615C 24020009 */ addiu $v0, $zero, 9 -/* 194A40 80266160 A2020213 */ sb $v0, 0x213($s0) -.L80266164: -/* 194A44 80266164 0200202D */ daddu $a0, $s0, $zero -/* 194A48 80266168 24050004 */ addiu $a1, $zero, 4 -/* 194A4C 8026616C 2402000B */ addiu $v0, $zero, 0xb -/* 194A50 80266170 0C099B6B */ jal func_80266DAC -/* 194A54 80266174 A202021C */ sb $v0, 0x21c($s0) -/* 194A58 80266178 86040436 */ lh $a0, 0x436($s0) -/* 194A5C 8026617C 0C011E4A */ jal func_80047928 -/* 194A60 80266180 2405000B */ addiu $a1, $zero, 0xb -/* 194A64 80266184 0809988F */ j .L8026623C -/* 194A68 80266188 24020001 */ addiu $v0, $zero, 1 -glabel L8026618C_194A6C -/* 194A6C 8026618C 86030192 */ lh $v1, 0x192($s0) -/* 194A70 80266190 24020100 */ addiu $v0, $zero, 0x100 -/* 194A74 80266194 10620028 */ beq $v1, $v0, L80266238_194B18 -/* 194A78 80266198 2403000C */ addiu $v1, $zero, 0xc -/* 194A7C 8026619C 00121600 */ sll $v0, $s2, 0x18 -/* 194A80 802661A0 00021603 */ sra $v0, $v0, 0x18 -/* 194A84 802661A4 2842000A */ slti $v0, $v0, 0xa -/* 194A88 802661A8 A2030214 */ sb $v1, 0x214($s0) -/* 194A8C 802661AC 14400010 */ bnez $v0, .L802661F0 -/* 194A90 802661B0 A2120215 */ sb $s2, 0x215($s0) -/* 194A94 802661B4 24020009 */ addiu $v0, $zero, 9 -/* 194A98 802661B8 0809987C */ j .L802661F0 -/* 194A9C 802661BC A2020215 */ sb $v0, 0x215($s0) -glabel L802661C0_194AA0 -/* 194AA0 802661C0 82020216 */ lb $v0, 0x216($s0) -/* 194AA4 802661C4 0051102A */ slt $v0, $v0, $s1 -/* 194AA8 802661C8 1040001B */ beqz $v0, L80266238_194B18 -/* 194AAC 802661CC 2403000D */ addiu $v1, $zero, 0xd -/* 194AB0 802661D0 00121600 */ sll $v0, $s2, 0x18 -/* 194AB4 802661D4 00021603 */ sra $v0, $v0, 0x18 -/* 194AB8 802661D8 2842000A */ slti $v0, $v0, 0xa -/* 194ABC 802661DC A2030216 */ sb $v1, 0x216($s0) -/* 194AC0 802661E0 14400003 */ bnez $v0, .L802661F0 -/* 194AC4 802661E4 A2120217 */ sb $s2, 0x217($s0) -/* 194AC8 802661E8 24020009 */ addiu $v0, $zero, 9 -/* 194ACC 802661EC A2020217 */ sb $v0, 0x217($s0) -.L802661F0: -/* 194AD0 802661F0 0809988E */ j L80266238_194B18 -/* 194AD4 802661F4 A203021C */ sb $v1, 0x21c($s0) -glabel L802661F8_194AD8 -/* 194AD8 802661F8 86030192 */ lh $v1, 0x192($s0) -/* 194ADC 802661FC 24020100 */ addiu $v0, $zero, 0x100 -/* 194AE0 80266200 1062000D */ beq $v1, $v0, L80266238_194B18 -/* 194AE4 80266204 2403000E */ addiu $v1, $zero, 0xe -/* 194AE8 80266208 00121600 */ sll $v0, $s2, 0x18 -/* 194AEC 8026620C 00021603 */ sra $v0, $v0, 0x18 -/* 194AF0 80266210 2842000A */ slti $v0, $v0, 0xa -/* 194AF4 80266214 A2030218 */ sb $v1, 0x218($s0) -/* 194AF8 80266218 14400003 */ bnez $v0, .L80266228 -/* 194AFC 8026621C A2120219 */ sb $s2, 0x219($s0) -/* 194B00 80266220 24020009 */ addiu $v0, $zero, 9 -/* 194B04 80266224 A2020219 */ sb $v0, 0x219($s0) -.L80266228: -/* 194B08 80266228 86040436 */ lh $a0, 0x436($s0) -/* 194B0C 8026622C 2405000E */ addiu $a1, $zero, 0xe -/* 194B10 80266230 0C011E8C */ jal func_80047A30 -/* 194B14 80266234 A203021C */ sb $v1, 0x21c($s0) -glabel L80266238_194B18 -/* 194B18 80266238 24020001 */ addiu $v0, $zero, 1 -.L8026623C: -/* 194B1C 8026623C 8FBF0024 */ lw $ra, 0x24($sp) -/* 194B20 80266240 8FB20020 */ lw $s2, 0x20($sp) -/* 194B24 80266244 8FB1001C */ lw $s1, 0x1c($sp) -/* 194B28 80266248 8FB00018 */ lw $s0, 0x18($sp) -/* 194B2C 8026624C 03E00008 */ jr $ra -/* 194B30 80266250 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/1A5830/DropStarPoints.s b/ver/us/asm/nonmatchings/1A5830/DropStarPoints.s deleted file mode 100644 index 597f2763b3..0000000000 --- a/ver/us/asm/nonmatchings/1A5830/DropStarPoints.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel DropStarPoints -/* 1AB184 8027C8A4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 1AB188 8027C8A8 AFB00020 */ sw $s0, 0x20($sp) -/* 1AB18C 8027C8AC 0080802D */ daddu $s0, $a0, $zero -/* 1AB190 8027C8B0 AFBF0034 */ sw $ra, 0x34($sp) -/* 1AB194 8027C8B4 AFB40030 */ sw $s4, 0x30($sp) -/* 1AB198 8027C8B8 AFB3002C */ sw $s3, 0x2c($sp) -/* 1AB19C 8027C8BC AFB20028 */ sw $s2, 0x28($sp) -/* 1AB1A0 8027C8C0 AFB10024 */ sw $s1, 0x24($sp) -/* 1AB1A4 8027C8C4 8E02000C */ lw $v0, 0xc($s0) -/* 1AB1A8 8027C8C8 0C0B1EAF */ jal get_variable -/* 1AB1AC 8027C8CC 8C450000 */ lw $a1, ($v0) -/* 1AB1B0 8027C8D0 0040202D */ daddu $a0, $v0, $zero -/* 1AB1B4 8027C8D4 3C14800E */ lui $s4, %hi(gBattleStatus) -/* 1AB1B8 8027C8D8 2694C070 */ addiu $s4, $s4, %lo(gBattleStatus) -/* 1AB1BC 8027C8DC 2402FF81 */ addiu $v0, $zero, -0x7f -/* 1AB1C0 8027C8E0 14820002 */ bne $a0, $v0, .L8027C8EC -/* 1AB1C4 8027C8E4 00000000 */ nop -/* 1AB1C8 8027C8E8 8E040148 */ lw $a0, 0x148($s0) -.L8027C8EC: -/* 1AB1CC 8027C8EC 0C09A75B */ jal get_actor -/* 1AB1D0 8027C8F0 00000000 */ nop -/* 1AB1D4 8027C8F4 0040882D */ daddu $s1, $v0, $zero -/* 1AB1D8 8027C8F8 8E220008 */ lw $v0, 8($s1) -/* 1AB1DC 8027C8FC 90420006 */ lbu $v0, 6($v0) -/* 1AB1E0 8027C900 44800000 */ mtc1 $zero, $f0 -/* 1AB1E4 8027C904 44823000 */ mtc1 $v0, $f6 -/* 1AB1E8 8027C908 00000000 */ nop -/* 1AB1EC 8027C90C 468031A0 */ cvt.s.w $f6, $f6 -/* 1AB1F0 8027C910 46003032 */ c.eq.s $f6, $f0 -/* 1AB1F4 8027C914 00000000 */ nop -/* 1AB1F8 8027C918 45000003 */ bc1f .L8027C928 -/* 1AB1FC 8027C91C 00000000 */ nop -/* 1AB200 8027C920 3C013F80 */ lui $at, 0x3f80 -/* 1AB204 8027C924 44813000 */ mtc1 $at, $f6 -.L8027C928: -/* 1AB208 8027C928 3C028011 */ lui $v0, %hi(gPlayerData) -/* 1AB20C 8027C92C 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 1AB210 8027C930 80430009 */ lb $v1, 9($v0) -/* 1AB214 8027C934 44832000 */ mtc1 $v1, $f4 -/* 1AB218 8027C938 00000000 */ nop -/* 1AB21C 8027C93C 46802120 */ cvt.s.w $f4, $f4 -/* 1AB220 8027C940 46002032 */ c.eq.s $f4, $f0 -/* 1AB224 8027C944 00000000 */ nop -/* 1AB228 8027C948 45000004 */ bc1f .L8027C95C -/* 1AB22C 8027C94C 00000000 */ nop -/* 1AB230 8027C950 3C013F80 */ lui $at, 0x3f80 -/* 1AB234 8027C954 44812000 */ mtc1 $at, $f4 -/* 1AB238 8027C958 00000000 */ nop -.L8027C95C: -/* 1AB23C 8027C95C 4604303C */ c.lt.s $f6, $f4 -/* 1AB240 8027C960 00000000 */ nop -/* 1AB244 8027C964 45010017 */ bc1t .L8027C9C4 -/* 1AB248 8027C968 46000086 */ mov.s $f2, $f0 -/* 1AB24C 8027C96C 46043081 */ sub.s $f2, $f6, $f4 -/* 1AB250 8027C970 3C013F00 */ lui $at, 0x3f00 -/* 1AB254 8027C974 44810000 */ mtc1 $at, $f0 -/* 1AB258 8027C978 00000000 */ nop -/* 1AB25C 8027C97C 46001082 */ mul.s $f2, $f2, $f0 -/* 1AB260 8027C980 00000000 */ nop -/* 1AB264 8027C984 8282008E */ lb $v0, 0x8e($s4) -/* 1AB268 8027C988 00021080 */ sll $v0, $v0, 2 -/* 1AB26C 8027C98C 3C018029 */ lui $at, %hi(D_802946E0) -/* 1AB270 8027C990 00220821 */ addu $at, $at, $v0 -/* 1AB274 8027C994 C42046E0 */ lwc1 $f0, %lo(D_802946E0)($at) -/* 1AB278 8027C998 46800020 */ cvt.s.w $f0, $f0 -/* 1AB27C 8027C99C 46001082 */ mul.s $f2, $f2, $f0 -/* 1AB280 8027C9A0 00000000 */ nop -/* 1AB284 8027C9A4 3C014248 */ lui $at, 0x4248 -/* 1AB288 8027C9A8 44810000 */ mtc1 $at, $f0 -/* 1AB28C 8027C9AC 00000000 */ nop -/* 1AB290 8027C9B0 46001000 */ add.s $f0, $f2, $f0 -/* 1AB294 8027C9B4 3C0142C8 */ lui $at, 0x42c8 -/* 1AB298 8027C9B8 44811000 */ mtc1 $at, $f2 -/* 1AB29C 8027C9BC 00000000 */ nop -/* 1AB2A0 8027C9C0 46020083 */ div.s $f2, $f0, $f2 -.L8027C9C4: -/* 1AB2A4 8027C9C4 4600120D */ trunc.w.s $f8, $f2 -/* 1AB2A8 8027C9C8 44134000 */ mfc1 $s3, $f8 -/* 1AB2AC 8027C9CC 2862001B */ slti $v0, $v1, 0x1b -/* 1AB2B0 8027C9D0 10400019 */ beqz $v0, .L8027CA38 -/* 1AB2B4 8027C9D4 00000000 */ nop -/* 1AB2B8 8027C9D8 8E220000 */ lw $v0, ($s1) -/* 1AB2BC 8027C9DC 30420800 */ andi $v0, $v0, 0x800 -/* 1AB2C0 8027C9E0 10400002 */ beqz $v0, .L8027C9EC -/* 1AB2C4 8027C9E4 24120017 */ addiu $s2, $zero, 0x17 -/* 1AB2C8 8027C9E8 24120019 */ addiu $s2, $zero, 0x19 -.L8027C9EC: -/* 1AB2CC 8027C9EC 1A60000D */ blez $s3, .L8027CA24 -/* 1AB2D0 8027C9F0 0000802D */ daddu $s0, $zero, $zero -/* 1AB2D4 8027C9F4 24040159 */ addiu $a0, $zero, 0x159 -.L8027C9F8: -/* 1AB2D8 8027C9F8 AFB20010 */ sw $s2, 0x10($sp) -/* 1AB2DC 8027C9FC AFB00014 */ sw $s0, 0x14($sp) -/* 1AB2E0 8027CA00 AFA00018 */ sw $zero, 0x18($sp) -/* 1AB2E4 8027CA04 8E250144 */ lw $a1, 0x144($s1) -/* 1AB2E8 8027CA08 8E260148 */ lw $a2, 0x148($s1) -/* 1AB2EC 8027CA0C 8E27014C */ lw $a3, 0x14c($s1) -/* 1AB2F0 8027CA10 0C04C6B2 */ jal make_item_entity_delayed -/* 1AB2F4 8027CA14 26100001 */ addiu $s0, $s0, 1 -/* 1AB2F8 8027CA18 0213102A */ slt $v0, $s0, $s3 -/* 1AB2FC 8027CA1C 1440FFF6 */ bnez $v0, .L8027C9F8 -/* 1AB300 8027CA20 24040159 */ addiu $a0, $zero, 0x159 -.L8027CA24: -/* 1AB304 8027CA24 92820079 */ lbu $v0, 0x79($s4) -/* 1AB308 8027CA28 24030028 */ addiu $v1, $zero, 0x28 -/* 1AB30C 8027CA2C A283007A */ sb $v1, 0x7a($s4) -/* 1AB310 8027CA30 00531021 */ addu $v0, $v0, $s3 -/* 1AB314 8027CA34 A2820079 */ sb $v0, 0x79($s4) -.L8027CA38: -/* 1AB318 8027CA38 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 1AB31C 8027CA3C 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 1AB320 8027CA40 8C640000 */ lw $a0, ($v1) -/* 1AB324 8027CA44 3C050100 */ lui $a1, 0x100 -/* 1AB328 8027CA48 00852025 */ or $a0, $a0, $a1 -/* 1AB32C 8027CA4C AC640000 */ sw $a0, ($v1) -/* 1AB330 8027CA50 8FBF0034 */ lw $ra, 0x34($sp) -/* 1AB334 8027CA54 8FB40030 */ lw $s4, 0x30($sp) -/* 1AB338 8027CA58 8FB3002C */ lw $s3, 0x2c($sp) -/* 1AB33C 8027CA5C 8FB20028 */ lw $s2, 0x28($sp) -/* 1AB340 8027CA60 8FB10024 */ lw $s1, 0x24($sp) -/* 1AB344 8027CA64 8FB00020 */ lw $s0, 0x20($sp) -/* 1AB348 8027CA68 24020002 */ addiu $v0, $zero, 2 -/* 1AB34C 8027CA6C 03E00008 */ jr $ra -/* 1AB350 8027CA70 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/1a1f0_len_5390/show_first_strike_message.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/show_first_strike_message.s deleted file mode 100644 index d4e5ce7227..0000000000 --- a/ver/us/asm/nonmatchings/1a1f0_len_5390/show_first_strike_message.s +++ /dev/null @@ -1,187 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel show_first_strike_message -/* 1D05C 80041C5C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 1D060 80041C60 3C05800B */ lui $a1, %hi(gCurrentEncounter) -/* 1D064 80041C64 24A50F10 */ addiu $a1, $a1, %lo(gCurrentEncounter) -/* 1D068 80041C68 AFBF0054 */ sw $ra, 0x54($sp) -/* 1D06C 80041C6C AFB00050 */ sw $s0, 0x50($sp) -/* 1D070 80041C70 8CA20094 */ lw $v0, 0x94($a1) -/* 1D074 80041C74 14400005 */ bnez $v0, .L80041C8C -/* 1D078 80041C78 2402FF38 */ addiu $v0, $zero, -0xc8 -/* 1D07C 80041C7C 3C01800A */ lui $at, %hi(D_8009A668) -/* 1D080 80041C80 A422A668 */ sh $v0, %lo(D_8009A668)($at) -/* 1D084 80041C84 080107C0 */ j .L80041F00 -/* 1D088 80041C88 00000000 */ nop -.L80041C8C: -/* 1D08C 80041C8C 3C02800A */ lui $v0, %hi(D_8009A668) -/* 1D090 80041C90 2442A668 */ addiu $v0, $v0, %lo(D_8009A668) -/* 1D094 80041C94 94430000 */ lhu $v1, ($v0) -/* 1D098 80041C98 24630028 */ addiu $v1, $v1, 0x28 -/* 1D09C 80041C9C 00032400 */ sll $a0, $v1, 0x10 -/* 1D0A0 80041CA0 00048403 */ sra $s0, $a0, 0x10 -/* 1D0A4 80041CA4 1A000005 */ blez $s0, .L80041CBC -/* 1D0A8 80041CA8 A4430000 */ sh $v1, ($v0) -/* 1D0AC 80041CAC 2A020640 */ slti $v0, $s0, 0x640 -/* 1D0B0 80041CB0 10400002 */ beqz $v0, .L80041CBC -/* 1D0B4 80041CB4 2610F9C0 */ addiu $s0, $s0, -0x640 -/* 1D0B8 80041CB8 0000802D */ daddu $s0, $zero, $zero -.L80041CBC: -/* 1D0BC 80041CBC 80A30004 */ lb $v1, 4($a1) -/* 1D0C0 80041CC0 24020001 */ addiu $v0, $zero, 1 -/* 1D0C4 80041CC4 10620005 */ beq $v1, $v0, .L80041CDC -/* 1D0C8 80041CC8 24020002 */ addiu $v0, $zero, 2 -/* 1D0CC 80041CCC 1062005D */ beq $v1, $v0, .L80041E44 -/* 1D0D0 80041CD0 00000000 */ nop -/* 1D0D4 80041CD4 080107C0 */ j .L80041F00 -/* 1D0D8 80041CD8 00000000 */ nop -.L80041CDC: -/* 1D0DC 80041CDC 80A30005 */ lb $v1, 5($a1) -/* 1D0E0 80041CE0 24020004 */ addiu $v0, $zero, 4 -/* 1D0E4 80041CE4 1062000C */ beq $v1, $v0, .L80041D18 -/* 1D0E8 80041CE8 28620005 */ slti $v0, $v1, 5 -/* 1D0EC 80041CEC 10400005 */ beqz $v0, .L80041D04 -/* 1D0F0 80041CF0 24020002 */ addiu $v0, $zero, 2 -/* 1D0F4 80041CF4 10620009 */ beq $v1, $v0, .L80041D1C -/* 1D0F8 80041CF8 3C04001D */ lui $a0, 0x1d -/* 1D0FC 80041CFC 080107C0 */ j .L80041F00 -/* 1D100 80041D00 00000000 */ nop -.L80041D04: -/* 1D104 80041D04 24020006 */ addiu $v0, $zero, 6 -/* 1D108 80041D08 10620029 */ beq $v1, $v0, .L80041DB0 -/* 1D10C 80041D0C 3C04001D */ lui $a0, 0x1d -/* 1D110 80041D10 080107C0 */ j .L80041F00 -/* 1D114 80041D14 00000000 */ nop -.L80041D18: -/* 1D118 80041D18 3C04001D */ lui $a0, 0x1d -.L80041D1C: -/* 1D11C 80041D1C 348400AC */ ori $a0, $a0, 0xac -/* 1D120 80041D20 0C04991D */ jal get_string_width -/* 1D124 80041D24 0000282D */ daddu $a1, $zero, $zero -/* 1D128 80041D28 24480018 */ addiu $t0, $v0, 0x18 -/* 1D12C 80041D2C 260300A0 */ addiu $v1, $s0, 0xa0 -/* 1D130 80041D30 000817C2 */ srl $v0, $t0, 0x1f -/* 1D134 80041D34 01021021 */ addu $v0, $t0, $v0 -/* 1D138 80041D38 00021043 */ sra $v0, $v0, 1 -/* 1D13C 80041D3C 00628023 */ subu $s0, $v1, $v0 -/* 1D140 80041D40 0000202D */ daddu $a0, $zero, $zero -/* 1D144 80041D44 24050014 */ addiu $a1, $zero, 0x14 -/* 1D148 80041D48 0200302D */ daddu $a2, $s0, $zero -/* 1D14C 80041D4C 24070045 */ addiu $a3, $zero, 0x45 -/* 1D150 80041D50 2402001C */ addiu $v0, $zero, 0x1c -/* 1D154 80041D54 AFA20018 */ sw $v0, 0x18($sp) -/* 1D158 80041D58 240200FF */ addiu $v0, $zero, 0xff -/* 1D15C 80041D5C AFA2001C */ sw $v0, 0x1c($sp) -/* 1D160 80041D60 24020140 */ addiu $v0, $zero, 0x140 -/* 1D164 80041D64 AFA20044 */ sw $v0, 0x44($sp) -/* 1D168 80041D68 240200F0 */ addiu $v0, $zero, 0xf0 -/* 1D16C 80041D6C AFA00010 */ sw $zero, 0x10($sp) -/* 1D170 80041D70 AFA80014 */ sw $t0, 0x14($sp) -/* 1D174 80041D74 AFA00020 */ sw $zero, 0x20($sp) -/* 1D178 80041D78 AFA00024 */ sw $zero, 0x24($sp) -/* 1D17C 80041D7C AFA00028 */ sw $zero, 0x28($sp) -/* 1D180 80041D80 AFA0002C */ sw $zero, 0x2c($sp) -/* 1D184 80041D84 AFA00030 */ sw $zero, 0x30($sp) -/* 1D188 80041D88 AFA00034 */ sw $zero, 0x34($sp) -/* 1D18C 80041D8C AFA00038 */ sw $zero, 0x38($sp) -/* 1D190 80041D90 AFA0003C */ sw $zero, 0x3c($sp) -/* 1D194 80041D94 AFA00040 */ sw $zero, 0x40($sp) -/* 1D198 80041D98 AFA20048 */ sw $v0, 0x48($sp) -/* 1D19C 80041D9C 0C03D4B8 */ jal draw_box -/* 1D1A0 80041DA0 AFA0004C */ sw $zero, 0x4c($sp) -/* 1D1A4 80041DA4 3C04001D */ lui $a0, 0x1d -/* 1D1A8 80041DA8 080107B9 */ j .L80041EE4 -/* 1D1AC 80041DAC 348400AC */ ori $a0, $a0, 0xac -.L80041DB0: -/* 1D1B0 80041DB0 348400AD */ ori $a0, $a0, 0xad -/* 1D1B4 80041DB4 0C04991D */ jal get_string_width -/* 1D1B8 80041DB8 0000282D */ daddu $a1, $zero, $zero -/* 1D1BC 80041DBC 24480018 */ addiu $t0, $v0, 0x18 -/* 1D1C0 80041DC0 260300A0 */ addiu $v1, $s0, 0xa0 -/* 1D1C4 80041DC4 000817C2 */ srl $v0, $t0, 0x1f -/* 1D1C8 80041DC8 01021021 */ addu $v0, $t0, $v0 -/* 1D1CC 80041DCC 00021043 */ sra $v0, $v0, 1 -/* 1D1D0 80041DD0 00628023 */ subu $s0, $v1, $v0 -/* 1D1D4 80041DD4 0000202D */ daddu $a0, $zero, $zero -/* 1D1D8 80041DD8 24050014 */ addiu $a1, $zero, 0x14 -/* 1D1DC 80041DDC 0200302D */ daddu $a2, $s0, $zero -/* 1D1E0 80041DE0 24070045 */ addiu $a3, $zero, 0x45 -/* 1D1E4 80041DE4 2402001C */ addiu $v0, $zero, 0x1c -/* 1D1E8 80041DE8 AFA20018 */ sw $v0, 0x18($sp) -/* 1D1EC 80041DEC 240200FF */ addiu $v0, $zero, 0xff -/* 1D1F0 80041DF0 AFA2001C */ sw $v0, 0x1c($sp) -/* 1D1F4 80041DF4 24020140 */ addiu $v0, $zero, 0x140 -/* 1D1F8 80041DF8 AFA20044 */ sw $v0, 0x44($sp) -/* 1D1FC 80041DFC 240200F0 */ addiu $v0, $zero, 0xf0 -/* 1D200 80041E00 AFA00010 */ sw $zero, 0x10($sp) -/* 1D204 80041E04 AFA80014 */ sw $t0, 0x14($sp) -/* 1D208 80041E08 AFA00020 */ sw $zero, 0x20($sp) -/* 1D20C 80041E0C AFA00024 */ sw $zero, 0x24($sp) -/* 1D210 80041E10 AFA00028 */ sw $zero, 0x28($sp) -/* 1D214 80041E14 AFA0002C */ sw $zero, 0x2c($sp) -/* 1D218 80041E18 AFA00030 */ sw $zero, 0x30($sp) -/* 1D21C 80041E1C AFA00034 */ sw $zero, 0x34($sp) -/* 1D220 80041E20 AFA00038 */ sw $zero, 0x38($sp) -/* 1D224 80041E24 AFA0003C */ sw $zero, 0x3c($sp) -/* 1D228 80041E28 AFA00040 */ sw $zero, 0x40($sp) -/* 1D22C 80041E2C AFA20048 */ sw $v0, 0x48($sp) -/* 1D230 80041E30 0C03D4B8 */ jal draw_box -/* 1D234 80041E34 AFA0004C */ sw $zero, 0x4c($sp) -/* 1D238 80041E38 3C04001D */ lui $a0, 0x1d -/* 1D23C 80041E3C 080107B9 */ j .L80041EE4 -/* 1D240 80041E40 348400AD */ ori $a0, $a0, 0xad -.L80041E44: -/* 1D244 80041E44 0C03A752 */ jal is_ability_active -/* 1D248 80041E48 24040011 */ addiu $a0, $zero, 0x11 -/* 1D24C 80041E4C 1440002C */ bnez $v0, .L80041F00 -/* 1D250 80041E50 3C04001D */ lui $a0, 0x1d -/* 1D254 80041E54 348400AE */ ori $a0, $a0, 0xae -/* 1D258 80041E58 0C04991D */ jal get_string_width -/* 1D25C 80041E5C 0000282D */ daddu $a1, $zero, $zero -/* 1D260 80041E60 24480018 */ addiu $t0, $v0, 0x18 -/* 1D264 80041E64 260300A0 */ addiu $v1, $s0, 0xa0 -/* 1D268 80041E68 000817C2 */ srl $v0, $t0, 0x1f -/* 1D26C 80041E6C 01021021 */ addu $v0, $t0, $v0 -/* 1D270 80041E70 00021043 */ sra $v0, $v0, 1 -/* 1D274 80041E74 00628023 */ subu $s0, $v1, $v0 -/* 1D278 80041E78 0000202D */ daddu $a0, $zero, $zero -/* 1D27C 80041E7C 24050004 */ addiu $a1, $zero, 4 -/* 1D280 80041E80 0200302D */ daddu $a2, $s0, $zero -/* 1D284 80041E84 24070045 */ addiu $a3, $zero, 0x45 -/* 1D288 80041E88 2402001C */ addiu $v0, $zero, 0x1c -/* 1D28C 80041E8C AFA20018 */ sw $v0, 0x18($sp) -/* 1D290 80041E90 240200FF */ addiu $v0, $zero, 0xff -/* 1D294 80041E94 AFA2001C */ sw $v0, 0x1c($sp) -/* 1D298 80041E98 24020140 */ addiu $v0, $zero, 0x140 -/* 1D29C 80041E9C AFA20044 */ sw $v0, 0x44($sp) -/* 1D2A0 80041EA0 240200F0 */ addiu $v0, $zero, 0xf0 -/* 1D2A4 80041EA4 AFA00010 */ sw $zero, 0x10($sp) -/* 1D2A8 80041EA8 AFA80014 */ sw $t0, 0x14($sp) -/* 1D2AC 80041EAC AFA00020 */ sw $zero, 0x20($sp) -/* 1D2B0 80041EB0 AFA00024 */ sw $zero, 0x24($sp) -/* 1D2B4 80041EB4 AFA00028 */ sw $zero, 0x28($sp) -/* 1D2B8 80041EB8 AFA0002C */ sw $zero, 0x2c($sp) -/* 1D2BC 80041EBC AFA00030 */ sw $zero, 0x30($sp) -/* 1D2C0 80041EC0 AFA00034 */ sw $zero, 0x34($sp) -/* 1D2C4 80041EC4 AFA00038 */ sw $zero, 0x38($sp) -/* 1D2C8 80041EC8 AFA0003C */ sw $zero, 0x3c($sp) -/* 1D2CC 80041ECC AFA00040 */ sw $zero, 0x40($sp) -/* 1D2D0 80041ED0 AFA20048 */ sw $v0, 0x48($sp) -/* 1D2D4 80041ED4 0C03D4B8 */ jal draw_box -/* 1D2D8 80041ED8 AFA0004C */ sw $zero, 0x4c($sp) -/* 1D2DC 80041EDC 3C04001D */ lui $a0, 0x1d -/* 1D2E0 80041EE0 348400AE */ ori $a0, $a0, 0xae -.L80041EE4: -/* 1D2E4 80041EE4 2605000B */ addiu $a1, $s0, 0xb -/* 1D2E8 80041EE8 2406004B */ addiu $a2, $zero, 0x4b -/* 1D2EC 80041EEC 240700FF */ addiu $a3, $zero, 0xff -/* 1D2F0 80041EF0 2402000A */ addiu $v0, $zero, 0xa -/* 1D2F4 80041EF4 AFA20010 */ sw $v0, 0x10($sp) -/* 1D2F8 80041EF8 0C04993B */ jal draw_string -/* 1D2FC 80041EFC AFA00014 */ sw $zero, 0x14($sp) -.L80041F00: -/* 1D300 80041F00 8FBF0054 */ lw $ra, 0x54($sp) -/* 1D304 80041F04 8FB00050 */ lw $s0, 0x50($sp) -/* 1D308 80041F08 03E00008 */ jr $ra -/* 1D30C 80041F0C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/25f00_len_940/nuAuDmaCallBack.s b/ver/us/asm/nonmatchings/25f00_len_940/nuAuDmaCallBack.s index f3db2f4a1d..3eabd05b00 100644 --- a/ver/us/asm/nonmatchings/25f00_len_940/nuAuDmaCallBack.s +++ b/ver/us/asm/nonmatchings/25f00_len_940/nuAuDmaCallBack.s @@ -98,8 +98,8 @@ glabel nuAuDmaCallBack /* 265C8 8004B1C8 AE22000C */ sw $v0, 0xc($s1) /* 265CC 8004B1CC AC830000 */ sw $v1, ($a0) /* 265D0 8004B1D0 A0A00002 */ sb $zero, 2($a1) -/* 265D4 8004B1D4 3C04800A */ lui $a0, %hi(carthandle) -/* 265D8 8004B1D8 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 265D4 8004B1D4 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 265D8 8004B1D8 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 265DC 8004B1DC 3C02800A */ lui $v0, %hi(D_800A3640) /* 265E0 8004B1E0 24423640 */ addiu $v0, $v0, %lo(D_800A3640) /* 265E4 8004B1E4 ACA20004 */ sw $v0, 4($a1) diff --git a/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s b/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s index 5ea640d7e8..d5ad244973 100644 --- a/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s +++ b/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s @@ -13,8 +13,8 @@ glabel func_802AE000_316C00 /* 316C20 802AE020 0000802D */ daddu $s0, $zero, $zero /* 316C24 802AE024 3C05B000 */ lui $a1, 0xb000 /* 316C28 802AE028 34A50574 */ ori $a1, $a1, 0x574 -/* 316C2C 802AE02C 3C04800A */ lui $a0, %hi(carthandle) -/* 316C30 802AE030 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 316C2C 802AE02C 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 316C30 802AE030 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 316C34 802AE034 27A60010 */ addiu $a2, $sp, 0x10 /* 316C38 802AE038 AFB20020 */ sw $s2, 0x20($sp) /* 316C3C 802AE03C 0200902D */ daddu $s2, $s0, $zero @@ -40,8 +40,8 @@ glabel func_802AE000_316C00 /* 316C8C 802AE08C 0060B02D */ daddu $s6, $v1, $zero .L802AE090: /* 316C90 802AE090 0220282D */ daddu $a1, $s1, $zero -/* 316C94 802AE094 3C04800A */ lui $a0, %hi(carthandle) -/* 316C98 802AE098 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 316C94 802AE094 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 316C98 802AE098 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 316C9C 802AE09C 02A0F809 */ jalr $s5 /* 316CA0 802AE0A0 27A60010 */ addiu $a2, $sp, 0x10 /* 316CA4 802AE0A4 8FA30010 */ lw $v1, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/316d90/func_802AE000.s b/ver/us/asm/nonmatchings/316d90/func_802AE000.s index 5a6fe14b38..bf304896b1 100644 --- a/ver/us/asm/nonmatchings/316d90/func_802AE000.s +++ b/ver/us/asm/nonmatchings/316d90/func_802AE000.s @@ -12,8 +12,8 @@ glabel func_802AE000 /* 316DAC 802AE01C 0000802D */ daddu $s0, $zero, $zero /* 316DB0 802AE020 3C05B000 */ lui $a1, 0xb000 /* 316DB4 802AE024 34A50800 */ ori $a1, $a1, 0x800 -/* 316DB8 802AE028 3C04800A */ lui $a0, %hi(carthandle) -/* 316DBC 802AE02C 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 316DB8 802AE028 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 316DBC 802AE02C 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 316DC0 802AE030 27A60010 */ addiu $a2, $sp, 0x10 /* 316DC4 802AE034 AFB20020 */ sw $s2, 0x20($sp) /* 316DC8 802AE038 0200902D */ daddu $s2, $s0, $zero @@ -39,8 +39,8 @@ glabel func_802AE000 /* 316E18 802AE088 0060B02D */ daddu $s6, $v1, $zero .L802AE08C: /* 316E1C 802AE08C 0220282D */ daddu $a1, $s1, $zero -/* 316E20 802AE090 3C04800A */ lui $a0, %hi(carthandle) -/* 316E24 802AE094 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 316E20 802AE090 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 316E24 802AE094 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 316E28 802AE098 02A0F809 */ jalr $s5 /* 316E2C 802AE09C 27A60010 */ addiu $a2, $sp, 0x10 /* 316E30 802AE0A0 8FA30010 */ lw $v1, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s b/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s index 43180f5cda..eafa1e9680 100644 --- a/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s +++ b/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s @@ -85,8 +85,8 @@ glabel func_E02000AC /* 325CB8 E02001E8 00021080 */ sll $v0, $v0, 2 /* 325CBC E02001EC 30580FFF */ andi $t8, $v0, 0xfff /* 325CC0 E02001F0 8D430000 */ lw $v1, ($t2) -/* 325CC4 E02001F4 3C0E800A */ lui $t6, %hi(D_8009A64C) -/* 325CC8 E02001F8 8DCEA64C */ lw $t6, %lo(D_8009A64C)($t6) +/* 325CC4 E02001F4 3C0E800A */ lui $t6, %hi(nuGfxCfb_ptr) +/* 325CC8 E02001F8 8DCEA64C */ lw $t6, %lo(nuGfxCfb_ptr)($t6) /* 325CCC E02001FC 0060102D */ daddu $v0, $v1, $zero /* 325CD0 E0200200 01C0202D */ daddu $a0, $t6, $zero /* 325CD4 E0200204 24630008 */ addiu $v1, $v1, 8 diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200410.s b/ver/us/asm/nonmatchings/325EE0/func_E0200410.s deleted file mode 100644 index e41227f24c..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200410.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200410 -/* 325EE0 E0200410 3C01E020 */ lui $at, %hi(D_E0200694) -/* 325EE4 E0200414 8C210694 */ lw $at, %lo(D_E0200694)($at) -/* 325EE8 E0200418 00200008 */ jr $at -/* 325EEC E020041C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200420.s b/ver/us/asm/nonmatchings/325EE0/func_E0200420.s deleted file mode 100644 index 6475fa3c03..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200420.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200420 -/* 325EF0 E0200420 3C01E020 */ lui $at, %hi(D_E0200698) -/* 325EF4 E0200424 8C210698 */ lw $at, %lo(D_E0200698)($at) -/* 325EF8 E0200428 00200008 */ jr $at -/* 325EFC E020042C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200430.s b/ver/us/asm/nonmatchings/325EE0/func_E0200430.s deleted file mode 100644 index d4a6a6fc84..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200430.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200430 -/* 325F00 E0200430 3C01E020 */ lui $at, %hi(D_E020069C) -/* 325F04 E0200434 8C21069C */ lw $at, %lo(D_E020069C)($at) -/* 325F08 E0200438 00200008 */ jr $at -/* 325F0C E020043C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200440.s b/ver/us/asm/nonmatchings/325EE0/func_E0200440.s deleted file mode 100644 index 91b7e7d5a6..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200440.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200440 -/* 325F10 E0200440 3C01E020 */ lui $at, %hi(D_E02006A0) -/* 325F14 E0200444 8C2106A0 */ lw $at, %lo(D_E02006A0)($at) -/* 325F18 E0200448 00200008 */ jr $at -/* 325F1C E020044C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200450.s b/ver/us/asm/nonmatchings/325EE0/func_E0200450.s deleted file mode 100644 index 34f7b34a09..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200450.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200450 -/* 325F20 E0200450 3C01E020 */ lui $at, %hi(D_E02006A4) -/* 325F24 E0200454 8C2106A4 */ lw $at, %lo(D_E02006A4)($at) -/* 325F28 E0200458 00200008 */ jr $at -/* 325F2C E020045C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200460.s b/ver/us/asm/nonmatchings/325EE0/func_E0200460.s deleted file mode 100644 index 472bc73993..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200460.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200460 -/* 325F30 E0200460 3C01E020 */ lui $at, %hi(D_E02006A8) -/* 325F34 E0200464 8C2106A8 */ lw $at, %lo(D_E02006A8)($at) -/* 325F38 E0200468 00200008 */ jr $at -/* 325F3C E020046C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200470.s b/ver/us/asm/nonmatchings/325EE0/func_E0200470.s deleted file mode 100644 index c29146c5cb..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200470.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200470 -/* 325F40 E0200470 3C01E020 */ lui $at, %hi(D_E02006AC) -/* 325F44 E0200474 8C2106AC */ lw $at, %lo(D_E02006AC)($at) -/* 325F48 E0200478 00200008 */ jr $at -/* 325F4C E020047C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200480.s b/ver/us/asm/nonmatchings/325EE0/func_E0200480.s deleted file mode 100644 index 9cd78178b1..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200480.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200480 -/* 325F50 E0200480 3C01E020 */ lui $at, %hi(D_E02006B0) -/* 325F54 E0200484 8C2106B0 */ lw $at, %lo(D_E02006B0)($at) -/* 325F58 E0200488 00200008 */ jr $at -/* 325F5C E020048C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200490.s b/ver/us/asm/nonmatchings/325EE0/func_E0200490.s deleted file mode 100644 index 8c05975a50..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200490.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200490 -/* 325F60 E0200490 3C01E020 */ lui $at, %hi(D_E02006B4) -/* 325F64 E0200494 8C2106B4 */ lw $at, %lo(D_E02006B4)($at) -/* 325F68 E0200498 00200008 */ jr $at -/* 325F6C E020049C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02004A0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004A0.s deleted file mode 100644 index 4f2d651cdf..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02004A0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02004A0 -/* 325F70 E02004A0 3C01E020 */ lui $at, %hi(D_E02006B8) -/* 325F74 E02004A4 8C2106B8 */ lw $at, %lo(D_E02006B8)($at) -/* 325F78 E02004A8 00200008 */ jr $at -/* 325F7C E02004AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02004B0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004B0.s deleted file mode 100644 index 85073f29ee..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02004B0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02004B0 -/* 325F80 E02004B0 3C01E020 */ lui $at, %hi(D_E02006BC) -/* 325F84 E02004B4 8C2106BC */ lw $at, %lo(D_E02006BC)($at) -/* 325F88 E02004B8 00200008 */ jr $at -/* 325F8C E02004BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02004C0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004C0.s deleted file mode 100644 index 04b4a4f331..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02004C0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02004C0 -/* 325F90 E02004C0 3C01E020 */ lui $at, %hi(D_E02006C0) -/* 325F94 E02004C4 8C2106C0 */ lw $at, %lo(D_E02006C0)($at) -/* 325F98 E02004C8 00200008 */ jr $at -/* 325F9C E02004CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02004D0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004D0.s deleted file mode 100644 index 159294c630..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02004D0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02004D0 -/* 325FA0 E02004D0 3C01E020 */ lui $at, %hi(D_E02006C4) -/* 325FA4 E02004D4 8C2106C4 */ lw $at, %lo(D_E02006C4)($at) -/* 325FA8 E02004D8 00200008 */ jr $at -/* 325FAC E02004DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02004E0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004E0.s deleted file mode 100644 index d9a4c381b9..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02004E0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02004E0 -/* 325FB0 E02004E0 3C01E020 */ lui $at, %hi(D_E02006C8) -/* 325FB4 E02004E4 8C2106C8 */ lw $at, %lo(D_E02006C8)($at) -/* 325FB8 E02004E8 00200008 */ jr $at -/* 325FBC E02004EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02004F0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004F0.s deleted file mode 100644 index 11400d9ee8..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02004F0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02004F0 -/* 325FC0 E02004F0 3C01E020 */ lui $at, %hi(D_E02006CC) -/* 325FC4 E02004F4 8C2106CC */ lw $at, %lo(D_E02006CC)($at) -/* 325FC8 E02004F8 00200008 */ jr $at -/* 325FCC E02004FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200500.s b/ver/us/asm/nonmatchings/325EE0/func_E0200500.s deleted file mode 100644 index 353915afcf..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200500.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200500 -/* 325FD0 E0200500 3C01E020 */ lui $at, %hi(D_E02006D0) -/* 325FD4 E0200504 8C2106D0 */ lw $at, %lo(D_E02006D0)($at) -/* 325FD8 E0200508 00200008 */ jr $at -/* 325FDC E020050C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200510.s b/ver/us/asm/nonmatchings/325EE0/func_E0200510.s deleted file mode 100644 index 97cd76e085..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200510.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200510 -/* 325FE0 E0200510 3C01E020 */ lui $at, %hi(D_E02006D4) -/* 325FE4 E0200514 8C2106D4 */ lw $at, %lo(D_E02006D4)($at) -/* 325FE8 E0200518 00200008 */ jr $at -/* 325FEC E020051C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200520.s b/ver/us/asm/nonmatchings/325EE0/func_E0200520.s deleted file mode 100644 index 4cbb9882f8..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200520.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200520 -/* 325FF0 E0200520 3C01E020 */ lui $at, %hi(D_E02006D8) -/* 325FF4 E0200524 8C2106D8 */ lw $at, %lo(D_E02006D8)($at) -/* 325FF8 E0200528 00200008 */ jr $at -/* 325FFC E020052C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200530.s b/ver/us/asm/nonmatchings/325EE0/func_E0200530.s deleted file mode 100644 index 1d756f7bb4..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200530.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200530 -/* 326000 E0200530 3C01E020 */ lui $at, %hi(D_E02006DC) -/* 326004 E0200534 8C2106DC */ lw $at, %lo(D_E02006DC)($at) -/* 326008 E0200538 00200008 */ jr $at -/* 32600C E020053C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200540.s b/ver/us/asm/nonmatchings/325EE0/func_E0200540.s deleted file mode 100644 index a8dc4b0cb5..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200540.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200540 -/* 326010 E0200540 3C01E020 */ lui $at, %hi(D_E02006E0) -/* 326014 E0200544 8C2106E0 */ lw $at, %lo(D_E02006E0)($at) -/* 326018 E0200548 00200008 */ jr $at -/* 32601C E020054C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200550.s b/ver/us/asm/nonmatchings/325EE0/func_E0200550.s deleted file mode 100644 index 0a5b559bf7..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200550.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200550 -/* 326020 E0200550 3C01E020 */ lui $at, %hi(D_E02006E4) -/* 326024 E0200554 8C2106E4 */ lw $at, %lo(D_E02006E4)($at) -/* 326028 E0200558 00200008 */ jr $at -/* 32602C E020055C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200560.s b/ver/us/asm/nonmatchings/325EE0/func_E0200560.s deleted file mode 100644 index 58568f0579..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200560.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200560 -/* 326030 E0200560 3C01E020 */ lui $at, %hi(D_E02006E8) -/* 326034 E0200564 8C2106E8 */ lw $at, %lo(D_E02006E8)($at) -/* 326038 E0200568 00200008 */ jr $at -/* 32603C E020056C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200570.s b/ver/us/asm/nonmatchings/325EE0/func_E0200570.s deleted file mode 100644 index d5a299091e..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200570.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200570 -/* 326040 E0200570 3C01E020 */ lui $at, %hi(D_E02006EC) -/* 326044 E0200574 8C2106EC */ lw $at, %lo(D_E02006EC)($at) -/* 326048 E0200578 00200008 */ jr $at -/* 32604C E020057C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200580.s b/ver/us/asm/nonmatchings/325EE0/func_E0200580.s deleted file mode 100644 index e7994ae1b8..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200580.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200580 -/* 326050 E0200580 3C01E020 */ lui $at, %hi(D_E02006F0) -/* 326054 E0200584 8C2106F0 */ lw $at, %lo(D_E02006F0)($at) -/* 326058 E0200588 00200008 */ jr $at -/* 32605C E020058C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200590.s b/ver/us/asm/nonmatchings/325EE0/func_E0200590.s deleted file mode 100644 index b7e9fc55f5..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200590.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200590 -/* 326060 E0200590 3C01E020 */ lui $at, %hi(D_E02006F4) -/* 326064 E0200594 8C2106F4 */ lw $at, %lo(D_E02006F4)($at) -/* 326068 E0200598 00200008 */ jr $at -/* 32606C E020059C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02005A0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005A0.s deleted file mode 100644 index f76a2188a0..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02005A0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02005A0 -/* 326070 E02005A0 3C01E020 */ lui $at, %hi(D_E02006F8) -/* 326074 E02005A4 8C2106F8 */ lw $at, %lo(D_E02006F8)($at) -/* 326078 E02005A8 00200008 */ jr $at -/* 32607C E02005AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02005B0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005B0.s deleted file mode 100644 index 8d9da04e45..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02005B0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02005B0 -/* 326080 E02005B0 3C01E020 */ lui $at, %hi(D_E02006FC) -/* 326084 E02005B4 8C2106FC */ lw $at, %lo(D_E02006FC)($at) -/* 326088 E02005B8 00200008 */ jr $at -/* 32608C E02005BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02005C0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005C0.s deleted file mode 100644 index 6688b044f2..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02005C0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02005C0 -/* 326090 E02005C0 3C01E020 */ lui $at, %hi(D_E0200700) -/* 326094 E02005C4 8C210700 */ lw $at, %lo(D_E0200700)($at) -/* 326098 E02005C8 00200008 */ jr $at -/* 32609C E02005CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02005D0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005D0.s deleted file mode 100644 index 50099b98d8..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02005D0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02005D0 -/* 3260A0 E02005D0 3C01E020 */ lui $at, %hi(D_E0200704) -/* 3260A4 E02005D4 8C210704 */ lw $at, %lo(D_E0200704)($at) -/* 3260A8 E02005D8 00200008 */ jr $at -/* 3260AC E02005DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02005E0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005E0.s deleted file mode 100644 index b0bc7ef95b..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02005E0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02005E0 -/* 3260B0 E02005E0 3C01E020 */ lui $at, %hi(D_E0200708) -/* 3260B4 E02005E4 8C210708 */ lw $at, %lo(D_E0200708)($at) -/* 3260B8 E02005E8 00200008 */ jr $at -/* 3260BC E02005EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E02005F0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005F0.s deleted file mode 100644 index bd93b5c86d..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E02005F0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E02005F0 -/* 3260C0 E02005F0 3C01E020 */ lui $at, %hi(D_E020070C) -/* 3260C4 E02005F4 8C21070C */ lw $at, %lo(D_E020070C)($at) -/* 3260C8 E02005F8 00200008 */ jr $at -/* 3260CC E02005FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200600.s b/ver/us/asm/nonmatchings/325EE0/func_E0200600.s deleted file mode 100644 index baf6ecc9eb..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200600.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200600 -/* 3260D0 E0200600 3C01E020 */ lui $at, %hi(D_E0200710) -/* 3260D4 E0200604 8C210710 */ lw $at, %lo(D_E0200710)($at) -/* 3260D8 E0200608 00200008 */ jr $at -/* 3260DC E020060C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200610.s b/ver/us/asm/nonmatchings/325EE0/func_E0200610.s deleted file mode 100644 index e0ce661818..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200610.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200610 -/* 3260E0 E0200610 3C01E020 */ lui $at, %hi(D_E0200714) -/* 3260E4 E0200614 8C210714 */ lw $at, %lo(D_E0200714)($at) -/* 3260E8 E0200618 00200008 */ jr $at -/* 3260EC E020061C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200620.s b/ver/us/asm/nonmatchings/325EE0/func_E0200620.s deleted file mode 100644 index a13b2f0e1f..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200620.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200620 -/* 3260F0 E0200620 3C01E020 */ lui $at, %hi(D_E0200718) -/* 3260F4 E0200624 8C210718 */ lw $at, %lo(D_E0200718)($at) -/* 3260F8 E0200628 00200008 */ jr $at -/* 3260FC E020062C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200630.s b/ver/us/asm/nonmatchings/325EE0/func_E0200630.s deleted file mode 100644 index e4aca31fb6..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200630.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200630 -/* 326100 E0200630 3C01E020 */ lui $at, %hi(D_E020071C) -/* 326104 E0200634 8C21071C */ lw $at, %lo(D_E020071C)($at) -/* 326108 E0200638 00200008 */ jr $at -/* 32610C E020063C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200640.s b/ver/us/asm/nonmatchings/325EE0/func_E0200640.s deleted file mode 100644 index 67d309861e..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200640.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200640 -/* 326110 E0200640 3C01E020 */ lui $at, %hi(D_E0200720) -/* 326114 E0200644 8C210720 */ lw $at, %lo(D_E0200720)($at) -/* 326118 E0200648 00200008 */ jr $at -/* 32611C E020064C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200650.s b/ver/us/asm/nonmatchings/325EE0/func_E0200650.s deleted file mode 100644 index 2930efb91c..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200650.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200650 -/* 326120 E0200650 3C01E020 */ lui $at, %hi(D_E0200724) -/* 326124 E0200654 8C210724 */ lw $at, %lo(D_E0200724)($at) -/* 326128 E0200658 00200008 */ jr $at -/* 32612C E020065C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200660.s b/ver/us/asm/nonmatchings/325EE0/func_E0200660.s deleted file mode 100644 index 1b66493b2f..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200660.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200660 -/* 326130 E0200660 3C01E020 */ lui $at, %hi(D_E0200728) -/* 326134 E0200664 8C210728 */ lw $at, %lo(D_E0200728)($at) -/* 326138 E0200668 00200008 */ jr $at -/* 32613C E020066C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200670.s b/ver/us/asm/nonmatchings/325EE0/func_E0200670.s deleted file mode 100644 index f500036e85..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200670.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200670 -/* 326140 E0200670 3C01E020 */ lui $at, %hi(D_E020072C) -/* 326144 E0200674 8C21072C */ lw $at, %lo(D_E020072C)($at) -/* 326148 E0200678 00200008 */ jr $at -/* 32614C E020067C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/325EE0/func_E0200680.s b/ver/us/asm/nonmatchings/325EE0/func_E0200680.s deleted file mode 100644 index 4833d841e1..0000000000 --- a/ver/us/asm/nonmatchings/325EE0/func_E0200680.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_E0200680 -/* 326150 E0200680 3C01E020 */ lui $at, %hi(D_E0200730) -/* 326154 E0200684 8C210730 */ lw $at, %lo(D_E0200730)($at) -/* 326158 E0200688 00200008 */ jr $at -/* 32615C E020068C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/353300/func_E0040348.s b/ver/us/asm/nonmatchings/353300/func_E0040348.s index 171557c167..14bf3fa8c1 100644 --- a/ver/us/asm/nonmatchings/353300/func_E0040348.s +++ b/ver/us/asm/nonmatchings/353300/func_E0040348.s @@ -91,8 +91,8 @@ glabel func_E0040348 /* 3537A0 E00404A0 ACE20014 */ sw $v0, 0x14($a3) /* 3537A4 E00404A4 3C020900 */ lui $v0, 0x900 /* 3537A8 E00404A8 244209E0 */ addiu $v0, $v0, 0x9e0 -/* 3537AC E00404AC 3C03800A */ lui $v1, %hi(D_8009A64C) -/* 3537B0 E00404B0 8C63A64C */ lw $v1, %lo(D_8009A64C)($v1) +/* 3537AC E00404AC 3C03800A */ lui $v1, %hi(nuGfxCfb_ptr) +/* 3537B0 E00404B0 8C63A64C */ lw $v1, %lo(nuGfxCfb_ptr)($v1) /* 3537B4 E00404B4 3C04ED00 */ lui $a0, 0xed00 /* 3537B8 E00404B8 ACE50008 */ sw $a1, 8($a3) /* 3537BC E00404BC ACE50018 */ sw $a1, 0x18($a3) diff --git a/ver/us/asm/nonmatchings/37A3F0/func_E007827C.s b/ver/us/asm/nonmatchings/37A3F0/func_E007827C.s index 1befedd7c2..9371337253 100644 --- a/ver/us/asm/nonmatchings/37A3F0/func_E007827C.s +++ b/ver/us/asm/nonmatchings/37A3F0/func_E007827C.s @@ -342,8 +342,8 @@ glabel func_E007827C /* 37AB80 E0078790 35080400 */ ori $t0, $t0, 0x400 /* 37AB84 E0078794 258C0001 */ addiu $t4, $t4, 1 /* 37AB88 E0078798 8D250000 */ lw $a1, ($t1) -/* 37AB8C E007879C 3C03800A */ lui $v1, %hi(D_8009A64C) -/* 37AB90 E00787A0 8C63A64C */ lw $v1, %lo(D_8009A64C)($v1) +/* 37AB8C E007879C 3C03800A */ lui $v1, %hi(nuGfxCfb_ptr) +/* 37AB90 E00787A0 8C63A64C */ lw $v1, %lo(nuGfxCfb_ptr)($v1) /* 37AB94 E00787A4 00A0202D */ daddu $a0, $a1, $zero /* 37AB98 E00787A8 24A50008 */ addiu $a1, $a1, 8 /* 37AB9C E00787AC 007E1821 */ addu $v1, $v1, $fp diff --git a/ver/us/asm/nonmatchings/3A2990/func_E00A223C.s b/ver/us/asm/nonmatchings/3A2990/func_E00A223C.s index 5fb4f82cf8..e7c5b87a8c 100644 --- a/ver/us/asm/nonmatchings/3A2990/func_E00A223C.s +++ b/ver/us/asm/nonmatchings/3A2990/func_E00A223C.s @@ -382,8 +382,8 @@ glabel func_E00A223C /* 3A3170 E00A27E0 35080400 */ ori $t0, $t0, 0x400 /* 3A3174 E00A27E4 258C0001 */ addiu $t4, $t4, 1 /* 3A3178 E00A27E8 8E050000 */ lw $a1, ($s0) -/* 3A317C E00A27EC 3C03800A */ lui $v1, %hi(D_8009A64C) -/* 3A3180 E00A27F0 8C63A64C */ lw $v1, %lo(D_8009A64C)($v1) +/* 3A317C E00A27EC 3C03800A */ lui $v1, %hi(nuGfxCfb_ptr) +/* 3A3180 E00A27F0 8C63A64C */ lw $v1, %lo(nuGfxCfb_ptr)($v1) /* 3A3184 E00A27F4 00A0202D */ daddu $a0, $a1, $zero /* 3A3188 E00A27F8 24A50008 */ addiu $a1, $a1, 8 /* 3A318C E00A27FC AE050000 */ sw $a1, ($s0) diff --git a/ver/us/asm/nonmatchings/3B8BD0/func_E00BA620.s b/ver/us/asm/nonmatchings/3B8BD0/func_E00BA620.s index 53c84c70c4..f48c625f06 100644 --- a/ver/us/asm/nonmatchings/3B8BD0/func_E00BA620.s +++ b/ver/us/asm/nonmatchings/3B8BD0/func_E00BA620.s @@ -14,8 +14,8 @@ glabel func_E00BA620 /* 3B9214 E00BA644 AFB200B8 */ sw $s2, 0xb8($sp) /* 3B9218 E00BA648 3C12FD10 */ lui $s2, 0xfd10 /* 3B921C E00BA64C 3652013F */ ori $s2, $s2, 0x13f -/* 3B9220 E00BA650 3C18800A */ lui $t8, %hi(D_8009A64C) -/* 3B9224 E00BA654 2718A64C */ addiu $t8, $t8, %lo(D_8009A64C) +/* 3B9220 E00BA650 3C18800A */ lui $t8, %hi(nuGfxCfb_ptr) +/* 3B9224 E00BA654 2718A64C */ addiu $t8, $t8, %lo(nuGfxCfb_ptr) /* 3B9228 E00BA658 3C0CF510 */ lui $t4, 0xf510 /* 3B922C E00BA65C 358CA000 */ ori $t4, $t4, 0xa000 /* 3B9230 E00BA660 AFB700CC */ sw $s7, 0xcc($sp) @@ -158,8 +158,8 @@ glabel func_E00BA620 /* 3B9450 E00BA880 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 3B9454 E00BA884 8E080000 */ lw $t0, ($s0) /* 3B9458 E00BA888 3C05C2A0 */ lui $a1, 0xc2a0 -/* 3B945C E00BA88C 3C03800A */ lui $v1, %hi(D_8009A64C) -/* 3B9460 E00BA890 8C63A64C */ lw $v1, %lo(D_8009A64C)($v1) +/* 3B945C E00BA88C 3C03800A */ lui $v1, %hi(nuGfxCfb_ptr) +/* 3B9460 E00BA890 8C63A64C */ lw $v1, %lo(nuGfxCfb_ptr)($v1) /* 3B9464 E00BA894 3C01C270 */ lui $at, 0xc270 /* 3B9468 E00BA898 44810000 */ mtc1 $at, $f0 /* 3B946C E00BA89C 3C014320 */ lui $at, 0x4320 @@ -502,8 +502,8 @@ glabel func_E00BA620 /* 3B9988 E00BADB8 AC440004 */ sw $a0, 4($v0) /* 3B998C E00BADBC 24620008 */ addiu $v0, $v1, 8 /* 3B9990 E00BADC0 ACA20000 */ sw $v0, ($a1) -/* 3B9994 E00BADC4 3C04800A */ lui $a0, %hi(D_8009A64C) -/* 3B9998 E00BADC8 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* 3B9994 E00BADC4 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* 3B9998 E00BADC8 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* 3B999C E00BADCC 3C02DE00 */ lui $v0, 0xde00 /* 3B99A0 E00BADD0 AC620000 */ sw $v0, ($v1) /* 3B99A4 E00BADD4 3C020900 */ lui $v0, 0x900 diff --git a/ver/us/asm/nonmatchings/3BBF60/func_E00BE5BC.s b/ver/us/asm/nonmatchings/3BBF60/func_E00BE5BC.s index d96bd5e56a..2ca3821118 100644 --- a/ver/us/asm/nonmatchings/3BBF60/func_E00BE5BC.s +++ b/ver/us/asm/nonmatchings/3BBF60/func_E00BE5BC.s @@ -168,8 +168,8 @@ glabel func_E00BE5BC /* 3BC794 E00BE834 30C60FFF */ andi $a2, $a2, 0xfff /* 3BC798 E00BE838 0100202D */ daddu $a0, $t0, $zero /* 3BC79C E00BE83C AC820000 */ sw $v0, ($a0) -/* 3BC7A0 E00BE840 3C02800A */ lui $v0, %hi(D_8009A64C) -/* 3BC7A4 E00BE844 8C42A64C */ lw $v0, %lo(D_8009A64C)($v0) +/* 3BC7A0 E00BE840 3C02800A */ lui $v0, %hi(nuGfxCfb_ptr) +/* 3BC7A4 E00BE844 8C42A64C */ lw $v0, %lo(nuGfxCfb_ptr)($v0) /* 3BC7A8 E00BE848 25080008 */ addiu $t0, $t0, 8 /* 3BC7AC E00BE84C 00431021 */ addu $v0, $v0, $v1 /* 3BC7B0 E00BE850 AC820004 */ sw $v0, 4($a0) diff --git a/ver/us/asm/nonmatchings/80850_len_3060/is_ability_active.s b/ver/us/asm/nonmatchings/80850_len_3060/is_ability_active.s index 8d1e4a2594..4ac8fa41b7 100644 --- a/ver/us/asm/nonmatchings/80850_len_3060/is_ability_active.s +++ b/ver/us/asm/nonmatchings/80850_len_3060/is_ability_active.s @@ -3,8 +3,8 @@ .section .rodata -glabel D_8010BF60 -.word 0x800E9DEC, 0x800EA07C, 0x800E9DF4, 0x800E9DFC, 0x800E9E04, 0x800E9E0C, 0x800E9E14, 0x800E9E34, 0x800E9E3C, 0x800E9E44, 0x800E9E4C, 0x800E9E54, 0x800E9E5C, 0x800E9E64, 0x800E9E6C, 0x800E9E74, 0x800E9F38, 0x800E9F40, 0x800E9F48, 0x800E9F50, 0x800E9F58, 0x800E9F60, 0x800E9F68, 0x800E9F70, 0x800E9F78, 0x800E9F80, 0x800EA008, 0x800E9F88, 0x800E9F90, 0x800E9F98, 0x800E9FA0, 0x800E9FA8, 0x800E9FB0, 0x800E9FB8, 0x800E9FC0, 0x800E9FC8, 0x800E9FD0, 0x800E9FD8, 0x800E9FE0, 0x800E9FE8, 0x800E9FF0, 0x800E9FF8, 0x800EA000, 0x800EA010, 0x800EA018, 0x800EA020, 0x800EA028, 0x800EA030, 0x800EA038, 0x800EA040, 0x800EA048, 0x800EA050, 0x800EA058, 0x800EA060, 0x800EA068, 0x800EA070 +glabel jtbl_8010BF60 +.word L800E9DEC, L800EA07C, L800E9DF4, L800E9DFC, L800E9E04, L800E9E0C, L800E9E14, L800E9E34, L800E9E3C, L800E9E44, L800E9E4C, L800E9E54, L800E9E5C, L800E9E64, L800E9E6C, L800E9E74, L800E9F38, L800E9F40, L800E9F48, L800E9F50, L800E9F58, L800E9F60, L800E9F68, L800E9F70, L800E9F78, L800E9F80, L800EA008, L800E9F88, L800E9F90, L800E9F98, L800E9FA0, L800E9FA8, L800E9FB0, L800E9FB8, L800E9FC0, L800E9FC8, L800E9FD0, L800E9FD8, L800E9FE0, L800E9FE8, L800E9FF0, L800E9FF8, L800EA000, L800EA010, L800EA018, L800EA020, L800EA028, L800EA030, L800EA038, L800EA040, L800EA048, L800EA050, L800EA058, L800EA060, L800EA068, L800EA070 .section .text @@ -30,8 +30,8 @@ glabel is_ability_active /* 8323C 800E9D8C 144000C7 */ bnez $v0, .L800EA0AC /* 83240 800E9D90 0000102D */ daddu $v0, $zero, $zero /* 83244 800E9D94 0000382D */ daddu $a3, $zero, $zero -/* 83248 800E9D98 3C038011 */ lui $v1, %hi(D_8010BF60) -/* 8324C 800E9D9C 2463BF60 */ addiu $v1, $v1, %lo(D_8010BF60) +/* 83248 800E9D98 3C038011 */ lui $v1, %hi(jtbl_8010BF60) +/* 8324C 800E9D9C 2463BF60 */ addiu $v1, $v1, %lo(jtbl_8010BF60) /* 83250 800E9DA0 00091080 */ sll $v0, $t1, 2 /* 83254 800E9DA4 00435021 */ addu $t2, $v0, $v1 /* 83258 800E9DA8 27A30010 */ addiu $v1, $sp, 0x10 @@ -48,46 +48,61 @@ glabel is_ability_active /* 83280 800E9DD0 906378FA */ lbu $v1, %lo(gItemTable+0x1A)($v1) .L800E9DD4: /* 83284 800E9DD4 2D220038 */ sltiu $v0, $t1, 0x38 -/* 83288 800E9DD8 504000A9 */ beql $v0, $zero, .L800EA080 +/* 83288 800E9DD8 504000A9 */ beql $v0, $zero, L800EA080 /* 8328C 800E9DDC 24E70001 */ addiu $a3, $a3, 1 /* 83290 800E9DE0 8D420000 */ lw $v0, ($t2) /* 83294 800E9DE4 00400008 */ jr $v0 /* 83298 800E9DE8 00000000 */ nop -/* 8329C 800E9DEC 0803A81D */ j .L800EA074 +glabel L800E9DEC +/* 8329C 800E9DEC 0803A81D */ j L800EA074 /* 832A0 800E9DF0 2402004C */ addiu $v0, $zero, 0x4c -/* 832A4 800E9DF4 0803A81D */ j .L800EA074 +glabel L800E9DF4 +/* 832A4 800E9DF4 0803A81D */ j L800EA074 /* 832A8 800E9DF8 24020040 */ addiu $v0, $zero, 0x40 -/* 832AC 800E9DFC 0803A81D */ j .L800EA074 +glabel L800E9DFC +/* 832AC 800E9DFC 0803A81D */ j L800EA074 /* 832B0 800E9E00 2402004D */ addiu $v0, $zero, 0x4d -/* 832B4 800E9E04 0803A81D */ j .L800EA074 +glabel L800E9E04 +/* 832B4 800E9E04 0803A81D */ j L800EA074 /* 832B8 800E9E08 24020052 */ addiu $v0, $zero, 0x52 -/* 832BC 800E9E0C 0803A81D */ j .L800EA074 +glabel L800E9E0C +/* 832BC 800E9E0C 0803A81D */ j L800EA074 /* 832C0 800E9E10 24020035 */ addiu $v0, $zero, 0x35 +glabel L800E9E14 /* 832C4 800E9E14 24020053 */ addiu $v0, $zero, 0x53 /* 832C8 800E9E18 50620001 */ beql $v1, $v0, .L800E9E20 /* 832CC 800E9E1C 24A50001 */ addiu $a1, $a1, 1 .L800E9E20: /* 832D0 800E9E20 8102000A */ lb $v0, 0xa($t0) -/* 832D4 800E9E24 50400096 */ beql $v0, $zero, .L800EA080 +/* 832D4 800E9E24 50400096 */ beql $v0, $zero, L800EA080 /* 832D8 800E9E28 24E70001 */ addiu $a3, $a3, 1 -/* 832DC 800E9E2C 0803A81F */ j .L800EA07C +/* 832DC 800E9E2C 0803A81F */ j L800EA07C /* 832E0 800E9E30 24A50001 */ addiu $a1, $a1, 1 -/* 832E4 800E9E34 0803A81D */ j .L800EA074 +glabel L800E9E34 +/* 832E4 800E9E34 0803A81D */ j L800EA074 /* 832E8 800E9E38 24020041 */ addiu $v0, $zero, 0x41 -/* 832EC 800E9E3C 0803A81D */ j .L800EA074 +glabel L800E9E3C +/* 832EC 800E9E3C 0803A81D */ j L800EA074 /* 832F0 800E9E40 24020042 */ addiu $v0, $zero, 0x42 -/* 832F4 800E9E44 0803A81D */ j .L800EA074 +glabel L800E9E44 +/* 832F4 800E9E44 0803A81D */ j L800EA074 /* 832F8 800E9E48 2402005A */ addiu $v0, $zero, 0x5a -/* 832FC 800E9E4C 0803A81D */ j .L800EA074 +glabel L800E9E4C +/* 832FC 800E9E4C 0803A81D */ j L800EA074 /* 83300 800E9E50 2402003C */ addiu $v0, $zero, 0x3c -/* 83304 800E9E54 0803A81D */ j .L800EA074 +glabel L800E9E54 +/* 83304 800E9E54 0803A81D */ j L800EA074 /* 83308 800E9E58 2402004E */ addiu $v0, $zero, 0x4e -/* 8330C 800E9E5C 0803A81D */ j .L800EA074 +glabel L800E9E5C +/* 8330C 800E9E5C 0803A81D */ j L800EA074 /* 83310 800E9E60 2402005B */ addiu $v0, $zero, 0x5b -/* 83314 800E9E64 0803A81D */ j .L800EA074 +glabel L800E9E64 +/* 83314 800E9E64 0803A81D */ j L800EA074 /* 83318 800E9E68 2402003D */ addiu $v0, $zero, 0x3d -/* 8331C 800E9E6C 0803A81D */ j .L800EA074 +glabel L800E9E6C +/* 8331C 800E9E6C 0803A81D */ j L800EA074 /* 83320 800E9E70 24020043 */ addiu $v0, $zero, 0x43 +glabel L800E9E74 /* 83324 800E9E74 24020054 */ addiu $v0, $zero, 0x54 /* 83328 800E9E78 14620007 */ bne $v1, $v0, .L800E9E98 /* 8332C 800E9E7C 24020055 */ addiu $v0, $zero, 0x55 @@ -134,99 +149,139 @@ glabel is_ability_active /* 833C0 800E9F10 2405FFFF */ addiu $a1, $zero, -1 /* 833C4 800E9F14 24020059 */ addiu $v0, $zero, 0x59 .L800E9F18: -/* 833C8 800E9F18 54620059 */ bnel $v1, $v0, .L800EA080 +/* 833C8 800E9F18 54620059 */ bnel $v1, $v0, L800EA080 /* 833CC 800E9F1C 24E70001 */ addiu $a3, $a3, 1 /* 833D0 800E9F20 24020006 */ addiu $v0, $zero, 6 /* 833D4 800E9F24 ACC20000 */ sw $v0, ($a2) /* 833D8 800E9F28 24C60004 */ addiu $a2, $a2, 4 /* 833DC 800E9F2C 24840001 */ addiu $a0, $a0, 1 -/* 833E0 800E9F30 0803A81F */ j .L800EA07C +/* 833E0 800E9F30 0803A81F */ j L800EA07C /* 833E4 800E9F34 2405FFFF */ addiu $a1, $zero, -1 -/* 833E8 800E9F38 0803A81D */ j .L800EA074 +glabel L800E9F38 +/* 833E8 800E9F38 0803A81D */ j L800EA074 /* 833EC 800E9F3C 2402005C */ addiu $v0, $zero, 0x5c -/* 833F0 800E9F40 0803A81D */ j .L800EA074 +glabel L800E9F40 +/* 833F0 800E9F40 0803A81D */ j L800EA074 /* 833F4 800E9F44 2402005D */ addiu $v0, $zero, 0x5d -/* 833F8 800E9F48 0803A81D */ j .L800EA074 +glabel L800E9F48 +/* 833F8 800E9F48 0803A81D */ j L800EA074 /* 833FC 800E9F4C 2402005E */ addiu $v0, $zero, 0x5e -/* 83400 800E9F50 0803A81D */ j .L800EA074 +glabel L800E9F50 +/* 83400 800E9F50 0803A81D */ j L800EA074 /* 83404 800E9F54 24020044 */ addiu $v0, $zero, 0x44 -/* 83408 800E9F58 0803A81D */ j .L800EA074 +glabel L800E9F58 +/* 83408 800E9F58 0803A81D */ j L800EA074 /* 8340C 800E9F5C 2402005F */ addiu $v0, $zero, 0x5f -/* 83410 800E9F60 0803A81D */ j .L800EA074 +glabel L800E9F60 +/* 83410 800E9F60 0803A81D */ j L800EA074 /* 83414 800E9F64 24020060 */ addiu $v0, $zero, 0x60 -/* 83418 800E9F68 0803A81D */ j .L800EA074 +glabel L800E9F68 +/* 83418 800E9F68 0803A81D */ j L800EA074 /* 8341C 800E9F6C 2402004F */ addiu $v0, $zero, 0x4f -/* 83420 800E9F70 0803A81D */ j .L800EA074 +glabel L800E9F70 +/* 83420 800E9F70 0803A81D */ j L800EA074 /* 83424 800E9F74 24020061 */ addiu $v0, $zero, 0x61 -/* 83428 800E9F78 0803A81D */ j .L800EA074 +glabel L800E9F78 +/* 83428 800E9F78 0803A81D */ j L800EA074 /* 8342C 800E9F7C 24020062 */ addiu $v0, $zero, 0x62 -/* 83430 800E9F80 0803A81D */ j .L800EA074 +glabel L800E9F80 +/* 83430 800E9F80 0803A81D */ j L800EA074 /* 83434 800E9F84 24020063 */ addiu $v0, $zero, 0x63 -/* 83438 800E9F88 0803A81D */ j .L800EA074 +glabel L800E9F88 +/* 83438 800E9F88 0803A81D */ j L800EA074 /* 8343C 800E9F8C 24020045 */ addiu $v0, $zero, 0x45 -/* 83440 800E9F90 0803A81D */ j .L800EA074 +glabel L800E9F90 +/* 83440 800E9F90 0803A81D */ j L800EA074 /* 83444 800E9F94 2402003B */ addiu $v0, $zero, 0x3b -/* 83448 800E9F98 0803A81D */ j .L800EA074 +glabel L800E9F98 +/* 83448 800E9F98 0803A81D */ j L800EA074 /* 8344C 800E9F9C 2402006E */ addiu $v0, $zero, 0x6e -/* 83450 800E9FA0 0803A81D */ j .L800EA074 +glabel L800E9FA0 +/* 83450 800E9FA0 0803A81D */ j L800EA074 /* 83454 800E9FA4 24020064 */ addiu $v0, $zero, 0x64 -/* 83458 800E9FA8 0803A81D */ j .L800EA074 +glabel L800E9FA8 +/* 83458 800E9FA8 0803A81D */ j L800EA074 /* 8345C 800E9FAC 24020065 */ addiu $v0, $zero, 0x65 -/* 83460 800E9FB0 0803A81D */ j .L800EA074 +glabel L800E9FB0 +/* 83460 800E9FB0 0803A81D */ j L800EA074 /* 83464 800E9FB4 24020046 */ addiu $v0, $zero, 0x46 -/* 83468 800E9FB8 0803A81D */ j .L800EA074 +glabel L800E9FB8 +/* 83468 800E9FB8 0803A81D */ j L800EA074 /* 8346C 800E9FBC 24020047 */ addiu $v0, $zero, 0x47 -/* 83470 800E9FC0 0803A81D */ j .L800EA074 +glabel L800E9FC0 +/* 83470 800E9FC0 0803A81D */ j L800EA074 /* 83474 800E9FC4 2402003E */ addiu $v0, $zero, 0x3e -/* 83478 800E9FC8 0803A81D */ j .L800EA074 +glabel L800E9FC8 +/* 83478 800E9FC8 0803A81D */ j L800EA074 /* 8347C 800E9FCC 24020048 */ addiu $v0, $zero, 0x48 -/* 83480 800E9FD0 0803A81D */ j .L800EA074 +glabel L800E9FD0 +/* 83480 800E9FD0 0803A81D */ j L800EA074 /* 83484 800E9FD4 24020066 */ addiu $v0, $zero, 0x66 -/* 83488 800E9FD8 0803A81D */ j .L800EA074 +glabel L800E9FD8 +/* 83488 800E9FD8 0803A81D */ j L800EA074 /* 8348C 800E9FDC 24020049 */ addiu $v0, $zero, 0x49 -/* 83490 800E9FE0 0803A81D */ j .L800EA074 +glabel L800E9FE0 +/* 83490 800E9FE0 0803A81D */ j L800EA074 /* 83494 800E9FE4 24020067 */ addiu $v0, $zero, 0x67 -/* 83498 800E9FE8 0803A81D */ j .L800EA074 +glabel L800E9FE8 +/* 83498 800E9FE8 0803A81D */ j L800EA074 /* 8349C 800E9FEC 2402006D */ addiu $v0, $zero, 0x6d -/* 834A0 800E9FF0 0803A81D */ j .L800EA074 +glabel L800E9FF0 +/* 834A0 800E9FF0 0803A81D */ j L800EA074 /* 834A4 800E9FF4 2402006A */ addiu $v0, $zero, 0x6a -/* 834A8 800E9FF8 0803A81D */ j .L800EA074 +glabel L800E9FF8 +/* 834A8 800E9FF8 0803A81D */ j L800EA074 /* 834AC 800E9FFC 2402006C */ addiu $v0, $zero, 0x6c -/* 834B0 800EA000 0803A81D */ j .L800EA074 +glabel L800EA000 +/* 834B0 800EA000 0803A81D */ j L800EA074 /* 834B4 800EA004 24020050 */ addiu $v0, $zero, 0x50 -/* 834B8 800EA008 0803A81D */ j .L800EA074 +glabel L800EA008 +/* 834B8 800EA008 0803A81D */ j L800EA074 /* 834BC 800EA00C 24020038 */ addiu $v0, $zero, 0x38 -/* 834C0 800EA010 0803A81D */ j .L800EA074 +glabel L800EA010 +/* 834C0 800EA010 0803A81D */ j L800EA074 /* 834C4 800EA014 24020068 */ addiu $v0, $zero, 0x68 -/* 834C8 800EA018 0803A81D */ j .L800EA074 +glabel L800EA018 +/* 834C8 800EA018 0803A81D */ j L800EA074 /* 834CC 800EA01C 24020069 */ addiu $v0, $zero, 0x69 -/* 834D0 800EA020 0803A81D */ j .L800EA074 +glabel L800EA020 +/* 834D0 800EA020 0803A81D */ j L800EA074 /* 834D4 800EA024 2402006B */ addiu $v0, $zero, 0x6b -/* 834D8 800EA028 0803A81D */ j .L800EA074 +glabel L800EA028 +/* 834D8 800EA028 0803A81D */ j L800EA074 /* 834DC 800EA02C 2402006F */ addiu $v0, $zero, 0x6f -/* 834E0 800EA030 0803A81D */ j .L800EA074 +glabel L800EA030 +/* 834E0 800EA030 0803A81D */ j L800EA074 /* 834E4 800EA034 24020070 */ addiu $v0, $zero, 0x70 -/* 834E8 800EA038 0803A81D */ j .L800EA074 +glabel L800EA038 +/* 834E8 800EA038 0803A81D */ j L800EA074 /* 834EC 800EA03C 24020071 */ addiu $v0, $zero, 0x71 -/* 834F0 800EA040 0803A81D */ j .L800EA074 +glabel L800EA040 +/* 834F0 800EA040 0803A81D */ j L800EA074 /* 834F4 800EA044 24020072 */ addiu $v0, $zero, 0x72 -/* 834F8 800EA048 0803A81D */ j .L800EA074 +glabel L800EA048 +/* 834F8 800EA048 0803A81D */ j L800EA074 /* 834FC 800EA04C 24020073 */ addiu $v0, $zero, 0x73 -/* 83500 800EA050 0803A81D */ j .L800EA074 +glabel L800EA050 +/* 83500 800EA050 0803A81D */ j L800EA074 /* 83504 800EA054 24020033 */ addiu $v0, $zero, 0x33 -/* 83508 800EA058 0803A81D */ j .L800EA074 +glabel L800EA058 +/* 83508 800EA058 0803A81D */ j L800EA074 /* 8350C 800EA05C 24020074 */ addiu $v0, $zero, 0x74 -/* 83510 800EA060 0803A81D */ j .L800EA074 +glabel L800EA060 +/* 83510 800EA060 0803A81D */ j L800EA074 /* 83514 800EA064 24020075 */ addiu $v0, $zero, 0x75 -/* 83518 800EA068 0803A81D */ j .L800EA074 +glabel L800EA068 +/* 83518 800EA068 0803A81D */ j L800EA074 /* 8351C 800EA06C 24020076 */ addiu $v0, $zero, 0x76 +glabel L800EA070 /* 83520 800EA070 2402004A */ addiu $v0, $zero, 0x4a -.L800EA074: -/* 83524 800EA074 50620001 */ beql $v1, $v0, .L800EA07C +glabel L800EA074 +/* 83524 800EA074 50620001 */ beql $v1, $v0, L800EA07C /* 83528 800EA078 24A50001 */ addiu $a1, $a1, 1 -.L800EA07C: +glabel L800EA07C /* 8352C 800EA07C 24E70001 */ addiu $a3, $a3, 1 -.L800EA080: +glabel L800EA080 /* 83530 800EA080 28E20040 */ slti $v0, $a3, 0x40 /* 83534 800EA084 1440FF4C */ bnez $v0, .L800E9DB8 /* 83538 800EA088 00071040 */ sll $v0, $a3, 1 diff --git a/ver/us/asm/nonmatchings/8560/func_8002D160.s b/ver/us/asm/nonmatchings/8560/func_8002D160.s index 0070e79948..5c22cb54c7 100644 --- a/ver/us/asm/nonmatchings/8560/func_8002D160.s +++ b/ver/us/asm/nonmatchings/8560/func_8002D160.s @@ -16,8 +16,8 @@ glabel func_8002D160 /* 858C 8002D18C 0000802D */ daddu $s0, $zero, $zero /* 8590 8002D190 3C05B000 */ lui $a1, 0xb000 /* 8594 8002D194 34A50D10 */ ori $a1, $a1, 0xd10 -/* 8598 8002D198 3C04800A */ lui $a0, %hi(carthandle) -/* 859C 8002D19C 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 8598 8002D198 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 859C 8002D19C 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 85A0 8002D1A0 27A60010 */ addiu $a2, $sp, 0x10 /* 85A4 8002D1A4 AFB20020 */ sw $s2, 0x20($sp) /* 85A8 8002D1A8 0200902D */ daddu $s2, $s0, $zero @@ -41,8 +41,8 @@ glabel func_8002D160 /* 85F0 8002D1F0 0060B82D */ daddu $s7, $v1, $zero .L8002D1F4: /* 85F4 8002D1F4 0220282D */ daddu $a1, $s1, $zero -/* 85F8 8002D1F8 3C04800A */ lui $a0, %hi(carthandle) -/* 85FC 8002D1FC 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 85F8 8002D1F8 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 85FC 8002D1FC 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 8600 8002D200 0280F809 */ jalr $s4 /* 8604 8002D204 27A60010 */ addiu $a2, $sp, 0x10 /* 8608 8002D208 8FA30010 */ lw $v1, 0x10($sp) @@ -96,8 +96,8 @@ glabel func_8002D160 /* 86B8 8002D2B8 3C05B000 */ lui $a1, 0xb000 /* 86BC 8002D2BC 34A50E38 */ ori $a1, $a1, 0xe38 /* 86C0 8002D2C0 27A60014 */ addiu $a2, $sp, 0x14 -/* 86C4 8002D2C4 3C04800A */ lui $a0, %hi(carthandle) -/* 86C8 8002D2C8 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 86C4 8002D2C4 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 86C8 8002D2C8 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 86CC 8002D2CC 3C148006 */ lui $s4, %hi(osEPiReadIo) /* 86D0 8002D2D0 26940DC0 */ addiu $s4, $s4, %lo(osEPiReadIo) /* 86D4 8002D2D4 0280F809 */ jalr $s4 @@ -114,8 +114,8 @@ glabel func_8002D160 /* 8700 8002D300 0060B82D */ daddu $s7, $v1, $zero .L8002D304: /* 8704 8002D304 0220282D */ daddu $a1, $s1, $zero -/* 8708 8002D308 3C04800A */ lui $a0, %hi(carthandle) -/* 870C 8002D30C 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 8708 8002D308 3C04800A */ lui $a0, %hi(nuPiCartHandle) +/* 870C 8002D30C 8C84A638 */ lw $a0, %lo(nuPiCartHandle)($a0) /* 8710 8002D310 0280F809 */ jalr $s4 /* 8714 8002D314 27A60014 */ addiu $a2, $sp, 0x14 /* 8718 8002D318 8FA30014 */ lw $v1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/8800/render_frame.s b/ver/us/asm/nonmatchings/8800/render_frame.s index ac8df088ec..d4762f4862 100644 --- a/ver/us/asm/nonmatchings/8800/render_frame.s +++ b/ver/us/asm/nonmatchings/8800/render_frame.s @@ -267,8 +267,8 @@ glabel render_frame /* 8F24 8002DB24 AEE20000 */ sw $v0, ($s7) /* 8F28 8002DB28 240200C0 */ addiu $v0, $zero, 0xc0 /* 8F2C 8002DB2C 8FAB0024 */ lw $t3, 0x24($sp) -/* 8F30 8002DB30 3C04800A */ lui $a0, %hi(D_8009A64C) -/* 8F34 8002DB34 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* 8F30 8002DB30 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* 8F34 8002DB34 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* 8F38 8002DB38 356B013F */ ori $t3, $t3, 0x13f /* 8F3C 8002DB3C AFAB0024 */ sw $t3, 0x24($sp) /* 8F40 8002DB40 AEA2007C */ sw $v0, 0x7c($s5) @@ -471,8 +471,8 @@ glabel render_frame .L8002DE38: /* 9238 8002DE38 3463013F */ ori $v1, $v1, 0x13f /* 923C 8002DE3C 8EF00000 */ lw $s0, ($s7) -/* 9240 8002DE40 3C04800A */ lui $a0, %hi(D_8009A64C) -/* 9244 8002DE44 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* 9240 8002DE40 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* 9244 8002DE44 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* 9248 8002DE48 0200102D */ daddu $v0, $s0, $zero /* 924C 8002DE4C 26100008 */ addiu $s0, $s0, 8 /* 9250 8002DE50 3C0BE700 */ lui $t3, 0xe700 diff --git a/ver/us/asm/nonmatchings/8e790_len_2850/draw_box.s b/ver/us/asm/nonmatchings/8e790_len_2850/draw_box.s index ecd1f315af..82ac9467e3 100644 --- a/ver/us/asm/nonmatchings/8e790_len_2850/draw_box.s +++ b/ver/us/asm/nonmatchings/8e790_len_2850/draw_box.s @@ -2388,8 +2388,8 @@ glabel draw_box /* 90AD0 800F7620 0040182D */ daddu $v1, $v0, $zero /* 90AD4 800F7624 24420008 */ addiu $v0, $v0, 8 /* 90AD8 800F7628 AF020000 */ sw $v0, ($t8) -/* 90ADC 800F762C 3C08800A */ lui $t0, %hi(D_8009A64C) -/* 90AE0 800F7630 8D08A64C */ lw $t0, %lo(D_8009A64C)($t0) +/* 90ADC 800F762C 3C08800A */ lui $t0, %hi(nuGfxCfb_ptr) +/* 90AE0 800F7630 8D08A64C */ lw $t0, %lo(nuGfxCfb_ptr)($t0) /* 90AE4 800F7634 27B000A0 */ addiu $s0, $sp, 0xa0 /* 90AE8 800F7638 AC710000 */ sw $s1, ($v1) /* 90AEC 800F763C AC600004 */ sw $zero, 4($v1) diff --git a/ver/us/asm/nonmatchings/CEE40/func_80138740.s b/ver/us/asm/nonmatchings/CEE40/func_80138740.s index 70752c2fdb..4b568d31e9 100644 --- a/ver/us/asm/nonmatchings/CEE40/func_80138740.s +++ b/ver/us/asm/nonmatchings/CEE40/func_80138740.s @@ -37,8 +37,8 @@ glabel func_80138740 /* CEEB8 801387B8 00830018 */ mult $a0, $v1 /* CEEBC 801387BC 24540004 */ addiu $s4, $v0, 4 /* CEEC0 801387C0 0000902D */ daddu $s2, $zero, $zero -/* CEEC4 801387C4 3C058007 */ lui $a1, %hi(D_800773F0) -/* CEEC8 801387C8 24A573F0 */ addiu $a1, $a1, %lo(D_800773F0) +/* CEEC4 801387C4 3C058007 */ lui $a1, %hi(nuGfxCfbNum) +/* CEEC8 801387C8 24A573F0 */ addiu $a1, $a1, %lo(nuGfxCfbNum) /* CEECC 801387CC 000417C3 */ sra $v0, $a0, 0x1f /* CEED0 801387D0 0000C810 */ mfhi $t9 /* CEED4 801387D4 0322C823 */ subu $t9, $t9, $v0 @@ -52,10 +52,10 @@ glabel func_80138740 /* CEEF4 801387F4 1060001A */ beqz $v1, .L80138860 /* CEEF8 801387F8 AFA40010 */ sw $a0, 0x10($sp) /* CEEFC 801387FC 00A0382D */ daddu $a3, $a1, $zero -/* CEF00 80138800 3C05800A */ lui $a1, %hi(D_8009A658) -/* CEF04 80138804 8CA5A658 */ lw $a1, %lo(D_8009A658)($a1) -/* CEF08 80138808 3C06800A */ lui $a2, %hi(D_8009A64C) -/* CEF0C 8013880C 8CC6A64C */ lw $a2, %lo(D_8009A64C)($a2) +/* CEF00 80138800 3C05800A */ lui $a1, %hi(nuGfxCfb) +/* CEF04 80138804 8CA5A658 */ lw $a1, %lo(nuGfxCfb)($a1) +/* CEF08 80138808 3C06800A */ lui $a2, %hi(nuGfxCfb_ptr) +/* CEF0C 8013880C 8CC6A64C */ lw $a2, %lo(nuGfxCfb_ptr)($a2) /* CEF10 80138810 00A0202D */ daddu $a0, $a1, $zero .L80138814: /* CEF14 80138814 8C820000 */ lw $v0, ($a0) @@ -73,8 +73,8 @@ glabel func_80138740 /* CEF40 80138840 00651821 */ addu $v1, $v1, $a1 /* CEF44 80138844 8C780000 */ lw $t8, ($v1) .L80138848: -/* CEF48 80138848 3C028007 */ lui $v0, %hi(D_800773F0) -/* CEF4C 8013884C 8C4273F0 */ lw $v0, %lo(D_800773F0)($v0) +/* CEF48 80138848 3C028007 */ lui $v0, %hi(nuGfxCfbNum) +/* CEF4C 8013884C 8C4273F0 */ lw $v0, %lo(nuGfxCfbNum)($v0) /* CEF50 80138850 26520001 */ addiu $s2, $s2, 1 /* CEF54 80138854 0242102B */ sltu $v0, $s2, $v0 /* CEF58 80138858 1440FFEE */ bnez $v0, .L80138814 diff --git a/ver/us/asm/nonmatchings/CEE40/func_80138E54.s b/ver/us/asm/nonmatchings/CEE40/func_80138E54.s index a4b5e9d40b..d06f0191cb 100644 --- a/ver/us/asm/nonmatchings/CEE40/func_80138E54.s +++ b/ver/us/asm/nonmatchings/CEE40/func_80138E54.s @@ -632,8 +632,8 @@ glabel func_80138E54 /* CFEC4 801397C4 34E7013F */ ori $a3, $a3, 0x13f /* CFEC8 801397C8 AE02004C */ sw $v0, 0x4c($s0) /* CFECC 801397CC 3C02F700 */ lui $v0, 0xf700 -/* CFED0 801397D0 3C04800A */ lui $a0, %hi(D_8009A64C) -/* CFED4 801397D4 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* CFED0 801397D0 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* CFED4 801397D4 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* CFED8 801397D8 0220182D */ daddu $v1, $s1, $zero /* CFEDC 801397DC 26310008 */ addiu $s1, $s1, 8 /* CFEE0 801397E0 AED10000 */ sw $s1, ($s6) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/UseDynamicShadow.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/UseDynamicShadow.s deleted file mode 100644 index 6ac54b4036..0000000000 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/UseDynamicShadow.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UseDynamicShadow -/* A862C 80111F2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8630 80111F30 AFB00010 */ sw $s0, 0x10($sp) -/* A8634 80111F34 0080802D */ daddu $s0, $a0, $zero -/* A8638 80111F38 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) -/* A863C 80111F3C 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) -/* A8640 80111F40 AFBF0014 */ sw $ra, 0x14($sp) -/* A8644 80111F44 0C04417A */ jal get_entity_by_index -/* A8648 80111F48 00000000 */ nop -/* A864C 80111F4C 8E03000C */ lw $v1, 0xc($s0) -/* A8650 80111F50 0200202D */ daddu $a0, $s0, $zero -/* A8654 80111F54 8C650000 */ lw $a1, ($v1) -/* A8658 80111F58 0C0B1EAF */ jal get_variable -/* A865C 80111F5C 0040802D */ daddu $s0, $v0, $zero -/* A8660 80111F60 1040000B */ beqz $v0, .L80111F90 -/* A8664 80111F64 2403FFFB */ addiu $v1, $zero, -5 -/* A8668 80111F68 8E020000 */ lw $v0, ($s0) -/* A866C 80111F6C 86040016 */ lh $a0, 0x16($s0) -/* A8670 80111F70 34420004 */ ori $v0, $v0, 4 -/* A8674 80111F74 0C044181 */ jal get_shadow_by_index -/* A8678 80111F78 AE020000 */ sw $v0, ($s0) -/* A867C 80111F7C 8C430000 */ lw $v1, ($v0) -/* A8680 80111F80 3C040040 */ lui $a0, 0x40 -/* A8684 80111F84 00641825 */ or $v1, $v1, $a0 -/* A8688 80111F88 080447E7 */ j .L80111F9C -/* A868C 80111F8C AC430000 */ sw $v1, ($v0) -.L80111F90: -/* A8690 80111F90 8E020000 */ lw $v0, ($s0) -/* A8694 80111F94 00431024 */ and $v0, $v0, $v1 -/* A8698 80111F98 AE020000 */ sw $v0, ($s0) -.L80111F9C: -/* A869C 80111F9C 8FBF0014 */ lw $ra, 0x14($sp) -/* A86A0 80111FA0 8FB00010 */ lw $s0, 0x10($sp) -/* A86A4 80111FA4 24020002 */ addiu $v0, $zero, 2 -/* A86A8 80111FA8 03E00008 */ jr $ra -/* A86AC 80111FAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C80C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C80C.s index dfd9cd6181..cdba425474 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C80C.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C80C.s @@ -375,8 +375,8 @@ glabel func_8011C80C /* B34CC 8011CDCC AE02008C */ sw $v0, 0x8c($s0) /* B34D0 8011CDD0 3C02F100 */ lui $v0, 0xf100 /* B34D4 8011CDD4 AE0200A0 */ sw $v0, 0xa0($s0) -/* B34D8 8011CDD8 3C04800A */ lui $a0, %hi(D_8009A64C) -/* B34DC 8011CDDC 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* B34D8 8011CDD8 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* B34DC 8011CDDC 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* B34E0 8011CDE0 260200B0 */ addiu $v0, $s0, 0xb0 /* B34E4 8011CDE4 AE1900A4 */ sw $t9, 0xa4($s0) /* B34E8 8011CDE8 AE220000 */ sw $v0, ($s1) diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011CFBC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011CFBC.s index 4840d823dd..95a0acea21 100644 --- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011CFBC.s +++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011CFBC.s @@ -359,8 +359,8 @@ glabel func_8011CFBC /* B3C3C 8011D53C AE02008C */ sw $v0, 0x8c($s0) /* B3C40 8011D540 3C02F100 */ lui $v0, 0xf100 /* B3C44 8011D544 AE0200A0 */ sw $v0, 0xa0($s0) -/* B3C48 8011D548 3C04800A */ lui $a0, %hi(D_8009A64C) -/* B3C4C 8011D54C 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* B3C48 8011D548 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* B3C4C 8011D54C 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* B3C50 8011D550 260200B0 */ addiu $v0, $s0, 0xb0 /* B3C54 8011D554 AE1900A4 */ sw $t9, 0xa4($s0) /* B3C58 8011D558 AE220000 */ sw $v0, ($s1) diff --git a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s index 9fd8a99e8b..2934ce4646 100644 --- a/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s +++ b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s @@ -140,8 +140,8 @@ glabel func_80143C48 /* DA564 80143E64 34A5FFFC */ ori $a1, $a1, 0xfffc /* DA568 80143E68 AE02006C */ sw $v0, 0x6c($s0) /* DA56C 80143E6C 3C02F700 */ lui $v0, 0xf700 -/* DA570 80143E70 3C04800A */ lui $a0, %hi(D_8009A64C) -/* DA574 80143E74 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* DA570 80143E70 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* DA574 80143E74 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* DA578 80143E78 0220182D */ daddu $v1, $s1, $zero /* DA57C 80143E7C 26310008 */ addiu $s1, $s1, 8 /* DA580 80143E80 AE510000 */ sw $s1, ($s2) diff --git a/ver/us/asm/nonmatchings/ddaf0_len_c50/render_window_root.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/render_window_root.s index 5844baae0d..cdb96d8ca4 100644 --- a/ver/us/asm/nonmatchings/ddaf0_len_c50/render_window_root.s +++ b/ver/us/asm/nonmatchings/ddaf0_len_c50/render_window_root.s @@ -60,8 +60,8 @@ glabel render_window_root /* DE294 80147B94 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) /* DE298 80147B98 3C02D900 */ lui $v0, 0xd900 /* DE29C 80147B9C 8E300000 */ lw $s0, ($s1) -/* DE2A0 80147BA0 3C04800A */ lui $a0, %hi(D_8009A64C) -/* DE2A4 80147BA4 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* DE2A0 80147BA0 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* DE2A4 80147BA4 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* DE2A8 80147BA8 0200182D */ daddu $v1, $s0, $zero /* DE2AC 80147BAC 26100008 */ addiu $s0, $s0, 8 /* DE2B0 80147BB0 AE300000 */ sw $s0, ($s1) diff --git a/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shaded_sprite.s b/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shaded_sprite.s index 118e70a19c..b8edd0abba 100644 --- a/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shaded_sprite.s +++ b/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shaded_sprite.s @@ -346,8 +346,8 @@ glabel appendGfx_shaded_sprite /* DF5CC 80148ECC 26020060 */ addiu $v0, $s0, 0x60 /* DF5D0 80148ED0 AE0E0054 */ sw $t6, 0x54($s0) /* DF5D4 80148ED4 AEE20000 */ sw $v0, ($s7) -/* DF5D8 80148ED8 3C04800A */ lui $a0, %hi(D_8009A64C) -/* DF5DC 80148EDC 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* DF5D8 80148ED8 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* DF5DC 80148EDC 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* DF5E0 80148EE0 26020068 */ addiu $v0, $s0, 0x68 /* DF5E4 80148EE4 AE110058 */ sw $s1, 0x58($s0) /* DF5E8 80148EE8 AE00005C */ sw $zero, 0x5c($s0) diff --git a/ver/us/asm/nonmatchings/main_loop/func_800279B4.s b/ver/us/asm/nonmatchings/main_loop/func_800279B4.s deleted file mode 100644 index bf133e26d9..0000000000 --- a/ver/us/asm/nonmatchings/main_loop/func_800279B4.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_800279B4 -/* 2DB4 800279B4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 2DB8 800279B8 AFB50054 */ sw $s5, 0x54($sp) -/* 2DBC 800279BC 0080A82D */ daddu $s5, $a0, $zero -/* 2DC0 800279C0 AFB60058 */ sw $s6, 0x58($sp) -/* 2DC4 800279C4 00A0B02D */ daddu $s6, $a1, $zero -/* 2DC8 800279C8 AFB3004C */ sw $s3, 0x4c($sp) -/* 2DCC 800279CC 24130001 */ addiu $s3, $zero, 1 -/* 2DD0 800279D0 27A80018 */ addiu $t0, $sp, 0x18 -/* 2DD4 800279D4 AFA80038 */ sw $t0, 0x38($sp) -/* 2DD8 800279D8 24080140 */ addiu $t0, $zero, 0x140 -/* 2DDC 800279DC AFBF0064 */ sw $ra, 0x64($sp) -/* 2DE0 800279E0 AFBE0060 */ sw $fp, 0x60($sp) -/* 2DE4 800279E4 AFB7005C */ sw $s7, 0x5c($sp) -/* 2DE8 800279E8 AFB40050 */ sw $s4, 0x50($sp) -/* 2DEC 800279EC AFB20048 */ sw $s2, 0x48($sp) -/* 2DF0 800279F0 AFB10044 */ sw $s1, 0x44($sp) -/* 2DF4 800279F4 AFB00040 */ sw $s0, 0x40($sp) -/* 2DF8 800279F8 AFA60070 */ sw $a2, 0x70($sp) -/* 2DFC 800279FC AFA8003C */ sw $t0, 0x3c($sp) -.L80027A00: -/* 2E00 80027A00 24120002 */ addiu $s2, $zero, 2 -/* 2E04 80027A04 267EFFFF */ addiu $fp, $s3, -1 -/* 2E08 80027A08 26770001 */ addiu $s7, $s3, 1 -.L80027A0C: -/* 2E0C 80027A0C 8FA8003C */ lw $t0, 0x3c($sp) -/* 2E10 80027A10 01121021 */ addu $v0, $t0, $s2 -/* 2E14 80027A14 0002A040 */ sll $s4, $v0, 1 -/* 2E18 80027A18 02961021 */ addu $v0, $s4, $s6 -/* 2E1C 80027A1C 94420000 */ lhu $v0, ($v0) -/* 2E20 80027A20 00021082 */ srl $v0, $v0, 2 -/* 2E24 80027A24 3042000F */ andi $v0, $v0, 0xf -/* 2E28 80027A28 2C420008 */ sltiu $v0, $v0, 8 -/* 2E2C 80027A2C 10400043 */ beqz $v0, .L80027B3C -/* 2E30 80027A30 02A0202D */ daddu $a0, $s5, $zero -/* 2E34 80027A34 02C0282D */ daddu $a1, $s6, $zero -/* 2E38 80027A38 03C0302D */ daddu $a2, $fp, $zero -/* 2E3C 80027A3C 2650FFFF */ addiu $s0, $s2, -1 -/* 2E40 80027A40 8FA80038 */ lw $t0, 0x38($sp) -/* 2E44 80027A44 0200382D */ daddu $a3, $s0, $zero -/* 2E48 80027A48 0C009C7F */ jal func_800271FC -/* 2E4C 80027A4C AFA80010 */ sw $t0, 0x10($sp) -/* 2E50 80027A50 02A0202D */ daddu $a0, $s5, $zero -/* 2E54 80027A54 02C0282D */ daddu $a1, $s6, $zero -/* 2E58 80027A58 03C0302D */ daddu $a2, $fp, $zero -/* 2E5C 80027A5C 26510001 */ addiu $s1, $s2, 1 -/* 2E60 80027A60 0220382D */ daddu $a3, $s1, $zero -/* 2E64 80027A64 27A2001C */ addiu $v0, $sp, 0x1c -/* 2E68 80027A68 0C009C7F */ jal func_800271FC -/* 2E6C 80027A6C AFA20010 */ sw $v0, 0x10($sp) -/* 2E70 80027A70 02A0202D */ daddu $a0, $s5, $zero -/* 2E74 80027A74 02C0282D */ daddu $a1, $s6, $zero -/* 2E78 80027A78 0260302D */ daddu $a2, $s3, $zero -/* 2E7C 80027A7C 2647FFFE */ addiu $a3, $s2, -2 -/* 2E80 80027A80 27A20020 */ addiu $v0, $sp, 0x20 -/* 2E84 80027A84 0C009C7F */ jal func_800271FC -/* 2E88 80027A88 AFA20010 */ sw $v0, 0x10($sp) -/* 2E8C 80027A8C 02A0202D */ daddu $a0, $s5, $zero -/* 2E90 80027A90 02C0282D */ daddu $a1, $s6, $zero -/* 2E94 80027A94 0260302D */ daddu $a2, $s3, $zero -/* 2E98 80027A98 26470002 */ addiu $a3, $s2, 2 -/* 2E9C 80027A9C 27A20024 */ addiu $v0, $sp, 0x24 -/* 2EA0 80027AA0 0C009C7F */ jal func_800271FC -/* 2EA4 80027AA4 AFA20010 */ sw $v0, 0x10($sp) -/* 2EA8 80027AA8 02A0202D */ daddu $a0, $s5, $zero -/* 2EAC 80027AAC 02C0282D */ daddu $a1, $s6, $zero -/* 2EB0 80027AB0 02E0302D */ daddu $a2, $s7, $zero -/* 2EB4 80027AB4 0200382D */ daddu $a3, $s0, $zero -/* 2EB8 80027AB8 27A20028 */ addiu $v0, $sp, 0x28 -/* 2EBC 80027ABC 0C009C7F */ jal func_800271FC -/* 2EC0 80027AC0 AFA20010 */ sw $v0, 0x10($sp) -/* 2EC4 80027AC4 02A0202D */ daddu $a0, $s5, $zero -/* 2EC8 80027AC8 02C0282D */ daddu $a1, $s6, $zero -/* 2ECC 80027ACC 02E0302D */ daddu $a2, $s7, $zero -/* 2ED0 80027AD0 0220382D */ daddu $a3, $s1, $zero -/* 2ED4 80027AD4 27A2002C */ addiu $v0, $sp, 0x2c -/* 2ED8 80027AD8 0C009C7F */ jal func_800271FC -/* 2EDC 80027ADC AFA20010 */ sw $v0, 0x10($sp) -/* 2EE0 80027AE0 02A0202D */ daddu $a0, $s5, $zero -/* 2EE4 80027AE4 02C0282D */ daddu $a1, $s6, $zero -/* 2EE8 80027AE8 0260302D */ daddu $a2, $s3, $zero -/* 2EEC 80027AEC 0240382D */ daddu $a3, $s2, $zero -/* 2EF0 80027AF0 27A20030 */ addiu $v0, $sp, 0x30 -/* 2EF4 80027AF4 0C009C7F */ jal func_800271FC -/* 2EF8 80027AF8 AFA20010 */ sw $v0, 0x10($sp) -/* 2EFC 80027AFC 8FA40038 */ lw $a0, 0x38($sp) -/* 2F00 80027B00 8FA80070 */ lw $t0, 0x70($sp) -/* 2F04 80027B04 93A50030 */ lbu $a1, 0x30($sp) -/* 2F08 80027B08 93A20031 */ lbu $v0, 0x31($sp) -/* 2F0C 80027B0C 93A30032 */ lbu $v1, 0x32($sp) -/* 2F10 80027B10 01143021 */ addu $a2, $t0, $s4 -/* 2F14 80027B14 00052E00 */ sll $a1, $a1, 0x18 -/* 2F18 80027B18 00021400 */ sll $v0, $v0, 0x10 -/* 2F1C 80027B1C 00A22825 */ or $a1, $a1, $v0 -/* 2F20 80027B20 00031A00 */ sll $v1, $v1, 8 -/* 2F24 80027B24 93A20033 */ lbu $v0, 0x33($sp) -/* 2F28 80027B28 00A32825 */ or $a1, $a1, $v1 -/* 2F2C 80027B2C 0C009C97 */ jal func_8002725C -/* 2F30 80027B30 00A22825 */ or $a1, $a1, $v0 -/* 2F34 80027B34 08009ED6 */ j .L80027B58 -/* 2F38 80027B38 26520001 */ addiu $s2, $s2, 1 -.L80027B3C: -/* 2F3C 80027B3C 02951021 */ addu $v0, $s4, $s5 -/* 2F40 80027B40 8FA80070 */ lw $t0, 0x70($sp) -/* 2F44 80027B44 94420000 */ lhu $v0, ($v0) -/* 2F48 80027B48 02881821 */ addu $v1, $s4, $t0 -/* 2F4C 80027B4C 34420001 */ ori $v0, $v0, 1 -/* 2F50 80027B50 A4620000 */ sh $v0, ($v1) -/* 2F54 80027B54 26520001 */ addiu $s2, $s2, 1 -.L80027B58: -/* 2F58 80027B58 2A42013E */ slti $v0, $s2, 0x13e -/* 2F5C 80027B5C 1440FFAB */ bnez $v0, .L80027A0C -/* 2F60 80027B60 00000000 */ nop -/* 2F64 80027B64 26730001 */ addiu $s3, $s3, 1 -/* 2F68 80027B68 8FA8003C */ lw $t0, 0x3c($sp) -/* 2F6C 80027B6C 2A6200EF */ slti $v0, $s3, 0xef -/* 2F70 80027B70 25080140 */ addiu $t0, $t0, 0x140 -/* 2F74 80027B74 1440FFA2 */ bnez $v0, .L80027A00 -/* 2F78 80027B78 AFA8003C */ sw $t0, 0x3c($sp) -/* 2F7C 80027B7C 8FBF0064 */ lw $ra, 0x64($sp) -/* 2F80 80027B80 8FBE0060 */ lw $fp, 0x60($sp) -/* 2F84 80027B84 8FB7005C */ lw $s7, 0x5c($sp) -/* 2F88 80027B88 8FB60058 */ lw $s6, 0x58($sp) -/* 2F8C 80027B8C 8FB50054 */ lw $s5, 0x54($sp) -/* 2F90 80027B90 8FB40050 */ lw $s4, 0x50($sp) -/* 2F94 80027B94 8FB3004C */ lw $s3, 0x4c($sp) -/* 2F98 80027B98 8FB20048 */ lw $s2, 0x48($sp) -/* 2F9C 80027B9C 8FB10044 */ lw $s1, 0x44($sp) -/* 2FA0 80027BA0 8FB00040 */ lw $s0, 0x40($sp) -/* 2FA4 80027BA4 03E00008 */ jr $ra -/* 2FA8 80027BA8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/os/39cb0_len_100/boot_idle.s b/ver/us/asm/nonmatchings/os/39cb0_len_100/boot_idle.s index 531b2d3fa9..715bae0562 100644 --- a/ver/us/asm/nonmatchings/os/39cb0_len_100/boot_idle.s +++ b/ver/us/asm/nonmatchings/os/39cb0_len_100/boot_idle.s @@ -17,8 +17,8 @@ glabel boot_idle /* 39D3C 8005E93C 26104420 */ addiu $s0, $s0, %lo(D_800A4420) /* 39D40 8005E940 0200202D */ daddu $a0, $s0, $zero /* 39D44 8005E944 24050003 */ addiu $a1, $zero, 3 -/* 39D48 8005E948 3C02800C */ lui $v0, %hi(D_800B8590) -/* 39D4C 8005E94C 24428590 */ addiu $v0, $v0, %lo(D_800B8590) +/* 39D48 8005E948 3C02800C */ lui $v0, %hi(nuYieldBuf) +/* 39D4C 8005E94C 24428590 */ addiu $v0, $v0, %lo(nuYieldBuf) /* 39D50 8005E950 AFA20010 */ sw $v0, 0x10($sp) /* 39D54 8005E954 2402000A */ addiu $v0, $zero, 0xa /* 39D58 8005E958 3C068002 */ lui $a2, %hi(boot_main) diff --git a/ver/us/asm/nonmatchings/os/3b710_len_40/nuGfxSwapCfbFuncSet.s b/ver/us/asm/nonmatchings/os/3b710_len_40/nuGfxSwapCfbFuncSet.s deleted file mode 100644 index de1f45dd9e..0000000000 --- a/ver/us/asm/nonmatchings/os/3b710_len_40/nuGfxSwapCfbFuncSet.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxSwapCfbFuncSet -/* 3B710 80060310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3B714 80060314 AFB00010 */ sw $s0, 0x10($sp) -/* 3B718 80060318 0080802D */ daddu $s0, $a0, $zero -/* 3B71C 8006031C AFBF0014 */ sw $ra, 0x14($sp) -/* 3B720 80060320 0C018250 */ jal osSetIntMask -/* 3B724 80060324 24040001 */ addiu $a0, $zero, 1 -/* 3B728 80060328 3C018007 */ lui $at, %hi(D_800773F4) -/* 3B72C 8006032C AC3073F4 */ sw $s0, %lo(D_800773F4)($at) -/* 3B730 80060330 0C018250 */ jal osSetIntMask -/* 3B734 80060334 0040202D */ daddu $a0, $v0, $zero -/* 3B738 80060338 8FBF0014 */ lw $ra, 0x14($sp) -/* 3B73C 8006033C 8FB00010 */ lw $s0, 0x10($sp) -/* 3B740 80060340 03E00008 */ jr $ra -/* 3B744 80060344 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3B748 80060348 00000000 */ nop -/* 3B74C 8006034C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/3b770_len_80/nuGfxRetraceWait.s b/ver/us/asm/nonmatchings/os/3b770_len_80/nuGfxRetraceWait.s deleted file mode 100644 index dab35d725a..0000000000 --- a/ver/us/asm/nonmatchings/os/3b770_len_80/nuGfxRetraceWait.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxRetraceWait -/* 3B770 80060370 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 3B774 80060374 AFB10044 */ sw $s1, 0x44($sp) -/* 3B778 80060378 0080882D */ daddu $s1, $a0, $zero -/* 3B77C 8006037C AFB00040 */ sw $s0, 0x40($sp) -/* 3B780 80060380 27B00020 */ addiu $s0, $sp, 0x20 -/* 3B784 80060384 0200202D */ daddu $a0, $s0, $zero -/* 3B788 80060388 27A50038 */ addiu $a1, $sp, 0x38 -/* 3B78C 8006038C AFBF0048 */ sw $ra, 0x48($sp) -/* 3B790 80060390 0C019560 */ jal osCreateMesgQueue -/* 3B794 80060394 24060001 */ addiu $a2, $zero, 1 -/* 3B798 80060398 27A40010 */ addiu $a0, $sp, 0x10 -/* 3B79C 8006039C 0200282D */ daddu $a1, $s0, $zero -/* 3B7A0 800603A0 0C017B8C */ jal nuScAddClient -/* 3B7A4 800603A4 24060001 */ addiu $a2, $zero, 1 -/* 3B7A8 800603A8 12200007 */ beqz $s1, .L800603C8 -/* 3B7AC 800603AC 27A40020 */ addiu $a0, $sp, 0x20 -.L800603B0: -/* 3B7B0 800603B0 0000282D */ daddu $a1, $zero, $zero -/* 3B7B4 800603B4 0C0195BC */ jal osRecvMesg -/* 3B7B8 800603B8 24060001 */ addiu $a2, $zero, 1 -/* 3B7BC 800603BC 2631FFFF */ addiu $s1, $s1, -1 -/* 3B7C0 800603C0 1620FFFB */ bnez $s1, .L800603B0 -/* 3B7C4 800603C4 27A40020 */ addiu $a0, $sp, 0x20 -.L800603C8: -/* 3B7C8 800603C8 0C017BAF */ jal nuScRemoveClient -/* 3B7CC 800603CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 3B7D0 800603D0 8FBF0048 */ lw $ra, 0x48($sp) -/* 3B7D4 800603D4 8FB10044 */ lw $s1, 0x44($sp) -/* 3B7D8 800603D8 8FB00040 */ lw $s0, 0x40($sp) -/* 3B7DC 800603DC 03E00008 */ jr $ra -/* 3B7E0 800603E0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 3B7E4 800603E4 00000000 */ nop -/* 3B7E8 800603E8 00000000 */ nop -/* 3B7EC 800603EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackAdd.s b/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackAdd.s deleted file mode 100644 index eef9403276..0000000000 --- a/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackAdd.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuSiCallBackAdd -/* 3B7F0 800603F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3B7F4 800603F4 AFB00010 */ sw $s0, 0x10($sp) -/* 3B7F8 800603F8 3C108007 */ lui $s0, %hi(D_80077400) -/* 3B7FC 800603FC 26107400 */ addiu $s0, $s0, %lo(D_80077400) -/* 3B800 80060400 AFBF001C */ sw $ra, 0x1c($sp) -/* 3B804 80060404 AFB20018 */ sw $s2, 0x18($sp) -/* 3B808 80060408 AFB10014 */ sw $s1, 0x14($sp) -/* 3B80C 8006040C 8E020000 */ lw $v0, ($s0) -/* 3B810 80060410 10400009 */ beqz $v0, .L80060438 -/* 3B814 80060414 0080902D */ daddu $s2, $a0, $zero -/* 3B818 80060418 96440008 */ lhu $a0, 8($s2) -.L8006041C: -/* 3B81C 8006041C 8E030000 */ lw $v1, ($s0) -/* 3B820 80060420 94620008 */ lhu $v0, 8($v1) -/* 3B824 80060424 10440014 */ beq $v0, $a0, .L80060478 -/* 3B828 80060428 0060802D */ daddu $s0, $v1, $zero -/* 3B82C 8006042C 8E020000 */ lw $v0, ($s0) -/* 3B830 80060430 1440FFFA */ bnez $v0, .L8006041C -/* 3B834 80060434 00000000 */ nop -.L80060438: -/* 3B838 80060438 8E430004 */ lw $v1, 4($s2) -/* 3B83C 8006043C 8C620004 */ lw $v0, 4($v1) -/* 3B840 80060440 10400006 */ beqz $v0, .L8006045C -/* 3B844 80060444 24110001 */ addiu $s1, $zero, 1 -/* 3B848 80060448 24630004 */ addiu $v1, $v1, 4 -.L8006044C: -/* 3B84C 8006044C 24630004 */ addiu $v1, $v1, 4 -/* 3B850 80060450 8C620000 */ lw $v0, ($v1) -/* 3B854 80060454 1440FFFD */ bnez $v0, .L8006044C -/* 3B858 80060458 26310001 */ addiu $s1, $s1, 1 -.L8006045C: -/* 3B85C 8006045C 0C018250 */ jal osSetIntMask -/* 3B860 80060460 24040001 */ addiu $a0, $zero, 1 -/* 3B864 80060464 0040202D */ daddu $a0, $v0, $zero -/* 3B868 80060468 AE120000 */ sw $s2, ($s0) -/* 3B86C 8006046C AE400000 */ sw $zero, ($s2) -/* 3B870 80060470 0C018250 */ jal osSetIntMask -/* 3B874 80060474 A251000A */ sb $s1, 0xa($s2) -.L80060478: -/* 3B878 80060478 8FBF001C */ lw $ra, 0x1c($sp) -/* 3B87C 8006047C 8FB20018 */ lw $s2, 0x18($sp) -/* 3B880 80060480 8FB10014 */ lw $s1, 0x14($sp) -/* 3B884 80060484 8FB00010 */ lw $s0, 0x10($sp) -/* 3B888 80060488 03E00008 */ jr $ra -/* 3B88C 8006048C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackRemove.s b/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackRemove.s deleted file mode 100644 index f983be7dde..0000000000 --- a/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackRemove.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuSiCallBackRemove -/* 3B890 80060490 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3B894 80060494 AFB10014 */ sw $s1, 0x14($sp) -/* 3B898 80060498 3C118007 */ lui $s1, %hi(D_80077400) -/* 3B89C 8006049C 26317400 */ addiu $s1, $s1, %lo(D_80077400) -/* 3B8A0 800604A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 3B8A4 800604A4 AFB00010 */ sw $s0, 0x10($sp) -/* 3B8A8 800604A8 8E220000 */ lw $v0, ($s1) -/* 3B8AC 800604AC 10400011 */ beqz $v0, .L800604F4 -/* 3B8B0 800604B0 00000000 */ nop -.L800604B4: -/* 3B8B4 800604B4 8E220000 */ lw $v0, ($s1) -/* 3B8B8 800604B8 8C500000 */ lw $s0, ($v0) -/* 3B8BC 800604BC 1604000B */ bne $s0, $a0, .L800604EC -/* 3B8C0 800604C0 00000000 */ nop -/* 3B8C4 800604C4 0C018250 */ jal osSetIntMask -/* 3B8C8 800604C8 24040001 */ addiu $a0, $zero, 1 -/* 3B8CC 800604CC 8E250000 */ lw $a1, ($s1) -/* 3B8D0 800604D0 8E030000 */ lw $v1, ($s0) -/* 3B8D4 800604D4 0040202D */ daddu $a0, $v0, $zero -/* 3B8D8 800604D8 ACA30000 */ sw $v1, ($a1) -/* 3B8DC 800604DC 0C018250 */ jal osSetIntMask -/* 3B8E0 800604E0 AE000000 */ sw $zero, ($s0) -/* 3B8E4 800604E4 0801813D */ j .L800604F4 -/* 3B8E8 800604E8 00000000 */ nop -.L800604EC: -/* 3B8EC 800604EC 1600FFF1 */ bnez $s0, .L800604B4 -/* 3B8F0 800604F0 0040882D */ daddu $s1, $v0, $zero -.L800604F4: -/* 3B8F4 800604F4 8FBF0018 */ lw $ra, 0x18($sp) -/* 3B8F8 800604F8 8FB10014 */ lw $s1, 0x14($sp) -/* 3B8FC 800604FC 8FB00010 */ lw $s0, 0x10($sp) -/* 3B900 80060500 03E00008 */ jr $ra -/* 3B904 80060504 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3B908 80060508 00000000 */ nop -/* 3B90C 8006050C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataClose.s b/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataClose.s deleted file mode 100644 index 9f152873c6..0000000000 --- a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataClose.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContDataClose -/* 3BA0C 8006060C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3BA10 80060610 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BA14 80060614 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) -/* 3BA18 80060618 0000282D */ daddu $a1, $zero, $zero -/* 3BA1C 8006061C AFBF0010 */ sw $ra, 0x10($sp) -/* 3BA20 80060620 0C019608 */ jal osSendMesg -/* 3BA24 80060624 24060001 */ addiu $a2, $zero, 1 -/* 3BA28 80060628 8FBF0010 */ lw $ra, 0x10($sp) -/* 3BA2C 8006062C 03E00008 */ jr $ra -/* 3BA30 80060630 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataLock.s b/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataLock.s deleted file mode 100644 index 11ef827bd6..0000000000 --- a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataLock.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContDataLock -/* 3BCC0 800608C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3BCC4 800608C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 3BCC8 800608C8 0C018250 */ jal osSetIntMask -/* 3BCCC 800608CC 24040001 */ addiu $a0, $zero, 1 -/* 3BCD0 800608D0 24030001 */ addiu $v1, $zero, 1 -/* 3BCD4 800608D4 3C01800A */ lui $at, %hi(D_8009A5E0) -/* 3BCD8 800608D8 AC23A5E0 */ sw $v1, %lo(D_8009A5E0)($at) -/* 3BCDC 800608DC 0C018250 */ jal osSetIntMask -/* 3BCE0 800608E0 0040202D */ daddu $a0, $v0, $zero -/* 3BCE4 800608E4 8FBF0010 */ lw $ra, 0x10($sp) -/* 3BCE8 800608E8 03E00008 */ jr $ra -/* 3BCEC 800608EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataOpen.s b/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataOpen.s deleted file mode 100644 index ae2063d795..0000000000 --- a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataOpen.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContDataOpen -/* 3BA34 80060634 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3BA38 80060638 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BA3C 8006063C 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) -/* 3BA40 80060640 0000282D */ daddu $a1, $zero, $zero -/* 3BA44 80060644 AFBF0010 */ sw $ra, 0x10($sp) -/* 3BA48 80060648 0C0195BC */ jal osRecvMesg -/* 3BA4C 8006064C 24060001 */ addiu $a2, $zero, 1 -/* 3BA50 80060650 8FBF0010 */ lw $ra, 0x10($sp) -/* 3BA54 80060654 03E00008 */ jr $ra -/* 3BA58 80060658 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataUnLock.s b/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataUnLock.s deleted file mode 100644 index 6ef95485a8..0000000000 --- a/ver/us/asm/nonmatchings/os/nuContMgr/nuContDataUnLock.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContDataUnLock -/* 3BCF0 800608F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3BCF4 800608F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 3BCF8 800608F8 0C018250 */ jal osSetIntMask -/* 3BCFC 800608FC 24040001 */ addiu $a0, $zero, 1 -/* 3BD00 80060900 3C01800A */ lui $at, %hi(D_8009A5E0) -/* 3BD04 80060904 AC20A5E0 */ sw $zero, %lo(D_8009A5E0)($at) -/* 3BD08 80060908 0C018250 */ jal osSetIntMask -/* 3BD0C 8006090C 0040202D */ daddu $a0, $v0, $zero -/* 3BD10 80060910 8FBF0010 */ lw $ra, 0x10($sp) -/* 3BD14 80060914 03E00008 */ jr $ra -/* 3BD18 80060918 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3BD1C 8006091C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/nuContMgrInit.s b/ver/us/asm/nonmatchings/os/nuContMgr/nuContMgrInit.s deleted file mode 100644 index 6567e2bf08..0000000000 --- a/ver/us/asm/nonmatchings/os/nuContMgr/nuContMgrInit.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContMgrInit -/* 3B910 80060510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3B914 80060514 AFBF0010 */ sw $ra, 0x10($sp) -/* 3B918 80060518 0C01823C */ jal nuContDataUnLock -/* 3B91C 8006051C 00000000 */ nop -/* 3B920 80060520 3C04800B */ lui $a0, %hi(D_800B0EB8) -/* 3B924 80060524 24840EB8 */ addiu $a0, $a0, %lo(D_800B0EB8) -/* 3B928 80060528 3C05800B */ lui $a1, %hi(D_800AE6D0) -/* 3B92C 8006052C 24A5E6D0 */ addiu $a1, $a1, %lo(D_800AE6D0) -/* 3B930 80060530 0C019560 */ jal osCreateMesgQueue -/* 3B934 80060534 24060001 */ addiu $a2, $zero, 1 -/* 3B938 80060538 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3B93C 8006053C 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) -/* 3B940 80060540 3C05800B */ lui $a1, %hi(D_800AE6D4) -/* 3B944 80060544 24A5E6D4 */ addiu $a1, $a1, %lo(D_800AE6D4) -/* 3B948 80060548 0C019560 */ jal osCreateMesgQueue -/* 3B94C 8006054C 24060001 */ addiu $a2, $zero, 1 -/* 3B950 80060550 3C048009 */ lui $a0, %hi(nuContCallBack) -/* 3B954 80060554 0C0180FC */ jal nuSiCallBackAdd -/* 3B958 80060558 24843D38 */ addiu $a0, $a0, %lo(nuContCallBack) -/* 3B95C 8006055C 0C018248 */ jal nuContQueryRead -/* 3B960 80060560 00000000 */ nop -/* 3B964 80060564 24050001 */ addiu $a1, $zero, 1 -/* 3B968 80060568 0000302D */ daddu $a2, $zero, $zero -/* 3B96C 8006056C 0000202D */ daddu $a0, $zero, $zero -/* 3B970 80060570 24070005 */ addiu $a3, $zero, 5 -/* 3B974 80060574 3C01800A */ lui $at, %hi(D_8009A614) -/* 3B978 80060578 AC20A614 */ sw $zero, %lo(D_8009A614)($at) -/* 3B97C 8006057C 00041880 */ sll $v1, $a0, 2 -.L80060580: -/* 3B980 80060580 3C02800B */ lui $v0, %hi(D_800B1B7F) -/* 3B984 80060584 00431021 */ addu $v0, $v0, $v1 -/* 3B988 80060588 90421B7F */ lbu $v0, %lo(D_800B1B7F)($v0) -/* 3B98C 8006058C 5440000F */ bnel $v0, $zero, .L800605CC -/* 3B990 80060590 24840001 */ addiu $a0, $a0, 1 -/* 3B994 80060594 3C02800B */ lui $v0, %hi(D_800B1B7C) -/* 3B998 80060598 00431021 */ addu $v0, $v0, $v1 -/* 3B99C 8006059C 94421B7C */ lhu $v0, %lo(D_800B1B7C)($v0) -/* 3B9A0 800605A0 30421F07 */ andi $v0, $v0, 0x1f07 -/* 3B9A4 800605A4 54470008 */ bnel $v0, $a3, .L800605C8 -/* 3B9A8 800605A8 00052840 */ sll $a1, $a1, 1 -/* 3B9AC 800605AC 3C02800A */ lui $v0, %hi(D_8009A614) -/* 3B9B0 800605B0 8C42A614 */ lw $v0, %lo(D_8009A614)($v0) -/* 3B9B4 800605B4 00C53025 */ or $a2, $a2, $a1 -/* 3B9B8 800605B8 24420001 */ addiu $v0, $v0, 1 -/* 3B9BC 800605BC 3C01800A */ lui $at, %hi(D_8009A614) -/* 3B9C0 800605C0 AC22A614 */ sw $v0, %lo(D_8009A614)($at) -/* 3B9C4 800605C4 00052840 */ sll $a1, $a1, 1 -.L800605C8: -/* 3B9C8 800605C8 24840001 */ addiu $a0, $a0, 1 -.L800605CC: -/* 3B9CC 800605CC 28820004 */ slti $v0, $a0, 4 -/* 3B9D0 800605D0 1440FFEB */ bnez $v0, .L80060580 -/* 3B9D4 800605D4 00041880 */ sll $v1, $a0, 2 -/* 3B9D8 800605D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 3B9DC 800605DC 30C200FF */ andi $v0, $a2, 0xff -/* 3B9E0 800605E0 03E00008 */ jr $ra -/* 3B9E4 800605E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/nuContMgrRemove.s b/ver/us/asm/nonmatchings/os/nuContMgr/nuContMgrRemove.s deleted file mode 100644 index 258bd22cb5..0000000000 --- a/ver/us/asm/nonmatchings/os/nuContMgr/nuContMgrRemove.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContMgrRemove -/* 3B9E8 800605E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3B9EC 800605EC 3C048009 */ lui $a0, %hi(nuContCallBack) -/* 3B9F0 800605F0 24843D38 */ addiu $a0, $a0, %lo(nuContCallBack) -/* 3B9F4 800605F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 3B9F8 800605F8 0C018124 */ jal nuSiCallBackRemove -/* 3B9FC 800605FC 00000000 */ nop -/* 3BA00 80060600 8FBF0010 */ lw $ra, 0x10($sp) -/* 3BA04 80060604 03E00008 */ jr $ra -/* 3BA08 80060608 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/nusys/3B4A0/nuPiReadRomOverlay.s b/ver/us/asm/nonmatchings/os/nusys/3B4A0/nuPiReadRomOverlay.s deleted file mode 100644 index 6fcbc5e7e1..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/3B4A0/nuPiReadRomOverlay.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuPiReadRomOverlay -/* 3B4E0 800600E0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 3B4E4 800600E4 AFB40058 */ sw $s4, 0x58($sp) -/* 3B4E8 800600E8 0080A02D */ daddu $s4, $a0, $zero -/* 3B4EC 800600EC AFB5005C */ sw $s5, 0x5c($sp) -/* 3B4F0 800600F0 24150001 */ addiu $s5, $zero, 1 -/* 3B4F4 800600F4 AFB00048 */ sw $s0, 0x48($sp) -/* 3B4F8 800600F8 27B00028 */ addiu $s0, $sp, 0x28 -/* 3B4FC 800600FC 0200202D */ daddu $a0, $s0, $zero -/* 3B500 80060100 27A50040 */ addiu $a1, $sp, 0x40 -/* 3B504 80060104 02A0302D */ daddu $a2, $s5, $zero -/* 3B508 80060108 AFBF0060 */ sw $ra, 0x60($sp) -/* 3B50C 8006010C AFB30054 */ sw $s3, 0x54($sp) -/* 3B510 80060110 AFB20050 */ sw $s2, 0x50($sp) -/* 3B514 80060114 0C019560 */ jal osCreateMesgQueue -/* 3B518 80060118 AFB1004C */ sw $s1, 0x4c($sp) -/* 3B51C 8006011C A3A00012 */ sb $zero, 0x12($sp) -/* 3B520 80060120 AFB00014 */ sw $s0, 0x14($sp) -/* 3B524 80060124 8E840014 */ lw $a0, 0x14($s4) -/* 3B528 80060128 8E850018 */ lw $a1, 0x18($s4) -/* 3B52C 8006012C 0C0185C8 */ jal osInvalDCache -/* 3B530 80060130 00A42823 */ subu $a1, $a1, $a0 -/* 3B534 80060134 8E84000C */ lw $a0, 0xc($s4) -/* 3B538 80060138 8E850010 */ lw $a1, 0x10($s4) -/* 3B53C 8006013C 0C0185F4 */ jal osInvalICache -/* 3B540 80060140 00A42823 */ subu $a1, $a1, $a0 -/* 3B544 80060144 8E920000 */ lw $s2, ($s4) -/* 3B548 80060148 8E820004 */ lw $v0, 4($s4) -/* 3B54C 8006014C 8E930008 */ lw $s3, 8($s4) -/* 3B550 80060150 00528823 */ subu $s1, $v0, $s2 -/* 3B554 80060154 1220001C */ beqz $s1, .L800601C8 -/* 3B558 80060158 00000000 */ nop -.L8006015C: -/* 3B55C 8006015C 2E224001 */ sltiu $v0, $s1, 0x4001 -/* 3B560 80060160 14400002 */ bnez $v0, .L8006016C -/* 3B564 80060164 0220802D */ daddu $s0, $s1, $zero -/* 3B568 80060168 24104000 */ addiu $s0, $zero, 0x4000 -.L8006016C: -/* 3B56C 8006016C 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B570 80060170 3C04800A */ lui $a0, %hi(carthandle) -/* 3B574 80060174 8C84A638 */ lw $a0, %lo(carthandle)($a0) -/* 3B578 80060178 0000302D */ daddu $a2, $zero, $zero -/* 3B57C 8006017C AFB30018 */ sw $s3, 0x18($sp) -/* 3B580 80060180 AFB2001C */ sw $s2, 0x1c($sp) -/* 3B584 80060184 0C018388 */ jal osEPiStartDma -/* 3B588 80060188 AFB00020 */ sw $s0, 0x20($sp) -/* 3B58C 8006018C 12A00007 */ beqz $s5, .L800601AC -/* 3B590 80060190 27A40028 */ addiu $a0, $sp, 0x28 -/* 3B594 80060194 8E84001C */ lw $a0, 0x1c($s4) -/* 3B598 80060198 8E850020 */ lw $a1, 0x20($s4) -/* 3B59C 8006019C 0000A82D */ daddu $s5, $zero, $zero -/* 3B5A0 800601A0 0C01925C */ jal bzero -/* 3B5A4 800601A4 00A42823 */ subu $a1, $a1, $a0 -/* 3B5A8 800601A8 27A40028 */ addiu $a0, $sp, 0x28 -.L800601AC: -/* 3B5AC 800601AC 27A50040 */ addiu $a1, $sp, 0x40 -/* 3B5B0 800601B0 0C0195BC */ jal osRecvMesg -/* 3B5B4 800601B4 24060001 */ addiu $a2, $zero, 1 -/* 3B5B8 800601B8 02509021 */ addu $s2, $s2, $s0 -/* 3B5BC 800601BC 02308823 */ subu $s1, $s1, $s0 -/* 3B5C0 800601C0 1620FFE6 */ bnez $s1, .L8006015C -/* 3B5C4 800601C4 02709821 */ addu $s3, $s3, $s0 -.L800601C8: -/* 3B5C8 800601C8 8FBF0060 */ lw $ra, 0x60($sp) -/* 3B5CC 800601CC 8FB5005C */ lw $s5, 0x5c($sp) -/* 3B5D0 800601D0 8FB40058 */ lw $s4, 0x58($sp) -/* 3B5D4 800601D4 8FB30054 */ lw $s3, 0x54($sp) -/* 3B5D8 800601D8 8FB20050 */ lw $s2, 0x50($sp) -/* 3B5DC 800601DC 8FB1004C */ lw $s1, 0x4c($sp) -/* 3B5E0 800601E0 8FB00048 */ lw $s0, 0x48($sp) -/* 3B5E4 800601E4 03E00008 */ jr $ra -/* 3B5E8 800601E8 27BD0068 */ addiu $sp, $sp, 0x68 -/* 3B5EC 800601EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgr.s b/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgr.s deleted file mode 100644 index 07fbdf5e5e..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgr.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxTaskMgr -/* 7E40 8002CA40 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7E44 8002CA44 3C04800E */ lui $a0, %hi(D_800DAC90) -/* 7E48 8002CA48 2484AC90 */ addiu $a0, $a0, %lo(D_800DAC90) -/* 7E4C 8002CA4C 3C05800A */ lui $a1, %hi(D_8009E6D0) -/* 7E50 8002CA50 24A5E6D0 */ addiu $a1, $a1, %lo(D_8009E6D0) -/* 7E54 8002CA54 24060008 */ addiu $a2, $zero, 8 -/* 7E58 8002CA58 AFBF0028 */ sw $ra, 0x28($sp) -/* 7E5C 8002CA5C AFB30024 */ sw $s3, 0x24($sp) -/* 7E60 8002CA60 AFB20020 */ sw $s2, 0x20($sp) -/* 7E64 8002CA64 AFB1001C */ sw $s1, 0x1c($sp) -/* 7E68 8002CA68 0C019560 */ jal osCreateMesgQueue -/* 7E6C 8002CA6C AFB00018 */ sw $s0, 0x18($sp) -/* 7E70 8002CA70 24130004 */ addiu $s3, $zero, 4 -/* 7E74 8002CA74 24120008 */ addiu $s2, $zero, 8 -/* 7E78 8002CA78 3C11800A */ lui $s1, %hi(nuGfxDisplay) -/* 7E7C 8002CA7C 2631A5F8 */ addiu $s1, $s1, %lo(nuGfxDisplay) -/* 7E80 8002CA80 3C10800A */ lui $s0, %hi(nuGfxTaskSpool) -/* 7E84 8002CA84 2610A618 */ addiu $s0, $s0, %lo(nuGfxTaskSpool) -.L8002CA88: -/* 7E88 8002CA88 3C04800E */ lui $a0, %hi(D_800DAC90) -/* 7E8C 8002CA8C 2484AC90 */ addiu $a0, $a0, %lo(D_800DAC90) -/* 7E90 8002CA90 27A50010 */ addiu $a1, $sp, 0x10 -/* 7E94 8002CA94 0C0195BC */ jal osRecvMesg -/* 7E98 8002CA98 24060001 */ addiu $a2, $zero, 1 -/* 7E9C 8002CA9C 8FA40010 */ lw $a0, 0x10($sp) -/* 7EA0 8002CAA0 8C820054 */ lw $v0, 0x54($a0) -/* 7EA4 8002CAA4 84420000 */ lh $v0, ($v0) -/* 7EA8 8002CAA8 10530005 */ beq $v0, $s3, .L8002CAC0 -/* 7EAC 8002CAAC 00000000 */ nop -/* 7EB0 8002CAB0 10520012 */ beq $v0, $s2, .L8002CAFC -/* 7EB4 8002CAB4 00000000 */ nop -/* 7EB8 8002CAB8 0800B2A2 */ j .L8002CA88 -/* 7EBC 8002CABC 00000000 */ nop -.L8002CAC0: -/* 7EC0 8002CAC0 3C028007 */ lui $v0, %hi(D_800773F4) -/* 7EC4 8002CAC4 8C4273F4 */ lw $v0, %lo(D_800773F4)($v0) -/* 7EC8 8002CAC8 10400003 */ beqz $v0, .L8002CAD8 -/* 7ECC 8002CACC 00000000 */ nop -/* 7ED0 8002CAD0 0040F809 */ jalr $v0 -/* 7ED4 8002CAD4 00000000 */ nop -.L8002CAD8: -/* 7ED8 8002CAD8 8E220000 */ lw $v0, ($s1) -/* 7EDC 8002CADC 30420080 */ andi $v0, $v0, 0x80 -/* 7EE0 8002CAE0 1040000C */ beqz $v0, .L8002CB14 -/* 7EE4 8002CAE4 00000000 */ nop -/* 7EE8 8002CAE8 0C019CE0 */ jal osViBlack -/* 7EEC 8002CAEC 0000202D */ daddu $a0, $zero, $zero -/* 7EF0 8002CAF0 24020001 */ addiu $v0, $zero, 1 -/* 7EF4 8002CAF4 0800B2C5 */ j .L8002CB14 -/* 7EF8 8002CAF8 AE220000 */ sw $v0, ($s1) -.L8002CAFC: -/* 7EFC 8002CAFC 3C028007 */ lui $v0, %hi(D_800773F8) -/* 7F00 8002CB00 8C4273F8 */ lw $v0, %lo(D_800773F8)($v0) -/* 7F04 8002CB04 10400003 */ beqz $v0, .L8002CB14 -/* 7F08 8002CB08 00000000 */ nop -/* 7F0C 8002CB0C 0040F809 */ jalr $v0 -/* 7F10 8002CB10 00000000 */ nop -.L8002CB14: -/* 7F14 8002CB14 0C018250 */ jal osSetIntMask -/* 7F18 8002CB18 24040001 */ addiu $a0, $zero, 1 -/* 7F1C 8002CB1C 8E030000 */ lw $v1, ($s0) -/* 7F20 8002CB20 0040202D */ daddu $a0, $v0, $zero -/* 7F24 8002CB24 2463FFFF */ addiu $v1, $v1, -1 -/* 7F28 8002CB28 0C018250 */ jal osSetIntMask -/* 7F2C 8002CB2C AE030000 */ sw $v1, ($s0) -/* 7F30 8002CB30 0800B2A2 */ j .L8002CA88 -/* 7F34 8002CB34 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgrInit.s b/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgrInit.s deleted file mode 100644 index ee98b6d12e..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgrInit.s +++ /dev/null @@ -1,104 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxTaskMgrInit -/* 7F38 8002CB38 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 7F3C 8002CB3C 24020008 */ addiu $v0, $zero, 8 -/* 7F40 8002CB40 3C01800A */ lui $at, %hi(D_8009C514) -/* 7F44 8002CB44 A422C514 */ sh $v0, %lo(D_8009C514)($at) -/* 7F48 8002CB48 24020004 */ addiu $v0, $zero, 4 -/* 7F4C 8002CB4C 3C01800A */ lui $at, %hi(D_8009C516) -/* 7F50 8002CB50 A422C516 */ sh $v0, %lo(D_8009C516)($at) -/* 7F54 8002CB54 3C02800A */ lui $v0, %hi(nuGfxTaskSpool) -/* 7F58 8002CB58 2442A618 */ addiu $v0, $v0, %lo(nuGfxTaskSpool) -/* 7F5C 8002CB5C AFBF0038 */ sw $ra, 0x38($sp) -/* 7F60 8002CB60 AFB70034 */ sw $s7, 0x34($sp) -/* 7F64 8002CB64 AFB60030 */ sw $s6, 0x30($sp) -/* 7F68 8002CB68 AFB5002C */ sw $s5, 0x2c($sp) -/* 7F6C 8002CB6C AFB40028 */ sw $s4, 0x28($sp) -/* 7F70 8002CB70 AFB30024 */ sw $s3, 0x24($sp) -/* 7F74 8002CB74 AFB20020 */ sw $s2, 0x20($sp) -/* 7F78 8002CB78 AFB1001C */ sw $s1, 0x1c($sp) -/* 7F7C 8002CB7C AFB00018 */ sw $s0, 0x18($sp) -/* 7F80 8002CB80 AC400000 */ sw $zero, ($v0) -/* 7F84 8002CB84 0C017D00 */ jal nuGfxDisplayOff -/* 7F88 8002CB88 0000902D */ daddu $s2, $zero, $zero -/* 7F8C 8002CB8C 3C10800A */ lui $s0, %hi(D_8009C518) -/* 7F90 8002CB90 2610C518 */ addiu $s0, $s0, %lo(D_8009C518) -/* 7F94 8002CB94 0200202D */ daddu $a0, $s0, $zero -/* 7F98 8002CB98 24050005 */ addiu $a1, $zero, 5 -/* 7F9C 8002CB9C 3C068003 */ lui $a2, %hi(nuGfxTaskMgr) -/* 7FA0 8002CBA0 24C6CA40 */ addiu $a2, $a2, %lo(nuGfxTaskMgr) -/* 7FA4 8002CBA4 3C02800A */ lui $v0, %hi(D_8009E6D0) -/* 7FA8 8002CBA8 2442E6D0 */ addiu $v0, $v0, %lo(D_8009E6D0) -/* 7FAC 8002CBAC AFA20010 */ sw $v0, 0x10($sp) -/* 7FB0 8002CBB0 2402003C */ addiu $v0, $zero, 0x3c -/* 7FB4 8002CBB4 0000382D */ daddu $a3, $zero, $zero -/* 7FB8 8002CBB8 0C019798 */ jal osCreateThread -/* 7FBC 8002CBBC AFA20014 */ sw $v0, 0x14($sp) -/* 7FC0 8002CBC0 0C019808 */ jal osStartThread -/* 7FC4 8002CBC4 0200202D */ daddu $a0, $s0, $zero -/* 7FC8 8002CBC8 3C17800E */ lui $s7, %hi(D_800DAC90) -/* 7FCC 8002CBCC 26F7AC90 */ addiu $s7, $s7, %lo(D_800DAC90) -/* 7FD0 8002CBD0 24160001 */ addiu $s6, $zero, 1 -/* 7FD4 8002CBD4 3C13800E */ lui $s3, %hi(D_800D9780) -/* 7FD8 8002CBD8 26739780 */ addiu $s3, $s3, %lo(D_800D9780) -/* 7FDC 8002CBDC 24150100 */ addiu $s5, $zero, 0x100 -/* 7FE0 8002CBE0 24141000 */ addiu $s4, $zero, 0x1000 -/* 7FE4 8002CBE4 3C02800E */ lui $v0, %hi(D_800D9278) -/* 7FE8 8002CBE8 24429278 */ addiu $v0, $v0, %lo(D_800D9278) -/* 7FEC 8002CBEC 0040802D */ daddu $s0, $v0, $zero -/* 7FF0 8002CBF0 26110058 */ addiu $s1, $s0, 0x58 -.L8002CBF4: -/* 7FF4 8002CBF4 3C04B000 */ lui $a0, 0xb000 -/* 7FF8 8002CBF8 34840B70 */ ori $a0, $a0, 0xb70 -/* 7FFC 8002CBFC 3C05B000 */ lui $a1, 0xb000 -/* 8000 8002CC00 34A50C70 */ ori $a1, $a1, 0xc70 -/* 8004 8002CC04 0260302D */ daddu $a2, $s3, $zero -/* 8008 8002CC08 AE110000 */ sw $s1, ($s0) -/* 800C 8002CC0C AE170050 */ sw $s7, 0x50($s0) -/* 8010 8002CC10 AE160010 */ sw $s6, 0x10($s0) -/* 8014 8002CC14 0C00A5CF */ jal dma_copy -/* 8018 8002CC18 AE000014 */ sw $zero, 0x14($s0) -/* 801C 8002CC1C 24020800 */ addiu $v0, $zero, 0x800 -/* 8020 8002CC20 AE02002C */ sw $v0, 0x2c($s0) -/* 8024 8002CC24 3C02800E */ lui $v0, %hi(D_800DA040) -/* 8028 8002CC28 2442A040 */ addiu $v0, $v0, %lo(D_800DA040) -/* 802C 8002CC2C AE020030 */ sw $v0, 0x30($s0) -/* 8030 8002CC30 24020400 */ addiu $v0, $zero, 0x400 -/* 8034 8002CC34 AE020034 */ sw $v0, 0x34($s0) -/* 8038 8002CC38 3C02800C */ lui $v0, %hi(D_800B91D0) -/* 803C 8002CC3C 244291D0 */ addiu $v0, $v0, %lo(D_800B91D0) -/* 8040 8002CC40 AE020038 */ sw $v0, 0x38($s0) -/* 8044 8002CC44 3C02800E */ lui $v0, %hi(D_800D91D0) -/* 8048 8002CC48 244291D0 */ addiu $v0, $v0, %lo(D_800D91D0) -/* 804C 8002CC4C AE02003C */ sw $v0, 0x3c($s0) -/* 8050 8002CC50 3C02800C */ lui $v0, %hi(D_800B8590) -/* 8054 8002CC54 24428590 */ addiu $v0, $v0, %lo(D_800B8590) -/* 8058 8002CC58 AE020048 */ sw $v0, 0x48($s0) -/* 805C 8002CC5C 24020C10 */ addiu $v0, $zero, 0xc10 -/* 8060 8002CC60 AE130018 */ sw $s3, 0x18($s0) -/* 8064 8002CC64 AE15001C */ sw $s5, 0x1c($s0) -/* 8068 8002CC68 AE140024 */ sw $s4, 0x24($s0) -/* 806C 8002CC6C AE02004C */ sw $v0, 0x4c($s0) -/* 8070 8002CC70 26100058 */ addiu $s0, $s0, 0x58 -/* 8074 8002CC74 26520001 */ addiu $s2, $s2, 1 -/* 8078 8002CC78 2E42000A */ sltiu $v0, $s2, 0xa -/* 807C 8002CC7C 1440FFDD */ bnez $v0, .L8002CBF4 -/* 8080 8002CC80 26310058 */ addiu $s1, $s1, 0x58 -/* 8084 8002CC84 3C02800E */ lui $v0, %hi(D_800D9278) -/* 8088 8002CC88 24429278 */ addiu $v0, $v0, %lo(D_800D9278) -/* 808C 8002CC8C AC420318 */ sw $v0, 0x318($v0) -/* 8090 8002CC90 8FBF0038 */ lw $ra, 0x38($sp) -/* 8094 8002CC94 8FB70034 */ lw $s7, 0x34($sp) -/* 8098 8002CC98 8FB60030 */ lw $s6, 0x30($sp) -/* 809C 8002CC9C 8FB5002C */ lw $s5, 0x2c($sp) -/* 80A0 8002CCA0 8FB40028 */ lw $s4, 0x28($sp) -/* 80A4 8002CCA4 8FB30024 */ lw $s3, 0x24($sp) -/* 80A8 8002CCA8 8FB20020 */ lw $s2, 0x20($sp) -/* 80AC 8002CCAC 8FB1001C */ lw $s1, 0x1c($sp) -/* 80B0 8002CCB0 8FB00018 */ lw $s0, 0x18($sp) -/* 80B4 8002CCB4 3C01800A */ lui $at, %hi(D_8009C510) -/* 80B8 8002CCB8 AC22C510 */ sw $v0, %lo(D_8009C510)($at) -/* 80BC 8002CCBC 03E00008 */ jr $ra -/* 80C0 8002CCC0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskStart.s b/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskStart.s deleted file mode 100644 index 371e646ca9..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskStart.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxTaskStart -/* 80C4 8002CCC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 80C8 8002CCC8 3C0A800A */ lui $t2, %hi(D_8009C510) -/* 80CC 8002CCCC 254AC510 */ addiu $t2, $t2, %lo(D_8009C510) -/* 80D0 8002CCD0 00071402 */ srl $v0, $a3, 0x10 -/* 80D4 8002CCD4 AFBF0014 */ sw $ra, 0x14($sp) -/* 80D8 8002CCD8 AFB00010 */ sw $s0, 0x10($sp) -/* 80DC 8002CCDC 8D480000 */ lw $t0, ($t2) -/* 80E0 8002CCE0 000630C0 */ sll $a2, $a2, 3 -/* 80E4 8002CCE4 AD020014 */ sw $v0, 0x14($t0) -/* 80E8 8002CCE8 3C02800A */ lui $v0, %hi(D_8009A610) -/* 80EC 8002CCEC 8C42A610 */ lw $v0, %lo(D_8009A610)($v0) -/* 80F0 8002CCF0 3C0B800A */ lui $t3, %hi(D_8009A64C) -/* 80F4 8002CCF4 256BA64C */ addiu $t3, $t3, %lo(D_8009A64C) -/* 80F8 8002CCF8 AD040040 */ sw $a0, 0x40($t0) -/* 80FC 8002CCFC AD050044 */ sw $a1, 0x44($t0) -/* 8100 8002CD00 00C23021 */ addu $a2, $a2, $v0 -/* 8104 8002CD04 8CC20000 */ lw $v0, ($a2) -/* 8108 8002CD08 3C098007 */ lui $t1, %hi(D_800773FC) -/* 810C 8002CD0C 252973FC */ addiu $t1, $t1, %lo(D_800773FC) -/* 8110 8002CD10 AD020020 */ sw $v0, 0x20($t0) -/* 8114 8002CD14 8CC40004 */ lw $a0, 4($a2) -/* 8118 8002CD18 8D630000 */ lw $v1, ($t3) -/* 811C 8002CD1C 95250000 */ lhu $a1, ($t1) -/* 8120 8002CD20 30E2FFFF */ andi $v0, $a3, 0xffff -/* 8124 8002CD24 AD020008 */ sw $v0, 8($t0) -/* 8128 8002CD28 30A20004 */ andi $v0, $a1, 4 -/* 812C 8002CD2C AD03000C */ sw $v1, 0xc($t0) -/* 8130 8002CD30 10400006 */ beqz $v0, .L8002CD4C -/* 8134 8002CD34 AD040028 */ sw $a0, 0x28($t0) -/* 8138 8002CD38 8D020014 */ lw $v0, 0x14($t0) -/* 813C 8002CD3C 38A30004 */ xori $v1, $a1, 4 -/* 8140 8002CD40 A5230000 */ sh $v1, ($t1) -/* 8144 8002CD44 34420002 */ ori $v0, $v0, 2 -/* 8148 8002CD48 AD020014 */ sw $v0, 0x14($t0) -.L8002CD4C: -/* 814C 8002CD4C 30E20001 */ andi $v0, $a3, 1 -/* 8150 8002CD50 10400017 */ beqz $v0, .L8002CDB0 -/* 8154 8002CD54 A5270000 */ sh $a3, ($t1) -/* 8158 8002CD58 3C05800A */ lui $a1, %hi(D_8009A5F0) -/* 815C 8002CD5C 24A5A5F0 */ addiu $a1, $a1, %lo(D_8009A5F0) -/* 8160 8002CD60 8CA20000 */ lw $v0, ($a1) -/* 8164 8002CD64 3C038007 */ lui $v1, %hi(D_800773F0) -/* 8168 8002CD68 8C6373F0 */ lw $v1, %lo(D_800773F0)($v1) -/* 816C 8002CD6C 24420001 */ addiu $v0, $v0, 1 -/* 8170 8002CD70 14600002 */ bnez $v1, .L8002CD7C -/* 8174 8002CD74 0043001B */ divu $zero, $v0, $v1 -/* 8178 8002CD78 0007000D */ break 7 -.L8002CD7C: -/* 817C 8002CD7C 00002010 */ mfhi $a0 -/* 8180 8002CD80 8D430000 */ lw $v1, ($t2) -/* 8184 8002CD84 3C02800A */ lui $v0, %hi(D_8009C516) -/* 8188 8002CD88 2442C516 */ addiu $v0, $v0, %lo(D_8009C516) -/* 818C 8002CD8C AC620054 */ sw $v0, 0x54($v1) -/* 8190 8002CD90 3C03800A */ lui $v1, %hi(D_8009A658) -/* 8194 8002CD94 8C63A658 */ lw $v1, %lo(D_8009A658)($v1) -/* 8198 8002CD98 00041080 */ sll $v0, $a0, 2 -/* 819C 8002CD9C 00431021 */ addu $v0, $v0, $v1 -/* 81A0 8002CDA0 8C420000 */ lw $v0, ($v0) -/* 81A4 8002CDA4 ACA40000 */ sw $a0, ($a1) -/* 81A8 8002CDA8 0800B370 */ j .L8002CDC0 -/* 81AC 8002CDAC AD620000 */ sw $v0, ($t3) -.L8002CDB0: -/* 81B0 8002CDB0 8D430000 */ lw $v1, ($t2) -/* 81B4 8002CDB4 3C02800A */ lui $v0, %hi(D_8009C514) -/* 81B8 8002CDB8 2442C514 */ addiu $v0, $v0, %lo(D_8009C514) -/* 81BC 8002CDBC AC620054 */ sw $v0, 0x54($v1) -.L8002CDC0: -/* 81C0 8002CDC0 0C018250 */ jal osSetIntMask -/* 81C4 8002CDC4 24040001 */ addiu $a0, $zero, 1 -/* 81C8 8002CDC8 3C05800A */ lui $a1, %hi(nuGfxTaskSpool) -/* 81CC 8002CDCC 24A5A618 */ addiu $a1, $a1, %lo(nuGfxTaskSpool) -/* 81D0 8002CDD0 8CA30000 */ lw $v1, ($a1) -/* 81D4 8002CDD4 0040202D */ daddu $a0, $v0, $zero -/* 81D8 8002CDD8 24630001 */ addiu $v1, $v1, 1 -/* 81DC 8002CDDC 0C018250 */ jal osSetIntMask -/* 81E0 8002CDE0 ACA30000 */ sw $v1, ($a1) -/* 81E4 8002CDE4 0C018634 */ jal osWritebackDCacheAll -/* 81E8 8002CDE8 00000000 */ nop -/* 81EC 8002CDEC 3C04800E */ lui $a0, %hi(D_800DA47C) -/* 81F0 8002CDF0 2484A47C */ addiu $a0, $a0, %lo(D_800DA47C) -/* 81F4 8002CDF4 3C10800A */ lui $s0, %hi(D_8009C510) -/* 81F8 8002CDF8 2610C510 */ addiu $s0, $s0, %lo(D_8009C510) -/* 81FC 8002CDFC 8E050000 */ lw $a1, ($s0) -/* 8200 8002CE00 0C019608 */ jal osSendMesg -/* 8204 8002CE04 24060001 */ addiu $a2, $zero, 1 -/* 8208 8002CE08 8E020000 */ lw $v0, ($s0) -/* 820C 8002CE0C 8C420000 */ lw $v0, ($v0) -/* 8210 8002CE10 AE020000 */ sw $v0, ($s0) -/* 8214 8002CE14 8FBF0014 */ lw $ra, 0x14($sp) -/* 8218 8002CE18 8FB00010 */ lw $s0, 0x10($sp) -/* 821C 8002CE1C 03E00008 */ jr $ra -/* 8220 8002CE20 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8224 8002CE24 00000000 */ nop -/* 8228 8002CE28 00000000 */ nop -/* 822C 8002CE2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/contQuery.s b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contQuery.s similarity index 89% rename from ver/us/asm/nonmatchings/os/nuContMgr/contQuery.s rename to ver/us/asm/nonmatchings/os/nusys/nuContMgr/contQuery.s index 956a5d1a38..6ddf828207 100644 --- a/ver/us/asm/nonmatchings/os/nuContMgr/contQuery.s +++ b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contQuery.s @@ -14,9 +14,9 @@ glabel contQuery /* 3BC94 80060894 0000282D */ daddu $a1, $zero, $zero /* 3BC98 80060898 0C0195BC */ jal osRecvMesg /* 3BC9C 8006089C 24060001 */ addiu $a2, $zero, 1 -/* 3BCA0 800608A0 3C04800B */ lui $a0, %hi(D_800B1B7C) +/* 3BCA0 800608A0 3C04800B */ lui $a0, %hi(nuContStatus) /* 3BCA4 800608A4 0C018660 */ jal osContGetQuery -/* 3BCA8 800608A8 24841B7C */ addiu $a0, $a0, %lo(D_800B1B7C) +/* 3BCA8 800608A8 24841B7C */ addiu $a0, $a0, %lo(nuContStatus) /* 3BCAC 800608AC 0000102D */ daddu $v0, $zero, $zero .L800608B0: /* 3BCB0 800608B0 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/contReadData.s b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contReadData.s similarity index 85% rename from ver/us/asm/nonmatchings/os/nuContMgr/contReadData.s rename to ver/us/asm/nonmatchings/os/nusys/nuContMgr/contReadData.s index 86f626d3b8..30d4d52b8a 100644 --- a/ver/us/asm/nonmatchings/os/nuContMgr/contReadData.s +++ b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contReadData.s @@ -16,15 +16,15 @@ glabel contReadData /* 3BB64 80060764 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BB68 80060768 0C0195BC */ jal osRecvMesg /* 3BB6C 8006076C 24060001 */ addiu $a2, $zero, 1 -/* 3BB70 80060770 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BB74 80060774 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) +/* 3BB70 80060770 3C04800E */ lui $a0, %hi(nuContDataMutexQ) +/* 3BB74 80060774 2484C040 */ addiu $a0, $a0, %lo(nuContDataMutexQ) /* 3BB78 80060778 0000282D */ daddu $a1, $zero, $zero /* 3BB7C 8006077C 0C019608 */ jal osSendMesg /* 3BB80 80060780 24060001 */ addiu $a2, $zero, 1 /* 3BB84 80060784 0C01868A */ jal osContGetReadData /* 3BB88 80060788 0200202D */ daddu $a0, $s0, $zero -/* 3BB8C 8006078C 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BB90 80060790 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) +/* 3BB8C 8006078C 3C04800E */ lui $a0, %hi(nuContDataMutexQ) +/* 3BB90 80060790 2484C040 */ addiu $a0, $a0, %lo(nuContDataMutexQ) /* 3BB94 80060794 0000282D */ daddu $a1, $zero, $zero /* 3BB98 80060798 0C0195BC */ jal osRecvMesg /* 3BB9C 8006079C 24060001 */ addiu $a2, $zero, 1 diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/contReadNW.s b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contReadNW.s similarity index 85% rename from ver/us/asm/nonmatchings/os/nuContMgr/contReadNW.s rename to ver/us/asm/nonmatchings/os/nusys/nuContMgr/contReadNW.s index 8ae4258c43..ea04e342ed 100644 --- a/ver/us/asm/nonmatchings/os/nuContMgr/contReadNW.s +++ b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contReadNW.s @@ -5,8 +5,8 @@ glabel contReadNW /* 3BBB4 800607B4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3BBB8 800607B8 AFB00010 */ sw $s0, 0x10($sp) /* 3BBBC 800607BC 0080802D */ daddu $s0, $a0, $zero -/* 3BBC0 800607C0 3C04800B */ lui $a0, %hi(D_800B0EB8) -/* 3BBC4 800607C4 24840EB8 */ addiu $a0, $a0, %lo(D_800B0EB8) +/* 3BBC0 800607C0 3C04800B */ lui $a0, %hi(nuContWaitMesgQ) +/* 3BBC4 800607C4 24840EB8 */ addiu $a0, $a0, %lo(nuContWaitMesgQ) /* 3BBC8 800607C8 0000282D */ daddu $a1, $zero, $zero /* 3BBCC 800607CC AFBF0014 */ sw $ra, 0x14($sp) /* 3BBD0 800607D0 0C0195BC */ jal osRecvMesg @@ -21,16 +21,16 @@ glabel contReadNW /* 3BBF4 800607F4 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BBF8 800607F8 0C0195BC */ jal osRecvMesg /* 3BBFC 800607FC 24060001 */ addiu $a2, $zero, 1 -/* 3BC00 80060800 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BC04 80060804 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) +/* 3BC00 80060800 3C04800E */ lui $a0, %hi(nuContDataMutexQ) +/* 3BC04 80060804 2484C040 */ addiu $a0, $a0, %lo(nuContDataMutexQ) /* 3BC08 80060808 0000282D */ daddu $a1, $zero, $zero /* 3BC0C 8006080C 0C019608 */ jal osSendMesg /* 3BC10 80060810 24060001 */ addiu $a2, $zero, 1 /* 3BC14 80060814 3C04800B */ lui $a0, %hi(nuContData) /* 3BC18 80060818 0C01868A */ jal osContGetReadData /* 3BC1C 8006081C 24841D68 */ addiu $a0, $a0, %lo(nuContData) -/* 3BC20 80060820 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BC24 80060824 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) +/* 3BC20 80060820 3C04800E */ lui $a0, %hi(nuContDataMutexQ) +/* 3BC24 80060824 2484C040 */ addiu $a0, $a0, %lo(nuContDataMutexQ) /* 3BC28 80060828 0000282D */ daddu $a1, $zero, $zero /* 3BC2C 8006082C 0C0195BC */ jal osRecvMesg /* 3BC30 80060830 24060001 */ addiu $a2, $zero, 1 diff --git a/ver/us/asm/nonmatchings/os/nuContMgr/contRetrace.s b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contRetrace.s similarity index 75% rename from ver/us/asm/nonmatchings/os/nuContMgr/contRetrace.s rename to ver/us/asm/nonmatchings/os/nusys/nuContMgr/contRetrace.s index 9d7a3c73be..53c590099f 100644 --- a/ver/us/asm/nonmatchings/os/nuContMgr/contRetrace.s +++ b/ver/us/asm/nonmatchings/os/nusys/nuContMgr/contRetrace.s @@ -2,15 +2,15 @@ .set noreorder # don't insert nops after branches glabel contRetrace -/* 3BA5C 8006065C 3C02800A */ lui $v0, %hi(D_8009A5E0) -/* 3BA60 80060660 8C42A5E0 */ lw $v0, %lo(D_8009A5E0)($v0) +/* 3BA5C 8006065C 3C02800A */ lui $v0, %hi(nuContDataLockKey) +/* 3BA60 80060660 8C42A5E0 */ lw $v0, %lo(nuContDataLockKey)($v0) /* 3BA64 80060664 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3BA68 80060668 AFB00010 */ sw $s0, 0x10($sp) /* 3BA6C 8006066C 0080802D */ daddu $s0, $a0, $zero /* 3BA70 80060670 1440002C */ bnez $v0, .L80060724 /* 3BA74 80060674 AFBF0014 */ sw $ra, 0x14($sp) -/* 3BA78 80060678 3C04800B */ lui $a0, %hi(D_800B0EB8) -/* 3BA7C 8006067C 24840EB8 */ addiu $a0, $a0, %lo(D_800B0EB8) +/* 3BA78 80060678 3C04800B */ lui $a0, %hi(nuContWaitMesgQ) +/* 3BA7C 8006067C 24840EB8 */ addiu $a0, $a0, %lo(nuContWaitMesgQ) /* 3BA80 80060680 0000282D */ daddu $a1, $zero, $zero /* 3BA84 80060684 0C0195BC */ jal osRecvMesg /* 3BA88 80060688 00A0302D */ daddu $a2, $a1, $zero @@ -24,20 +24,20 @@ glabel contRetrace /* 3BAA8 800606A8 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BAAC 800606AC 0C0195BC */ jal osRecvMesg /* 3BAB0 800606B0 24060001 */ addiu $a2, $zero, 1 -/* 3BAB4 800606B4 3C02800A */ lui $v0, %hi(D_8009A5E0) -/* 3BAB8 800606B8 8C42A5E0 */ lw $v0, %lo(D_8009A5E0)($v0) +/* 3BAB4 800606B4 3C02800A */ lui $v0, %hi(nuContDataLockKey) +/* 3BAB8 800606B8 8C42A5E0 */ lw $v0, %lo(nuContDataLockKey)($v0) /* 3BABC 800606BC 30420001 */ andi $v0, $v0, 1 /* 3BAC0 800606C0 1440000D */ bnez $v0, .L800606F8 /* 3BAC4 800606C4 0000282D */ daddu $a1, $zero, $zero -/* 3BAC8 800606C8 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BACC 800606CC 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) +/* 3BAC8 800606C8 3C04800E */ lui $a0, %hi(nuContDataMutexQ) +/* 3BACC 800606CC 2484C040 */ addiu $a0, $a0, %lo(nuContDataMutexQ) /* 3BAD0 800606D0 0C019608 */ jal osSendMesg /* 3BAD4 800606D4 24060001 */ addiu $a2, $zero, 1 /* 3BAD8 800606D8 3C04800B */ lui $a0, %hi(nuContData) /* 3BADC 800606DC 0C01868A */ jal osContGetReadData /* 3BAE0 800606E0 24841D68 */ addiu $a0, $a0, %lo(nuContData) -/* 3BAE4 800606E4 3C04800E */ lui $a0, %hi(D_800DC040) -/* 3BAE8 800606E8 2484C040 */ addiu $a0, $a0, %lo(D_800DC040) +/* 3BAE4 800606E4 3C04800E */ lui $a0, %hi(nuContDataMutexQ) +/* 3BAE8 800606E8 2484C040 */ addiu $a0, $a0, %lo(nuContDataMutexQ) /* 3BAEC 800606EC 0000282D */ daddu $a1, $zero, $zero /* 3BAF0 800606F0 0C0195BC */ jal osRecvMesg /* 3BAF4 800606F4 24060001 */ addiu $a2, $zero, 1 @@ -49,8 +49,8 @@ glabel contRetrace /* 3BB08 80060708 0040F809 */ jalr $v0 /* 3BB0C 8006070C 86040000 */ lh $a0, ($s0) .L80060710: -/* 3BB10 80060710 3C04800B */ lui $a0, %hi(D_800B0EB8) -/* 3BB14 80060714 24840EB8 */ addiu $a0, $a0, %lo(D_800B0EB8) +/* 3BB10 80060710 3C04800B */ lui $a0, %hi(nuContWaitMesgQ) +/* 3BB14 80060714 24840EB8 */ addiu $a0, $a0, %lo(nuContWaitMesgQ) /* 3BB18 80060718 0000282D */ daddu $a1, $zero, $zero /* 3BB1C 8006071C 0C019608 */ jal osSendMesg /* 3BB20 80060720 00A0302D */ daddu $a2, $a1, $zero diff --git a/ver/us/asm/nonmatchings/os/nusys/nuContRmbModeSet/nuContRmbModeSet.s b/ver/us/asm/nonmatchings/os/nusys/nuContRmbModeSet/nuContRmbModeSet.s deleted file mode 100644 index ad35443cf6..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuContRmbModeSet/nuContRmbModeSet.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContRmbModeSet -/* 3B390 8005FF90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3B394 8005FF94 AFB00010 */ sw $s0, 0x10($sp) -/* 3B398 8005FF98 0080802D */ daddu $s0, $a0, $zero -/* 3B39C 8005FF9C AFB10014 */ sw $s1, 0x14($sp) -/* 3B3A0 8005FFA0 00A0882D */ daddu $s1, $a1, $zero -/* 3B3A4 8005FFA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 3B3A8 8005FFA8 0C018250 */ jal osSetIntMask -/* 3B3AC 8005FFAC 24040001 */ addiu $a0, $zero, 1 -/* 3B3B0 8005FFB0 0220202D */ daddu $a0, $s1, $zero -/* 3B3B4 8005FFB4 00101880 */ sll $v1, $s0, 2 -/* 3B3B8 8005FFB8 00701821 */ addu $v1, $v1, $s0 -/* 3B3BC 8005FFBC 00032840 */ sll $a1, $v1, 1 -/* 3B3C0 8005FFC0 3C03800B */ lui $v1, %hi(D_800B1D47) -/* 3B3C4 8005FFC4 00651821 */ addu $v1, $v1, $a1 -/* 3B3C8 8005FFC8 90631D47 */ lbu $v1, %lo(D_800B1D47)($v1) -/* 3B3CC 8005FFCC 308400FF */ andi $a0, $a0, 0xff -/* 3B3D0 8005FFD0 30660080 */ andi $a2, $v1, 0x80 -/* 3B3D4 8005FFD4 24030001 */ addiu $v1, $zero, 1 -/* 3B3D8 8005FFD8 1083000C */ beq $a0, $v1, .L8006000C -/* 3B3DC 8005FFDC 0040382D */ daddu $a3, $v0, $zero -/* 3B3E0 8005FFE0 28820002 */ slti $v0, $a0, 2 -/* 3B3E4 8005FFE4 10400005 */ beqz $v0, .L8005FFFC -/* 3B3E8 8005FFE8 24020002 */ addiu $v0, $zero, 2 -/* 3B3EC 8005FFEC 1080000D */ beqz $a0, .L80060024 -/* 3B3F0 8005FFF0 02261025 */ or $v0, $s1, $a2 -/* 3B3F4 8005FFF4 0801801E */ j .L80060078 -/* 3B3F8 8005FFF8 00000000 */ nop -.L8005FFFC: -/* 3B3FC 8005FFFC 1082000E */ beq $a0, $v0, .L80060038 -/* 3B400 80060000 02261025 */ or $v0, $s1, $a2 -/* 3B404 80060004 0801801E */ j .L80060078 -/* 3B408 80060008 00000000 */ nop -.L8006000C: -/* 3B40C 8006000C 3C03800B */ lui $v1, %hi(D_800B1D49) -/* 3B410 80060010 00651821 */ addu $v1, $v1, $a1 -/* 3B414 80060014 90631D49 */ lbu $v1, %lo(D_800B1D49)($v1) -/* 3B418 80060018 24020002 */ addiu $v0, $zero, 2 -/* 3B41C 8006001C 14620016 */ bne $v1, $v0, .L80060078 -/* 3B420 80060020 02261025 */ or $v0, $s1, $a2 -.L80060024: -/* 3B424 80060024 3C01800B */ lui $at, %hi(D_800B1D47) -/* 3B428 80060028 00250821 */ addu $at, $at, $a1 -/* 3B42C 8006002C A0221D47 */ sb $v0, %lo(D_800B1D47)($at) -/* 3B430 80060030 0801801E */ j .L80060078 -/* 3B434 80060034 00000000 */ nop -.L80060038: -/* 3B438 80060038 3C01800B */ lui $at, %hi(D_800B1D47) -/* 3B43C 8006003C 00250821 */ addu $at, $at, $a1 -/* 3B440 80060040 A0221D47 */ sb $v0, %lo(D_800B1D47)($at) -/* 3B444 80060044 3C02800B */ lui $v0, %hi(D_800B1D49) -/* 3B448 80060048 00451021 */ addu $v0, $v0, $a1 -/* 3B44C 8006004C 90421D49 */ lbu $v0, %lo(D_800B1D49)($v0) -/* 3B450 80060050 14440006 */ bne $v0, $a0, .L8006006C -/* 3B454 80060054 00000000 */ nop -/* 3B458 80060058 3C01800B */ lui $at, %hi(D_800B1D48) -/* 3B45C 8006005C 00250821 */ addu $at, $at, $a1 -/* 3B460 80060060 A0231D48 */ sb $v1, %lo(D_800B1D48)($at) -/* 3B464 80060064 0801801E */ j .L80060078 -/* 3B468 80060068 00000000 */ nop -.L8006006C: -/* 3B46C 8006006C 3C01800B */ lui $at, %hi(D_800B1D48) -/* 3B470 80060070 00250821 */ addu $at, $at, $a1 -/* 3B474 80060074 A0201D48 */ sb $zero, %lo(D_800B1D48)($at) -.L80060078: -/* 3B478 80060078 0C018250 */ jal osSetIntMask -/* 3B47C 8006007C 00E0202D */ daddu $a0, $a3, $zero -/* 3B480 80060080 8FBF0018 */ lw $ra, 0x18($sp) -/* 3B484 80060084 8FB10014 */ lw $s1, 0x14($sp) -/* 3B488 80060088 8FB00010 */ lw $s0, 0x10($sp) -/* 3B48C 8006008C 03E00008 */ jr $ra -/* 3B490 80060090 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3B494 80060094 00000000 */ nop -/* 3B498 80060098 00000000 */ nop -/* 3B49C 8006009C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s b/ver/us/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s deleted file mode 100644 index 7df5cb32f5..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxSetCfb -/* 3A6F0 8005F2F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3A6F4 8005F2F4 AFB10014 */ sw $s1, 0x14($sp) -/* 3A6F8 8005F2F8 00A0882D */ daddu $s1, $a1, $zero -/* 3A6FC 8005F2FC AFBF0018 */ sw $ra, 0x18($sp) -/* 3A700 8005F300 AFB00010 */ sw $s0, 0x10($sp) -/* 3A704 8005F304 3C01800A */ lui $at, %hi(D_8009A658) -/* 3A708 8005F308 AC24A658 */ sw $a0, %lo(D_8009A658)($at) -/* 3A70C 8005F30C 3C018007 */ lui $at, %hi(D_800773F0) -/* 3A710 8005F310 AC3173F0 */ sw $s1, %lo(D_800773F0)($at) -/* 3A714 8005F314 3C01800A */ lui $at, %hi(D_8009A5F0) -/* 3A718 8005F318 AC20A5F0 */ sw $zero, %lo(D_8009A5F0)($at) -/* 3A71C 8005F31C 8C820000 */ lw $v0, ($a0) -/* 3A720 8005F320 3C01800A */ lui $at, %hi(D_8009A64C) -/* 3A724 8005F324 AC22A64C */ sw $v0, %lo(D_8009A64C)($at) -/* 3A728 8005F328 0C0180DC */ jal nuGfxRetraceWait -/* 3A72C 8005F32C 24040001 */ addiu $a0, $zero, 1 -/* 3A730 8005F330 0C017BE4 */ jal nuScSetFrameBufferNum -/* 3A734 8005F334 322400FF */ andi $a0, $s1, 0xff -/* 3A738 8005F338 2E220002 */ sltiu $v0, $s1, 2 -/* 3A73C 8005F33C 1440002A */ bnez $v0, .L8005F3E8 -/* 3A740 8005F340 2625FFFF */ addiu $a1, $s1, -1 -/* 3A744 8005F344 10A0000B */ beqz $a1, .L8005F374 -/* 3A748 8005F348 0000802D */ daddu $s0, $zero, $zero -/* 3A74C 8005F34C 3C04800A */ lui $a0, %hi(D_8009A658) -/* 3A750 8005F350 8C84A658 */ lw $a0, %lo(D_8009A658)($a0) -.L8005F354: -/* 3A754 8005F354 8C830000 */ lw $v1, ($a0) -/* 3A758 8005F358 8C820004 */ lw $v0, 4($a0) -/* 3A75C 8005F35C 14620006 */ bne $v1, $v0, .L8005F378 -/* 3A760 8005F360 2622FFFF */ addiu $v0, $s1, -1 -/* 3A764 8005F364 26100001 */ addiu $s0, $s0, 1 -/* 3A768 8005F368 0205102B */ sltu $v0, $s0, $a1 -/* 3A76C 8005F36C 1440FFF9 */ bnez $v0, .L8005F354 -/* 3A770 8005F370 24840004 */ addiu $a0, $a0, 4 -.L8005F374: -/* 3A774 8005F374 2622FFFF */ addiu $v0, $s1, -1 -.L8005F378: -/* 3A778 8005F378 1602000C */ bne $s0, $v0, .L8005F3AC -/* 3A77C 8005F37C 00000000 */ nop -/* 3A780 8005F380 0C017BE4 */ jal nuScSetFrameBufferNum -/* 3A784 8005F384 24040001 */ addiu $a0, $zero, 1 -/* 3A788 8005F388 08017CFA */ j .L8005F3E8 -/* 3A78C 8005F38C 00000000 */ nop -.L8005F390: -/* 3A790 8005F390 8C820000 */ lw $v0, ($a0) -/* 3A794 8005F394 3C01800A */ lui $at, %hi(D_8009A5F0) -/* 3A798 8005F398 AC30A5F0 */ sw $s0, %lo(D_8009A5F0)($at) -/* 3A79C 8005F39C 3C01800A */ lui $at, %hi(D_8009A64C) -/* 3A7A0 8005F3A0 AC22A64C */ sw $v0, %lo(D_8009A64C)($at) -/* 3A7A4 8005F3A4 08017CFA */ j .L8005F3E8 -/* 3A7A8 8005F3A8 00000000 */ nop -.L8005F3AC: -/* 3A7AC 8005F3AC 1220000E */ beqz $s1, .L8005F3E8 -/* 3A7B0 8005F3B0 0000802D */ daddu $s0, $zero, $zero -.L8005F3B4: -/* 3A7B4 8005F3B4 0C019A6C */ jal osViGetCurrentFramebuffer -/* 3A7B8 8005F3B8 00000000 */ nop -/* 3A7BC 8005F3BC 3C03800A */ lui $v1, %hi(D_8009A658) -/* 3A7C0 8005F3C0 8C63A658 */ lw $v1, %lo(D_8009A658)($v1) -/* 3A7C4 8005F3C4 00102080 */ sll $a0, $s0, 2 -/* 3A7C8 8005F3C8 00832021 */ addu $a0, $a0, $v1 -/* 3A7CC 8005F3CC 8C830000 */ lw $v1, ($a0) -/* 3A7D0 8005F3D0 1443FFEF */ bne $v0, $v1, .L8005F390 -/* 3A7D4 8005F3D4 00000000 */ nop -/* 3A7D8 8005F3D8 26100001 */ addiu $s0, $s0, 1 -/* 3A7DC 8005F3DC 0211102B */ sltu $v0, $s0, $s1 -/* 3A7E0 8005F3E0 1440FFF4 */ bnez $v0, .L8005F3B4 -/* 3A7E4 8005F3E4 00000000 */ nop -.L8005F3E8: -/* 3A7E8 8005F3E8 8FBF0018 */ lw $ra, 0x18($sp) -/* 3A7EC 8005F3EC 8FB10014 */ lw $s1, 0x14($sp) -/* 3A7F0 8005F3F0 8FB00010 */ lw $s0, 0x10($sp) -/* 3A7F4 8005F3F4 03E00008 */ jr $ra -/* 3A7F8 8005F3F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3A7FC 8005F3FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nusys/nuGfxThread/nuGfxThread2.s b/ver/us/asm/nonmatchings/os/nusys/nuGfxThread/nuGfxThread2.s deleted file mode 100644 index d656ea144f..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuGfxThread/nuGfxThread2.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxThread2 -/* 3B648 80060248 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 3B64C 8006024C AFB00028 */ sw $s0, 0x28($sp) -/* 3B650 80060250 3C10800B */ lui $s0, %hi(D_800B42F0) -/* 3B654 80060254 261042F0 */ addiu $s0, $s0, %lo(D_800B42F0) -/* 3B658 80060258 0200202D */ daddu $a0, $s0, $zero -/* 3B65C 8006025C 3C05800B */ lui $a1, %hi(D_800AC6B0) -/* 3B660 80060260 24A5C6B0 */ addiu $a1, $a1, %lo(D_800AC6B0) -/* 3B664 80060264 24060008 */ addiu $a2, $zero, 8 -/* 3B668 80060268 AFBF0030 */ sw $ra, 0x30($sp) -/* 3B66C 8006026C 0C019560 */ jal osCreateMesgQueue -/* 3B670 80060270 AFB1002C */ sw $s1, 0x2c($sp) -/* 3B674 80060274 27A40010 */ addiu $a0, $sp, 0x10 -/* 3B678 80060278 0200282D */ daddu $a1, $s0, $zero -/* 3B67C 8006027C 0C017B8C */ jal nuScAddClient -/* 3B680 80060280 24060003 */ addiu $a2, $zero, 3 -/* 3B684 80060284 24110001 */ addiu $s1, $zero, 1 -/* 3B688 80060288 24100002 */ addiu $s0, $zero, 2 -.L8006028C: -/* 3B68C 8006028C 3C04800B */ lui $a0, %hi(D_800B42F0) -/* 3B690 80060290 248442F0 */ addiu $a0, $a0, %lo(D_800B42F0) -/* 3B694 80060294 27A50020 */ addiu $a1, $sp, 0x20 -/* 3B698 80060298 0C0195BC */ jal osRecvMesg -/* 3B69C 8006029C 24060001 */ addiu $a2, $zero, 1 -/* 3B6A0 800602A0 8FA20020 */ lw $v0, 0x20($sp) -/* 3B6A4 800602A4 84420000 */ lh $v0, ($v0) -/* 3B6A8 800602A8 10510005 */ beq $v0, $s1, .L800602C0 -/* 3B6AC 800602AC 00000000 */ nop -/* 3B6B0 800602B0 1050000D */ beq $v0, $s0, .L800602E8 -/* 3B6B4 800602B4 00000000 */ nop -/* 3B6B8 800602B8 080180A3 */ j .L8006028C -/* 3B6BC 800602BC 00000000 */ nop -.L800602C0: -/* 3B6C0 800602C0 3C028009 */ lui $v0, %hi(nuGfxFunc) -/* 3B6C4 800602C4 8C423D10 */ lw $v0, %lo(nuGfxFunc)($v0) -/* 3B6C8 800602C8 1040FFF0 */ beqz $v0, .L8006028C -/* 3B6CC 800602CC 00000000 */ nop -/* 3B6D0 800602D0 3C04800A */ lui $a0, %hi(nuGfxTaskSpool) -/* 3B6D4 800602D4 8C84A618 */ lw $a0, %lo(nuGfxTaskSpool)($a0) -/* 3B6D8 800602D8 0040F809 */ jalr $v0 -/* 3B6DC 800602DC 00000000 */ nop -/* 3B6E0 800602E0 080180A3 */ j .L8006028C -/* 3B6E4 800602E4 00000000 */ nop -.L800602E8: -/* 3B6E8 800602E8 3C028009 */ lui $v0, %hi(nuGfxPreNMIFunc) -/* 3B6EC 800602EC 8C423D14 */ lw $v0, %lo(nuGfxPreNMIFunc)($v0) -/* 3B6F0 800602F0 1040FFE6 */ beqz $v0, .L8006028C -/* 3B6F4 800602F4 00000000 */ nop -/* 3B6F8 800602F8 0040F809 */ jalr $v0 -/* 3B6FC 800602FC 00000000 */ nop -/* 3B700 80060300 080180A3 */ j .L8006028C -/* 3B704 80060304 00000000 */ nop -/* 3B708 80060308 00000000 */ nop -/* 3B70C 8006030C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrInit.s b/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrInit.s deleted file mode 100644 index 412a9fe0b1..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrInit.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuSiMgrInit -/* 8230 8002CE30 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8234 8002CE34 AFB00030 */ sw $s0, 0x30($sp) -/* 8238 8002CE38 3C10800E */ lui $s0, %hi(nuSiMesgQ) -/* 823C 8002CE3C 2610AC78 */ addiu $s0, $s0, %lo(nuSiMesgQ) -/* 8240 8002CE40 0200202D */ daddu $a0, $s0, $zero -/* 8244 8002CE44 3C05800A */ lui $a1, %hi(D_8009E6F0) -/* 8248 8002CE48 24A5E6F0 */ addiu $a1, $a1, %lo(D_8009E6F0) -/* 824C 8002CE4C AFBF0034 */ sw $ra, 0x34($sp) -/* 8250 8002CE50 0C019560 */ jal osCreateMesgQueue -/* 8254 8002CE54 24060008 */ addiu $a2, $zero, 8 -/* 8258 8002CE58 24040005 */ addiu $a0, $zero, 5 -/* 825C 8002CE5C 0200282D */ daddu $a1, $s0, $zero -/* 8260 8002CE60 0C019654 */ jal osSetEventMesg -/* 8264 8002CE64 0000302D */ daddu $a2, $zero, $zero -/* 8268 8002CE68 0200202D */ daddu $a0, $s0, $zero -/* 826C 8002CE6C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8270 8002CE70 0C0186E0 */ jal osContInit -/* 8274 8002CE74 27A60018 */ addiu $a2, $sp, 0x18 -/* 8278 8002CE78 0000182D */ daddu $v1, $zero, $zero -/* 827C 8002CE7C 24070005 */ addiu $a3, $zero, 5 -/* 8280 8002CE80 24060001 */ addiu $a2, $zero, 1 -/* 8284 8002CE84 27A40018 */ addiu $a0, $sp, 0x18 -.L8002CE88: -/* 8288 8002CE88 93A50028 */ lbu $a1, 0x28($sp) -/* 828C 8002CE8C 00651007 */ srav $v0, $a1, $v1 -/* 8290 8002CE90 30420001 */ andi $v0, $v0, 1 -/* 8294 8002CE94 5040000D */ beql $v0, $zero, .L8002CECC -/* 8298 8002CE98 24630001 */ addiu $v1, $v1, 1 -/* 829C 8002CE9C 90820003 */ lbu $v0, 3($a0) -/* 82A0 8002CEA0 5440000A */ bnel $v0, $zero, .L8002CECC -/* 82A4 8002CEA4 24630001 */ addiu $v1, $v1, 1 -/* 82A8 8002CEA8 94820000 */ lhu $v0, ($a0) -/* 82AC 8002CEAC 30421F07 */ andi $v0, $v0, 0x1f07 -/* 82B0 8002CEB0 50470006 */ beql $v0, $a3, .L8002CECC -/* 82B4 8002CEB4 24630001 */ addiu $v1, $v1, 1 -/* 82B8 8002CEB8 00661004 */ sllv $v0, $a2, $v1 -/* 82BC 8002CEBC 00021027 */ nor $v0, $zero, $v0 -/* 82C0 8002CEC0 00A21024 */ and $v0, $a1, $v0 -/* 82C4 8002CEC4 A3A20028 */ sb $v0, 0x28($sp) -/* 82C8 8002CEC8 24630001 */ addiu $v1, $v1, 1 -.L8002CECC: -/* 82CC 8002CECC 2C620004 */ sltiu $v0, $v1, 4 -/* 82D0 8002CED0 1440FFED */ bnez $v0, .L8002CE88 -/* 82D4 8002CED4 24840004 */ addiu $a0, $a0, 4 -/* 82D8 8002CED8 3C10800A */ lui $s0, %hi(D_8009E710) -/* 82DC 8002CEDC 2610E710 */ addiu $s0, $s0, %lo(D_8009E710) -/* 82E0 8002CEE0 0200202D */ daddu $a0, $s0, $zero -/* 82E4 8002CEE4 24050006 */ addiu $a1, $zero, 6 -/* 82E8 8002CEE8 3C068003 */ lui $a2, %hi(nuSiMgrThread) -/* 82EC 8002CEEC 24C6CFD0 */ addiu $a2, $a2, %lo(nuSiMgrThread) -/* 82F0 8002CEF0 3C02800A */ lui $v0, %hi(D_800A08C0) -/* 82F4 8002CEF4 244208C0 */ addiu $v0, $v0, %lo(D_800A08C0) -/* 82F8 8002CEF8 AFA20010 */ sw $v0, 0x10($sp) -/* 82FC 8002CEFC 24020073 */ addiu $v0, $zero, 0x73 -/* 8300 8002CF00 0000382D */ daddu $a3, $zero, $zero -/* 8304 8002CF04 0C019798 */ jal osCreateThread -/* 8308 8002CF08 AFA20014 */ sw $v0, 0x14($sp) -/* 830C 8002CF0C 0C019808 */ jal osStartThread -/* 8310 8002CF10 0200202D */ daddu $a0, $s0, $zero -/* 8314 8002CF14 93A20028 */ lbu $v0, 0x28($sp) -/* 8318 8002CF18 8FBF0034 */ lw $ra, 0x34($sp) -/* 831C 8002CF1C 8FB00030 */ lw $s0, 0x30($sp) -/* 8320 8002CF20 03E00008 */ jr $ra -/* 8324 8002CF24 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s b/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s deleted file mode 100644 index d923d0c81c..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuSiMgrRestart -/* 83AC 8002CFAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 83B0 8002CFB0 3C04800A */ lui $a0, %hi(D_8009E710) -/* 83B4 8002CFB4 2484E710 */ addiu $a0, $a0, %lo(D_8009E710) -/* 83B8 8002CFB8 AFBF0010 */ sw $ra, 0x10($sp) -/* 83BC 8002CFBC 0C019808 */ jal osStartThread -/* 83C0 8002CFC0 00000000 */ nop -/* 83C4 8002CFC4 8FBF0010 */ lw $ra, 0x10($sp) -/* 83C8 8002CFC8 03E00008 */ jr $ra -/* 83CC 8002CFCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s b/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s deleted file mode 100644 index 34dfbff842..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s +++ /dev/null @@ -1,113 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuSiMgrThread -/* 83D0 8002CFD0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 83D4 8002CFD4 AFB00048 */ sw $s0, 0x48($sp) -/* 83D8 8002CFD8 3C10800E */ lui $s0, %hi(D_800D91F8) -/* 83DC 8002CFDC 261091F8 */ addiu $s0, $s0, %lo(D_800D91F8) -/* 83E0 8002CFE0 0200202D */ daddu $a0, $s0, $zero -/* 83E4 8002CFE4 27A50020 */ addiu $a1, $sp, 0x20 -/* 83E8 8002CFE8 24060008 */ addiu $a2, $zero, 8 -/* 83EC 8002CFEC AFBF0050 */ sw $ra, 0x50($sp) -/* 83F0 8002CFF0 0C019560 */ jal osCreateMesgQueue -/* 83F4 8002CFF4 AFB1004C */ sw $s1, 0x4c($sp) -/* 83F8 8002CFF8 27A40010 */ addiu $a0, $sp, 0x10 -/* 83FC 8002CFFC 0200282D */ daddu $a1, $s0, $zero -/* 8400 8002D000 0C017B8C */ jal nuScAddClient -/* 8404 8002D004 24060001 */ addiu $a2, $zero, 1 -.L8002D008: -/* 8408 8002D008 3C04800E */ lui $a0, %hi(D_800D91F8) -/* 840C 8002D00C 248491F8 */ addiu $a0, $a0, %lo(D_800D91F8) -/* 8410 8002D010 27A50040 */ addiu $a1, $sp, 0x40 -/* 8414 8002D014 0C0195BC */ jal osRecvMesg -/* 8418 8002D018 24060001 */ addiu $a2, $zero, 1 -/* 841C 8002D01C 8FA40040 */ lw $a0, 0x40($sp) -/* 8420 8002D020 3C108007 */ lui $s0, %hi(D_80077400) -/* 8424 8002D024 26107400 */ addiu $s0, $s0, %lo(D_80077400) -/* 8428 8002D028 84830000 */ lh $v1, ($a0) -/* 842C 8002D02C 24020001 */ addiu $v0, $zero, 1 -/* 8430 8002D030 10620005 */ beq $v1, $v0, .L8002D048 -/* 8434 8002D034 24027F00 */ addiu $v0, $zero, 0x7f00 -/* 8438 8002D038 10620016 */ beq $v1, $v0, .L8002D094 -/* 843C 8002D03C 0000282D */ daddu $a1, $zero, $zero -/* 8440 8002D040 0800B432 */ j .L8002D0C8 -/* 8444 8002D044 00000000 */ nop -.L8002D048: -/* 8448 8002D048 8E020000 */ lw $v0, ($s0) -/* 844C 8002D04C 1040FFEE */ beqz $v0, .L8002D008 -/* 8450 8002D050 00000000 */ nop -.L8002D054: -/* 8454 8002D054 8E020000 */ lw $v0, ($s0) -/* 8458 8002D058 8C420004 */ lw $v0, 4($v0) -/* 845C 8002D05C 8C420000 */ lw $v0, ($v0) -/* 8460 8002D060 10400004 */ beqz $v0, .L8002D074 -/* 8464 8002D064 00000000 */ nop -/* 8468 8002D068 0040F809 */ jalr $v0 -/* 846C 8002D06C 8FA40040 */ lw $a0, 0x40($sp) -/* 8470 8002D070 0040882D */ daddu $s1, $v0, $zero -.L8002D074: -/* 8474 8002D074 1620FFE4 */ bnez $s1, .L8002D008 -/* 8478 8002D078 00000000 */ nop -/* 847C 8002D07C 8E100000 */ lw $s0, ($s0) -/* 8480 8002D080 8E020000 */ lw $v0, ($s0) -/* 8484 8002D084 1440FFF3 */ bnez $v0, .L8002D054 -/* 8488 8002D088 00000000 */ nop -/* 848C 8002D08C 0800B402 */ j .L8002D008 -/* 8490 8002D090 00000000 */ nop -.L8002D094: -/* 8494 8002D094 8C840004 */ lw $a0, 4($a0) -/* 8498 8002D098 0C019608 */ jal osSendMesg -/* 849C 8002D09C 24060001 */ addiu $a2, $zero, 1 -/* 84A0 8002D0A0 27A40010 */ addiu $a0, $sp, 0x10 -/* 84A4 8002D0A4 0C017BCE */ jal nuScResetClientMesgType -/* 84A8 8002D0A8 0000282D */ daddu $a1, $zero, $zero -/* 84AC 8002D0AC 0C019850 */ jal osStopThread -/* 84B0 8002D0B0 0000202D */ daddu $a0, $zero, $zero -/* 84B4 8002D0B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 84B8 8002D0B8 0C017BCE */ jal nuScResetClientMesgType -/* 84BC 8002D0BC 24050001 */ addiu $a1, $zero, 1 -/* 84C0 8002D0C0 0800B402 */ j .L8002D008 -/* 84C4 8002D0C4 00000000 */ nop -.L8002D0C8: -/* 84C8 8002D0C8 8FA20040 */ lw $v0, 0x40($sp) -/* 84CC 8002D0CC 94420000 */ lhu $v0, ($v0) -/* 84D0 8002D0D0 8E030000 */ lw $v1, ($s0) -/* 84D4 8002D0D4 3044FF00 */ andi $a0, $v0, 0xff00 -/* 84D8 8002D0D8 1060FFCB */ beqz $v1, .L8002D008 -/* 84DC 8002D0DC 304200FF */ andi $v0, $v0, 0xff -/* 84E0 8002D0E0 3085FFFF */ andi $a1, $a0, 0xffff -/* 84E4 8002D0E4 3044FFFF */ andi $a0, $v0, 0xffff -/* 84E8 8002D0E8 00043080 */ sll $a2, $a0, 2 -.L8002D0EC: -/* 84EC 8002D0EC 8E030000 */ lw $v1, ($s0) -/* 84F0 8002D0F0 94620008 */ lhu $v0, 8($v1) -/* 84F4 8002D0F4 54450015 */ bnel $v0, $a1, .L8002D14C -/* 84F8 8002D0F8 0060802D */ daddu $s0, $v1, $zero -/* 84FC 8002D0FC 9062000A */ lbu $v0, 0xa($v1) -/* 8500 8002D100 0082102B */ sltu $v0, $a0, $v0 -/* 8504 8002D104 10400009 */ beqz $v0, .L8002D12C -/* 8508 8002D108 00000000 */ nop -/* 850C 8002D10C 8C620004 */ lw $v0, 4($v1) -/* 8510 8002D110 8FA40040 */ lw $a0, 0x40($sp) -/* 8514 8002D114 00C21021 */ addu $v0, $a2, $v0 -/* 8518 8002D118 8C420000 */ lw $v0, ($v0) -/* 851C 8002D11C 0040F809 */ jalr $v0 -/* 8520 8002D120 00000000 */ nop -/* 8524 8002D124 8FA30040 */ lw $v1, 0x40($sp) -/* 8528 8002D128 AC620008 */ sw $v0, 8($v1) -.L8002D12C: -/* 852C 8002D12C 8FA20040 */ lw $v0, 0x40($sp) -/* 8530 8002D130 8C440004 */ lw $a0, 4($v0) -/* 8534 8002D134 1080FFB4 */ beqz $a0, .L8002D008 -/* 8538 8002D138 0000282D */ daddu $a1, $zero, $zero -/* 853C 8002D13C 0C019608 */ jal osSendMesg -/* 8540 8002D140 24060001 */ addiu $a2, $zero, 1 -/* 8544 8002D144 0800B402 */ j .L8002D008 -/* 8548 8002D148 00000000 */ nop -.L8002D14C: -/* 854C 8002D14C 8E020000 */ lw $v0, ($s0) -/* 8550 8002D150 1440FFE6 */ bnez $v0, .L8002D0EC -/* 8554 8002D154 00000000 */ nop -/* 8558 8002D158 0800B402 */ j .L8002D008 -/* 855C 8002D15C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiSendMesg.s b/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiSendMesg.s deleted file mode 100644 index f0af22bdeb..0000000000 --- a/ver/us/asm/nonmatchings/os/nusys/nuSiMgr/nuSiSendMesg.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuSiSendMesg -/* 8328 8002CF28 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 832C 8002CF2C AFB00040 */ sw $s0, 0x40($sp) -/* 8330 8002CF30 27B00010 */ addiu $s0, $sp, 0x10 -/* 8334 8002CF34 A7A40028 */ sh $a0, 0x28($sp) -/* 8338 8002CF38 0200202D */ daddu $a0, $s0, $zero -/* 833C 8002CF3C AFA50034 */ sw $a1, 0x34($sp) -/* 8340 8002CF40 27A50038 */ addiu $a1, $sp, 0x38 -/* 8344 8002CF44 24060001 */ addiu $a2, $zero, 1 -/* 8348 8002CF48 AFBF0044 */ sw $ra, 0x44($sp) -/* 834C 8002CF4C 0C019560 */ jal osCreateMesgQueue -/* 8350 8002CF50 AFB0002C */ sw $s0, 0x2c($sp) -/* 8354 8002CF54 3C04800E */ lui $a0, %hi(D_800D91F8) -/* 8358 8002CF58 248491F8 */ addiu $a0, $a0, %lo(D_800D91F8) -/* 835C 8002CF5C 27A50028 */ addiu $a1, $sp, 0x28 -/* 8360 8002CF60 0C019608 */ jal osSendMesg -/* 8364 8002CF64 24060001 */ addiu $a2, $zero, 1 -/* 8368 8002CF68 0200202D */ daddu $a0, $s0, $zero -/* 836C 8002CF6C 0000282D */ daddu $a1, $zero, $zero -/* 8370 8002CF70 0C0195BC */ jal osRecvMesg -/* 8374 8002CF74 24060001 */ addiu $a2, $zero, 1 -/* 8378 8002CF78 8FA20030 */ lw $v0, 0x30($sp) -/* 837C 8002CF7C 8FBF0044 */ lw $ra, 0x44($sp) -/* 8380 8002CF80 8FB00040 */ lw $s0, 0x40($sp) -/* 8384 8002CF84 03E00008 */ jr $ra -/* 8388 8002CF88 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/state_battle/state_step_battle.s b/ver/us/asm/nonmatchings/state_battle/state_step_battle.s index 6104e737b6..cb617f1bee 100644 --- a/ver/us/asm/nonmatchings/state_battle/state_step_battle.s +++ b/ver/us/asm/nonmatchings/state_battle/state_step_battle.s @@ -11,11 +11,11 @@ glabel state_step_battle /* ECFC 800338FC 82020000 */ lb $v0, ($s0) /* ED00 80033900 1443000F */ bne $v0, $v1, .L80033940 /* ED04 80033904 92040000 */ lbu $a0, ($s0) -/* ED08 80033908 3C02800A */ lui $v0, %hi(D_8009A658) -/* ED0C 8003390C 8C42A658 */ lw $v0, %lo(D_8009A658)($v0) +/* ED08 80033908 3C02800A */ lui $v0, %hi(nuGfxCfb) +/* ED0C 8003390C 8C42A658 */ lw $v0, %lo(nuGfxCfb)($v0) /* ED10 80033910 8C430004 */ lw $v1, 4($v0) -/* ED14 80033914 3C02800A */ lui $v0, %hi(D_8009A64C) -/* ED18 80033918 8C42A64C */ lw $v0, %lo(D_8009A64C)($v0) +/* ED14 80033914 3C02800A */ lui $v0, %hi(nuGfxCfb_ptr) +/* ED18 80033918 8C42A64C */ lw $v0, %lo(nuGfxCfb_ptr)($v0) /* ED1C 8003391C 14620089 */ bne $v1, $v0, .L80033B44 /* ED20 80033920 2484FFFF */ addiu $a0, $a0, -1 /* ED24 80033924 3C02800A */ lui $v0, %hi(gOverrideFlags) diff --git a/ver/us/asm/nonmatchings/state_file_select/state_step_language_select.s b/ver/us/asm/nonmatchings/state_file_select/state_step_language_select.s index db21d202a8..f00e2abd48 100644 --- a/ver/us/asm/nonmatchings/state_file_select/state_step_language_select.s +++ b/ver/us/asm/nonmatchings/state_file_select/state_step_language_select.s @@ -90,11 +90,11 @@ glabel state_step_language_select /* 10704 80035304 24847980 */ addiu $a0, $a0, %lo(D_80077980) /* 10708 80035308 0C017CBC */ jal nuGfxSetCfb /* 1070C 8003530C 24050002 */ addiu $a1, $zero, 2 -/* 10710 80035310 3C02800A */ lui $v0, %hi(D_8009A658) -/* 10714 80035314 8C42A658 */ lw $v0, %lo(D_8009A658)($v0) +/* 10710 80035310 3C02800A */ lui $v0, %hi(nuGfxCfb) +/* 10714 80035314 8C42A658 */ lw $v0, %lo(nuGfxCfb)($v0) /* 10718 80035318 8C430008 */ lw $v1, 8($v0) -/* 1071C 8003531C 3C02800A */ lui $v0, %hi(D_8009A64C) -/* 10720 80035320 8C42A64C */ lw $v0, %lo(D_8009A64C)($v0) +/* 1071C 8003531C 3C02800A */ lui $v0, %hi(nuGfxCfb_ptr) +/* 10720 80035320 8C42A64C */ lw $v0, %lo(nuGfxCfb_ptr)($v0) /* 10724 80035324 14620008 */ bne $v1, $v0, .L80035348 /* 10728 80035328 24040003 */ addiu $a0, $zero, 3 /* 1072C 8003532C 3C02800A */ lui $v0, %hi(gOverrideFlags) diff --git a/ver/us/asm/nonmatchings/state_title_screen/appendGfx_title_screen.s b/ver/us/asm/nonmatchings/state_title_screen/appendGfx_title_screen.s index 4dad028af2..bf1a7726be 100644 --- a/ver/us/asm/nonmatchings/state_title_screen/appendGfx_title_screen.s +++ b/ver/us/asm/nonmatchings/state_title_screen/appendGfx_title_screen.s @@ -78,8 +78,8 @@ glabel L80037718_12B18 /* 12B24 80037724 2610A66C */ addiu $s0, $s0, %lo(gMasterGfxPos) /* 12B28 80037728 3C12E700 */ lui $s2, 0xe700 /* 12B2C 8003772C 8E110000 */ lw $s1, ($s0) -/* 12B30 80037730 3C04800A */ lui $a0, %hi(D_8009A64C) -/* 12B34 80037734 8C84A64C */ lw $a0, %lo(D_8009A64C)($a0) +/* 12B30 80037730 3C04800A */ lui $a0, %hi(nuGfxCfb_ptr) +/* 12B34 80037734 8C84A64C */ lw $a0, %lo(nuGfxCfb_ptr)($a0) /* 12B38 80037738 0220102D */ daddu $v0, $s1, $zero /* 12B3C 8003773C 26310008 */ addiu $s1, $s1, 8 /* 12B40 80037740 AE110000 */ sw $s1, ($s0) diff --git a/ver/us/asm/nonmatchings/world/action/16/func_802B6000_E287F0.s b/ver/us/asm/nonmatchings/world/action/16/func_802B6000_E287F0.s deleted file mode 100644 index ab1e78d5b7..0000000000 --- a/ver/us/asm/nonmatchings/world/action/16/func_802B6000_E287F0.s +++ /dev/null @@ -1,152 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802B6000_E287F0 -/* E287F0 802B6000 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E287F4 802B6004 AFB00020 */ sw $s0, 0x20($sp) -/* E287F8 802B6008 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* E287FC 802B600C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* E28800 802B6010 AFBF0028 */ sw $ra, 0x28($sp) -/* E28804 802B6014 AFB10024 */ sw $s1, 0x24($sp) -/* E28808 802B6018 8E030000 */ lw $v1, ($s0) -/* E2880C 802B601C 0461003E */ bgez $v1, .L802B6118 -/* E28810 802B6020 0200882D */ daddu $s1, $s0, $zero -/* E28814 802B6024 3C027FFF */ lui $v0, 0x7fff -/* E28818 802B6028 3442FFFF */ ori $v0, $v0, 0xffff -/* E2881C 802B602C 3C040001 */ lui $a0, 1 -/* E28820 802B6030 34840017 */ ori $a0, $a0, 0x17 -/* E28824 802B6034 00621024 */ and $v0, $v1, $v0 -/* E28828 802B6038 0C037FDE */ jal suggest_player_anim_setUnkFlag -/* E2882C 802B603C AE020000 */ sw $v0, ($s0) -/* E28830 802B6040 C60C0028 */ lwc1 $f12, 0x28($s0) -/* E28834 802B6044 C60E0030 */ lwc1 $f14, 0x30($s0) -/* E28838 802B6048 86020016 */ lh $v0, 0x16($s0) -/* E2883C 802B604C 3C014192 */ lui $at, 0x4192 -/* E28840 802B6050 3421C745 */ ori $at, $at, 0xc745 -/* E28844 802B6054 44810000 */ mtc1 $at, $f0 -/* E28848 802B6058 3C01C06F */ lui $at, 0xc06f -/* E2884C 802B605C 34213B64 */ ori $at, $at, 0x3b64 -/* E28850 802B6060 44811000 */ mtc1 $at, $f2 -/* E28854 802B6064 3C013F4E */ lui $at, 0x3f4e -/* E28858 802B6068 34214F76 */ ori $at, $at, 0x4f76 -/* E2885C 802B606C 44812000 */ mtc1 $at, $f4 -/* E28860 802B6070 3C01BDCA */ lui $at, 0xbdca -/* E28864 802B6074 3421233A */ ori $at, $at, 0x233a -/* E28868 802B6078 44813000 */ mtc1 $at, $f6 -/* E2886C 802B607C 8604001A */ lh $a0, 0x1a($s0) -/* E28870 802B6080 3C03800B */ lui $v1, %hi(gCameras) -/* E28874 802B6084 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* E28878 802B6088 A20000B6 */ sb $zero, 0xb6($s0) -/* E2887C 802B608C 44824000 */ mtc1 $v0, $f8 -/* E28880 802B6090 00000000 */ nop -/* E28884 802B6094 46804220 */ cvt.s.w $f8, $f8 -/* E28888 802B6098 44064000 */ mfc1 $a2, $f8 -/* E2888C 802B609C 8E020000 */ lw $v0, ($s0) -/* E28890 802B60A0 44844000 */ mtc1 $a0, $f8 -/* E28894 802B60A4 00000000 */ nop -/* E28898 802B60A8 46804220 */ cvt.s.w $f8, $f8 -/* E2889C 802B60AC E6000070 */ swc1 $f0, 0x70($s0) -/* E288A0 802B60B0 E6020074 */ swc1 $f2, 0x74($s0) -/* E288A4 802B60B4 E6040078 */ swc1 $f4, 0x78($s0) -/* E288A8 802B60B8 E606007C */ swc1 $f6, 0x7c($s0) -/* E288AC 802B60BC 34420008 */ ori $v0, $v0, 8 -/* E288B0 802B60C0 AE020000 */ sw $v0, ($s0) -/* E288B4 802B60C4 94620002 */ lhu $v0, 2($v1) -/* E288B8 802B60C8 44074000 */ mfc1 $a3, $f8 -/* E288BC 802B60CC 34420001 */ ori $v0, $v0, 1 -/* E288C0 802B60D0 0C00A720 */ jal atan2 -/* E288C4 802B60D4 A4620002 */ sh $v0, 2($v1) -/* E288C8 802B60D8 86020016 */ lh $v0, 0x16($s0) -/* E288CC 802B60DC 8603001A */ lh $v1, 0x1a($s0) -/* E288D0 802B60E0 3C01802B */ lui $at, %hi(D_802B6240) -/* E288D4 802B60E4 E4206240 */ swc1 $f0, %lo(D_802B6240)($at) -/* E288D8 802B60E8 44826000 */ mtc1 $v0, $f12 -/* E288DC 802B60EC 00000000 */ nop -/* E288E0 802B60F0 46806320 */ cvt.s.w $f12, $f12 -/* E288E4 802B60F4 44837000 */ mtc1 $v1, $f14 -/* E288E8 802B60F8 00000000 */ nop -/* E288EC 802B60FC 0C038022 */ jal get_xz_dist_to_player -/* E288F0 802B6100 468073A0 */ cvt.s.w $f14, $f14 -/* E288F4 802B6104 3C014190 */ lui $at, 0x4190 -/* E288F8 802B6108 44811000 */ mtc1 $at, $f2 -/* E288FC 802B610C 00000000 */ nop -/* E28900 802B6110 46020003 */ div.s $f0, $f0, $f2 -/* E28904 802B6114 E6000054 */ swc1 $f0, 0x54($s0) -.L802B6118: -/* E28908 802B6118 3C01802B */ lui $at, %hi(D_802B6240) -/* E2890C 802B611C C42C6240 */ lwc1 $f12, %lo(D_802B6240)($at) -/* E28910 802B6120 3C0140C9 */ lui $at, 0x40c9 -/* E28914 802B6124 34210FD0 */ ori $at, $at, 0xfd0 -/* E28918 802B6128 44810000 */ mtc1 $at, $f0 -/* E2891C 802B612C 00000000 */ nop -/* E28920 802B6130 46006302 */ mul.s $f12, $f12, $f0 -/* E28924 802B6134 00000000 */ nop -/* E28928 802B6138 27A50010 */ addiu $a1, $sp, 0x10 -/* E2892C 802B613C 3C0143B4 */ lui $at, 0x43b4 -/* E28930 802B6140 44810000 */ mtc1 $at, $f0 -/* E28934 802B6144 27A60014 */ addiu $a2, $sp, 0x14 -/* E28938 802B6148 0C00A82D */ jal sin_cos_rad -/* E2893C 802B614C 46006303 */ div.s $f12, $f12, $f0 -/* E28940 802B6150 3C030004 */ lui $v1, 4 -/* E28944 802B6154 8E020000 */ lw $v0, ($s0) -/* E28948 802B6158 C6020054 */ lwc1 $f2, 0x54($s0) -/* E2894C 802B615C 00431024 */ and $v0, $v0, $v1 -/* E28950 802B6160 10400006 */ beqz $v0, .L802B617C -/* E28954 802B6164 00000000 */ nop -/* E28958 802B6168 3C013F00 */ lui $at, 0x3f00 -/* E2895C 802B616C 44810000 */ mtc1 $at, $f0 -/* E28960 802B6170 00000000 */ nop -/* E28964 802B6174 46001082 */ mul.s $f2, $f2, $f0 -/* E28968 802B6178 00000000 */ nop -.L802B617C: -/* E2896C 802B617C C7A00010 */ lwc1 $f0, 0x10($sp) -/* E28970 802B6180 46001002 */ mul.s $f0, $f2, $f0 -/* E28974 802B6184 00000000 */ nop -/* E28978 802B6188 C7A40014 */ lwc1 $f4, 0x14($sp) -/* E2897C 802B618C 46041102 */ mul.s $f4, $f2, $f4 -/* E28980 802B6190 00000000 */ nop -/* E28984 802B6194 C6020028 */ lwc1 $f2, 0x28($s0) -/* E28988 802B6198 46001080 */ add.s $f2, $f2, $f0 -/* E2898C 802B619C C6000030 */ lwc1 $f0, 0x30($s0) -/* E28990 802B61A0 820200B6 */ lb $v0, 0xb6($s0) -/* E28994 802B61A4 46040001 */ sub.s $f0, $f0, $f4 -/* E28998 802B61A8 E6020028 */ swc1 $f2, 0x28($s0) -/* E2899C 802B61AC 14400012 */ bnez $v0, .L802B61F8 -/* E289A0 802B61B0 E6000030 */ swc1 $f0, 0x30($s0) -/* E289A4 802B61B4 0C038D12 */ jal integrate_gravity -/* E289A8 802B61B8 00000000 */ nop -/* E289AC 802B61BC C600002C */ lwc1 $f0, 0x2c($s0) -/* E289B0 802B61C0 C6040070 */ lwc1 $f4, 0x70($s0) -/* E289B4 802B61C4 46040000 */ add.s $f0, $f0, $f4 -/* E289B8 802B61C8 44801000 */ mtc1 $zero, $f2 -/* E289BC 802B61CC 00000000 */ nop -/* E289C0 802B61D0 4602203C */ c.lt.s $f4, $f2 -/* E289C4 802B61D4 00000000 */ nop -/* E289C8 802B61D8 45000014 */ bc1f .L802B622C -/* E289CC 802B61DC E600002C */ swc1 $f0, 0x2c($s0) -/* E289D0 802B61E0 8E020000 */ lw $v0, ($s0) -/* E289D4 802B61E4 24030001 */ addiu $v1, $zero, 1 -/* E289D8 802B61E8 A20300B6 */ sb $v1, 0xb6($s0) -/* E289DC 802B61EC 34420004 */ ori $v0, $v0, 4 -/* E289E0 802B61F0 080AD88B */ j .L802B622C -/* E289E4 802B61F4 AE020000 */ sw $v0, ($s0) -.L802B61F8: -/* E289E8 802B61F8 0C038D36 */ jal func_800E34D8 -/* E289EC 802B61FC 00000000 */ nop -/* E289F0 802B6200 46000306 */ mov.s $f12, $f0 -/* E289F4 802B6204 0C038D45 */ jal player_check_collision_below -/* E289F8 802B6208 27A50018 */ addiu $a1, $sp, 0x18 -/* E289FC 802B620C 8FA40018 */ lw $a0, 0x18($sp) -/* E28A00 802B6210 04800006 */ bltz $a0, .L802B622C -/* E28A04 802B6214 E620002C */ swc1 $f0, 0x2c($s1) -/* E28A08 802B6218 0C016F6A */ jal get_collider_type_by_id -/* E28A0C 802B621C 00000000 */ nop -/* E28A10 802B6220 AFA20018 */ sw $v0, 0x18($sp) -/* E28A14 802B6224 0C039769 */ jal set_action_state -/* E28A18 802B6228 2404000A */ addiu $a0, $zero, 0xa -.L802B622C: -/* E28A1C 802B622C 8FBF0028 */ lw $ra, 0x28($sp) -/* E28A20 802B6230 8FB10024 */ lw $s1, 0x24($sp) -/* E28A24 802B6234 8FB00020 */ lw $s0, 0x20($sp) -/* E28A28 802B6238 03E00008 */ jr $ra -/* E28A2C 802B623C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/action/walk/func_802B65E8_E23CC8.s b/ver/us/asm/nonmatchings/world/action/walk/func_802B65E8_E23CC8.s deleted file mode 100644 index a8089ee130..0000000000 --- a/ver/us/asm/nonmatchings/world/action/walk/func_802B65E8_E23CC8.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802B65E8_E23CC8 -/* E23CC8 802B65E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E23CCC 802B65EC AFB00018 */ sw $s0, 0x18($sp) -/* E23CD0 802B65F0 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* E23CD4 802B65F4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* E23CD8 802B65F8 AFBF001C */ sw $ra, 0x1c($sp) -/* E23CDC 802B65FC 8E030000 */ lw $v1, ($s0) -/* E23CE0 802B6600 0461000B */ bgez $v1, .L802B6630 -/* E23CE4 802B6604 3C027FFF */ lui $v0, 0x7fff -/* E23CE8 802B6608 3442FFFF */ ori $v0, $v0, 0xffff -/* E23CEC 802B660C 00621024 */ and $v0, $v1, $v0 -/* E23CF0 802B6610 AE020000 */ sw $v0, ($s0) -/* E23CF4 802B6614 30624000 */ andi $v0, $v1, 0x4000 -/* E23CF8 802B6618 14400003 */ bnez $v0, .L802B6628 -/* E23CFC 802B661C AE000060 */ sw $zero, 0x60($s0) -/* E23D00 802B6620 C6000058 */ lwc1 $f0, 0x58($s0) -/* E23D04 802B6624 E6000054 */ swc1 $f0, 0x54($s0) -.L802B6628: -/* E23D08 802B6628 0C0AD954 */ jal func_802B6550_E23C30 -/* E23D0C 802B662C 00000000 */ nop -.L802B6630: -/* E23D10 802B6630 8E020000 */ lw $v0, ($s0) -/* E23D14 802B6634 30424000 */ andi $v0, $v0, 0x4000 -/* E23D18 802B6638 10400004 */ beqz $v0, .L802B664C -/* E23D1C 802B663C 24040008 */ addiu $a0, $zero, 8 -/* E23D20 802B6640 C60000A0 */ lwc1 $f0, 0xa0($s0) -/* E23D24 802B6644 080AD9C8 */ j .L802B6720 -/* E23D28 802B6648 E6000080 */ swc1 $f0, 0x80($s0) -.L802B664C: -/* E23D2C 802B664C 27A40010 */ addiu $a0, $sp, 0x10 -/* E23D30 802B6650 0C0388C1 */ jal player_input_to_move_vector -/* E23D34 802B6654 27A50014 */ addiu $a1, $sp, 0x14 -/* E23D38 802B6658 0C039454 */ jal phys_update_interact_collider -/* E23D3C 802B665C 00000000 */ nop -/* E23D40 802B6660 C7A20014 */ lwc1 $f2, 0x14($sp) -/* E23D44 802B6664 44800000 */ mtc1 $zero, $f0 -/* E23D48 802B6668 00000000 */ nop -/* E23D4C 802B666C 46001032 */ c.eq.s $f2, $f0 -/* E23D50 802B6670 00000000 */ nop -/* E23D54 802B6674 45000005 */ bc1f .L802B668C -/* E23D58 802B6678 00000000 */ nop -/* E23D5C 802B667C 0C039769 */ jal set_action_state -/* E23D60 802B6680 0000202D */ daddu $a0, $zero, $zero -/* E23D64 802B6684 080AD9CA */ j .L802B6728 -/* E23D68 802B6688 00000000 */ nop -.L802B668C: -/* E23D6C 802B668C C7A00010 */ lwc1 $f0, 0x10($sp) -/* E23D70 802B6690 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* E23D74 802B6694 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* E23D78 802B6698 E6000080 */ swc1 $f0, 0x80($s0) -/* E23D7C 802B669C 90420080 */ lbu $v0, 0x80($v0) -/* E23D80 802B66A0 1440001F */ bnez $v0, .L802B6720 -/* E23D84 802B66A4 24040008 */ addiu $a0, $zero, 8 -/* E23D88 802B66A8 8E0200E8 */ lw $v0, 0xe8($s0) -/* E23D8C 802B66AC 00420018 */ mult $v0, $v0 -/* E23D90 802B66B0 00001812 */ mflo $v1 -/* E23D94 802B66B4 8E0200EC */ lw $v0, 0xec($s0) -/* E23D98 802B66B8 00000000 */ nop -/* E23D9C 802B66BC 00420018 */ mult $v0, $v0 -/* E23DA0 802B66C0 00001012 */ mflo $v0 -/* E23DA4 802B66C4 00621021 */ addu $v0, $v1, $v0 -/* E23DA8 802B66C8 44826000 */ mtc1 $v0, $f12 -/* E23DAC 802B66CC 00000000 */ nop -/* E23DB0 802B66D0 46806320 */ cvt.s.w $f12, $f12 -/* E23DB4 802B66D4 46006084 */ sqrt.s $f2, $f12 -/* E23DB8 802B66D8 46021032 */ c.eq.s $f2, $f2 -/* E23DBC 802B66DC 00000000 */ nop -/* E23DC0 802B66E0 45010004 */ bc1t .L802B66F4 -/* E23DC4 802B66E4 00000000 */ nop -/* E23DC8 802B66E8 0C0187BC */ jal sqrtf -/* E23DCC 802B66EC 00000000 */ nop -/* E23DD0 802B66F0 46000086 */ mov.s $f2, $f0 -.L802B66F4: -/* E23DD4 802B66F4 3C01425C */ lui $at, 0x425c -/* E23DD8 802B66F8 44810000 */ mtc1 $at, $f0 -/* E23DDC 802B66FC 00000000 */ nop -/* E23DE0 802B6700 4602003C */ c.lt.s $f0, $f2 -/* E23DE4 802B6704 00000000 */ nop -/* E23DE8 802B6708 45000005 */ bc1f .L802B6720 -/* E23DEC 802B670C 24040008 */ addiu $a0, $zero, 8 -/* E23DF0 802B6710 0C039769 */ jal set_action_state -/* E23DF4 802B6714 24040002 */ addiu $a0, $zero, 2 -/* E23DF8 802B6718 080AD9CA */ j .L802B6728 -/* E23DFC 802B671C 00000000 */ nop -.L802B6720: -/* E23E00 802B6720 0C039426 */ jal try_player_footstep_sounds -/* E23E04 802B6724 00000000 */ nop -.L802B6728: -/* E23E08 802B6728 8FBF001C */ lw $ra, 0x1c($sp) -/* E23E0C 802B672C 8FB00018 */ lw $s0, 0x18($sp) -/* E23E10 802B6730 03E00008 */ jr $ra -/* E23E14 802B6734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s index 2f4e000898..e31035e863 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_10/CB96B0/flo_10_func_802404B0_CB96B0.s @@ -90,8 +90,8 @@ glabel flo_10_func_802404B0_CB96B0 /* CB97DC 802405DC 004A1021 */ addu $v0, $v0, $t2 /* CB97E0 802405E0 AFAA0014 */ sw $t2, 0x14($sp) /* CB97E4 802405E4 AFAA0010 */ sw $t2, 0x10($sp) -/* CB97E8 802405E8 3C0A800A */ lui $t2, %hi(D_8009A64C) -/* CB97EC 802405EC 8D4AA64C */ lw $t2, %lo(D_8009A64C)($t2) +/* CB97E8 802405E8 3C0A800A */ lui $t2, %hi(nuGfxCfb_ptr) +/* CB97EC 802405EC 8D4AA64C */ lw $t2, %lo(nuGfxCfb_ptr)($t2) /* CB97F0 802405F0 00021040 */ sll $v0, $v0, 1 /* CB97F4 802405F4 AFAA0018 */ sw $t2, 0x18($sp) /* CB97F8 802405F8 8FAA0010 */ lw $t2, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s index 01443b4542..5f0a81ef45 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s @@ -7,8 +7,8 @@ glabel func_802408F8_A277C8 /* A277D0 80240900 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* A277D4 80240904 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* A277D8 80240908 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A277DC 8024090C 3C05800A */ lui $a1, %hi(D_8009A64C) -/* A277E0 80240910 8CA5A64C */ lw $a1, %lo(D_8009A64C)($a1) +/* A277DC 8024090C 3C05800A */ lui $a1, %hi(nuGfxCfb_ptr) +/* A277E0 80240910 8CA5A64C */ lw $a1, %lo(nuGfxCfb_ptr)($a1) /* A277E4 80240914 3C088024 */ lui $t0, %hi(D_80241B80_A28A50) /* A277E8 80240918 25081B80 */ addiu $t0, $t0, %lo(D_80241B80_A28A50) /* A277EC 8024091C AFBF0020 */ sw $ra, 0x20($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s index 3b5e94155b..1618cf60e1 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s @@ -7,8 +7,8 @@ glabel func_80241274_A2B4B4 /* A2B4BC 8024127C 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* A2B4C0 80241280 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* A2B4C4 80241284 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2B4C8 80241288 3C05800A */ lui $a1, %hi(D_8009A64C) -/* A2B4CC 8024128C 8CA5A64C */ lw $a1, %lo(D_8009A64C)($a1) +/* A2B4C8 80241288 3C05800A */ lui $a1, %hi(nuGfxCfb_ptr) +/* A2B4CC 8024128C 8CA5A64C */ lw $a1, %lo(nuGfxCfb_ptr)($a1) /* A2B4D0 80241290 3C088025 */ lui $t0, %hi(D_802498D4_A33B14) /* A2B4D4 80241294 250898D4 */ addiu $t0, $t0, %lo(D_802498D4_A33B14) /* A2B4D8 80241298 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s index 926896b971..78d8de46dc 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s @@ -7,8 +7,8 @@ glabel func_8024146C_A2B6AC /* A2B6B4 80241474 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* A2B6B8 80241478 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* A2B6BC 8024147C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2B6C0 80241480 3C05800A */ lui $a1, %hi(D_8009A64C) -/* A2B6C4 80241484 8CA5A64C */ lw $a1, %lo(D_8009A64C)($a1) +/* A2B6C0 80241480 3C05800A */ lui $a1, %hi(nuGfxCfb_ptr) +/* A2B6C4 80241484 8CA5A64C */ lw $a1, %lo(nuGfxCfb_ptr)($a1) /* A2B6C8 80241488 3C088025 */ lui $t0, %hi(D_802498D4_A33B14) /* A2B6CC 8024148C 250898D4 */ addiu $t0, $t0, %lo(D_802498D4_A33B14) /* A2B6D0 80241490 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s index 26a71b641c..d4af548056 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s @@ -32,8 +32,8 @@ glabel func_80243CC0_A2DF00 /* A2DF6C 80243D2C 00C0202D */ daddu $a0, $a2, $zero /* A2DF70 80243D30 24C60008 */ addiu $a2, $a2, 8 /* A2DF74 80243D34 AE060000 */ sw $a2, ($s0) -/* A2DF78 80243D38 3C03800A */ lui $v1, %hi(D_8009A64C) -/* A2DF7C 80243D3C 8C63A64C */ lw $v1, %lo(D_8009A64C)($v1) +/* A2DF78 80243D38 3C03800A */ lui $v1, %hi(nuGfxCfb_ptr) +/* A2DF7C 80243D3C 8C63A64C */ lw $v1, %lo(nuGfxCfb_ptr)($v1) /* A2DF80 80243D40 3C138025 */ lui $s3, %hi(D_8024AA20_A34C60) /* A2DF84 80243D44 2673AA20 */ addiu $s3, $s3, %lo(D_8024AA20_A34C60) /* A2DF88 80243D48 AC820000 */ sw $v0, ($a0) diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s index 40151b6361..9f8e779aaa 100644 --- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s +++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s @@ -101,8 +101,8 @@ glabel func_80240160_8AA5B0 /* 8AA708 802402B8 000D1040 */ sll $v0, $t5, 1 /* 8AA70C 802402BC 004D1021 */ addu $v0, $v0, $t5 /* 8AA710 802402C0 00021040 */ sll $v0, $v0, 1 -/* 8AA714 802402C4 3C0C800A */ lui $t4, %hi(D_8009A64C) -/* 8AA718 802402C8 8D8CA64C */ lw $t4, %lo(D_8009A64C)($t4) +/* 8AA714 802402C4 3C0C800A */ lui $t4, %hi(nuGfxCfb_ptr) +/* 8AA718 802402C8 8D8CA64C */ lw $t4, %lo(nuGfxCfb_ptr)($t4) /* 8AA71C 802402CC 00621823 */ subu $v1, $v1, $v0 /* 8AA720 802402D0 AFAD0010 */ sw $t5, 0x10($sp) /* 8AA724 802402D4 AFA30014 */ sw $v1, 0x14($sp) diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s index 68d9b3d5be..2df81f8ef1 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s @@ -187,8 +187,8 @@ glabel func_80240628_800EA8 /* 801168 802408E8 3C03FFFD */ lui $v1, 0xfffd /* 80116C 802408EC 3463FEFF */ ori $v1, $v1, 0xfeff /* 801170 802408F0 3C05F8F0 */ lui $a1, 0xf8f0 -/* 801174 802408F4 3C1E800A */ lui $fp, %hi(D_8009A64C) -/* 801178 802408F8 27DEA64C */ addiu $fp, $fp, %lo(D_8009A64C) +/* 801174 802408F4 3C1E800A */ lui $fp, %hi(nuGfxCfb_ptr) +/* 801178 802408F8 27DEA64C */ addiu $fp, $fp, %lo(nuGfxCfb_ptr) /* 80117C 802408FC 34A5F000 */ ori $a1, $a1, 0xf000 /* 801180 80240900 8E900000 */ lw $s0, ($s4) /* 801184 80240904 8FC40000 */ lw $a0, ($fp) diff --git a/ver/us/effect_shims.yaml b/ver/us/effect_shims.yaml new file mode 100644 index 0000000000..51b17dd9b3 --- /dev/null +++ b/ver/us/effect_shims.yaml @@ -0,0 +1,40 @@ +- func_E0200410 +- func_E0200420 +- func_E0200430 +- func_E0200440 +- func_E0200450 +- func_E0200460 +- func_E0200470 +- func_E0200480 +- func_E0200490 +- func_E02004A0 +- func_E02004B0 +- func_E02004C0 +- func_E02004D0 +- func_E02004E0 +- func_E02004F0 +- func_E0200500 +- func_E0200510 +- func_E0200520 +- func_E0200530 +- func_E0200540 +- func_E0200550 +- func_E0200560 +- func_E0200570 +- func_E0200580 +- func_E0200590 +- func_E02005A0 +- func_E02005B0 +- func_E02005C0 +- func_E02005D0 +- func_E02005E0 +- func_E02005F0 +- func_E0200600 +- func_E0200610 +- func_E0200620 +- func_E0200630 +- func_E0200640 +- func_E0200650 +- func_E0200660 +- func_E0200670 +- func_E0200680 diff --git a/ver/us/main_bss_syms.txt b/ver/us/main_bss_syms.txt index 573b9065db..4de8a79b36 100644 --- a/ver/us/main_bss_syms.txt +++ b/ver/us/main_bss_syms.txt @@ -7,11 +7,11 @@ D_8009A5D0 = 0x8009A5D0; D_8009A5D4 = 0x8009A5D4; timeFreezeMode = 0x8009A5D8; nuGfxZBuffer = 0x8009A5DC; -D_8009A5E0 = 0x8009A5E0; +nuContDataLockKey = 0x8009A5E0; D_8009A5E4 = 0x8009A5E4; D_8009A5E8 = 0x8009A5E8; D_8009A5EC = 0x8009A5EC; -D_8009A5F0 = 0x8009A5F0; +nuGfxCfbCounter = 0x8009A5F0; D_8009A5F4 = 0x8009A5F4; nuGfxDisplay = 0x8009A5F8; D_8009A5FC = 0x8009A5FC; @@ -20,8 +20,8 @@ gNpcCount = 0x8009A604; D_8009A606 = 0x8009A606; D_8009A608 = 0x8009A608; D_8009A60C = 0x8009A60C; -D_8009A610 = 0x8009A610; -D_8009A614 = 0x8009A614; +nuGfxUcode = 0x8009A610; +nuContNum = 0x8009A614; nuGfxTaskSpool = 0x8009A618; D_8009A61C = 0x8009A61C; D_8009A620 = 0x8009A620; @@ -29,13 +29,13 @@ D_8009A628 = 0x8009A628; D_8009A62C = 0x8009A62C; D_8009A630 = 0x8009A630; gCurrentCamID = 0x8009A634; -carthandle = 0x8009A638; +nuPiCartHandle = 0x8009A638; D_8009A63C = 0x8009A63C; D_8009A640 = 0x8009A640; -D_8009A64C = 0x8009A64C; +nuGfxCfb_ptr = 0x8009A64C; gOverrideFlags = 0x8009A650; D_8009A654 = 0x8009A654; -D_8009A658 = 0x8009A658; +nuGfxCfb = 0x8009A658; D_8009A660 = 0x8009A660; D_8009A664 = 0x8009A664; D_8009A668 = 0x8009A668; @@ -62,13 +62,13 @@ D_8009BAA8 = 0x8009BAA8; D_8009BB30 = 0x8009BB30; D_8009C4E0 = 0x8009C4E0; D_8009C4FC = 0x8009C4FC; -D_8009C510 = 0x8009C510; -D_8009C514 = 0x8009C514; -D_8009C516 = 0x8009C516; -D_8009C518 = 0x8009C518; +nuGfxTask_ptr = 0x8009C510; +taskDoneMsg = 0x8009C514; +swapBufMsg = 0x8009C516; +GfxTaskMgrThread = 0x8009C518; D_8009E6D0 = 0x8009E6D0; -D_8009E6F0 = 0x8009E6F0; -D_8009E710 = 0x8009E710; +nuSiMesgBuf = 0x8009E6F0; +siMgrThread = 0x8009E710; D_800A08C0 = 0x800A08C0; D_800A08DC = 0x800A08DC; D_800A08E0 = 0x800A08E0; @@ -181,9 +181,9 @@ nuScAudioStack = 0x800A85D0; nuScGraphicsStack = 0x800AA5D0; D_800AC5D0 = 0x800AC5D0; D_800AC5E8 = 0x800AC5E8; -D_800AC6B0 = 0x800AC6B0; -D_800AE6D0 = 0x800AE6D0; -D_800AE6D4 = 0x800AE6D4; +nuGfxMesgBuf = 0x800AC6B0; +nuContWaitMesgBuf = 0x800AE6D0; +nuContDataMutexBuf = 0x800AE6D4; piMgrThread = 0x800AE6E0; __osPiMesgQueue = 0x800AF890; piMgrMesgBuff = 0x800AF8A8; @@ -233,7 +233,7 @@ D_800B0CE4 = 0x800B0CE4; D_800B0CE8 = 0x800B0CE8; mapTexName = 0x800B0CF0; D_800B0D08 = 0x800B0D08; -D_800B0EB8 = 0x800B0EB8; +nuContWaitMesgQ = 0x800B0EB8; D_800B0ED0 = 0x800B0ED0; D_800B0F08 = 0x800B0F08; D_800B0F0C = 0x800B0F0C; @@ -244,20 +244,13 @@ D_800B1B0D = 0x800B1B0D; D_800B1B0E = 0x800B1B0E; D_800B1B0F = 0x800B1B0F; D_800B1B10 = 0x800B1B10; -D_800B1B7C = 0x800B1B7C; -D_800B1B7F = 0x800B1B7F; +nuContStatus = 0x800B1B7C; D_800B1B90 = 0x800B1B90; nuContRmbCtl = 0x800B1D40; -D_800B1D42 = 0x800B1D42; -D_800B1D44 = 0x800B1D44; -D_800B1D46 = 0x800B1D46; -D_800B1D47 = 0x800B1D47; -D_800B1D48 = 0x800B1D48; -D_800B1D49 = 0x800B1D49; nuContData = 0x800B1D68; gCameras = 0x800B1D80; gCollisionData = 0x800B42E0; -D_800B42F0 = 0x800B42F0; +nuGfxMesgQ = 0x800B42F0; D_800B4308 = 0x800B4308; D_800B430C = 0x800B430C; D_800B430D = 0x800B430D; @@ -278,7 +271,7 @@ D_800B451F = 0x800B451F; D_800B4520 = 0x800B4520; D_800B6590 = 0x800B6590; D_800B7EF0 = 0x800B7EF0; -D_800B8590 = 0x800B8590; +nuYieldBuf = 0x800B8590; D_800B8D80 = 0x800B8D80; D_800B8DEC = 0x800B8DEC; D_800B91A0 = 0x800B91A0; @@ -287,10 +280,10 @@ D_800D91D0 = 0x800D91D0; D_800D91D4 = 0x800D91D4; D_800D91DC = 0x800D91DC; mapHitName = 0x800D91E0; -D_800D91F8 = 0x800D91F8; +nuSiMgrMesgQ = 0x800D91F8; mapShapeName = 0x800D9230; D_800D9248 = 0x800D9248; -D_800D9278 = 0x800D9278; +nuGfxTask = 0x800D9278; D_800D95E8 = 0x800D95E8; D_800D9620 = 0x800D9620; D_800D9668 = 0x800D9668; @@ -320,7 +313,7 @@ D_800DBC70 = 0x800DBC70; D_800DBD70 = 0x800DBD70; D_800DBF70 = 0x800DBF70; D_800DBF90 = 0x800DBF90; -D_800DC040 = 0x800DC040; +nuContDataMutexQ = 0x800DC040; D_800DC060 = 0x800DC060; D_800DC064 = 0x800DC064; gBattleState = 0x800DC068; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index edb9012d7c..55c5c55d7b 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -42,115 +42,119 @@ segments: - [0x1000, hasm, entry_point] - [0x1060, c, is_debug] - [0x1370, c, 1370_len_7d0] - - [0x1b40, c, main_loop] - - [0x3bf0, c, input] - - [0x42e0, c, rumble] + - [0x1B40, c, main_loop] + - [0x3BF0, c, input] + - [0x42E0, c, rumble] - [0x43F0, c] - [0x6000, c, heap] - [0x6240, c, fio] - - [0x6e40, c, curtains] + - [0x6E40, c, curtains] - [0x7340, c, crash] - - [0x7e40, c, os/nusys/7e40_len_3f0] + - [0x7E40, c, os/nusys/nuGfxTaskMgr, -fforce-addr] - [0x8230, c, os/nusys/nuSiMgr] - [0x8560, c] - [0x8800, c] - - [0x9d10, c, 9d10_len_1080] - - [0xad90, c, ad90_len_2880] + - [0x9D10, c, 9d10_len_1080] + - [0xAD90, c, ad90_len_2880] - [0xB0E0, c] - - [0xd610, c, camera] - - [0xe8f0, c, game_modes] - - [0xe940, c, state_startup] - - [0xebd0, c, intro_logos] - - [0xecd0, c, state_battle] - - [0xf270, c, state_logos] - - [0xfd40, c, state_pause] + - [0xD610, c, camera] + - [0xE8F0, c, game_modes] + - [0xE940, c, state_startup] + - [0xEBD0, c, intro_logos] + - [0xECD0, c, state_battle] + - [0xF270, c, state_logos] + - [0xFD40, c, state_pause] - [0x10400, c, state_file_select] - [0x11130, c, state_world] - - [0x111f0, c, 111f0_len_860] # possibly still state_world - - [0x11a50, c, state_intro] - - [0x121f0, c, state_title_screen] + - [0x111F0, c, 111f0_len_860] # possibly still state_world + - [0x11A50, c, state_intro] + - [0x121F0, c, state_title_screen] - [0x13480, c, state_demo] - [0x13870, c, npc] - - [0x1a1f0, c, 1a1f0_len_5390] - - [0x1f580, c, encounter_api] - - [0x20ec0, c, 20ec0_len_5040] + - [0x1A1F0, c, 1a1f0_len_5390] + - [0x1F580, c, encounter_api] + - [0x20EC0, c, 20ec0_len_5040] - [0x23680, c] - [0x25AF0, c] - - [0x25f00, c, 25f00_len_940] + - [0x25F00, c, 25f00_len_940] - [0x26840, c, 26840_len_20d0] - [0x28910, c, 28910_len_5090] - [0x2BF90, c] - - [0x2d9a0, c, 2d9a0_len_890] - - [0x2e230, c, 2e230_len_2190] - - [0x303c0, c, 303c0_len_3e10] + - [0x2D9A0, c, 2d9a0_len_890] + - [0x2E230, c, 2e230_len_2190] + - [0x303C0, c, 303c0_len_3e10] - [0x30450, c] - [0x31650, c, 31650] - [0x33450, c] - - [0x341d0, c, 341d0] - - [0x35ac0, c, world/world] - - [0x362a0, c, 362a0_len_2f70] + - [0x341D0, c, 341d0] + - [0x35AC0, c, world/world] + - [0x362A0, c, 362a0_len_2f70] - [0x39210, c, 39210_len_aa0] - - [0x39cb0, c, os/39cb0_len_100] - - [0x39db0, c, os/nusys/nuSched] - - [0x3a650, c, os/nusys/nuGfxFuncSet] - - [0x3a690, c, os/nusys/nuGfxPreNMIFuncSet] - - [0x3a6d0, c, os/nusys/nuGfxTaskAllEndWait] - - [0x3a6f0, c, os/nusys/nuGfxSetCfb] - - [0x3a800, c, os/nusys/nuGfxDisplayOff] - - [0x3a830, c, os/nusys/nuGfxDisplayOn] - - [0x3a850, c, os/nusys/nuPiInit] - - [0x3a890, c, os/nusys/nuPiReadRom] - - [0x3a960, c, os/nusys/nuGfxInit] - - [0x3aa10, c, os/nusys/nuContInit] - - [0x3aa50, c, os/nusys/nuContDataGet] - - [0x3aab0, c, os/nusys/nuContPakMgr] + - [0x39CB0, c, os/39cb0_len_100] + - [0x39DB0, c, os/nusys/nuSched] + - [0x3A650, c, os/nusys/nuGfxFuncSet] + - [0x3A690, c, os/nusys/nuGfxPreNMIFuncSet] + - [0x3A6D0, c, os/nusys/nuGfxTaskAllEndWait] + - [0x3A6F0, c, os/nusys/nuGfxSetCfb] + - [0x3A800, c, os/nusys/nuGfxDisplayOff] + - [0x3A830, c, os/nusys/nuGfxDisplayOn] + - [0x3A850, c, os/nusys/nuPiInit] + - [0x3A890, c, os/nusys/nuPiReadRom] + - [0x3A960, c, os/nusys/nuGfxInit] + - [0x3AA10, c, os/nusys/nuContInit] + - [0x3AA50, c, os/nusys/nuContDataGet] + - [0x3AAB0, c, os/nusys/nuContPakMgr] - [0x3AD20, c, os/nusys/nuContRmbMgr] - - [0x3b290, c, os/nusys/nuContRmbStart] - - [0x3b2f0, c, os/nusys/nuContRmbCheck] - - [0x3b390, c, os/nusys/nuContRmbModeSet] - - [0x3b4a0, c, os/nusys/3B4A0] + - [0x3B290, c, os/nusys/nuContRmbStart] + - [0x3B2F0, c, os/nusys/nuContRmbCheck] + - [0x3B390, c, os/nusys/nuContRmbModeSet] + - [0x3B4A0, c, os/nusys/nuContRmbForceStop] + - [0x3B4C0, c, os/nusys/nuContRmbForceStopEnd] + - [0x3B4E0, c, os/nusys/nuPiReadRomOverlay] - [0x3B5F0, c, os/nusys/nuGfxThread] - - [0x3b710, c, os/3b710_len_40] - - [0x3b750, c, os/3b750_len_20] - - [0x3b770, c, os/3b770_len_80] - - [0x3b7f0, c, os/3b7f0_len_120] - - [0x3b910, c, os/nuContMgr] - - [0x3bd20, c, os/3bd20_len_c0] + - [0x3B710, c, os/nusys/nuGfxSwapCfbFuncSet] + - [0x3B750, c, os/nusys/nuGfxSwapCfb] + - [0x3B770, c, os/nusys/nuGfxRetraceWait] + - [0x3B7F0, c, os/nusys/nuSiCallBackAdd] + - [0x3B890, c, os/nusys/nuSiCallBackRemove] + - [0x3B910, c, os/nusys/nuContMgr] + - [0x3BCC0, c, os/nusys/nuContDataLock] + - [0x3BD20, c, os/3bd20_len_c0] - [0x3BD40, hasm, os/osSetIntMask] - - [0x3bde0, c, os/osCreatePiManager] + - [0x3BDE0, c, os/osCreatePiManager] - [0x3C160, c, os/osEPiWriteIo] # MOVE_ADDU - - [0x3c1c0, c, os/osEPiReadIo] # MOVE_ADDU - - [0x3c220, c, os/osEPiStartDma] # MOVE_ADDU - - [0x3c2c0, c, os/osEPiLinkHandle] - - [0x3c310, c, os/osCartRomInit] - - [0x3c490, c, os/3c490_len_3c0] - - [0x3c850, c, os/3c850_len_f0] - - [0x3c940, c, os/3c940_len_140] - - [0x3ca80, c, os/3ca80_len_a0] + - [0x3C1C0, c, os/osEPiReadIo] # MOVE_ADDU + - [0x3C220, c, os/osEPiStartDma] # MOVE_ADDU + - [0x3C2C0, c, os/osEPiLinkHandle] + - [0x3C310, c, os/osCartRomInit] + - [0x3C490, c, os/3c490_len_3c0] + - [0x3C850, c, os/3c850_len_f0] + - [0x3C940, c, os/3c940_len_140] + - [0x3CA80, c, os/3ca80_len_a0] - [0x3CB20, hasm, os/osInvalDCache] - [0x3CBD0, hasm, os/osInvalICache] - - [0x3cc50, hasm, os/osWritebackDCache] - - [0x3ccd0, hasm, os/osWritebackDCacheAll] - - [0x3cd00, c, os/3cd00_len_5f0] # MOVE_ADDU + - [0x3CC50, hasm, os/osWritebackDCache] + - [0x3CCD0, hasm, os/osWritebackDCacheAll] + - [0x3CD00, c, os/3cd00_len_5f0] # MOVE_ADDU - [0x3CF80, c, os/controller] - [0x3D290, c, os/osVirtualToPhysical] - - [0x3d2f0, c, os/3d2f0_len_10] - - [0x3d300, c, os/3d300_len_30] - - [0x3d330, c, os/guFrustum] + - [0x3D2F0, c, os/3d2f0_len_10] + - [0x3D300, c, os/3d300_len_30] + - [0x3D330, c, os/guFrustum] - [0x3D5B0, c, os/guLookAt] - - [0x3dcc0, c, os/3dcc0_len_a60] - - [0x3e720, c, os/3e720_len_5f0] - - [0x3ed10, c, os/guOrtho] - - [0x3ef90, c, os/3ef90_len_600] - - [0x3f310, c, os/3f310_len_3c0] - - [0x3f6d0, c, os/3f6d0_len_320] - - [0x3f9f0, c, os/sins] - - [0x3fa50, c, os/3fa50_len_f60] + - [0x3DCC0, c, os/3dcc0_len_a60] + - [0x3E720, c, os/3e720_len_5f0] + - [0x3ED10, c, os/guOrtho] + - [0x3EF90, c, os/3ef90_len_600] + - [0x3F310, c, os/3f310_len_3c0] + - [0x3F6D0, c, os/3f6d0_len_320] + - [0x3F9F0, c, os/sins] + - [0x3FA50, c, os/3fa50_len_f60] - [0x3FEA0, c, os/3FEA0] # MOVE_ADDU - [0x40980, c, os/osCreateMesgQueue] - - [0x409b0, c, os/osJamMesg] - - [0x40af0, c, os/osRecvMesg] - - [0x40c20, c, os/40c20_len_1f0] + - [0x409B0, c, os/osJamMesg] + - [0x40AF0, c, os/osRecvMesg] + - [0x40C20, c, os/40c20_len_1f0] - [0x40E00, hasm, os/osGetCount] - [0x40E10, c, os/40E10] - [0x41050, c, os/osSpTaskYield] @@ -165,86 +169,86 @@ segments: - [0x41600, c, os/41600_len_40] - [0x41640, c, os/41640_len_50] - [0x41690, c, os/41690_len_10] - - [0x416a0, c, os/416a0_len_90] + - [0x416A0, c, os/416a0_len_90] - [0x41730, c, os/41730_len_20] - [0x41750, c, os/41750_len_450] - [0x41880, c, os/41880] - - [0x41ba0, c, os/41ba0_len_c0] - - [0x41c60, c, os/41c60_len_c0] - - [0x41d20, c, os/41d20_len_40] - - [0x41d60, c, os/41d60_len_50] - - [0x41db0, c, os/41db0_len_40] - - [0x41df0, c, os/41df0_len_40] - - [0x41e30, c, os/41e30_len_40] - - [0x41e70, c, os/41e70_len_340] - - [0x421b0, c, os/421b0_len_60] + - [0x41BA0, c, os/41ba0_len_c0] + - [0x41C60, c, os/41c60_len_c0] + - [0x41D20, c, os/41d20_len_40] + - [0x41D60, c, os/41d60_len_50] + - [0x41DB0, c, os/41db0_len_40] + - [0x41DF0, c, os/41df0_len_40] + - [0x41E30, c, os/41e30_len_40] + - [0x41E70, c, os/41e70_len_340] + - [0x421B0, c, os/421b0_len_60] - [0x42210, c, os/42210_len_50] - [0x42260, c, os/42260_len_170] - - [0x423d0, c, os/423d0_len_50] + - [0x423D0, c, os/423d0_len_50] - [0x42420, c, os/42420_len_50] - [0x42470, c, os/42470_len_310] - [0x42780, c, os/42780_len_120] - [0x427E0, c, os/osViRepeatLine] - [0x42840, c, os/guMtxIdent] - - [0x428a0, c, os/guMtxIdentF] + - [0x428A0, c, os/guMtxIdentF] - [0x42900, c, os/42900_len_80] - [0x42980, c, os/42980_len_80] - - [0x42a00, c, os/42a00_len_100] - - [0x42b00, c, os/42b00_len_c0] - - [0x42bc0, c, os/42bc0_len_60] - - [0x42c20, c, os/42c20_len_e0] - - [0x42d00, c, os/42d00_len_60] - - [0x42d60, c, os/42d60_len_80] - - [0x42de0, c, os/42de0_len_90] - - [0x42e70, c, os/42e70_len_390] + - [0x42A00, c, os/42a00_len_100] + - [0x42B00, c, os/42b00_len_c0] + - [0x42BC0, c, os/42bc0_len_60] + - [0x42C20, c, os/42c20_len_e0] + - [0x42D00, c, os/42d00_len_60] + - [0x42D60, c, os/42d60_len_80] + - [0x42DE0, c, os/42de0_len_90] + - [0x42E70, c, os/42e70_len_390] - [0x42F20, c, os/guRotate] - [0x43200, c, os/43200_len_7c0] - [0x43590, c, os/43590] - - [0x439c0, c, os/439c0_len_220] - - [0x43be0, c, os/43be0_len_5e0] - - [0x441c0, c, os/441c0_len_1c0] + - [0x439C0, c, os/439c0_len_220] + - [0x43BE0, c, os/43be0_len_5e0] + - [0x441C0, c, os/441c0_len_1c0] - [0x44380, c, os/44380_len_4e0] - [0x44490, c, os/44490] - [0x44860, c, os/44860_len_60] - - [0x448c0, c, os/448c0_len_210] - - [0x44ad0, c, os/44ad0_len_70] - - [0x44b40, c, os/44b40_len_a90] - - [0x455d0, c, os/455d0_len_1f0] - - [0x457c0, c, os/457c0_len_270] - - [0x45a30, c, os/45a30_len_20] - - [0x45a50, c, os/45a50_len_3a0] - - [0x45df0, hasm, os/exceptasm] + - [0x448C0, c, os/448c0_len_210] + - [0x44AD0, c, os/44ad0_len_70] + - [0x44B40, c, os/44b40_len_a90] + - [0x455D0, c, os/455d0_len_1f0] + - [0x457C0, c, os/457c0_len_270] + - [0x45A30, c, os/45a30_len_20] + - [0x45A50, c, os/45a50_len_3a0] + - [0x45DF0, hasm, os/exceptasm] - [0x46760, hasm, os/osDisableInt] - [0x467D0, hasm, os/osRestoreInt] - - [0x467f0, c, os/467f0_len_90] + - [0x467F0, c, os/467f0_len_90] - [0x46880, c, os/46880_len_260] - - [0x46ae0, c, os/46ae0_len_170] - - [0x46c50, c, os/46c50_len_20] - - [0x46c70, c, os/46c70_len_e00] + - [0x46AE0, c, os/46ae0_len_170] + - [0x46C50, c, os/46c50_len_20] + - [0x46C70, c, os/46c70_len_e00] - [0x47A60, hasm, os/osGetCause] - - [0x47a70, c, os/47a70_len_10] - - [0x47a80, c, os/47a80_len_10] - - [0x47a90, c, os/47a90_len_50] - - [0x47ae0, c, os/47ae0_len_e0] - - [0x47bc0, c, os/47bc0_len_50] - - [0x47c10, c, os/47c10_len_50] - - [0x47c60, c, os/47c60_len_f0] # MOVE_ADDU - - [0x47d50, c, os/47d50_len_e0] - - [0x47e30, c, os/47e30_len_60] - - [0x47e90, c, os/47e90_len_110] - - [0x47fa0, c, os/47fa0_len_20] - - [0x47fc0, c, os/47fc0_len_60] + - [0x47A70, c, os/47a70_len_10] + - [0x47A80, c, os/47a80_len_10] + - [0x47A90, c, os/47a90_len_50] + - [0x47AE0, c, os/47ae0_len_e0] + - [0x47BC0, c, os/47bc0_len_50] + - [0x47C10, c, os/47c10_len_50] + - [0x47C60, c, os/47c60_len_f0] # MOVE_ADDU + - [0x47D50, c, os/47d50_len_e0] + - [0x47E30, c, os/47e30_len_60] + - [0x47E90, c, os/47e90_len_110] + - [0x47FA0, c, os/47fa0_len_20] + - [0x47FC0, c, os/47fc0_len_60] - [0x48020, c, os/48020_len_a00] - - [0x48a20, c, os/ldiv] - - [0x48be0, c, os/osSiDeviceBusy] - - [0x48c00, c, os/48c00_len_5c0] - - [0x491c0, c, os/491c0_len_f80] + - [0x48A20, c, os/ldiv] + - [0x48BE0, c, os/osSiDeviceBusy] + - [0x48C00, c, os/48c00_len_5c0] + - [0x491C0, c, os/491c0_len_f80] - [0x49C70, c, os/49C70] - - [0x4a140, c, os/4a140_len_70] - - [0x4a1b0, c, os/4a1b0_len_40] - - [0x4a1f0, c, os/4a1f0_len_170] # yay0 decompression - some or all is hand-written - - [0x4a360, c, os/4a360_len_930] # osFlash* - IDO O2 -g - - [0x4ac90, pm_effects, effects] + - [0x4A140, c, os/4a140_len_70] + - [0x4A1B0, c, os/4a1b0_len_40] + - [0x4A1F0, c, os/4a1f0_len_170] # yay0 decompression - some or all is hand-written + - [0x4A360, c, os/4a360_len_930] # osFlash* - IDO O2 -g + - [0x4AC90, pm_effect_loads, effect_loads] - [0x4DF30, c, battle/battle] - [0x4E5A0, data, 1000_len_60] - [0x4F410, .data, 1370_len_7d0] @@ -253,10 +257,10 @@ segments: - [0x4F670, .data, 43F0] - [0x4F9D0, .data, fio] - [0x4F9E0, data, 6e40_beginning_data] - - [0x51540, ia8, no_controller, 128, 32] + - [0x51540, ia8, ui/no_controller, 128, 32] - [0x52540, .data, curtains] - [0x52610, .data, crash] - - [0x527F0, .data, os/nusys/7e40_len_3f0] + - [0x527F0, .data, os/nusys/nuGfxTaskMgr] - [0x52800, .data, os/nusys/nuSiMgr] - [0x52810, .data, camera] - [0x52820, .data, game_modes] @@ -275,7 +279,7 @@ segments: - [0x6EAC0, data] # has scripts - [0x6F0E0, .data, os/nusys/nuContRmbMgr] - [0x6F110, .data, os/nusys/nuGfxFuncSet] - - [0x6F120, .data, os/nuContMgr] + - [0x6F120, .data, os/nusys/nuContMgr] - [0x6F120, .data, os/osCreatePiManager] - [0x6F180, .data, os/osCartRomInit] - [0x6F190, .data, os/3c850_len_f0] @@ -338,21 +342,21 @@ segments: start: 0x759B0 vram: 0x800DC500 subsegments: - - [0x759b0, c, 759b0_len_61b0] + - [0x759B0, c, 759b0_len_61b0] - [0x77480, c, 77480] - [0x7B440, c, 7B440] - - [0x7bb60, c, 7bb60_len_41b0] - - [0x7fd10, c, 7fd10_len_b40] + - [0x7BB60, c, 7bb60_len_41b0] + - [0x7FD10, c, 7fd10_len_b40] - [0x80850, c, 80850_len_3060] - [0x838B0, c, world/actions] # DUMMY ROM - [0x838B0, c, world/partners] - - [0x891b0, c, 891b0_len_fb0] - - [0x8a160, c, 8a160_len_700] - - [0x8a860, c, 8a860_len_3f30] - - [0x8e790, c, 8e790_len_2850] + - [0x891B0, c, 891b0_len_fb0] + - [0x8A160, c, 8a160_len_700] + - [0x8A860, c, 8a860_len_3f30] + - [0x8E790, c, 8e790_len_2850] - [0x90FE0, .data, 759b0_len_61b0] - [0x913B0, .data, world/actions] - - [0x914E0, .data, world/partners] + - [0x914E0, .data, world/partners] # TODO shiftability: include following images in c file to fix padding issues - [0x919B0, ci4, ui/a_button_unpressed, 48, 40] - [0x91D70, palette, ui/a_button_unpressed] - [0x91D90, ci4, ui/a_button_pressed, 48, 40] @@ -375,10 +379,10 @@ segments: - [0x93390, palette, ui/unk_bar] - [0x933B0, ci4, ui/ok, 24, 16] - [0x93470, palette, ui/ok] - - [0x93490, ci4, ui/red_button, 48, 40] - - [0x93850, palette, ui/red_button] - - [0x93870, ci4, ui/red_button2, 48, 40] - - [0x93C30, palette, ui/red_button2] + - [0x93490, ci4, ui/start_button, 48, 40] + - [0x93850, palette, ui/start_button] + - [0x93870, ci4, ui/start_button2, 48, 40] + - [0x93C30, palette, ui/start_button2] - [0x93C50, ci4, ui/start, 24, 8] - [0x93CB0, palette, ui/start] - [0x93CD0, ci4, ui/hammer, 32, 32] @@ -761,7 +765,7 @@ segments: - type: group dir: charset start: 0x10F1B0 - subsegments: + subsegments: # TODO shiftability: what is going on here - [0x10F1B0, linker_offset, standard] - [0x10F1B0, pm_charset, standard, 16, 16, 0xA6] - [0x1144B0, linker_offset, standard_pal] @@ -780,7 +784,133 @@ segments: start: 0x131340 vram: 0x8023E000 subsegments: - - [0x131340, bin] # TODO images + - [0x131340, ci4, ui/unused_badge_points_icon, 24, 24] + - [0x131460, palette, ui/unused_badge_points_icon] + - [0x131480, palette, ui/unused_badge_points_icon.disabled] + - [0x1314A0, ci4, ui/unused_map_icon, 24, 24] + - [0x1315C0, palette, ui/unused_map_icon] + - [0x1315E0, palette, ui/unused_map_icon.disabled] + - [0x131600, ci4, ui/unused_menu_selector, 16, 16] + - [0x131680, palette, ui/unused_menu_selector] + - [0x1316A0, ci4, ui/unused_up_arrow, 16, 16] + - [0x131720, palette, ui/unused_up_arrow] + - [0x131740, bin] # todo + - [0x131780, ci4, ui/menu_label_stats, 48, 16] + - [0x131900, palette, ui/menu_label_stats] + - [0x131920, ci4, ui/menu_label_badges, 48, 16] + - [0x131AA0, palette, ui/menu_label_badges] + - [0x131AC0, ci4, ui/menu_label_items, 48, 16] + - [0x131C40, palette, ui/menu_label_items] + - [0x131C60, ci4, ui/menu_label_party, 48, 16] + - [0x131DE0, palette, ui/menu_label_party] + - [0x131E00, ci4, ui/menu_label_spirits, 48, 16] + - [0x131F80, palette, ui/menu_label_spirits] + - [0x131FA0, ci4, ui/menu_label_map, 48, 16] + - [0x132120, palette, ui/menu_label_map] + - [0x132140, bin] # todo + - [0x132400, ci4, ui/label_file, 32, 16] + - [0x132500, palette, ui/label_file] + - [0x132520, ci4, ui/label_file2, 32, 16] + - [0x132620, palette, ui/label_file2] + - [0x132640, ci4, ui/label_mono, 64, 16] + - [0x132840, palette, ui/label_mono] + - [0x132860, ci4, ui/label_mono2, 64, 16] + - [0x132A60, palette, ui/label_mono2] + - [0x132A80, ci4, ui/label_stereo, 64, 16] + - [0x132C80, palette, ui/label_stereo] + - [0x132CA0, ci4, ui/label_stereo2, 64, 16] + - [0x132EA0, palette, ui/label_stereo2] + - [0x132EC0, ci4, ui/eldstar_small, 16, 16] + - [0x132F40, palette, ui/eldstar_small] + - [0x132F60, ci4, ui/eldstar_small_silhouette, 16, 16] + - [0x132FE0, palette, ui/eldstar_small_silhouette] + - [0x133000, ci4, ui/mamar_small, 16, 16] + - [0x133080, palette, ui/mamar_small] + - [0x1330A0, ci4, ui/mamar_small_silhouette, 16, 16] + - [0x133120, palette, ui/mamar_small_silhouette] + - [0x133140, ci4, ui/skolar_small, 16, 16] + - [0x1331C0, palette, ui/skolar_small] + - [0x1331E0, ci4, ui/skolar_small_silhouette, 16, 16] + - [0x133260, palette, ui/skolar_small_silhouette] + - [0x133280, ci4, ui/muskular_small, 16, 16] + - [0x133300, palette, ui/muskular_small] + - [0x133320, ci4, ui/muskular_small_silhouette, 16, 16] + - [0x1333A0, palette, ui/muskular_small_silhouette] + - [0x1333C0, ci4, ui/misstar_small, 16, 16] + - [0x133440, palette, ui/misstar_small] + - [0x133460, ci4, ui/misstar_small_silhouette, 16, 16] + - [0x1334E0, palette, ui/misstar_small_silhouette] + - [0x133500, ci4, ui/klevar_small, 16, 16] + - [0x133580, palette, ui/klevar_small] + - [0x1335A0, ci4, ui/klevar_small_silhouette, 16, 16] + - [0x133620, palette, ui/klevar_small_silhouette] + - [0x133640, ci4, ui/kalmar_small, 16, 16] + - [0x1336C0, palette, ui/kalmar_small] + - [0x1336E0, ci4, ui/kalmar_small_silhouette, 16, 16] + - [0x133760, palette, ui/kalmar_small_silhouette] + - [0x133780, ci4, ui/mario_small, 24, 24] + - [0x1338A0, palette, ui/mario_small] + - [0x1338C0, ci4, ui/mario_small2, 24, 24] + - [0x1339E0, palette, ui/mario_small2] + - [0x133A00, ci4, ui/mario_small3, 24, 24] + - [0x133B20, palette, ui/mario_small3] + - [0x133B40, ci4, ui/ui_ja_super, 40, 16] + - [0x133C80, palette, ui/ui_ja_super] + - [0x133CA0, ci4, ui/ui_ja_ultra, 40, 16] + - [0x133DE0, palette, ui/ui_ja_ultra] + - [0x133E00, ci4, ui/z_up_arrow, 16, 16] + - [0x133E80, palette, ui/z_up_arrow] + - [0x133EA0, ci4, ui/r_down_arrow, 16, 16] + - [0x133F20, palette, ui/r_down_arrow] + - [0x133F40, ci4, ui/z_up_arrow2, 16, 16] + - [0x133FC0, palette, ui/z_up_arrow2] + - [0x133FE0, ci4, ui/r_down_arrow2, 16, 16] + - [0x134060, palette, ui/r_down_arrow2] + - [0x134080, ci4, ui/c_up, 16, 16] + - [0x134100, palette, ui/c_up] + - [0x134120, ci4, ui/c_down, 16, 16] + - [0x1341A0, palette, ui/c_down] + - [0x1341C0, ci4, ui/bp_needed, 48, 8] + - [0x134280, palette, ui/bp_needed] + - [0x1342A0, ci4, ui/mario_large, 32, 32] + - [0x1344A0, palette, ui/mario_large] + - [0x1344C0, ci4, ui/rectangle, 16, 8] + - [0x134500, palette, ui/rectangle] + - [0x134520, ci4, ui/badge_icon, 16, 16] + - [0x1345A0, palette, ui/badge_icon] + - [0x1345C0, ci4, ui/mario_icon, 16, 16] + - [0x134640, palette, ui/mario_icon] + - [0x134660, ci4, ui/clock_icon, 16, 16] + - [0x1346E0, palette, ui/clock_icon] + - [0x134700, ci4, ui/star_piece_icon, 16, 16] + - [0x134780, palette, ui/star_piece_icon] + - [0x1347A0, ci4, ui/star_piece_icon2, 16, 16] + - [0x134820, palette, ui/star_piece_icon2] + - [0x134840, ci4, ui/star_piece_icon3, 16, 16] + - [0x1348C0, palette, ui/star_piece_icon3] + - [0x1348E0, ci4, ui/fp_icon, 16, 16] + - [0x134960, palette, ui/fp_icon] + - [0x134980, bin] # todo + - [0x1349C0, ci4, ui/boots_disabled_icon, 16, 16] + - [0x134A40, palette, ui/boots_disabled_icon] + - [0x134A60, ci4, ui/boots_icon, 16, 16] + - [0x134AE0, palette, ui/boots_icon] + - [0x134B00, ci4, ui/super_boots_icon, 16, 16] + - [0x134B80, palette, ui/super_boots_icon] + - [0x134BA0, ci4, ui/ultra_boots_icon, 16, 16] + - [0x134C20, palette, ui/ultra_boots_icon] + - [0x134C40, ci4, ui/hammer_disabled_icon, 16, 16] + - [0x134CC0, palette, ui/hammer_disabled_icon] + - [0x134CE0, ci4, ui/hammer_icon, 16, 16] + - [0x134D60, palette, ui/hammer_icon] + - [0x134D80, ci4, ui/super_hammer_icon, 16, 16] + - [0x134E00, palette, ui/super_hammer_icon] + - [0x134E20, ci4, ui/ultra_hammer_icon, 16, 16] + - [0x134EA0, palette, ui/ultra_hammer_icon] + - [0x134EC0, ci4, ui/blue_orb, 16, 16] + - [0x134F40, palette, ui/blue_orb] + - [0x134F60, ci4, ui/label_bubble, 56, 16] + - [0x135120, palette, ui/label_bubble] - [0x135140, bin, pause_icon_table] # TODO data - type: code dir: pause @@ -2046,9 +2176,9 @@ segments: start: 0x325ad0 vram: 0xE0200000 subsegments: - - [0x325ad0, c] - - [0x325ee0, c] - - [0x326160, data] + - [0x325AD0, c] + - [0x325EE0, pm_effect_shims, effect_shims] + - [0x326160, .data, 325AD0] - [0x326410, bin] - type: code start: 0x3278f0 @@ -10534,153 +10664,153 @@ segments: subsegments: - [0xEFEB00, c] - [0xEFF440, bin] # some of this is audio-related and not part of this overlay - - [0xF007C0, bin, Battle_Fanfare_02] # BGM start - - [0xF02160, bin, Hey_You_03] - - [0xF03740, bin, The_Goomba_King_s_Decree_07] - - [0xF043F0, bin, Attack_of_the_Koopa_Bros_08] - - [0xF073C0, bin, Trojan_Bowser_09] - - [0xF08D40, bin, Chomp_Attack_0A] - - [0xF09600, bin, Ghost_Gulping_0B] - - [0xF0A550, bin, Keeping_Pace_0C] - - [0xF0BAE0, bin, Go_Mario_Go_0D] - - [0xF0DEC0, bin, Huffin_and_Puffin_0E] - - [0xF0FD20, bin, Freeze_0F] - - [0xF110D0, bin, Winning_a_Battle_8B] - - [0xF116C0, bin, Winning_a_Battle_and_Level_Up_8E] - - [0xF12320, bin, Jr_Troopa_Battle_04] - - [0xF13C20, bin, Final_Bowser_Battle_interlude_05] - - [0xF15F40, bin, Master_Battle_2C] - - [0xF16F80, bin, Game_Over_87] - - [0xF171D0, bin, Resting_at_the_Toad_House_88] - - [0xF17370, bin, Running_around_the_Heart_Pillar_in_Ch1_84] - - [0xF17570, bin, Tutankoopa_s_Warning_45] - - [0xF18940, bin, Kammy_Koopa_s_Theme_46] - - [0xF193D0, bin, Jr_Troopa_s_Theme_47] - - [0xF19BC0, bin, Goomba_King_s_Theme_50] - - [0xF1A6F0, bin, Koopa_Bros_Defeated_51] - - [0xF1ABD0, bin, Koopa_Bros_Theme_52] - - [0xF1C810, bin, Tutankoopa_s_Warning_2_53] - - [0xF1DBF0, bin, Tutankoopa_s_Theme_54] - - [0xF1F2E0, bin, Tubba_Blubba_s_Theme_55] - - [0xF20FF0, bin, General_Guy_s_Theme_56] - - [0xF21780, bin, Lava_Piranha_s_Theme_57] - - [0xF22A00, bin, Huff_N_Puff_s_Theme_58] - - [0xF23A00, bin, Crystal_King_s_Theme_59] - - [0xF24810, bin, Blooper_s_Theme_5A] - - [0xF25240, bin, Midboss_Theme_5B] - - [0xF26260, bin, Monstar_s_Theme_5C] - - [0xF27840, bin, Moustafa_s_Theme_86] - - [0xF27E20, bin, Fuzzy_Searching_Minigame_85] - - [0xF28E20, bin, Phonograph_in_Mansion_44] - - [0xF29AC0, bin, Toad_Town_00] - - [0xF2E130, bin, Bill_Blaster_Theme_48] - - [0xF2EF90, bin, Monty_Mole_Theme_in_Flower_Fields_49] - - [0xF30590, bin, Shy_Guys_in_Toad_Town_4A] - - [0xF318B0, bin, Whale_s_Problem_4C] - - [0xF32220, bin, Toad_Town_Sewers_4B] - - [0xF33060, bin, Unused_Theme_4D] - - [0xF33AA0, bin, Mario_s_House_Prologue_3E] - - [0xF33F10, bin, Peach_s_Party_3F] - - [0xF354E0, bin, Goomba_Village_01] - - [0xF35ED0, bin, Pleasant_Path_11] - - [0xF36690, bin, Fuzzy_s_Took_My_Shell_12] - - [0xF379E0, bin, Koopa_Village_13] - - [0xF38570, bin, Koopa_Bros_Fortress_14] - - [0xF39160, bin, Dry_Dry_Ruins_18] - - [0xF3A0D0, bin, Dry_Dry_Ruins_Mystery_19] - - [0xF3A450, bin, Mt_Rugged_16] - - [0xF3AF20, bin, Dry_Dry_Desert_Oasis_17] - - [0xF3C130, bin, Dry_Dry_Outpost_15] - - [0xF3CCC0, bin, Forever_Forest_1A] - - [0xF3E130, bin, Boo_s_Mansion_1B] - - [0xF3F3E0, bin, Bow_s_Theme_1C] - - [0xF40F00, bin, Gusty_Gulch_Adventure_1D] - - [0xF42F30, bin, Tubba_Blubba_s_Castle_1E] - - [0xF45500, bin, The_Castle_Crumbles_1F] - - [0xF465E0, bin, Shy_Guy_s_Toy_Box_20] - - [0xF474A0, bin, Toy_Train_Travel_21] - - [0xF47E10, bin, Big_Lantern_Ghost_s_Theme_22] - - [0xF48410, bin, Jade_Jungle_24] - - [0xF4A880, bin, Deep_Jungle_25] - - [0xF4BC00, bin, Lavalava_Island_26] - - [0xF4E690, bin, Search_for_the_Fearsome_5_27] - - [0xF50A00, bin, Raphael_the_Raven_28] - - [0xF52520, bin, Hot_Times_in_Mt_Lavalava_29] - - [0xF55C80, bin, Escape_from_Mt_Lavalava_2A] - - [0xF58ED0, bin, Cloudy_Climb_32] - - [0xF592B0, bin, Puff_Puff_Machine_33] - - [0xF5AFF0, bin, Flower_Fields_30] - - [0xF5C8D0, bin, Flower_Fields_Sunny_31] - - [0xF5DF40, bin, Sun_s_Tower_34] - - [0xF5F500, bin, Sun_s_Celebration_35] - - [0xF61700, bin, Shiver_City_38] - - [0xF62E50, bin, Detective_Mario_39] - - [0xF64220, bin, Snow_Road_3A] - - [0xF64CB0, bin, Over_Shiver_Mountain_3B] - - [0xF65B30, bin, Starborn_Valley_3C] - - [0xF66690, bin, Sanctuary_3D] - - [0xF66B70, bin, Crystal_Palace_37] - - [0xF67F80, bin, Star_Haven_60] - - [0xF69640, bin, Shooting_Star_Summit_61] - - [0xF6A050, bin, Legendary_Star_Ship_62] - - [0xF6C270, bin, Star_Sanctuary_63] - - [0xF6CED0, bin, Bowser_s_Castle_-_Caves_65] - - [0xF6EE40, bin, Bowser_s_Castle_64] - - [0xF73390, bin, Star_Elevator_2B] - - [0xF751F0, bin, Goomba_Bros_Defeated_7E] - - [0xF759C0, bin, Farewell_Twink_70] - - [0xF77200, bin, Peach_Cooking_71] - - [0xF77680, bin, Gourmet_Guy_72] - - [0xF78600, bin, Hope_on_the_Balcony_Peach_1_73] - - [0xF79070, bin, Peach_s_Theme_2_74] - - [0xF7A0C0, bin, Peach_Sneaking_75] - - [0xF7AA40, bin, Peach_Captured_76] - - [0xF7AD90, bin, Quiz_Show_Intro_77] - - [0xF7BEA0, bin, Unconscious_Mario_78] - - [0xF7C780, bin, Petunia_s_Theme_89] - - [0xF7DC00, bin, Flower_Fields_Door_appears_8A] - - [0xF7E190, bin, Beanstalk_7B] - - [0xF7EE20, bin, Lakilester_s_Theme_7D] - - [0xF80230, bin, The_Sun_s_Back_7F] - - [0xF81260, bin, Shiver_City_in_Crisis_79] - - [0xF82460, bin, Solved_Shiver_City_Mystery_7A] - - [0xF82D00, bin, Merlon_s_Spell_7C] - - [0xF83DC0, bin, Bowser_s_Theme_66] - - [0xF85590, bin, Train_Travel_80] - - [0xF860E0, bin, Whale_Trip_81] - - [0xF87000, bin, Chanterelle_s_Song_8C] - - [0xF87610, bin, Boo_s_Game_8D] - - [0xF88B30, bin, Dry_Dry_Ruins_rises_up_83] - - [0xF89570, bin, End_of_Chapter_40] - - [0xF8AAF0, bin, Beginning_of_Chapter_41] - - [0xF8B820, bin, Hammer_and_Jump_Upgrade_42] - - [0xF8BD90, bin, Found_Baby_Yoshi_s_4E] - - [0xF8C360, bin, New_Partner_JAP_96] - - [0xF8D110, bin, Unused_YI_Fanfare_4F] - - [0xF8D3E0, bin, Unused_YI_Fanfare_2_5D] - - [0xF90880, bin, Peach_s_Castle_inside_Bubble_5E] - - [0xF92A50, bin, Angry_Bowser_67] - - [0xF95510, bin, Bowser_s_Castle_explodes_5F] - - [0xF96280, bin, Peach_s_Wish_68] - - [0xF98520, bin, File_Select_69] - - [0xF98F90, bin, Title_Screen_6A] - - [0xF9B830, bin, Peach_s_Castle_in_Crisis_6B] - - [0xF9D3B0, bin, Mario_falls_from_Bowser_s_Castle_6C] - - [0xF9D690, bin, Peach_s_Arrival_6D] - - [0xF9EF30, bin, Star_Rod_Recovered_6F] - - [0xF9FA30, bin, Mario_s_House_94] - - [0xFA08A0, bin, Bowser_s_Attacks_95] - - [0xFA3C60, bin, End_Parade_1_90] - - [0xFA85F0, bin, End_Parade_2_91] - - [0xFABE90, bin, The_End_6E] - - [0xFACC80, bin, Koopa_Radio_Station_2D] - - [0xFAD210, bin, The_End_Low_Frequency__2E] - - [0xFAD8F0, bin, SMW_Remix_2F] - - [0xFADE70, bin, New_Partner_82] # BGM end + - [0xF007C0, bin, bgm/Battle_Fanfare_02] # BGM start + - [0xF02160, bin, bgm/Hey_You_03] + - [0xF03740, bin, bgm/The_Goomba_King_s_Decree_07] + - [0xF043F0, bin, bgm/Attack_of_the_Koopa_Bros_08] + - [0xF073C0, bin, bgm/Trojan_Bowser_09] + - [0xF08D40, bin, bgm/Chomp_Attack_0A] + - [0xF09600, bin, bgm/Ghost_Gulping_0B] + - [0xF0A550, bin, bgm/Keeping_Pace_0C] + - [0xF0BAE0, bin, bgm/Go_Mario_Go_0D] + - [0xF0DEC0, bin, bgm/Huffin_and_Puffin_0E] + - [0xF0FD20, bin, bgm/Freeze_0F] + - [0xF110D0, bin, bgm/Winning_a_Battle_8B] + - [0xF116C0, bin, bgm/Winning_a_Battle_and_Level_Up_8E] + - [0xF12320, bin, bgm/Jr_Troopa_Battle_04] + - [0xF13C20, bin, bgm/Final_Bowser_Battle_interlude_05] + - [0xF15F40, bin, bgm/Master_Battle_2C] + - [0xF16F80, bin, bgm/Game_Over_87] + - [0xF171D0, bin, bgm/Resting_at_the_Toad_House_88] + - [0xF17370, bin, bgm/Running_around_the_Heart_Pillar_in_Ch1_84] + - [0xF17570, bin, bgm/Tutankoopa_s_Warning_45] + - [0xF18940, bin, bgm/Kammy_Koopa_s_Theme_46] + - [0xF193D0, bin, bgm/Jr_Troopa_s_Theme_47] + - [0xF19BC0, bin, bgm/Goomba_King_s_Theme_50] + - [0xF1A6F0, bin, bgm/Koopa_Bros_Defeated_51] + - [0xF1ABD0, bin, bgm/Koopa_Bros_Theme_52] + - [0xF1C810, bin, bgm/Tutankoopa_s_Warning_2_53] + - [0xF1DBF0, bin, bgm/Tutankoopa_s_Theme_54] + - [0xF1F2E0, bin, bgm/Tubba_Blubba_s_Theme_55] + - [0xF20FF0, bin, bgm/General_Guy_s_Theme_56] + - [0xF21780, bin, bgm/Lava_Piranha_s_Theme_57] + - [0xF22A00, bin, bgm/Huff_N_Puff_s_Theme_58] + - [0xF23A00, bin, bgm/Crystal_King_s_Theme_59] + - [0xF24810, bin, bgm/Blooper_s_Theme_5A] + - [0xF25240, bin, bgm/Midboss_Theme_5B] + - [0xF26260, bin, bgm/Monstar_s_Theme_5C] + - [0xF27840, bin, bgm/Moustafa_s_Theme_86] + - [0xF27E20, bin, bgm/Fuzzy_Searching_Minigame_85] + - [0xF28E20, bin, bgm/Phonograph_in_Mansion_44] + - [0xF29AC0, bin, bgm/Toad_Town_00] + - [0xF2E130, bin, bgm/Bill_Blaster_Theme_48] + - [0xF2EF90, bin, bgm/Monty_Mole_Theme_in_Flower_Fields_49] + - [0xF30590, bin, bgm/Shy_Guys_in_Toad_Town_4A] + - [0xF318B0, bin, bgm/Whale_s_Problem_4C] + - [0xF32220, bin, bgm/Toad_Town_Sewers_4B] + - [0xF33060, bin, bgm/Unused_Theme_4D] + - [0xF33AA0, bin, bgm/Mario_s_House_Prologue_3E] + - [0xF33F10, bin, bgm/Peach_s_Party_3F] + - [0xF354E0, bin, bgm/Goomba_Village_01] + - [0xF35ED0, bin, bgm/Pleasant_Path_11] + - [0xF36690, bin, bgm/Fuzzy_s_Took_My_Shell_12] + - [0xF379E0, bin, bgm/Koopa_Village_13] + - [0xF38570, bin, bgm/Koopa_Bros_Fortress_14] + - [0xF39160, bin, bgm/Dry_Dry_Ruins_18] + - [0xF3A0D0, bin, bgm/Dry_Dry_Ruins_Mystery_19] + - [0xF3A450, bin, bgm/Mt_Rugged_16] + - [0xF3AF20, bin, bgm/Dry_Dry_Desert_Oasis_17] + - [0xF3C130, bin, bgm/Dry_Dry_Outpost_15] + - [0xF3CCC0, bin, bgm/Forever_Forest_1A] + - [0xF3E130, bin, bgm/Boo_s_Mansion_1B] + - [0xF3F3E0, bin, bgm/Bow_s_Theme_1C] + - [0xF40F00, bin, bgm/Gusty_Gulch_Adventure_1D] + - [0xF42F30, bin, bgm/Tubba_Blubba_s_Castle_1E] + - [0xF45500, bin, bgm/The_Castle_Crumbles_1F] + - [0xF465E0, bin, bgm/Shy_Guy_s_Toy_Box_20] + - [0xF474A0, bin, bgm/Toy_Train_Travel_21] + - [0xF47E10, bin, bgm/Big_Lantern_Ghost_s_Theme_22] + - [0xF48410, bin, bgm/Jade_Jungle_24] + - [0xF4A880, bin, bgm/Deep_Jungle_25] + - [0xF4BC00, bin, bgm/Lavalava_Island_26] + - [0xF4E690, bin, bgm/Search_for_the_Fearsome_5_27] + - [0xF50A00, bin, bgm/Raphael_the_Raven_28] + - [0xF52520, bin, bgm/Hot_Times_in_Mt_Lavalava_29] + - [0xF55C80, bin, bgm/Escape_from_Mt_Lavalava_2A] + - [0xF58ED0, bin, bgm/Cloudy_Climb_32] + - [0xF592B0, bin, bgm/Puff_Puff_Machine_33] + - [0xF5AFF0, bin, bgm/Flower_Fields_30] + - [0xF5C8D0, bin, bgm/Flower_Fields_Sunny_31] + - [0xF5DF40, bin, bgm/Sun_s_Tower_34] + - [0xF5F500, bin, bgm/Sun_s_Celebration_35] + - [0xF61700, bin, bgm/Shiver_City_38] + - [0xF62E50, bin, bgm/Detective_Mario_39] + - [0xF64220, bin, bgm/Snow_Road_3A] + - [0xF64CB0, bin, bgm/Over_Shiver_Mountain_3B] + - [0xF65B30, bin, bgm/Starborn_Valley_3C] + - [0xF66690, bin, bgm/Sanctuary_3D] + - [0xF66B70, bin, bgm/Crystal_Palace_37] + - [0xF67F80, bin, bgm/Star_Haven_60] + - [0xF69640, bin, bgm/Shooting_Star_Summit_61] + - [0xF6A050, bin, bgm/Legendary_Star_Ship_62] + - [0xF6C270, bin, bgm/Star_Sanctuary_63] + - [0xF6CED0, bin, bgm/Bowser_s_Castle_-_Caves_65] + - [0xF6EE40, bin, bgm/Bowser_s_Castle_64] + - [0xF73390, bin, bgm/Star_Elevator_2B] + - [0xF751F0, bin, bgm/Goomba_Bros_Defeated_7E] + - [0xF759C0, bin, bgm/Farewell_Twink_70] + - [0xF77200, bin, bgm/Peach_Cooking_71] + - [0xF77680, bin, bgm/Gourmet_Guy_72] + - [0xF78600, bin, bgm/Hope_on_the_Balcony_Peach_1_73] + - [0xF79070, bin, bgm/Peach_s_Theme_2_74] + - [0xF7A0C0, bin, bgm/Peach_Sneaking_75] + - [0xF7AA40, bin, bgm/Peach_Captured_76] + - [0xF7AD90, bin, bgm/Quiz_Show_Intro_77] + - [0xF7BEA0, bin, bgm/Unconscious_Mario_78] + - [0xF7C780, bin, bgm/Petunia_s_Theme_89] + - [0xF7DC00, bin, bgm/Flower_Fields_Door_appears_8A] + - [0xF7E190, bin, bgm/Beanstalk_7B] + - [0xF7EE20, bin, bgm/Lakilester_s_Theme_7D] + - [0xF80230, bin, bgm/The_Sun_s_Back_7F] + - [0xF81260, bin, bgm/Shiver_City_in_Crisis_79] + - [0xF82460, bin, bgm/Solved_Shiver_City_Mystery_7A] + - [0xF82D00, bin, bgm/Merlon_s_Spell_7C] + - [0xF83DC0, bin, bgm/Bowser_s_Theme_66] + - [0xF85590, bin, bgm/Train_Travel_80] + - [0xF860E0, bin, bgm/Whale_Trip_81] + - [0xF87000, bin, bgm/Chanterelle_s_Song_8C] + - [0xF87610, bin, bgm/Boo_s_Game_8D] + - [0xF88B30, bin, bgm/Dry_Dry_Ruins_rises_up_83] + - [0xF89570, bin, bgm/End_of_Chapter_40] + - [0xF8AAF0, bin, bgm/Beginning_of_Chapter_41] + - [0xF8B820, bin, bgm/Hammer_and_Jump_Upgrade_42] + - [0xF8BD90, bin, bgm/Found_Baby_Yoshi_s_4E] + - [0xF8C360, bin, bgm/New_Partner_JAP_96] + - [0xF8D110, bin, bgm/Unused_YI_Fanfare_4F] + - [0xF8D3E0, bin, bgm/Unused_YI_Fanfare_2_5D] + - [0xF90880, bin, bgm/Peach_s_Castle_inside_Bubble_5E] + - [0xF92A50, bin, bgm/Angry_Bowser_67] + - [0xF95510, bin, bgm/Bowser_s_Castle_explodes_5F] + - [0xF96280, bin, bgm/Peach_s_Wish_68] + - [0xF98520, bin, bgm/File_Select_69] + - [0xF98F90, bin, bgm/Title_Screen_6A] + - [0xF9B830, bin, bgm/Peach_s_Castle_in_Crisis_6B] + - [0xF9D3B0, bin, bgm/Mario_falls_from_Bowser_s_Castle_6C] + - [0xF9D690, bin, bgm/Peach_s_Arrival_6D] + - [0xF9EF30, bin, bgm/Star_Rod_Recovered_6F] + - [0xF9FA30, bin, bgm/Mario_s_House_94] + - [0xFA08A0, bin, bgm/Bowser_s_Attacks_95] + - [0xFA3C60, bin, bgm/End_Parade_1_90] + - [0xFA85F0, bin, bgm/End_Parade_2_91] + - [0xFABE90, bin, bgm/The_End_6E] + - [0xFACC80, bin, bgm/Koopa_Radio_Station_2D] + - [0xFAD210, bin, bgm/The_End_Low_Frequency__2E] + - [0xFAD8F0, bin, bgm/SMW_Remix_2F] + - [0xFADE70, bin, bgm/New_Partner_82] # BGM end - [0xFAE860, bin] # sfx - [0x1943000, bin] # duplicate of 0x1E00000 - [0x1983000, bin] - - [0x19E09A8, Yay0] + - [0x19E09A8, Yay0] # TODO shiftability - figure out what these are and if they have any pointers in them - [0x19E1390, Yay0] - [0x19E1888, Yay0] - [0x19E2330, Yay0] @@ -10693,7 +10823,7 @@ segments: - [0x19E5758, Yay0] - [0x19E5950, Yay0] - [0x19E62A0, Yay0] - - start: 0x19E67B8 + - start: 0x19E67B8 # TODO shiftability type: pm_npc_sprites dir: sprite name: npc @@ -10931,7 +11061,7 @@ segments: - parade_shy_guys - parade_twink - leaf - - [0x1B82208, bin] + - [0x1B82208, bin] # todo: figure out what this is - start: 0x1B83000 type: pm_msg files: @@ -12022,6 +12152,6 @@ segments: - party_opuku - party_pokopi - type: bin - start: 0x27FEE22 + start: 0x27FEE22 # TODO shiftability subalign: 2 - [0x2800000] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 0eaaa924fb..c6856808c9 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -897,7 +897,7 @@ nuContRmbForceStop = 0x800600A0; // type:func rom:0x3B4A0 nuContRmbForceStopEnd = 0x800600C0; // type:func rom:0x3B4C0 nuPiReadRomOverlay = 0x800600E0; // type:func rom:0x3B4E0 nuGfxThreadStart = 0x800601F0; // type:func rom:0x3B5F0 -nuGfxThread2 = 0x80060248; // type:func rom:0x3B648 +gfxThread = 0x80060248; // type:func rom:0x3B648 nuGfxSwapCfbFuncSet = 0x80060310; // type:func rom:0x3B710 nuGfxSwapCfb = 0x80060350; // type:func rom:0x3B750 nuGfxRetraceWait = 0x80060370; // type:func rom:0x3B770 @@ -1316,11 +1316,11 @@ D_80077210 = 0x80077210; // type:data rom:0x52610 D_80077290 = 0x80077290; // type:data rom:0x52690 D_80077390 = 0x80077390; // type:data rom:0x52790 D_800773D8 = 0x800773D8; // type:data rom:0x527D8 -D_800773F0 = 0x800773F0; // type:data rom:0x527F0 -D_800773F4 = 0x800773F4; // type:data rom:0x527F4 -D_800773F8 = 0x800773F8; // type:data rom:0x527F8 -D_800773FC = 0x800773FC; // type:data rom:0x527FC -D_80077400 = 0x80077400; // type:data rom:0x52800 +nuGfxCfbNum = 0x800773F0; // type:data rom:0x527F0 +nuGfxSwapCfbFunc = 0x800773F4; // type:data rom:0x527F4 +nuGfxTaskEndFunc = 0x800773F8; // type:data rom:0x527F8 +beforeFlag = 0x800773FC; // type:data rom:0x527FC +nuSiCallBackList = 0x80077400; // type:data rom:0x52800 gCurrentCameraID = 0x80077410; // rom:0x52810 D_80077420 = 0x80077420; // type:data rom:0x52820 gameModeBlueprints = 0x800776E8; // type:data rom:0x52AE8 @@ -18209,11 +18209,11 @@ D_8009A5D0 = 0x8009A5D0; // type:data D_8009A5D4 = 0x8009A5D4; // type:data timeFreezeMode = 0x8009A5D8; // type:data nuGfxZBuffer = 0x8009A5DC; // -D_8009A5E0 = 0x8009A5E0; // type:data +nuContDataLockKey = 0x8009A5E0; // type:data D_8009A5E4 = 0x8009A5E4; // type:data D_8009A5E8 = 0x8009A5E8; // type:data D_8009A5EC = 0x8009A5EC; // type:data -D_8009A5F0 = 0x8009A5F0; // type:data +nuGfxCfbCounter = 0x8009A5F0; // type:data D_8009A5F4 = 0x8009A5F4; // type:data nuGfxDisplay = 0x8009A5F8; // D_8009A5FC = 0x8009A5FC; // type:data @@ -18222,8 +18222,8 @@ gNpcCount = 0x8009A604; // type:data D_8009A606 = 0x8009A606; // type:data D_8009A608 = 0x8009A608; // type:data D_8009A60C = 0x8009A60C; // type:data -D_8009A610 = 0x8009A610; // type:data -D_8009A614 = 0x8009A614; // type:data +nuGfxUcode = 0x8009A610; // type:data +nuContNum = 0x8009A614; // type:data nuGfxTaskSpool = 0x8009A618; // D_8009A61C = 0x8009A61C; // type:data D_8009A620 = 0x8009A620; // type:data @@ -18231,13 +18231,13 @@ D_8009A628 = 0x8009A628; // type:data D_8009A62C = 0x8009A62C; // type:data D_8009A630 = 0x8009A630; // type:data gCurrentCamID = 0x8009A634; // type:data -carthandle = 0x8009A638; // +nuPiCartHandle = 0x8009A638; // D_8009A63C = 0x8009A63C; // type:data D_8009A640 = 0x8009A640; // type:data -D_8009A64C = 0x8009A64C; // type:data +nuGfxCfb_ptr = 0x8009A64C; // type:data gOverrideFlags = 0x8009A650; // type:data D_8009A654 = 0x8009A654; // type:data -D_8009A658 = 0x8009A658; // type:data +nuGfxCfb = 0x8009A658; // type:data D_8009A660 = 0x8009A660; // type:data D_8009A664 = 0x8009A664; // type:data D_8009A668 = 0x8009A668; // type:data @@ -18264,13 +18264,13 @@ D_8009BAA8 = 0x8009BAA8; // type:data D_8009BB30 = 0x8009BB30; // type:data D_8009C4E0 = 0x8009C4E0; // type:data D_8009C4FC = 0x8009C4FC; // type:data -D_8009C510 = 0x8009C510; // type:data -D_8009C514 = 0x8009C514; // type:data -D_8009C516 = 0x8009C516; // type:data -D_8009C518 = 0x8009C518; // type:data +nuGfxTask_ptr = 0x8009C510; // type:data +taskDoneMsg = 0x8009C514; // type:data +swapBufMsg = 0x8009C516; // type:data +GfxTaskMgrThread = 0x8009C518; // type:data D_8009E6D0 = 0x8009E6D0; // type:data -D_8009E6F0 = 0x8009E6F0; // type:data -D_8009E710 = 0x8009E710; // type:data +nuSiMesgBuf = 0x8009E6F0; // type:data +siMgrThread = 0x8009E710; // type:data D_800A08C0 = 0x800A08C0; // type:data D_800A08DC = 0x800A08DC; // type:data D_800A08E0 = 0x800A08E0; // type:data @@ -18383,9 +18383,9 @@ nuScAudioStack = 0x800A85D0; // nuScGraphicsStack = 0x800AA5D0; // D_800AC5D0 = 0x800AC5D0; // type:data D_800AC5E8 = 0x800AC5E8; // type:data -D_800AC6B0 = 0x800AC6B0; // type:data -D_800AE6D0 = 0x800AE6D0; // type:data -D_800AE6D4 = 0x800AE6D4; // type:data +nuGfxMesgBuf = 0x800AC6B0; // type:data +nuContWaitMesgBuf = 0x800AE6D0; // type:data +nuContDataMutexBuf = 0x800AE6D4; // type:data piMgrThread = 0x800AE6E0; // type:data __osPiMesgQueue = 0x800AF890; // type:data piMgrMesgBuff = 0x800AF8A8; // type:data @@ -18435,7 +18435,7 @@ D_800B0CE4 = 0x800B0CE4; // type:data D_800B0CE8 = 0x800B0CE8; // type:data mapTexName = 0x800B0CF0; // type:data D_800B0D08 = 0x800B0D08; // type:data -D_800B0EB8 = 0x800B0EB8; // type:data +nuContWaitMesgQ = 0x800B0EB8; // type:data D_800B0ED0 = 0x800B0ED0; // type:data D_800B0F08 = 0x800B0F08; // type:data D_800B0F0C = 0x800B0F0C; // type:data @@ -18446,20 +18446,13 @@ D_800B1B0D = 0x800B1B0D; // type:data D_800B1B0E = 0x800B1B0E; // type:data D_800B1B0F = 0x800B1B0F; // type:data D_800B1B10 = 0x800B1B10; // type:data -D_800B1B7C = 0x800B1B7C; // type:data -D_800B1B7F = 0x800B1B7F; // type:data +nuContStatus = 0x800B1B7C; // type:data D_800B1B90 = 0x800B1B90; // type:data nuContRmbCtl = 0x800B1D40; // -D_800B1D42 = 0x800B1D42; // type:data -D_800B1D44 = 0x800B1D44; // type:data -D_800B1D46 = 0x800B1D46; // type:data -D_800B1D47 = 0x800B1D47; // type:data -D_800B1D48 = 0x800B1D48; // type:data -D_800B1D49 = 0x800B1D49; // type:data nuContData = 0x800B1D68; // gCameras = 0x800B1D80; // type:data size:0x1560 gCollisionData = 0x800B42E0; // type:data size:0x10 -D_800B42F0 = 0x800B42F0; // type:data +nuGfxMesgQ = 0x800B42F0; // type:data D_800B4308 = 0x800B4308; // type:data D_800B430C = 0x800B430C; // type:data D_800B430D = 0x800B430D; // type:data @@ -18480,7 +18473,7 @@ D_800B451F = 0x800B451F; // type:data D_800B4520 = 0x800B4520; // type:data D_800B6590 = 0x800B6590; // type:data D_800B7EF0 = 0x800B7EF0; // type:data -D_800B8590 = 0x800B8590; // type:data +nuYieldBuf = 0x800B8590; // type:data D_800B8D80 = 0x800B8D80; // type:data D_800B8DEC = 0x800B8DEC; // type:data D_800B91A0 = 0x800B91A0; // type:data @@ -18489,10 +18482,10 @@ D_800D91D0 = 0x800D91D0; // type:data D_800D91D4 = 0x800D91D4; // type:data D_800D91DC = 0x800D91DC; // type:data mapHitName = 0x800D91E0; // type:data -D_800D91F8 = 0x800D91F8; // type:data +nuSiMgrMesgQ = 0x800D91F8; // type:data mapShapeName = 0x800D9230; // type:data D_800D9248 = 0x800D9248; // type:data struct:ALHeap -D_800D9278 = 0x800D9278; // type:data +nuGfxTask = 0x800D9278; // type:data D_800D95E8 = 0x800D95E8; // type:data D_800D9620 = 0x800D9620; // type:data D_800D9668 = 0x800D9668; // type:data @@ -18522,7 +18515,7 @@ D_800DBC70 = 0x800DBC70; // type:data D_800DBD70 = 0x800DBD70; // type:data D_800DBF70 = 0x800DBF70; // type:data D_800DBF90 = 0x800DBF90; // type:data -D_800DC040 = 0x800DC040; // type:data +nuContDataMutexQ = 0x800DC040; // type:data D_800DC060 = 0x800DC060; // type:data D_800DC064 = 0x800DC064; // type:data gBattleState = 0x800DC068; //