From 31d31d326034fde26dedaf2dadb1c608e00fb92f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 18:09:24 -0500 Subject: Sync compare macros, some event_scripts.s doc, begin map_scripts constants --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/script_menu.c b/src/script_menu.c index 4ebd0f8f8..be8578cd0 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -579,7 +579,7 @@ const u8 *const gStdStringPtrs[] = { gText_Items, gText_KeyItems, gText_PokeBalls, - gText_TmsgUnknown_8417B2CHms, + gText_TMsAndHMs, gText_Berries, gText_Boulderbadge, gText_Cascadebadge, -- cgit v1.2.3 From c39d295386654b34982d384a332b8cb7b2e55e24 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 00:15:41 -0500 Subject: Label used movement steps --- src/vs_seeker.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 46a0649d7..8478e2114 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -547,25 +547,25 @@ static const VsSeekerData sVsSeekerData[] = { }; static const u8 gUnknown_8453F5C[] = { - step_1c, - step_1c, - step_1c, + delay_16, + delay_16, + delay_16, step_end }; static const u8 gUnknown_8453F60[] = { - step_62, + emote_exclamation_mark, step_end }; static const u8 sMovementScript_TrainerNoRematch[] = { - step_64, + emote_x, step_end }; -static const u8 gUnknown_8453F64[] = { - step_2d, - step_65, +static const u8 sMovementScript_TrainerRematch[] = { + walk_in_place_fastest_down, + emote_double_exclamation_mark, step_end }; @@ -963,7 +963,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) { gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[vsSeekerIdx].localId] = r7; npc_coords_shift_still(&gObjectEvents[sVsSeeker->trainerInfo[vsSeekerIdx].objectEventId]); - StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], gUnknown_8453F64); + StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerRematch); sVsSeeker->trainerIdxArray[sVsSeeker->numRematchableTrainers] = r8; sVsSeeker->runningBehaviourEtcArray[sVsSeeker->numRematchableTrainers] = GetRunningBehaviorFromGraphicsId(sVsSeeker->trainerInfo[vsSeekerIdx].graphicsId); sVsSeeker->numRematchableTrainers++; @@ -1127,7 +1127,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) "\tbl npc_coords_shift_still\n" "\tldr r0, [r6]\n" "\tadds r0, r5\n" - "\tldr r1, _0810CB60 @ =gUnknown_8453F64\n" + "\tldr r1, _0810CB60 @ =sMovementScript_TrainerRematch\n" "\tbl StartTrainerObjectMovementScript\n" "\tldr r2, [r6]\n" "\tmov r3, r10\n" @@ -1197,7 +1197,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0) "_0810CB54: .4byte gSaveBlock1Ptr\n" "_0810CB58: .4byte 0x0000063a\n" "_0810CB5C: .4byte gObjectEvents\n" - "_0810CB60: .4byte gUnknown_8453F64\n" + "_0810CB60: .4byte sMovementScript_TrainerRematch\n" "_0810CB64: .4byte 0x00000431\n" "_0810CB68: .4byte sVsSeeker\n" "_0810CB6C: .4byte 0x00000801\n" -- cgit v1.2.3 From d071f055041d551b33fafac01e6bbe28aaee746f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 13:25:10 -0500 Subject: Split more files from event_scripts.s --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/script_menu.c b/src/script_menu.c index be8578cd0..827f79fa6 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1007,7 +1007,7 @@ static void CreatePCMenuWindow(void) void ScriptMenu_DisplayPCStartupPrompt(void) { sub_80F7768(0, TRUE); - AddTextPrinterParameterized2(0, 2, gUnknown_81A508A, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, Text_AccessWhichPC, 0, NULL, 2, 1, 3); } static void Task_ScriptShowMonPic(u8 taskId) -- cgit v1.2.3 From 94fbc3ac489e529176533a1fad7deac7e1014b9d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 9 Jan 2020 14:46:14 -0500 Subject: Sync temp vars --- src/battle_tower.c | 14 +++++++------- src/field_tasks.c | 2 +- src/trainer_tower.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/battle_tower.c b/src/battle_tower.c index c8098abf4..86ed75273 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -190,33 +190,33 @@ void ScrSpecial_BattleTowerMapScript2(void) case 0: ResetBattleTowerStreak(levelType); if (count == 0) - VarSet(VAR_0x4000, 5); + VarSet(VAR_TEMP_0, 5); break; case 1: ResetBattleTowerStreak(levelType); - VarSet(VAR_0x4000, BTSPECIAL_RESULT_SAVE_SCUM); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_SAVE_SCUM); count++; break; case 3: break; case 4: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_WON7); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_WON7); count++; break; case 5: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_LOST); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_LOST); count++; break; case 6: break; case 2: - VarSet(VAR_0x4000, BTSPECIAL_RESULT_QUICKSAVE); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_QUICKSAVE); count++; break; } } if (gSaveBlock2Ptr->battleTower.var_4AE[0] == 3 && gSaveBlock2Ptr->battleTower.var_4AE[1] == 3) - VarSet(VAR_0x4000, BTSPECIAL_RESULT_INACTIVE); + VarSet(VAR_TEMP_0, BTSPECIAL_RESULT_INACTIVE); ValidateBattleTowerRecordChecksums(); } @@ -1150,7 +1150,7 @@ void SaveBattleTowerProgress(void) if (gSpecialVar_0x8004 != 3) gSaveBlock2Ptr->battleTower.var_4AE[battleTowerLevelType] = gSpecialVar_0x8004; - VarSet(VAR_0x4000, BTSPECIAL_TEST); + VarSet(VAR_TEMP_0, BTSPECIAL_TEST); gSaveBlock2Ptr->battleTower.unk_554 = 1; TrySavingData(SAVE_EREADER); } diff --git a/src/field_tasks.c b/src/field_tasks.c index 7ca6d0e7b..e39009a2e 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -213,7 +213,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId) PlaySE(SE_RU_GASYAN); MapGridSetMetatileIdAt(x, y, 0x35b); CurrentMapDrawMetatileAt(x, y); - VarSet(VAR_0x4001, 1); + VarSet(VAR_TEMP_1, 1); data[1] = 1; } break; diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 5d1b3fc62..60c6fd93d 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -463,7 +463,7 @@ void InitTrainerTowerBattleStruct(void) sub_815DC8C(); sTrainerTowerOpponent = AllocZeroed(sizeof(*sTrainerTowerOpponent)); - r10 = VarGet(VAR_0x4001); + r10 = VarGet(VAR_TEMP_1); StringCopyN(sTrainerTowerOpponent->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11); for (r9 = 0; r9 < 6; r9++) @@ -494,7 +494,7 @@ void FreeTrainerTowerBattleStruct(void) void sub_815DBF4(u8 *dest, u8 opponentIdx) // TTower_GetBeforeBattleMessage? { - VarSet(VAR_0x4003, opponentIdx); + VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); if (opponentIdx == 0) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin, dest); @@ -505,7 +505,7 @@ void sub_815DBF4(u8 *dest, u8 opponentIdx) void sub_815DC40(u8 *dest, u8 opponentIdx) // TTower_GetAfterBattleMessage? { - VarSet(VAR_0x4003, opponentIdx); + VarSet(VAR_TEMP_3, opponentIdx); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass); if (opponentIdx == 0) TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose, dest); @@ -706,7 +706,7 @@ static void TrainerTowerGetOpponentTextColor(u8 battleType, u8 facilityClass) } if (r4 != NELEMS(sDoubleBattleTrainerInfo)) { - if (VarGet(VAR_0x4003)) + if (VarGet(VAR_TEMP_3)) r5 = sDoubleBattleTrainerInfo[r4].gender2; else r5 = sDoubleBattleTrainerInfo[r4].gender1; @@ -905,12 +905,12 @@ static void sub_815E720(void) PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); - VarSet(VAR_0x4001, windowId); + VarSet(VAR_TEMP_1, windowId); } static void sub_815E88C(void) { - u8 windowId = VarGet(VAR_0x4001); + u8 windowId = VarGet(VAR_TEMP_1); ClearStdWindowAndFrameToTransparent(windowId, TRUE); RemoveWindow(windowId); } @@ -948,7 +948,7 @@ static void sub_815E908(void) static void sub_815E948(void) { s32 i; - u16 var_4001 = VarGet(VAR_0x4001); + u16 var_4001 = VarGet(VAR_TEMP_1); u8 r1 = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[var_4001].facilityClass; for (i = 0; i < NELEMS(sTrainerEncounterMusicLUT); i++) @@ -974,7 +974,7 @@ static void sub_815E9C8(void) static void BuildEnemyParty(void) { - u16 trainerIdx = VarGet(VAR_0x4001); + u16 trainerIdx = VarGet(VAR_TEMP_1); s32 level = GetPartyMaxLevel(); u8 floorIdx = gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk8; s32 i; -- cgit v1.2.3 From 91bf7665c623011fb63a7045689ba600b4b1eda7 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 05:01:48 -0500 Subject: Sync split scripts, more misc splits/doc --- src/event_data.c | 2 +- src/field_tasks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/event_data.c b/src/event_data.c index 9291c06aa..010a4414c 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -213,7 +213,7 @@ static bool8 IsFlagOrVarStoredInQuestLog(u16 idx, bool8 isVar) } else { - if (idx < VAR_0x4030 - VARS_START) + if (idx < VAR_ICE_STEP_COUNT - VARS_START) return FALSE; if (idx >= VAR_MAP_SCENE_PALLET_TOWN_OAK - VARS_START && idx < VAR_PORTHOLE - VARS_START) return FALSE; diff --git a/src/field_tasks.c b/src/field_tasks.c index e39009a2e..67717c567 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -268,7 +268,7 @@ static void CrackedFloorPerStepCallback(u8 taskId) if (MetatileBehavior_ReturnFalse_13(behavior)) { if (GetPlayerSpeed() != 4) - VarSet(VAR_0x4030, 0); + VarSet(VAR_ICE_STEP_COUNT, 0); if (data[4] == 0) { -- cgit v1.2.3 From 388c40575de92923b576e37a97729c27f292b67f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 15:18:53 -0500 Subject: Sync Birth Island / Navel Rock scripts --- src/field_specials.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/field_specials.c b/src/field_specials.c index 7abc3f5c9..55f3bcce5 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -80,7 +80,7 @@ static void ChangeBoxPokemonNickname_CB(void); static void ChangePokemonNickname_CB(void); static void Task_RunPokemonLeagueLightingEffect(u8 taskId); static void Task_CancelPokemonLeagueLightingEffect(u8 taskId); -static void task_deoxys_sound(u8 taskId); +static void Task_DoDeoxysRockInteraction(u8 taskId); static void MoveDeoxysObject(u8 num); static void Task_WaitDeoxysFieldEffect(u8 taskId); static void Task_WingFlapSound(u8 taskId); @@ -2309,12 +2309,12 @@ static const u8 sDeoxysStepCaps[] = { 3 }; -void Special_DeoxysSound(void) +void DoDeoxysRockInteraction(void) { - CreateTask(task_deoxys_sound, 8); + CreateTask(Task_DoDeoxysRockInteraction, 8); } -static void task_deoxys_sound(u8 taskId) +static void Task_DoDeoxysRockInteraction(u8 taskId) { u16 r5; u16 r6; -- cgit v1.2.3 From 0bb7f18b8e609f76a9021420470737bbd16cc2bd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 10 Jan 2020 16:55:58 -0500 Subject: Sync Cable Club scripts --- src/battle_records.c | 2 +- src/battle_setup.c | 2 +- src/event_object_lock.c | 4 ++-- src/field_fadetransition.c | 2 +- src/field_specials.c | 2 +- src/post_battle_event_funcs.c | 2 +- src/save_location.c | 6 ++++-- src/script_menu.c | 20 ++++++++++---------- 8 files changed, 21 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/battle_records.c b/src/battle_records.c index 38889ca67..07ff665d9 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -450,7 +450,7 @@ static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId) void TryRecordLinkBattleOutcome(s32 battlerId) { - if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNKNOWN_MAP_00_04) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNKNOWN_MAP_00_04)) + if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNION_ROOM)) { UpdateBattleOutcomeOnTrainerCards(battlerId); AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].playerName, gTrainerCards[battlerId].trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); diff --git a/src/battle_setup.c b/src/battle_setup.c index 17da53083..dee0c492b 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -901,7 +901,7 @@ static void CB2_EndTrainerBattle(void) gSpecialVar_Result = 1; if (gUnknown_20386CC & 1) { - sp000_heal_pokemon(); + HealPlayerParty(); } else { diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 17ec57b20..ea4fa00b9 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -104,12 +104,12 @@ void sub_80696F0(void) UnfreezeObjectEvents(); } -void sub_8069740(void) +void Script_FacePlayer(void) { ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } -void sub_8069768(void) +void Script_ClearHeldMovement(void) { ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]); } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index e2da82de2..dbc5f23b5 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -677,7 +677,7 @@ static void sub_807E678(u8 taskId) } } -void sub_807E704(void) +void ReturnFromLinkRoom(void) { CreateTask(sub_807E678, 10); } diff --git a/src/field_specials.c b/src/field_specials.c index 55f3bcce5..6f42ba764 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1985,7 +1985,7 @@ const u16 sPokeCenter1FMaps[] = { MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_1F, - MAP_UNKNOWN_MAP_00_04, + MAP_UNION_ROOM, MAP_UNDEFINED }; diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 6d4652f35..1e61b9b77 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -14,7 +14,7 @@ bool8 Special_HallOfFame(void) bool8 *r7; int i; bool8 gaveAtLeastOneRibbon; - sp000_heal_pokemon(); + HealPlayerParty(); if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE) { gHasHallOfFameRecords = TRUE; diff --git a/src/save_location.c b/src/save_location.c index 9b679c7ee..561fd2ff2 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -36,8 +36,10 @@ static const u16 sSaveLocationPokeCenterList[] = MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_FIVE_ISLAND_POKEMON_CENTER_2F, MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_2F, MAP_SIX_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_2F, - MAP_UNKNOWN_MAP_00_00, MAP_UNKNOWN_MAP_00_01, - MAP_UNKNOWN_MAP_00_03, MAP_UNKNOWN_MAP_00_04, + MAP_BATTLE_COLOSSEUM_2P, + MAP_TRADE_CENTER, + MAP_BATTLE_COLOSSEUM_4P, + MAP_UNION_ROOM, 0xFFFF, }; diff --git a/src/script_menu.c b/src/script_menu.c index 827f79fa6..2a81a7bce 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -598,22 +598,22 @@ const u8 *const gStdStringPtrs[] = { }; static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { - Text_1BC388, - Text_1BC3C7, - Text_1BCB42 + CableClub_Text_TradeMonsUsingLinkCable, + CableClub_Text_BattleUsingLinkCable, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCAF2, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CanMakeBerryPowder, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CancelSelectedItem }; static const union AnimCmd sMuseumFossilAnim0[] = { -- cgit v1.2.3