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

btl_state_update_partner_menu (#860)

Browse Source 
* btl_state_update_partner_menu

* cleaning

* enums in btl_state_draw_partner_menu

* PR comments
This commit is contained in:
Unnunu 2022-11-16 12:46:50 +03:00 committed by GitHub
parent f56df3d9f7
commit 0f4f12a1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 1619 additions and 2476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
include/enums.h
View File

@ -505,6 +505,7 @@ enum SoundIDs {
SOUND_B = 0x0000000B, SOUND_B = 0x0000000B,
SOUND_D = 0x0000000D, SOUND_D = 0x0000000D,
SOUND_E = 0x0000000E, SOUND_E = 0x0000000E,
SOUND_F = 0x0000000F,
SOUND_10 = 0x00000010, SOUND_10 = 0x00000010,
SOUND_11 = 0x00000011, SOUND_11 = 0x00000011,
SOUND_14 = 0x00000014, SOUND_14 = 0x00000014,
@ -4056,56 +4057,126 @@ enum BattleStates {
BATTLE_STATE_END_DEMO_BATTLE = 35, BATTLE_STATE_END_DEMO_BATTLE = 35,
}; };
enum BattleStates2 { enum BattleSubStates {
BATTLE_STATE2_UNK_0 = 0x00000000, BATTLE_SUB_STATE_UNK_0 = 0x00000000,
BATTLE_STATE2_UNK_1 = 0x00000001, BATTLE_SUB_STATE_UNK_1 = 0x00000001,
BATTLE_STATE2_UNK_2 = 0x00000002, BATTLE_SUB_STATE_UNK_2 = 0x00000002,
BATTLE_STATE2_UNK_3 = 0x00000003, BATTLE_SUB_STATE_UNK_3 = 0x00000003,
BATTLE_STATE2_UNK_4 = 0x00000004, BATTLE_SUB_STATE_UNK_4 = 0x00000004,
BATTLE_STATE2_BEGIN_LEVEL_UP = 0x00000005, BATTLE_SUB_STATE_BEGIN_LEVEL_UP = 0x00000005,
BATTLE_STATE2_LEVEL_UP_SHOW_HUD = 0x00000006, BATTLE_SUB_STATE_LEVEL_UP_SHOW_HUD = 0x00000006,
BATTLE_STATE2_UNK_7 = 0x00000007, BATTLE_SUB_STATE_UNK_7 = 0x00000007,
BATTLE_STATE2_UNK_8 = 0x00000008, BATTLE_SUB_STATE_UNK_8 = 0x00000008,
BATTLE_STATE2_UNK_9 = 0x00000009, BATTLE_SUB_STATE_UNK_9 = 0x00000009,
BATTLE_STATE2_PLAYER_DEFEATED = 0x0000000A, BATTLE_SUB_STATE_PLAYER_DEFEATED = 0x0000000A,
BATTLE_STATE2_UNK_B = 0x0000000B, BATTLE_SUB_STATE_UNK_B = 0x0000000B,
BATTLE_STATE2_UNK_C = 0x0000000C, BATTLE_SUB_STATE_UNK_C = 0x0000000C,
BATTLE_STATE2_UNK_D = 0x0000000D, BATTLE_SUB_STATE_UNK_D = 0x0000000D,
BATTLE_STATE2_UNK_E = 0x0000000E, BATTLE_SUB_STATE_UNK_E = 0x0000000E,
BATTLE_STATE2_UNK_F = 0x0000000F, BATTLE_SUB_STATE_UNK_F = 0x0000000F,
BATTLE_STATE2_UNK_10 = 0x00000010, BATTLE_SUB_STATE_UNK_10 = 0x00000010,
BATTLE_STATE2_UNK_14 = 0x00000014, BATTLE_SUB_STATE_UNK_14 = 0x00000014,
BATTLE_STATE2_UNK_15 = 0x00000015, BATTLE_SUB_STATE_UNK_15 = 0x00000015,
BATTLE_STATE2_UNK_16 = 0x00000016, BATTLE_SUB_STATE_UNK_16 = 0x00000016,
BATTLE_STATE2_UNK_17 = 0x00000017, BATTLE_SUB_STATE_UNK_17 = 0x00000017,
BATTLE_STATE2_UNK_18 = 0x00000018, BATTLE_SUB_STATE_UNK_18 = 0x00000018,
BATTLE_STATE2_UNK_1E = 0x0000001E, BATTLE_SUB_STATE_UNK_1E = 0x0000001E,
BATTLE_STATE2_UNK_1F = 0x0000001F, BATTLE_SUB_STATE_UNK_1F = 0x0000001F,
BATTLE_STATE2_UNK_20 = 0x00000020, BATTLE_SUB_STATE_UNK_20 = 0x00000020,
BATTLE_STATE2_UNK_21 = 0x00000021, BATTLE_SUB_STATE_UNK_21 = 0x00000021,
BATTLE_STATE2_UNK_22 = 0x00000022, BATTLE_SUB_STATE_UNK_22 = 0x00000022,
BATTLE_STATE2_UNK_28 = 0x00000028, BATTLE_SUB_STATE_UNK_28 = 0x00000028,
BATTLE_STATE2_UNK_29 = 0x00000029, BATTLE_SUB_STATE_UNK_29 = 0x00000029,
BATTLE_STATE2_UNK_2A = 0x0000002A, BATTLE_SUB_STATE_UNK_2A = 0x0000002A,
BATTLE_STATE2_UNK_2B = 0x0000002B, BATTLE_SUB_STATE_UNK_2B = 0x0000002B,
BATTLE_STATE2_UNK_2C = 0x0000002C, BATTLE_SUB_STATE_UNK_2C = 0x0000002C,
BATTLE_STATE2_UNK_33 = 0x00000033, BATTLE_SUB_STATE_UNK_33 = 0x00000033,
BATTLE_STATE2_UNK_34 = 0x00000034, BATTLE_SUB_STATE_UNK_34 = 0x00000034,
BATTLE_STATE2_UNK_35 = 0x00000035, BATTLE_SUB_STATE_UNK_35 = 0x00000035,
BATTLE_STATE2_UNK_36 = 0x00000036, BATTLE_SUB_STATE_UNK_36 = 0x00000036,
BATTLE_STATE2_UNK_3D = 0x0000003D, BATTLE_SUB_STATE_UNK_3D = 0x0000003D,
BATTLE_STATE2_UNK_3E = 0x0000003E, BATTLE_SUB_STATE_UNK_3E = 0x0000003E,
BATTLE_STATE2_UNK_3F = 0x0000003F, BATTLE_SUB_STATE_UNK_3F = 0x0000003F,
BATTLE_STATE2_UNK_40 = 0x00000040, BATTLE_SUB_STATE_UNK_40 = 0x00000040,
BATTLE_STATE2_UNK_41 = 0x00000041, BATTLE_SUB_STATE_UNK_41 = 0x00000041,
BATTLE_STATE2_UNK_46 = 0x00000046, BATTLE_SUB_STATE_UNK_46 = 0x00000046,
BATTLE_STATE2_UNK_64 = 0x00000064, BATTLE_SUB_STATE_UNK_64 = 0x00000064,
BATTLE_STATE2_UNK_C8 = 0x000000C8, BATTLE_SUB_STATE_UNK_C8 = 0x000000C8,
BATTLE_STATE2_UNK_C9 = 0x000000C9, BATTLE_SUB_STATE_UNK_C9 = 0x000000C9,
BATTLE_STATE2_UNK_CA = 0x000000CA, BATTLE_SUB_STATE_UNK_CA = 0x000000CA,
BATTLE_STATE2_UNK_CB = 0x000000CB, BATTLE_SUB_STATE_UNK_CB = 0x000000CB,
BATTLE_STATE2_UNK_CC = 0x000000CC, BATTLE_SUB_STATE_UNK_CC = 0x000000CC,
BATTLE_STATE2_UNK_CD = 0x000000CD, BATTLE_SUB_STATE_UNK_CD = 0x000000CD,
BATTLE_SUB_STATE_UNK_12C = 0x0000012C,
BATTLE_SUB_STATE_UNK_12D = 0x0000012D,
BATTLE_SUB_STATE_UNK_12E = 0x0000012E,
};
enum BattleSubStatesPartner {
BATTLE_SUB_STATE_PARTNER_NONE = 0,
// Main menu
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_1 = 2,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_2 = 3,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_3 = 4,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_4 = 5,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_5 = 6,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_6 = 7,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_7 = 8,
BATTLE_SUB_STATE_PARTNER_MAIN_MENU_8 = 9,
// Abilities
BATTLE_SUB_STATE_PARTNER_ABILITIES_1 = 10,
BATTLE_SUB_STATE_PARTNER_ABILITIES_2 = 11,
BATTLE_SUB_STATE_PARTNER_ABILITIES_3 = 12,
BATTLE_SUB_STATE_PARTNER_ABILITIES_4 = 13,
BATTLE_SUB_STATE_PARTNER_ABILITIES_5 = 14,
BATTLE_SUB_STATE_PARTNER_ABILITIES_6 = 15,
BATTLE_SUB_STATE_PARTNER_ABILITIES_7 = 16,
// Unknown, referenced only in btl_state_draw_partner_menu
BATTLE_SUB_STATE_PARTNER_UNKNOWN_1 = 20,
BATTLE_SUB_STATE_PARTNER_UNKNOWN_2 = 21,
BATTLE_SUB_STATE_PARTNER_UNKNOWN_3 = 22,
BATTLE_SUB_STATE_PARTNER_UNKNOWN_4 = 23,
BATTLE_SUB_STATE_PARTNER_UNKNOWN_5 = 24,
// Change Partner
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_1 = 30,
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_2 = 31,
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_3 = 32,
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_4 = 33,
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_5 = 34,
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_6 = 35,
BATTLE_SUB_STATE_PARTNER_CHANGE_PARTNER_7 = 36,
// Items
BATTLE_SUB_STATE_PARTNER_ITEMS_1 = 40,
BATTLE_SUB_STATE_PARTNER_ITEMS_2 = 41,
BATTLE_SUB_STATE_PARTNER_ITEMS_3 = 42,
BATTLE_SUB_STATE_PARTNER_ITEMS_4 = 43,
BATTLE_SUB_STATE_PARTNER_ITEMS_5 = 44,
BATTLE_SUB_STATE_PARTNER_ITEMS_6 = 45,
// Switch partner (unused)
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_1 = 50,
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_2 = 51,
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_3 = 52,
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_4 = 53,
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_5 = 54,
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_6 = 55,
BATTLE_SUB_STATE_PARTNER_UNUSED_CHANGE_PARTNER_7 = 56,
// Focus
BATTLE_SUB_STATE_PARTNER_FOCUS_1 = 60,
BATTLE_SUB_STATE_PARTNER_FOCUS_2 = 61,
BATTLE_SUB_STATE_PARTNER_FOCUS_3 = 62,
BATTLE_SUB_STATE_PARTNER_FOCUS_4 = 63,
BATTLE_SUB_STATE_PARTNER_FOCUS_5 = 64,
BATTLE_SUB_STATE_PARTNER_FOCUS_6 = 65,
// Strategies
BATTLE_SUB_STATE_PARTNER_STRATEGIES_1 = 200,
BATTLE_SUB_STATE_PARTNER_STRATEGIES_2 = 201,
BATTLE_SUB_STATE_PARTNER_STRATEGIES_3 = 202,
BATTLE_SUB_STATE_PARTNER_STRATEGIES_4 = 203,
BATTLE_SUB_STATE_PARTNER_STRATEGIES_5 = 204,
BATTLE_SUB_STATE_PARTNER_STRATEGIES_6 = 205,
// initialize
BATTLE_SUB_STATE_PARTNER_12D = 301,
BATTLE_SUB_STATE_PARTNER_INIT_MENU = 302,
}; };
enum DebuffTypes { enum DebuffTypes {
@ -5105,6 +5176,7 @@ enum SimpleWindowUpdateId {
WINDOW_UPDATE_OPAQUE = 6, WINDOW_UPDATE_OPAQUE = 6,
WINDOW_UPDATE_SHOW_TRANSPARENT = 7, WINDOW_UPDATE_SHOW_TRANSPARENT = 7,
WINDOW_UPDATE_SHOW_DARKENED = 8, WINDOW_UPDATE_SHOW_DARKENED = 8,
WINDOW_UPDATE_9 = 9,
}; };
enum WindowGroupId { enum WindowGroupId {

2
include/variables.h
View File

@ -21,7 +21,7 @@ extern BattleStatus gBattleStatus;
extern s32 D_800DC4D0; extern s32 D_800DC4D0;
extern s32 D_800DC4D4; extern s32 D_800DC4D4;
extern s32 D_800DC4D8; extern s32 D_800DC4D8;
extern s32 gBattleState2; extern s32 gBattleSubState;
extern s32 D_800DC4E4; extern s32 D_800DC4E4;
extern s32 D_800DC4E8; extern s32 D_800DC4E8;
extern u8 gCurrentBattleSection; // in the middle of the previous var extern u8 gCurrentBattleSection; // in the middle of the previous var

620
src/16F740.c
View File

File diff suppressed because it is too large Load Diff

110
src/18C790.c
View File

@ -474,8 +474,8 @@ void btl_state_update_celebration(void) {
HudScript* new_var; HudScript* new_var;
switch (gBattleState2) { switch (gBattleSubState) {
case BATTLE_STATE2_UNK_0: case BATTLE_SUB_STATE_UNK_0:
if (battleStatus->pendingStarPoints <= 0) { if (battleStatus->pendingStarPoints <= 0) {
player->flags &= ~ACTOR_FLAG_8000000; player->flags &= ~ACTOR_FLAG_8000000;
D_8029FB6C = battleStatus->totalStarPoints * 100; D_8029FB6C = battleStatus->totalStarPoints * 100;
@ -497,11 +497,11 @@ void btl_state_update_celebration(void) {
btl_cam_use_preset(BTL_CAM_PRESET_23); btl_cam_use_preset(BTL_CAM_PRESET_23);
D_8029FB54 = 0; D_8029FB54 = 0;
D_8029FB4C = 1; D_8029FB4C = 1;
gBattleState2 = BATTLE_STATE2_UNK_1; gBattleSubState = BATTLE_SUB_STATE_UNK_1;
gBattleStatus.flags2 |= BS_FLAGS2_1; gBattleStatus.flags2 |= BS_FLAGS2_1;
} }
break; break;
case BATTLE_STATE2_UNK_1: case BATTLE_SUB_STATE_UNK_1:
if (D_8029FB4C != 0) { if (D_8029FB4C != 0) {
D_8029FB4C--; D_8029FB4C--;
} else if (btl_cam_is_moving_done()) { } else if (btl_cam_is_moving_done()) {
@ -514,10 +514,10 @@ void btl_state_update_celebration(void) {
D_8029FB4C = 1; D_8029FB4C = 1;
player->takeTurnID = script->id; player->takeTurnID = script->id;
script->owner1.enemyID = 0; script->owner1.enemyID = 0;
gBattleState2 = BATTLE_STATE2_UNK_2; gBattleSubState = BATTLE_SUB_STATE_UNK_2;
} }
break; break;
case BATTLE_STATE2_UNK_2: case BATTLE_SUB_STATE_UNK_2:
if (D_8029FB4C == 0) { if (D_8029FB4C == 0) {
if (battleStatus->totalStarPoints != 0) { if (battleStatus->totalStarPoints != 0) {
D_8029FB6C -= D_8029FB70; D_8029FB6C -= D_8029FB70;
@ -563,7 +563,7 @@ void btl_state_update_celebration(void) {
script->owner1.actorID = ACTOR_PARTNER; script->owner1.actorID = ACTOR_PARTNER;
} }
D_8029FB4C = 40; D_8029FB4C = 40;
gBattleState2 = BATTLE_STATE2_UNK_3; gBattleSubState = BATTLE_SUB_STATE_UNK_3;
} else { } else {
D_8029FB54--; D_8029FB54--;
} }
@ -572,18 +572,18 @@ void btl_state_update_celebration(void) {
D_8029FB4C--; D_8029FB4C--;
} }
break; break;
case BATTLE_STATE2_UNK_3: case BATTLE_SUB_STATE_UNK_3:
if (D_8029FB4C == 0) { if (D_8029FB4C == 0) {
if (D_8029FB74 == 0) { if (D_8029FB74 == 0) {
gBattleState2 = BATTLE_STATE2_UNK_14; gBattleSubState = BATTLE_SUB_STATE_UNK_14;
} else { } else {
gBattleState2 = BATTLE_STATE2_UNK_4; gBattleSubState = BATTLE_SUB_STATE_UNK_4;
} }
break; break;
} }
D_8029FB4C--; D_8029FB4C--;
break; break;
case BATTLE_STATE2_UNK_4: case BATTLE_SUB_STATE_UNK_4:
if (D_8029FB84 >= 99) { if (D_8029FB84 >= 99) {
playerData->level++; playerData->level++;
btl_cam_use_preset(BTL_CAM_PRESET_C); btl_cam_use_preset(BTL_CAM_PRESET_C);
@ -591,19 +591,19 @@ void btl_state_update_celebration(void) {
dma_copy(level_up_ROM_START, level_up_ROM_END, level_up_VRAM); dma_copy(level_up_ROM_START, level_up_ROM_END, level_up_VRAM);
sfx_play_sound(SOUND_80000008); sfx_play_sound(SOUND_80000008);
D_8029FB84 = 0; D_8029FB84 = 0;
gBattleState2 = BATTLE_STATE2_BEGIN_LEVEL_UP; gBattleSubState = BATTLE_SUB_STATE_BEGIN_LEVEL_UP;
} }
break; break;
case BATTLE_STATE2_BEGIN_LEVEL_UP: case BATTLE_SUB_STATE_BEGIN_LEVEL_UP:
D_8029FB7C = start_script(&EVS_ShowLevelUp, EVT_PRIORITY_A, 0); D_8029FB7C = start_script(&EVS_ShowLevelUp, EVT_PRIORITY_A, 0);
D_8029FB4C = 25; D_8029FB4C = 25;
gBattleState2 = BATTLE_STATE2_LEVEL_UP_SHOW_HUD; gBattleSubState = BATTLE_SUB_STATE_LEVEL_UP_SHOW_HUD;
D_8029FB80 = D_8029FB7C->id; D_8029FB80 = D_8029FB7C->id;
mdl_set_all_fog_mode(1); mdl_set_all_fog_mode(1);
*gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_1; *gBgRenderTypePtr = BACKGROUND_RENDER_TYPE_1;
set_background_color_blend(0, 0, 0, 0); set_background_color_blend(0, 0, 0, 0);
break; break;
case BATTLE_STATE2_LEVEL_UP_SHOW_HUD: case BATTLE_SUB_STATE_LEVEL_UP_SHOW_HUD:
if (D_8029FB4C == 18) { if (D_8029FB4C == 18) {
playerData->curHP = playerData->curMaxHP; playerData->curHP = playerData->curMaxHP;
playerData->curFP = playerData->curMaxFP; playerData->curFP = playerData->curMaxFP;
@ -890,10 +890,10 @@ void btl_state_update_celebration(void) {
hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80);
battleStatus->currentSubmenu = 1; battleStatus->currentSubmenu = 1;
D_8029FB4C = 10; D_8029FB4C = 10;
gBattleState2 = BATTLE_STATE2_UNK_7; gBattleSubState = BATTLE_SUB_STATE_UNK_7;
} }
break; break;
case BATTLE_STATE2_UNK_7: case BATTLE_SUB_STATE_UNK_7:
id = D_8029FA80[0]; id = D_8029FA80[0];
hud_element_get_render_pos(id, &x, &y); hud_element_get_render_pos(id, &x, &y);
x -= 20; x -= 20;
@ -942,18 +942,18 @@ void btl_state_update_celebration(void) {
y = 186; y = 186;
set_window_properties(WINDOW_ID_8, 20, 186, 280, 32, 20, func_80260948, NULL, -1); set_window_properties(WINDOW_ID_8, 20, 186, 280, 32, 20, func_80260948, NULL, -1);
set_window_update(WINDOW_ID_8, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_8, WINDOW_UPDATE_SHOW);
gBattleState2 = BATTLE_STATE2_UNK_8; gBattleSubState = BATTLE_SUB_STATE_UNK_8;
} }
break; break;
case BATTLE_STATE2_UNK_8: case BATTLE_SUB_STATE_UNK_8:
if (battleStatus->currentButtonsPressed & BUTTON_A) { if (battleStatus->currentButtonsPressed & BUTTON_A) {
if (D_8029FB60[battleStatus->currentSubmenu] == 0) { if (D_8029FB60[battleStatus->currentSubmenu] == 0) {
sfx_play_sound(SOUND_MENU_NEXT); sfx_play_sound(SOUND_MENU_NEXT);
sfx_play_sound(SOUND_749); sfx_play_sound(SOUND_749);
gBattleState2 = BATTLE_STATE2_UNK_9; gBattleSubState = BATTLE_SUB_STATE_UNK_9;
} else { } else {
sfx_play_sound(SOUND_MENU_ERROR); sfx_play_sound(SOUND_MENU_ERROR);
gBattleState2 = BATTLE_STATE2_UNK_F; gBattleSubState = BATTLE_SUB_STATE_UNK_F;
} }
break; break;
} }
@ -982,7 +982,7 @@ void btl_state_update_celebration(void) {
D_8029FB84 = 0; D_8029FB84 = 0;
} }
break; break;
case BATTLE_STATE2_UNK_9: case BATTLE_SUB_STATE_UNK_9:
hud_element_free(D_8029FAE8); hud_element_free(D_8029FAE8);
set_window_update(WINDOW_ID_8, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_8, WINDOW_UPDATE_HIDE);
@ -1031,9 +1031,9 @@ void btl_state_update_celebration(void) {
bgm_set_song(0, -1, 0, 2000, 8); bgm_set_song(0, -1, 0, 2000, 8);
} }
D_80284150 = 0; D_80284150 = 0;
gBattleState2 = BATTLE_STATE2_PLAYER_DEFEATED; gBattleSubState = BATTLE_SUB_STATE_PLAYER_DEFEATED;
break; break;
case BATTLE_STATE2_PLAYER_DEFEATED: case BATTLE_SUB_STATE_PLAYER_DEFEATED:
if ((gGameStatusPtr->frameCounter % 2) != 0) { if ((gGameStatusPtr->frameCounter % 2) != 0) {
switch (battleStatus->currentSubmenu) { switch (battleStatus->currentSubmenu) {
case 0: case 0:
@ -1062,7 +1062,7 @@ void btl_state_update_celebration(void) {
} }
} }
if (D_80284150 == 255) { if (D_80284150 == 255) {
gBattleState2 = BATTLE_STATE2_UNK_B; gBattleSubState = BATTLE_SUB_STATE_UNK_B;
break; break;
} }
D_80284150 += 10; D_80284150 += 10;
@ -1070,7 +1070,7 @@ void btl_state_update_celebration(void) {
D_80284150 = 255; D_80284150 = 255;
} }
break; break;
case BATTLE_STATE2_UNK_B: case BATTLE_SUB_STATE_UNK_B:
hud_element_free(D_8029FA80[0]); hud_element_free(D_8029FA80[0]);
hud_element_free(D_8029FA80[1]); hud_element_free(D_8029FA80[1]);
hud_element_free(D_8029FA80[3]); hud_element_free(D_8029FA80[3]);
@ -1085,18 +1085,18 @@ void btl_state_update_celebration(void) {
hud_element_free(D_8029FB48); hud_element_free(D_8029FB48);
set_background_color_blend(0, 0, 0, 0); set_background_color_blend(0, 0, 0, 0);
btl_set_state(BATTLE_STATE_END_BATTLE); btl_set_state(BATTLE_STATE_END_BATTLE);
gBattleState2 = BATTLE_STATE2_UNK_2; gBattleSubState = BATTLE_SUB_STATE_UNK_2;
break; break;
case BATTLE_STATE2_UNK_F: case BATTLE_SUB_STATE_UNK_F:
width = get_msg_width(0x1D00AB, 0) + 31; width = get_msg_width(0x1D00AB, 0) + 31;
x = 160 - (width / 2); x = 160 - (width / 2);
y = 80; y = 80;
set_window_properties(WINDOW_ID_9, x, y, width, 28, 10, func_80260A20, NULL, -1); set_window_properties(WINDOW_ID_9, x, y, width, 28, 10, func_80260A20, NULL, -1);
set_window_update(WINDOW_ID_9, WINDOW_UPDATE_SHOW); set_window_update(WINDOW_ID_9, WINDOW_UPDATE_SHOW);
D_8029FB4C = 60; D_8029FB4C = 60;
gBattleState2 = BATTLE_STATE2_UNK_10; gBattleSubState = BATTLE_SUB_STATE_UNK_10;
break; break;
case BATTLE_STATE2_UNK_10: case BATTLE_SUB_STATE_UNK_10:
if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) { if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) {
D_8029FB4C = 0; D_8029FB4C = 0;
} }
@ -1105,9 +1105,9 @@ void btl_state_update_celebration(void) {
break; break;
} }
set_window_update(WINDOW_ID_9, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_9, WINDOW_UPDATE_HIDE);
gBattleState2 = BATTLE_STATE2_UNK_8; gBattleSubState = BATTLE_SUB_STATE_UNK_8;
break; break;
case BATTLE_STATE2_UNK_14: case BATTLE_SUB_STATE_UNK_14:
if (battleStatus->currentButtonsPressed & (BUTTON_A | BUTTON_B)) { if (battleStatus->currentButtonsPressed & (BUTTON_A | BUTTON_B)) {
D_8029FB84 = 99; D_8029FB84 = 99;
} }
@ -1122,11 +1122,11 @@ void btl_state_update_celebration(void) {
set_animation(ACTOR_PARTNER, 0, D_80284154[playerData->currentPartner]); set_animation(ACTOR_PARTNER, 0, D_80284154[playerData->currentPartner]);
} }
D_8029FB4C = 6; D_8029FB4C = 6;
gBattleState2 = BATTLE_STATE2_UNK_15; gBattleSubState = BATTLE_SUB_STATE_UNK_15;
break; break;
} }
break; break;
case BATTLE_STATE2_UNK_15: case BATTLE_SUB_STATE_UNK_15:
if (D_8029FB4C != 0) { if (D_8029FB4C != 0) {
D_8029FB4C--; D_8029FB4C--;
if (D_8029FB4C == 0) { if (D_8029FB4C == 0) {
@ -1144,7 +1144,7 @@ void btl_state_update_celebration(void) {
} }
} }
if (D_80284150 == 255) { if (D_80284150 == 255) {
gBattleState2 = BATTLE_STATE2_UNK_16; gBattleSubState = BATTLE_SUB_STATE_UNK_16;
break; break;
} }
D_80284150 += 20; D_80284150 += 20;
@ -1152,7 +1152,7 @@ void btl_state_update_celebration(void) {
D_80284150 = 255; D_80284150 = 255;
} }
break; break;
case BATTLE_STATE2_UNK_16: case BATTLE_SUB_STATE_UNK_16:
if (does_script_exist(player->takeTurnID)) { if (does_script_exist(player->takeTurnID)) {
kill_script_by_ID(player->takeTurnID); kill_script_by_ID(player->takeTurnID);
} }
@ -1160,7 +1160,7 @@ void btl_state_update_celebration(void) {
kill_script_by_ID(partner->takeTurnID); kill_script_by_ID(partner->takeTurnID);
} }
btl_set_state(BATTLE_STATE_END_BATTLE); btl_set_state(BATTLE_STATE_END_BATTLE);
gBattleState2 = BATTLE_STATE2_UNK_2; gBattleSubState = BATTLE_SUB_STATE_UNK_2;
break; break;
} }
D_8029FB84 += 1; D_8029FB84 += 1;
@ -1223,8 +1223,8 @@ void btl_state_draw_celebration(void) {
s32 i; s32 i;
s32 j; s32 j;
switch (gBattleState2) { switch (gBattleSubState) {
case BATTLE_STATE2_UNK_7: case BATTLE_SUB_STATE_UNK_7:
btl_draw_upgrade_windows(0); btl_draw_upgrade_windows(0);
id = D_8029FA80[0]; id = D_8029FA80[0];
hud_element_set_tint(id, 128, 128, 128); hud_element_set_tint(id, 128, 128, 128);
@ -1248,9 +1248,9 @@ void btl_state_draw_celebration(void) {
} }
} }
break; break;
case BATTLE_STATE2_UNK_8: case BATTLE_SUB_STATE_UNK_8:
case BATTLE_STATE2_UNK_F: case BATTLE_SUB_STATE_UNK_F:
case BATTLE_STATE2_UNK_10: case BATTLE_SUB_STATE_UNK_10:
switch (battleStatus->currentSubmenu) { switch (battleStatus->currentSubmenu) {
case 0: case 0:
rotZ = 152; rotZ = 152;
@ -1364,8 +1364,8 @@ void btl_state_draw_celebration(void) {
hud_element_set_transform_rotation(id, 0.0f, 0.0f, rotZ); hud_element_set_transform_rotation(id, 0.0f, 0.0f, rotZ);
func_80144238(id); func_80144238(id);
break; break;
case BATTLE_STATE2_UNK_9: case BATTLE_SUB_STATE_UNK_9:
case BATTLE_STATE2_PLAYER_DEFEATED: case BATTLE_SUB_STATE_PLAYER_DEFEATED:
btl_draw_upgrade_windows(1); btl_draw_upgrade_windows(1);
hud_element_draw_clipped(D_8029FA80[0]); hud_element_draw_clipped(D_8029FA80[0]);
hud_element_draw_clipped(D_8029FA80[3]); hud_element_draw_clipped(D_8029FA80[3]);
@ -1380,20 +1380,20 @@ void btl_state_draw_celebration(void) {
set_screen_overlay_params_front(0, D_80284150); set_screen_overlay_params_front(0, D_80284150);
break; break;
case BATTLE_STATE2_UNK_B: case BATTLE_SUB_STATE_UNK_B:
set_screen_overlay_params_front(0, D_80284150); set_screen_overlay_params_front(0, D_80284150);
break; break;
case BATTLE_STATE2_UNK_15: case BATTLE_SUB_STATE_UNK_15:
if (D_80284150 != 0) { if (D_80284150 != 0) {
set_screen_overlay_params_front(0, D_80284150); set_screen_overlay_params_front(0, D_80284150);
} }
break; break;
} }
switch (gBattleState2) { switch (gBattleSubState) {
case BATTLE_STATE2_UNK_7: case BATTLE_SUB_STATE_UNK_7:
case BATTLE_STATE2_UNK_8: case BATTLE_SUB_STATE_UNK_8:
case BATTLE_STATE2_UNK_9: case BATTLE_SUB_STATE_UNK_9:
D_8029FB8C += 2; D_8029FB8C += 2;
D_8029FB88 += D_8029FB8C; D_8029FB88 += D_8029FB8C;
if (D_8029FB88 > 200) { if (D_8029FB88 > 200) {
@ -1404,7 +1404,7 @@ void btl_state_draw_celebration(void) {
hud_element_set_render_pos(id, D_8029FB88 - 43, 176); hud_element_set_render_pos(id, D_8029FB88 - 43, 176);
hud_element_draw_clipped(id); hud_element_draw_clipped(id);
break; break;
case BATTLE_STATE2_PLAYER_DEFEATED: case BATTLE_SUB_STATE_PLAYER_DEFEATED:
D_8029FB8C += 4; D_8029FB8C += 4;
D_8029FB88 += D_8029FB8C; D_8029FB88 += D_8029FB8C;
if (D_8029FB88 > 500) { if (D_8029FB88 > 500) {
@ -1422,10 +1422,10 @@ void func_80260948(s32 arg0, s32 posX, s32 posY) {
s32 xOffset; s32 xOffset;
s32 msgID; s32 msgID;
switch (gBattleState2) { switch (gBattleSubState) {
case BATTLE_STATE2_UNK_8: case BATTLE_SUB_STATE_UNK_8:
case BATTLE_STATE2_UNK_F: case BATTLE_SUB_STATE_UNK_F:
case BATTLE_STATE2_UNK_10: case BATTLE_SUB_STATE_UNK_10:
switch (battleStatus->currentSubmenu) { switch (battleStatus->currentSubmenu) {
case 0: case 0:
if (D_8029FB60[0] == 0) { if (D_8029FB60[0] == 0) {

2
src/18F340.c
View File

@ -219,7 +219,7 @@ ApiStatus RestorePreDefeatState(Evt* script, s32 isInitialCall) {
battleStatus->rushFlags = RUSH_FLAG_NONE; battleStatus->rushFlags = RUSH_FLAG_NONE;
gBattleState = D_800DC4E4; gBattleState = D_800DC4E4;
gBattleState2 = D_800DC4D8; gBattleSubState = D_800DC4D8;
battleStatus->flags1 |= BS_FLAGS1_8; battleStatus->flags1 |= BS_FLAGS1_8;
battleStatus->flags2 &= ~BS_FLAGS2_8000000; battleStatus->flags2 &= ~BS_FLAGS2_8000000;

2
src/190B20.c
View File

@ -250,7 +250,7 @@ s32 btl_check_player_defeated(void) {
return FALSE; return FALSE;
} }
D_800DC4E4 = gBattleState; D_800DC4E4 = gBattleState;
D_800DC4D8 = gBattleState2; D_800DC4D8 = gBattleSubState;
btl_set_state(BATTLE_STATE_DEFEAT); btl_set_state(BATTLE_STATE_DEFEAT);
return TRUE; return TRUE;
} }

1337
src/415D90.c
View File

File diff suppressed because it is too large Load Diff

4
src/battle/battle.c
View File

@ -280,7 +280,7 @@ void reset_battle_status(void) {
gGameStatusPtr->demoFlags = 0; gGameStatusPtr->demoFlags = 0;
gBattleState = BATTLE_STATE_0; gBattleState = BATTLE_STATE_0;
D_800DC4E0 = 1; D_800DC4E0 = 1;
gBattleState2 = BATTLE_STATE2_UNK_0; gBattleSubState = BATTLE_SUB_STATE_UNK_0;
D_800DC4D0 = 0; D_800DC4D0 = 0;
D_800DC4F0 = 0; D_800DC4F0 = 0;
D_800DC4D4 = 0; D_800DC4D4 = 0;
@ -324,7 +324,7 @@ void load_battle(s32 arg0) {
set_game_mode(GAME_MODE_BATTLE); set_game_mode(GAME_MODE_BATTLE);
gBattleState = 0; gBattleState = 0;
D_800DC4D0 = 0; D_800DC4D0 = 0;
gBattleState2 = 0; gBattleSubState = 0;
} }
void set_battle_stage(s32 arg0) { void set_battle_stage(s32 arg0) {

2
ver/us/asm/bss.s
View File

@ -1063,7 +1063,7 @@ dlabel D_800DC4D4
dlabel D_800DC4D8 dlabel D_800DC4D8
.space 4 .space 4
dlabel gBattleState2 dlabel gBattleSubState
.space 4 .space 4
dlabel D_800DC4E0 dlabel D_800DC4E0

56
ver/us/asm/nonmatchings/16F740/func_80242FE0.s
View File

@ -17,8 +17,8 @@ glabel func_80242FE0
/* 1718F0 80243010 F7B60038 */ sdc1 $f22, 0x38($sp) /* 1718F0 80243010 F7B60038 */ sdc1 $f22, 0x38($sp)
/* 1718F4 80243014 F7B40030 */ sdc1 $f20, 0x30($sp) /* 1718F4 80243014 F7B40030 */ sdc1 $f20, 0x30($sp)
/* 1718F8 80243018 8ED500D8 */ lw $s5, 0xd8($s6) /* 1718F8 80243018 8ED500D8 */ lw $s5, 0xd8($s6)
/* 1718FC 8024301C 3C02800E */ lui $v0, %hi(gBattleState2) /* 1718FC 8024301C 3C02800E */ lui $v0, %hi(gBattleSubState)
/* 171900 80243020 8C42C4DC */ lw $v0, %lo(gBattleState2)($v0) /* 171900 80243020 8C42C4DC */ lw $v0, %lo(gBattleSubState)($v0)
/* 171904 80243024 1440002D */ bnez $v0, .L802430DC /* 171904 80243024 1440002D */ bnez $v0, .L802430DC
/* 171908 80243028 8ED200DC */ lw $s2, 0xdc($s6) /* 171908 80243028 8ED200DC */ lw $s2, 0xdc($s6)
/* 17190C 8024302C 8EC30004 */ lw $v1, 4($s6) /* 17190C 8024302C 8EC30004 */ lw $v1, 4($s6)
@ -54,8 +54,8 @@ glabel func_80242FE0
/* 171978 80243098 24020001 */ addiu $v0, $zero, 1 /* 171978 80243098 24020001 */ addiu $v0, $zero, 1
/* 17197C 8024309C 3C04800E */ lui $a0, %hi(gBattleStatus) /* 17197C 8024309C 3C04800E */ lui $a0, %hi(gBattleStatus)
/* 171980 802430A0 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 171980 802430A0 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus)
/* 171984 802430A4 3C01800E */ lui $at, %hi(gBattleState2) /* 171984 802430A4 3C01800E */ lui $at, %hi(gBattleSubState)
/* 171988 802430A8 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 171988 802430A8 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 17198C 802430AC 8C820004 */ lw $v0, 4($a0) /* 17198C 802430AC 8C820004 */ lw $v0, 4($a0)
/* 171990 802430B0 2403FFFD */ addiu $v1, $zero, -3 /* 171990 802430B0 2403FFFD */ addiu $v1, $zero, -3
/* 171994 802430B4 3C01802A */ lui $at, %hi(D_8029F258) /* 171994 802430B4 3C01802A */ lui $at, %hi(D_8029F258)
@ -69,8 +69,8 @@ glabel func_80242FE0
/* 1719B4 802430D4 00431024 */ and $v0, $v0, $v1 /* 1719B4 802430D4 00431024 */ and $v0, $v0, $v1
/* 1719B8 802430D8 AC820004 */ sw $v0, 4($a0) /* 1719B8 802430D8 AC820004 */ sw $v0, 4($a0)
.L802430DC: .L802430DC:
/* 1719BC 802430DC 3C03800E */ lui $v1, %hi(gBattleState2) /* 1719BC 802430DC 3C03800E */ lui $v1, %hi(gBattleSubState)
/* 1719C0 802430E0 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) /* 1719C0 802430E0 8C63C4DC */ lw $v1, %lo(gBattleSubState)($v1)
/* 1719C4 802430E4 24020001 */ addiu $v0, $zero, 1 /* 1719C4 802430E4 24020001 */ addiu $v0, $zero, 1
/* 1719C8 802430E8 14620091 */ bne $v1, $v0, .L80243330 /* 1719C8 802430E8 14620091 */ bne $v1, $v0, .L80243330
/* 1719CC 802430EC 24020002 */ addiu $v0, $zero, 2 /* 1719CC 802430EC 24020002 */ addiu $v0, $zero, 2
@ -225,11 +225,11 @@ glabel func_80242FE0
/* 171BF0 80243310 1440FF92 */ bnez $v0, .L8024315C /* 171BF0 80243310 1440FF92 */ bnez $v0, .L8024315C
/* 171BF4 80243314 00111080 */ sll $v0, $s1, 2 /* 171BF4 80243314 00111080 */ sll $v0, $s1, 2
/* 171BF8 80243318 24020002 */ addiu $v0, $zero, 2 /* 171BF8 80243318 24020002 */ addiu $v0, $zero, 2
/* 171BFC 8024331C 3C01800E */ lui $at, %hi(gBattleState2) /* 171BFC 8024331C 3C01800E */ lui $at, %hi(gBattleSubState)
/* 171C00 80243320 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 171C00 80243320 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
.L80243324: .L80243324:
/* 171C04 80243324 3C03800E */ lui $v1, %hi(gBattleState2) /* 171C04 80243324 3C03800E */ lui $v1, %hi(gBattleSubState)
/* 171C08 80243328 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) /* 171C08 80243328 8C63C4DC */ lw $v1, %lo(gBattleSubState)($v1)
/* 171C0C 8024332C 24020002 */ addiu $v0, $zero, 2 /* 171C0C 8024332C 24020002 */ addiu $v0, $zero, 2
.L80243330: .L80243330:
/* 171C10 80243330 14620070 */ bne $v1, $v0, .L802434F4 /* 171C10 80243330 14620070 */ bne $v1, $v0, .L802434F4
@ -353,11 +353,11 @@ glabel func_80242FE0
/* 171DC4 802434E4 24020003 */ addiu $v0, $zero, 3 /* 171DC4 802434E4 24020003 */ addiu $v0, $zero, 3
/* 171DC8 802434E8 AC600048 */ sw $zero, 0x48($v1) /* 171DC8 802434E8 AC600048 */ sw $zero, 0x48($v1)
.L802434EC: .L802434EC:
/* 171DCC 802434EC 3C01800E */ lui $at, %hi(gBattleState2) /* 171DCC 802434EC 3C01800E */ lui $at, %hi(gBattleSubState)
/* 171DD0 802434F0 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 171DD0 802434F0 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
.L802434F4: .L802434F4:
/* 171DD4 802434F4 3C03800E */ lui $v1, %hi(gBattleState2) /* 171DD4 802434F4 3C03800E */ lui $v1, %hi(gBattleSubState)
/* 171DD8 802434F8 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) /* 171DD8 802434F8 8C63C4DC */ lw $v1, %lo(gBattleSubState)($v1)
/* 171DDC 802434FC 24020003 */ addiu $v0, $zero, 3 /* 171DDC 802434FC 24020003 */ addiu $v0, $zero, 3
/* 171DE0 80243500 1462006F */ bne $v1, $v0, .L802436C0 /* 171DE0 80243500 1462006F */ bne $v1, $v0, .L802436C0
/* 171DE4 80243504 00000000 */ nop /* 171DE4 80243504 00000000 */ nop
@ -470,13 +470,13 @@ glabel func_80242FE0
/* 171F84 802436A4 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) /* 171F84 802436A4 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus)
/* 171F88 802436A8 8C820000 */ lw $v0, ($a0) /* 171F88 802436A8 8C820000 */ lw $v0, ($a0)
/* 171F8C 802436AC 24030004 */ addiu $v1, $zero, 4 /* 171F8C 802436AC 24030004 */ addiu $v1, $zero, 4
/* 171F90 802436B0 3C01800E */ lui $at, %hi(gBattleState2) /* 171F90 802436B0 3C01800E */ lui $at, %hi(gBattleSubState)
/* 171F94 802436B4 AC23C4DC */ sw $v1, %lo(gBattleState2)($at) /* 171F94 802436B4 AC23C4DC */ sw $v1, %lo(gBattleSubState)($at)
/* 171F98 802436B8 00451024 */ and $v0, $v0, $a1 /* 171F98 802436B8 00451024 */ and $v0, $v0, $a1
/* 171F9C 802436BC AC820000 */ sw $v0, ($a0) /* 171F9C 802436BC AC820000 */ sw $v0, ($a0)
.L802436C0: .L802436C0:
/* 171FA0 802436C0 3C10800E */ lui $s0, %hi(gBattleState2) /* 171FA0 802436C0 3C10800E */ lui $s0, %hi(gBattleSubState)
/* 171FA4 802436C4 2610C4DC */ addiu $s0, $s0, %lo(gBattleState2) /* 171FA4 802436C4 2610C4DC */ addiu $s0, $s0, %lo(gBattleSubState)
/* 171FA8 802436C8 8E030000 */ lw $v1, ($s0) /* 171FA8 802436C8 8E030000 */ lw $v1, ($s0)
/* 171FAC 802436CC 24020004 */ addiu $v0, $zero, 4 /* 171FAC 802436CC 24020004 */ addiu $v0, $zero, 4
/* 171FB0 802436D0 14620038 */ bne $v1, $v0, .L802437B4 /* 171FB0 802436D0 14620038 */ bne $v1, $v0, .L802437B4
@ -540,8 +540,8 @@ glabel func_80242FE0
/* 17208C 802437AC 00431024 */ and $v0, $v0, $v1 /* 17208C 802437AC 00431024 */ and $v0, $v0, $v1
/* 172090 802437B0 ACA20004 */ sw $v0, 4($a1) /* 172090 802437B0 ACA20004 */ sw $v0, 4($a1)
.L802437B4: .L802437B4:
/* 172094 802437B4 3C03800E */ lui $v1, %hi(gBattleState2) /* 172094 802437B4 3C03800E */ lui $v1, %hi(gBattleSubState)
/* 172098 802437B8 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) /* 172098 802437B8 8C63C4DC */ lw $v1, %lo(gBattleSubState)($v1)
/* 17209C 802437BC 24020005 */ addiu $v0, $zero, 5 /* 17209C 802437BC 24020005 */ addiu $v0, $zero, 5
/* 1720A0 802437C0 14620028 */ bne $v1, $v0, .L80243864 /* 1720A0 802437C0 14620028 */ bne $v1, $v0, .L80243864
/* 1720A4 802437C4 24020006 */ addiu $v0, $zero, 6 /* 1720A4 802437C4 24020006 */ addiu $v0, $zero, 6
@ -582,11 +582,11 @@ glabel func_80242FE0
/* 172124 80243844 1440FFEC */ bnez $v0, .L802437F8 /* 172124 80243844 1440FFEC */ bnez $v0, .L802437F8
/* 172128 80243848 26520004 */ addiu $s2, $s2, 4 /* 172128 80243848 26520004 */ addiu $s2, $s2, 4
/* 17212C 8024384C 24020006 */ addiu $v0, $zero, 6 /* 17212C 8024384C 24020006 */ addiu $v0, $zero, 6
/* 172130 80243850 3C01800E */ lui $at, %hi(gBattleState2) /* 172130 80243850 3C01800E */ lui $at, %hi(gBattleSubState)
/* 172134 80243854 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 172134 80243854 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
.L80243858: .L80243858:
/* 172138 80243858 3C03800E */ lui $v1, %hi(gBattleState2) /* 172138 80243858 3C03800E */ lui $v1, %hi(gBattleSubState)
/* 17213C 8024385C 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) /* 17213C 8024385C 8C63C4DC */ lw $v1, %lo(gBattleSubState)($v1)
/* 172140 80243860 24020006 */ addiu $v0, $zero, 6 /* 172140 80243860 24020006 */ addiu $v0, $zero, 6
.L80243864: .L80243864:
/* 172144 80243864 14620016 */ bne $v1, $v0, .L802438C0 /* 172144 80243864 14620016 */ bne $v1, $v0, .L802438C0
@ -613,11 +613,11 @@ glabel func_80242FE0
/* 17218C 802438AC 26520004 */ addiu $s2, $s2, 4 /* 17218C 802438AC 26520004 */ addiu $s2, $s2, 4
/* 172190 802438B0 16800003 */ bnez $s4, .L802438C0 /* 172190 802438B0 16800003 */ bnez $s4, .L802438C0
/* 172194 802438B4 24020007 */ addiu $v0, $zero, 7 /* 172194 802438B4 24020007 */ addiu $v0, $zero, 7
/* 172198 802438B8 3C01800E */ lui $at, %hi(gBattleState2) /* 172198 802438B8 3C01800E */ lui $at, %hi(gBattleSubState)
/* 17219C 802438BC AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 17219C 802438BC AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
.L802438C0: .L802438C0:
/* 1721A0 802438C0 3C03800E */ lui $v1, %hi(gBattleState2) /* 1721A0 802438C0 3C03800E */ lui $v1, %hi(gBattleSubState)
/* 1721A4 802438C4 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) /* 1721A4 802438C4 8C63C4DC */ lw $v1, %lo(gBattleSubState)($v1)
/* 1721A8 802438C8 24020007 */ addiu $v0, $zero, 7 /* 1721A8 802438C8 24020007 */ addiu $v0, $zero, 7
/* 1721AC 802438CC 14620003 */ bne $v1, $v0, .L802438DC /* 1721AC 802438CC 14620003 */ bne $v1, $v0, .L802438DC
/* 1721B0 802438D0 24040014 */ addiu $a0, $zero, 0x14 /* 1721B0 802438D0 24040014 */ addiu $a0, $zero, 0x14

1744
ver/us/asm/nonmatchings/415D90/btl_state_update_partner_menu.s
View File

File diff suppressed because one or more lines are too long

40
ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s
View File

@ -17,8 +17,8 @@ glabel btl_state_update_player_menu
/* 41A72C 802A599C 3C158011 */ lui $s5, %hi(gPlayerData) /* 41A72C 802A599C 3C158011 */ lui $s5, %hi(gPlayerData)
/* 41A730 802A59A0 26B5F290 */ addiu $s5, $s5, %lo(gPlayerData) /* 41A730 802A59A0 26B5F290 */ addiu $s5, $s5, %lo(gPlayerData)
/* 41A734 802A59A4 AFB00010 */ sw $s0, 0x10($sp) /* 41A734 802A59A4 AFB00010 */ sw $s0, 0x10($sp)
/* 41A738 802A59A8 3C10800E */ lui $s0, %hi(gBattleState2) /* 41A738 802A59A8 3C10800E */ lui $s0, %hi(gBattleSubState)
/* 41A73C 802A59AC 2610C4DC */ addiu $s0, $s0, %lo(gBattleState2) /* 41A73C 802A59AC 2610C4DC */ addiu $s0, $s0, %lo(gBattleSubState)
/* 41A740 802A59B0 AFBF0034 */ sw $ra, 0x34($sp) /* 41A740 802A59B0 AFBF0034 */ sw $ra, 0x34($sp)
/* 41A744 802A59B4 AFBE0030 */ sw $fp, 0x30($sp) /* 41A744 802A59B4 AFBE0030 */ sw $fp, 0x30($sp)
/* 41A748 802A59B8 AFB7002C */ sw $s7, 0x2c($sp) /* 41A748 802A59B8 AFB7002C */ sw $s7, 0x2c($sp)
@ -182,8 +182,8 @@ glabel btl_state_update_player_menu
/* 41A9AC 802A5C1C 00441024 */ and $v0, $v0, $a0 /* 41A9AC 802A5C1C 00441024 */ and $v0, $v0, $a0
/* 41A9B0 802A5C20 AEC20000 */ sw $v0, ($s6) /* 41A9B0 802A5C20 AEC20000 */ sw $v0, ($s6)
.L802A5C24: .L802A5C24:
/* 41A9B4 802A5C24 3C02800E */ lui $v0, %hi(gBattleState2) /* 41A9B4 802A5C24 3C02800E */ lui $v0, %hi(gBattleSubState)
/* 41A9B8 802A5C28 8C42C4DC */ lw $v0, %lo(gBattleState2)($v0) /* 41A9B8 802A5C28 8C42C4DC */ lw $v0, %lo(gBattleSubState)($v0)
/* 41A9BC 802A5C2C 2443FFFF */ addiu $v1, $v0, -1 /* 41A9BC 802A5C2C 2443FFFF */ addiu $v1, $v0, -1
/* 41A9C0 802A5C30 2C62012E */ sltiu $v0, $v1, 0x12e /* 41A9C0 802A5C30 2C62012E */ sltiu $v0, $v1, 0x12e
/* 41A9C4 802A5C34 10400943 */ beqz $v0, .L802A8144_41CED4 /* 41A9C4 802A5C34 10400943 */ beqz $v0, .L802A8144_41CED4
@ -1257,8 +1257,8 @@ glabel btl_state_update_player_menu
/* 41B908 802A6B78 00000000 */ nop /* 41B908 802A6B78 00000000 */ nop
.L802A6B7C: .L802A6B7C:
/* 41B90C 802A6B7C 86C2006E */ lh $v0, 0x6e($s6) /* 41B90C 802A6B7C 86C2006E */ lh $v0, 0x6e($s6)
/* 41B910 802A6B80 3C01800E */ lui $at, %hi(gBattleState2) /* 41B910 802A6B80 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41B914 802A6B84 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41B914 802A6B84 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 41B918 802A6B88 0C0A9662 */ jal btl_state_update_player_menu /* 41B918 802A6B88 0C0A9662 */ jal btl_state_update_player_menu
/* 41B91C 802A6B8C 00000000 */ nop /* 41B91C 802A6B8C 00000000 */ nop
/* 41B920 802A6B90 080A9F69 */ j .L802A7DA4 /* 41B920 802A6B90 080A9F69 */ j .L802A7DA4
@ -2486,8 +2486,8 @@ glabel btl_state_update_player_menu
/* 41CA9C 802A7D0C 080AA051 */ j .L802A8144_41CED4 /* 41CA9C 802A7D0C 080AA051 */ j .L802A8144_41CED4
/* 41CAA0 802A7D10 00000000 */ nop /* 41CAA0 802A7D10 00000000 */ nop
.L802A7D14: .L802A7D14:
/* 41CAA4 802A7D14 3C01800E */ lui $at, %hi(gBattleState2) /* 41CAA4 802A7D14 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CAA8 802A7D18 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41CAA8 802A7D18 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 41CAAC 802A7D1C 0C0A9662 */ jal btl_state_update_player_menu /* 41CAAC 802A7D1C 0C0A9662 */ jal btl_state_update_player_menu
/* 41CAB0 802A7D20 00000000 */ nop /* 41CAB0 802A7D20 00000000 */ nop
/* 41CAB4 802A7D24 24040018 */ addiu $a0, $zero, 0x18 /* 41CAB4 802A7D24 24040018 */ addiu $a0, $zero, 0x18
@ -2507,8 +2507,8 @@ glabel btl_state_update_player_menu
/* 41CAE8 802A7D58 86C4006E */ lh $a0, 0x6e($s6) /* 41CAE8 802A7D58 86C4006E */ lh $a0, 0x6e($s6)
/* 41CAEC 802A7D5C 00451024 */ and $v0, $v0, $a1 /* 41CAEC 802A7D5C 00451024 */ and $v0, $v0, $a1
/* 41CAF0 802A7D60 AC620000 */ sw $v0, ($v1) /* 41CAF0 802A7D60 AC620000 */ sw $v0, ($v1)
/* 41CAF4 802A7D64 3C01800E */ lui $at, %hi(gBattleState2) /* 41CAF4 802A7D64 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CAF8 802A7D68 AC24C4DC */ sw $a0, %lo(gBattleState2)($at) /* 41CAF8 802A7D68 AC24C4DC */ sw $a0, %lo(gBattleSubState)($at)
/* 41CAFC 802A7D6C 0C0A9662 */ jal btl_state_update_player_menu /* 41CAFC 802A7D6C 0C0A9662 */ jal btl_state_update_player_menu
/* 41CB00 802A7D70 00000000 */ nop /* 41CB00 802A7D70 00000000 */ nop
.L802A7D74: .L802A7D74:
@ -2518,8 +2518,8 @@ glabel btl_state_update_player_menu
/* 41CB10 802A7D80 00000000 */ nop /* 41CB10 802A7D80 00000000 */ nop
.L802A7D84: .L802A7D84:
/* 41CB14 802A7D84 240200CD */ addiu $v0, $zero, 0xcd /* 41CB14 802A7D84 240200CD */ addiu $v0, $zero, 0xcd
/* 41CB18 802A7D88 3C01800E */ lui $at, %hi(gBattleState2) /* 41CB18 802A7D88 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CB1C 802A7D8C AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41CB1C 802A7D8C AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 41CB20 802A7D90 0C0A9662 */ jal btl_state_update_player_menu /* 41CB20 802A7D90 0C0A9662 */ jal btl_state_update_player_menu
/* 41CB24 802A7D94 00000000 */ nop /* 41CB24 802A7D94 00000000 */ nop
/* 41CB28 802A7D98 24040019 */ addiu $a0, $zero, 0x19 /* 41CB28 802A7D98 24040019 */ addiu $a0, $zero, 0x19
@ -2531,8 +2531,8 @@ glabel btl_state_update_player_menu
/* 41CB3C 802A7DAC 080AA051 */ j .L802A8144_41CED4 /* 41CB3C 802A7DAC 080AA051 */ j .L802A8144_41CED4
/* 41CB40 802A7DB0 00000000 */ nop /* 41CB40 802A7DB0 00000000 */ nop
.L802A7DB4: .L802A7DB4:
/* 41CB44 802A7DB4 3C01800E */ lui $at, %hi(gBattleState2) /* 41CB44 802A7DB4 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CB48 802A7DB8 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41CB48 802A7DB8 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 41CB4C 802A7DBC 0C0A9662 */ jal btl_state_update_player_menu /* 41CB4C 802A7DBC 0C0A9662 */ jal btl_state_update_player_menu
/* 41CB50 802A7DC0 00000000 */ nop /* 41CB50 802A7DC0 00000000 */ nop
.L802A7DC4: .L802A7DC4:
@ -2658,8 +2658,8 @@ glabel btl_state_update_player_menu
/* 41CD0C 802A7F7C 00000000 */ nop /* 41CD0C 802A7F7C 00000000 */ nop
/* 41CD10 802A7F80 240200C9 */ addiu $v0, $zero, 0xc9 /* 41CD10 802A7F80 240200C9 */ addiu $v0, $zero, 0xc9
.L802A7F84: .L802A7F84:
/* 41CD14 802A7F84 3C01800E */ lui $at, %hi(gBattleState2) /* 41CD14 802A7F84 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CD18 802A7F88 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41CD18 802A7F88 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 41CD1C 802A7F8C 0C0A9662 */ jal btl_state_update_player_menu /* 41CD1C 802A7F8C 0C0A9662 */ jal btl_state_update_player_menu
/* 41CD20 802A7F90 00000000 */ nop /* 41CD20 802A7F90 00000000 */ nop
/* 41CD24 802A7F94 0C0A9662 */ jal btl_state_update_player_menu /* 41CD24 802A7F94 0C0A9662 */ jal btl_state_update_player_menu
@ -2724,8 +2724,8 @@ glabel btl_state_update_player_menu
/* 41CE04 802A8074 10400033 */ beqz $v0, .L802A8144_41CED4 /* 41CE04 802A8074 10400033 */ beqz $v0, .L802A8144_41CED4
/* 41CE08 802A8078 00000000 */ nop /* 41CE08 802A8078 00000000 */ nop
/* 41CE0C 802A807C 86C2006E */ lh $v0, 0x6e($s6) /* 41CE0C 802A807C 86C2006E */ lh $v0, 0x6e($s6)
/* 41CE10 802A8080 3C01800E */ lui $at, %hi(gBattleState2) /* 41CE10 802A8080 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CE14 802A8084 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41CE14 802A8084 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
/* 41CE18 802A8088 0C0A9662 */ jal btl_state_update_player_menu /* 41CE18 802A8088 0C0A9662 */ jal btl_state_update_player_menu
/* 41CE1C 802A808C 00000000 */ nop /* 41CE1C 802A808C 00000000 */ nop
/* 41CE20 802A8090 0C090464 */ jal btl_set_state /* 41CE20 802A8090 0C090464 */ jal btl_set_state
@ -2777,8 +2777,8 @@ glabel btl_state_update_player_menu
/* 41CEC4 802A8134 24050009 */ addiu $a1, $zero, 9 /* 41CEC4 802A8134 24050009 */ addiu $a1, $zero, 9
/* 41CEC8 802A8138 2402001F */ addiu $v0, $zero, 0x1f /* 41CEC8 802A8138 2402001F */ addiu $v0, $zero, 0x1f
.L802A813C: .L802A813C:
/* 41CECC 802A813C 3C01800E */ lui $at, %hi(gBattleState2) /* 41CECC 802A813C 3C01800E */ lui $at, %hi(gBattleSubState)
/* 41CED0 802A8140 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) /* 41CED0 802A8140 AC22C4DC */ sw $v0, %lo(gBattleSubState)($at)
.L802A8144_41CED4: .L802A8144_41CED4:
/* 41CED4 802A8144 8FBF0034 */ lw $ra, 0x34($sp) /* 41CED4 802A8144 8FBF0034 */ lw $ra, 0x34($sp)
/* 41CED8 802A8148 8FBE0030 */ lw $fp, 0x30($sp) /* 41CED8 802A8148 8FBE0030 */ lw $fp, 0x30($sp)

2
ver/us/symbol_addrs.txt
View File

@ -4172,7 +4172,7 @@ appendGfx_entity_model = 0x80121184; // type:func rom:0xB7884
D_800DC4D0 = 0x800DC4D0; // type:data rom:0xB78D0 D_800DC4D0 = 0x800DC4D0; // type:data rom:0xB78D0
D_800DC4D4 = 0x800DC4D4; // type:data rom:0xB78D4 D_800DC4D4 = 0x800DC4D4; // type:data rom:0xB78D4
D_800DC4D8 = 0x800DC4D8; // type:data rom:0xB78D8 D_800DC4D8 = 0x800DC4D8; // type:data rom:0xB78D8
gBattleState2 = 0x800DC4DC; // type:data rom:0xB78DC gBattleSubState = 0x800DC4DC; // type:data rom:0xB78DC
D_800DC4E0 = 0x800DC4E0; // type:data rom:0xB78E0 D_800DC4E0 = 0x800DC4E0; // type:data rom:0xB78E0
D_800DC4E4 = 0x800DC4E4; // type:data rom:0xB78E4 D_800DC4E4 = 0x800DC4E4; // type:data rom:0xB78E4
D_800DC4E8 = 0x800DC4E8; // type:data rom:0xB78E8 D_800DC4E8 = 0x800DC4E8; // type:data rom:0xB78E8

2
ver/us/undefined_syms.txt
View File

@ -490,6 +490,8 @@ pra_02_D_80243CC0 = 0x80243CC0;
gActionCommandStatus = 0x8029FBE0; // more bss for 16c8e0's segment gActionCommandStatus = 0x8029FBE0; // more bss for 16c8e0's segment
D_80164000 = 0x80164000; // display contexts, part of bss3 D_80164000 = 0x80164000; // display contexts, part of bss3
D_802AD673 = 0x802AD673; // remove when func_802A45D8 is decompiled with D_802AD670 instead of D_802AD673
// battle/item BSS // battle/item BSS
D_802A25C8 = 0x802A25C8; D_802A25C8 = 0x802A25C8;
D_802A25E4 = 0x802A25E4; D_802A25E4 = 0x802A25E4;