diff options
50 files changed, 296 insertions, 299 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 7670d867d..69c6d9e4f 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -87,8 +87,8 @@ _08095B66: bx r1 thumb_func_end sub_8095B24 - thumb_func_start sub_8095B6C -sub_8095B6C: @ 8095B6C + thumb_func_start GetNumValidDaycarePartyMons +GetNumValidDaycarePartyMons: @ 8095B6C push {r4-r6,lr} movs r5, 0 movs r6, 0 @@ -124,7 +124,7 @@ _08095B9A: bx r1 .align 2, 0 _08095BB0: .4byte gPlayerParty - thumb_func_end sub_8095B6C + thumb_func_end GetNumValidDaycarePartyMons thumb_func_start CountAlivePartyMonsExceptOne CountAlivePartyMonsExceptOne: @ 8095BB4 @@ -174,8 +174,8 @@ _08095BF6: _08095C0C: .4byte gPlayerParty thumb_func_end CountAlivePartyMonsExceptOne - thumb_func_start sub_8095C10 -sub_8095C10: @ 8095C10 + thumb_func_start CountAlivePartyMonsExceptSelectedOne +CountAlivePartyMonsExceptSelectedOne: @ 8095C10 push {lr} ldr r0, _08095C24 @ =gSpecialVar_0x8004 ldrb r0, [r0] @@ -186,7 +186,7 @@ sub_8095C10: @ 8095C10 bx r1 .align 2, 0 _08095C24: .4byte gSpecialVar_0x8004 - thumb_func_end sub_8095C10 + thumb_func_end CountAlivePartyMonsExceptSelectedOne thumb_func_start StorageSystemGetPartySize StorageSystemGetPartySize: @ 8095C28 diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 7f3b89081..e786a6ab1 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -490,7 +490,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F4E0 compare RESULT, 2 goto_if_eq EventScript_15F503 - special sub_80BC224 + special BufferSecretBaseOwnerName msgbox UnknownString_81A3958, 5 compare RESULT, 0 goto_if_eq EventScript_15F452 @@ -2544,7 +2544,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special sub_80BF9F8 + special ChangePokemonNickname waitstate return @@ -3813,7 +3813,7 @@ EventScript_1A2E45: compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 - special sub_80BC50C + special MoveSecretBase closemessage fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -4317,7 +4317,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C setvar VAR_SPECIAL_4, 1 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate special ScrSpecial_HealPlayerParty release diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index 2b86dc4dc..edecb0312 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter diff --git a/data/event_scripts.s b/data/event_scripts.s index 898df7f3d..7d59b5234 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -490,7 +490,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F4E0 compare RESULT, 2 goto_if_eq EventScript_15F503 - special sub_80BC224 + special BufferSecretBaseOwnerName msgbox UnknownString_81A3958, 5 compare RESULT, 0 goto_if_eq EventScript_15F452 @@ -2538,7 +2538,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special sub_80BF9F8 + special ChangePokemonNickname waitstate return @@ -3792,7 +3792,7 @@ EventScript_1A2E45: compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 - special sub_80BC50C + special MoveSecretBase closemessage fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -4296,7 +4296,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C setvar VAR_SPECIAL_4, 1 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate special ScrSpecial_HealPlayerParty release diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a0eeaa73..0a7112125 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,7 +87,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7664a14ca..8c2325e04 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -96,7 +96,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialvar RESULT, sub_8095B6C + specialvar RESULT, GetNumValidDaycarePartyMons compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 @@ -105,7 +105,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C waitstate compare VAR_SPECIAL_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - specialvar RESULT, sub_8095C10 + specialvar RESULT, CountAlivePartyMonsExceptSelectedOne compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialvar RESULT, sub_80B7CE8 + specialvar RESULT, HasEnoughMoneyFor compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 @@ -207,7 +207,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 specialvar RESULT, TakePokemonFromDaycare - special sub_80B7D0C + special PayMoneyFor playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ff45d2cff..e2f43b77e 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -248,7 +248,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialvar RESULT, sub_80BDD18 + specialvar RESULT, GabbyAndTyGetLastBattleTrivia switch RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB @@ -310,7 +310,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 - special sub_80BDC14 + special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 343ef4233..9ad419da1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4D4 + specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialvar RESULT, sub_810F488 + specialvar RESULT, FoundAbandonedShipRoom1Key compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4FC + specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4B0 + specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 87ba8c01a..7853b3598 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -23,16 +23,16 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special ScrSpecial_HealPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -40,7 +40,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA BattleTower_BattleRoom_EventScript_160961:: @ 8160961 setvar VAR_SPECIAL_4, 6 - special sub_8135668 + special SetBattleTowerProperty switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 @@ -53,7 +53,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -91,14 +91,14 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 4 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 7 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -106,7 +106,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar VAR_SPECIAL_4, 2 - special sub_8135BA0 + special SaveBattleTowerProgress message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fccfcdb2c..6749c5623 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 527bae389..4058d5aae 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -6,18 +6,18 @@ BattleTower_Lobby_MapScripts:: @ 816027E .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 - special sub_813610C + special TryEnableBravoTrainerBattleTower call BattleTower_Lobby_EventScript_16029C end BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 - special sub_8135668 + special SetBattleTowerProperty checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -76,7 +76,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 message BattleTower_Lobby_Text_19A487 waitmessage setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special AwardBattleTowerRibbons @@ -90,23 +90,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar VAR_SPECIAL_4, 8 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 3 - special sub_8135668 + special SetBattleTowerProperty message BattleTower_Lobby_Text_19A4BB waitmessage special GiveBattleTowerPrize @@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD playfanfare 370 waitfanfare setvar VAR_SPECIAL_4, 9 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -145,9 +145,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 @@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B message BattleTower_Lobby_Text_19A5CE waitmessage setvar VAR_SPECIAL_4, 1 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 5 special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 @@ -185,7 +185,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty @@ -214,7 +214,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA setvar VAR_SPECIAL_4, 1 copyvar VAR_SPECIAL_5, RESULT copyvar VAR_SPECIAL_6, RESULT - special sub_8135668 + special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 special ChooseBattleTowerPlayerParty @@ -229,16 +229,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar VAR_SPECIAL_4, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 0 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty special LoadPlayerParty closemessage delay 2 @@ -249,7 +249,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 goto_if_eq BattleTower_Lobby_EventScript_160642 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage @@ -277,7 +277,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar VAR_SPECIAL_4, 12 - special sub_8135668 + special SetBattleTowerProperty goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F @@ -286,7 +286,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty BattleTower_Lobby_EventScript_160662:: @ 8160662 release @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialvar RESULT, sub_810F404 + specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index ee702c102..669b0a5fe 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -65,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar RESULT, sub_810E300 + specialvar RESULT, GetBattleOutcome compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 081850326..0546ef5be 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -24,11 +24,11 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 - special sub_80F9A4C + special SelectMoveTutorMon waitstate compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 compare VAR_SPECIAL_5, 0 @@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 - special sub_8132670 + special TeachMoveTutorMove waitstate compare VAR_SPECIAL_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index aee4141a8..f6f8aafa6 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 goto_if_eq FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_1856F7, 4 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 00a10b655..7e221122b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialvar RESULT, sub_8090FC0 + specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 8233504dd..1198054f0 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR - special sub_810E944 + special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage multichoice 0, 0, 57, 0 @@ -74,7 +74,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index a9680e3a5..d4dedb0c2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E waitmessage special RetrieveLotteryNumber copyvar VAR_SPECIAL_8, RESULT - special sub_810F9AC + special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 1024d30e9..a3c8d23af 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -14,11 +14,11 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves @@ -26,7 +26,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 - special sub_80F9EEC + special SelectMove fadescreen 0 compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE @@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE end LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 - special sub_80FA0DC + special DeleteMonMove playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 2db702ffc..4656f0182 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -68,37 +68,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 - special sub_810FCE8 + special UpdateMovedLilycoveFanClubMembers setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer setvar VAR_SPECIAL_4, 13 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 @@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer setvar VAR_SPECIAL_4, 8 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 @@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer setvar VAR_SPECIAL_4, 9 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 @@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer setvar VAR_SPECIAL_4, 10 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 @@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer setvar VAR_SPECIAL_4, 11 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 @@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer setvar VAR_SPECIAL_4, 12 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 @@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer setvar VAR_SPECIAL_4, 14 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 @@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer setvar VAR_SPECIAL_4, 15 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 @@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6befb5fb9..c2b785254 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 0 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 1 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 2 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 3 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 4 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 5 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 6 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 7 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 1e7c26511..ad3b366a8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -92,7 +92,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty - special sub_810F414 + special BufferEReaderTrainerName msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9395633e7..9f20b6310 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -20,7 +20,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E closemessage setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f073201ca..df7f42a8b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index b65c2e67d..f5f93f05a 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index cf91c31bd..2e0d106bb 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D goto_if_eq RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox RustboroCity_House1_Text_184F6B, 4 setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 2a25ded19..aa1157d7e 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 @@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialvar RESULT, sub_810F96C + specialvar RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 9f2d6c35b..38514b03b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 call SootopolisCity_Gym_1F_EventScript_15AF2E - special sub_8069D78 + special SetSootopolisGymCrackedIceMetatiles end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 6a72ec1da..91dd3490b 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -6,7 +6,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 lock faceplayer msgbox SootopolisCity_House8_Text_1900F7, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 @@ -55,7 +55,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 lock faceplayer msgbox SootopolisCity_House8_Text_190431, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 4a659f469..eb12ab148 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -53,7 +53,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 @@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 - special sub_804E538 + special DoBerryBlending waitstate releaseall end @@ -214,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 @@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D removeobject 239 removeobject 238 removeobject 237 - special sub_804E538 + special DoBerryBlending waitstate releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index ca48bb41f..5dba65b8a 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A EventScript_1C348E: fadescreen 1 - special sub_810BAF4 + special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 diff --git a/data/specials.inc b/data/specials.inc index 5c732309e..032a3884c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -139,8 +139,8 @@ gSpecials:: def_special GetDewfordHallPaintingNameIndex def_special SwapRegisteredBike def_special CalculatePlayerPartyCount - def_special sub_8095B6C - def_special sub_8095C10 + def_special GetNumValidDaycarePartyMons + def_special CountAlivePartyMonsExceptSelectedOne def_special sub_80C4CF8 def_special sub_80C4CEC def_special sub_80C4C78 @@ -165,29 +165,29 @@ gSpecials:: def_special ScrSpecial_ViewWallClock def_special ScrSpecial_ChooseStarter def_special ScrSpecial_StartWallyTutorialBattle - def_special sub_80BF9F8 - def_special sub_80F9A0C - def_special sub_810CA00 - def_special sub_804E538 + def_special ChangePokemonNickname + def_special SelectMonForNPCTrade + def_special GetFirstFreePokeblockSlot + def_special DoBerryBlending def_special PlayRoulette - def_special sub_810FD60 - def_special sub_810FCB0 - def_special sub_810FDAC + def_special ShouldMoveLilycoveFanClubMember + def_special GetNumMovedLilycoveFanClubMembers + def_special BufferStreakTrainerText def_special sub_810FA74 - def_special sub_810FCE8 + def_special UpdateMovedLilycoveFanClubMembers def_special sub_810FF48 def_special sub_810FAA0 def_special sub_810FF60 def_special ScrSpecial_RockSmashWildEncounter def_special GabbyAndTyGetBattleNum - def_special sub_80BDC14 + def_special GabbyAndTyAfterInterview def_special GabbyAndTyBeforeInterview def_special DoTVShowInSearchOfTrainers def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote - def_special sub_80BDD18 + def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds - def_special sub_810E300 + def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState def_special RejectEggFromDayCare @@ -204,8 +204,8 @@ gSpecials:: def_special EggHatch def_special sub_8042B4C def_special ShowLinkBattleRecords - def_special sub_80B7CE8 - def_special sub_80B7D0C + def_special HasEnoughMoneyFor + def_special PayMoneyFor def_special ExecuteWhiteOut def_special sp0C8_whiteout_maybe def_special RotatingGate_InitPuzzle @@ -215,7 +215,7 @@ gSpecials:: def_special EnterSafariMode def_special ExitSafariMode def_special SafariZoneGetPokeblockNameInFeeder - def_special sub_810BAF4 + def_special OpenPokeblockCaseOnFeeder def_special IsMirageIslandPresent def_special UpdateShoalTideFlag def_special InitBirchState @@ -226,12 +226,12 @@ gSpecials:: def_special SetDepartmentStoreFloorVar def_special DoLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect - def_special sub_80F9A4C - def_special sub_80F9EEC - def_special sub_80FA0DC + def_special SelectMoveTutorMon + def_special SelectMove + def_special DeleteMonMove def_special ScrSpecial_GetPokemonNicknameAndMoveName def_special ScrSpecial_CountPokemonMoves - def_special sub_8132670 + def_special TeachMoveTutorMove def_special GetRecordedCyclingRoadResults def_special ScrSpecial_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike @@ -243,26 +243,26 @@ gSpecials:: def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting - def_special sub_813556C - def_special sub_8135668 - def_special sub_81358A4 - def_special sub_8135A14 - def_special sub_8135BA0 + def_special StartSpecialBattle + def_special SetBattleTowerProperty + def_special BattleTowerUtil + def_special SetBattleTowerParty + def_special SaveBattleTowerProgress def_special BattleTower_SoftReset def_special DetermineBattleTowerPrize def_special GiveBattleTowerPrize def_special AwardBattleTowerRibbons def_special ChooseBattleTowerPlayerParty def_special ValidateEReaderTrainer - def_special sub_810F404 + def_special GetBestBattleTowerStreak def_special ReducePlayerPartyToThree def_special BedroomPC def_special PlayerPC def_special FieldShowRegionMap - def_special sub_804D89C - def_special sub_804DB68 - def_special sub_804E174 - def_special sub_804DB2C + def_special GetInGameTradeSpeciesInfo + def_special CreateInGameTradePokemon + def_special DoInGameTradeScene + def_special GetTradeSpecies def_special GetWeekCount def_special RetrieveLotteryNumber def_special PickLotteryCornerTicket @@ -280,7 +280,7 @@ gSpecials:: def_special sub_80C7958 def_special DoSoftReset def_special GameClear - def_special sub_810EBEC + def_special ShakeScreenInElevator def_special ShowGlassWorkshopMenu def_special SpawnCameraDummy def_special RemoveCameraDummy @@ -292,31 +292,31 @@ gSpecials:: def_special sub_80818FC def_special ShowBattleTowerRecords def_special WaitWeather - def_special sub_810F414 - def_special sub_810F424 + def_special BufferEReaderTrainerName + def_special GetSlotMachineId def_special player_get_direction_lower_nybble - def_special sub_810F488 - def_special sub_810F4B0 - def_special sub_810F4D4 - def_special sub_810F4FC + def_special FoundAbandonedShipRoom1Key + def_special FoundAbandonedShipRoom2Key + def_special FoundAbandonedShipRoom4Key + def_special FoundAbandonedShipRoom6Key def_special LeadMonHasEffortRibbon def_special GivLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special sub_8064EAC def_special sub_8064ED4 def_special InitRoamer - def_special sub_810F5BC + def_special TryUpdateRusturfTunnelState def_special IsGrassTypeInParty def_special sub_8081334 def_special PutZigzagoonInPlayerParty def_special IsStarterInParty - def_special sub_80BC224 + def_special BufferSecretBaseOwnerName def_special CheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 - def_special sub_810E944 + def_special DisplayCurrentElevatorFloor def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty - def_special sub_8069D78 + def_special SetSootopolisGymCrackedIceMetatiles def_special sub_810F758 def_special ScrSpecial_StartGroudonKyogreBattle def_special ScrSpecial_StartRayquazaBattle @@ -335,17 +335,17 @@ gSpecials:: def_special SetRoute123Weather def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies - def_special sub_80FA148 + def_special IsSelectedMonEgg def_special sub_810F8FC - def_special sub_80BC50C + def_special MoveSecretBase def_special LoadPlayerBag def_special sub_8081924 - def_special sub_810F950 - def_special sub_810F908 - def_special sub_8090FC0 - def_special sub_810F96C - def_special sub_810F9AC - def_special sub_813610C + def_special SetPacifidlogTMReceivedDay + def_special GetDaysUntilPacifidlogTMAvailable + def_special CompletedHoennPokedex + def_special MonOTNameMatchesPlayer + def_special BufferLottoTicketNumber + def_special TryEnableBravoTrainerBattleTower def_special GetNameOfEnigmaBerryInPlayerParty def_special ScriptRandom def_special sub_80835D8 diff --git a/include/battle_setup.h b/include/battle_setup.h index 378a19b72..8423a6e6e 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -56,7 +56,6 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); void TrainerWantsBattle(u8, u8 *); bool32 GetTrainerFlagFromScriptPointer(u8 *data); -//void sub_8082524(void); //u8 ScrSpecial_GetTrainerBattleMode(void); //u8 ScrSpecial_HasTrainerBeenFought(void); //void sub_808257C(void); diff --git a/include/learn_move.h b/include/learn_move.h index 85fbf046e..fca236ec9 100644 --- a/include/learn_move.h +++ b/include/learn_move.h @@ -1,6 +1,6 @@ #ifndef GUARD_LEARN_MOVE_H #define GUARD_LEARN_MOVE_H -void sub_8132670(void); +void TeachMoveTutorMove(void); #endif // GUARD_LEARN_MOVE_H diff --git a/include/money.h b/include/money.h index 5a0acd482..9f4ef71bc 100644 --- a/include/money.h +++ b/include/money.h @@ -11,7 +11,7 @@ void sub_80B7B34(u8, u8, int); void UpdateMoneyWindow(u32, u8, u8); void OpenMoneyWindow(u32, u8, u8); void CloseMoneyWindow(u8, u8); -bool8 sub_80B7CE8(void); -void sub_80B7D0C(void); +bool8 HasEnoughMoneyFor(void); +void PayMoneyFor(void); #endif // GUARD_MONEY_H diff --git a/include/pokedex.h b/include/pokedex.h index c47494e1f..d8416889a 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -22,7 +22,7 @@ s8 GetSetPokedexFlag(u16, u8); u16 GetNationalPokedexCount(u8); u16 GetHoennPokedexCount(u8); -bool8 sub_8090FC0(void); +bool8 CompletedHoennPokedex(void); u16 sub_8090FF4(void); #endif // GUARD_POKEDEX_H diff --git a/include/trade.h b/include/trade.h index 642bdcd65..46f58a802 100644 --- a/include/trade.h +++ b/include/trade.h @@ -51,14 +51,11 @@ extern const u32 gUnknown_0820CA98[]; extern const u16 gUnknown_0820F798[]; void sub_8047CD8(void); -u16 sub_804DB2C(void); -void sub_804DB68(void); void sub_804E174(void); extern const u8 gOtherText_MaleSymbol3[2]; extern const u8 gOtherText_FemaleSymbol3[2]; extern const u8 gOtherText_GenderlessSymbol[2]; void sub_804E22C(void); -u16 sub_804D89C(void); #endif //POKERUBY_TRADE_H diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c index 2c937bb28..83dba8b73 100644 --- a/src/debug/mori_debug_menu.c +++ b/src/debug/mori_debug_menu.c @@ -136,7 +136,7 @@ u8 MoriDebugMenu_10000Steps(void) u8 MoriDebugMenu_MoveTutor(void) { - sub_8132670(); + TeachMoveTutorMove(); CloseMenu(); return 1; } diff --git a/src/engine/trade.c b/src/engine/trade.c index 0567b4d2f..0bc589ff4 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -5391,7 +5391,7 @@ static void sub_804D80C(struct Sprite *sprite) } } -u16 sub_804D89C(void) +u16 GetInGameTradeSpeciesInfo(void) { const struct InGameTrade *inGameTrade = &gIngameTrades[gSpecialVar_0x8004]; StringCopy(gStringVar1, gSpeciesNames[inGameTrade->playerSpecies]); @@ -5408,7 +5408,7 @@ static void sub_804D8E4(void) StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]); } -static void sub_804D948(u8 whichPlayerMon, u8 whichInGameTrade) +static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade) { const struct InGameTrade *inGameTrade = &gIngameTrades[whichInGameTrade]; u8 level = GetMonData(&gPlayerParty[whichPlayerMon], MON_DATA_LEVEL); @@ -5478,16 +5478,16 @@ static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade mail->itemId = trade->heldItem; } -u16 sub_804DB2C(void) +u16 GetTradeSpecies(void) { if (GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_IS_EGG)) return SPECIES_NONE; return GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_SPECIES); } -void sub_804DB68(void) +void CreateInGameTradePokemon(void) { - sub_804D948(gSpecialVar_0x8005, gSpecialVar_0x8004); + _CreateInGameTradePokemon(gSpecialVar_0x8005, gSpecialVar_0x8004); } #ifdef NONMATCHING @@ -5670,7 +5670,7 @@ static void sub_804E144(void) UpdatePaletteFade(); } -void sub_804E174(void) +void DoInGameTradeScene(void) { ScriptContext2_Enable(); CreateTask(sub_804E1A0, 10); diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index dcd1197cb..ffa4cbd08 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -321,7 +321,7 @@ void sub_8093390(struct TrainerCard *trainerCard) trainerCard->firstHallOfFameC = playTime & 0xFF; trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET); - trainerCard->var_3 = sub_8090FC0(); + trainerCard->var_3 = CompletedHoennPokedex(); trainerCard->pokedexSeen = GetPokedexSeenCount(); trainerCard->trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0]; diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 12337631f..caebc6a7b 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -1608,7 +1608,7 @@ void sub_8135534(u8 taskId) } } -void sub_813556C(void) +void StartSpecialBattle(void) { s32 i; u16 heldItem; @@ -1616,7 +1616,7 @@ void sub_813556C(void) switch (gSpecialVar_0x8004) { - case 0: + case 0: // battle tower battle gBattleTypeFlags = (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_TRAINER); gTrainerBattleOpponent = 0; @@ -1627,7 +1627,7 @@ void sub_813556C(void) transition = BattleSetup_GetBattleTowerBattleTransition(); BattleTransition_StartOnField(transition); break; - case 1: + case 1: // secret base battle for (i = 0; i < PARTY_SIZE; i++) { heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); @@ -1639,7 +1639,7 @@ void sub_813556C(void) transition = BattleSetup_GetBattleTowerBattleTransition(); BattleTransition_StartOnField(transition); break; - case 2: + case 2: // e-reader trainer battle ZeroEnemyPartyMons(); for (i = 0; i < 3; i++) @@ -1658,7 +1658,7 @@ void sub_813556C(void) } } -void sub_8135668(void) +void SetBattleTowerProperty(void) { s32 i; u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -1740,7 +1740,7 @@ void sub_8135668(void) } } -void sub_81358A4(void) +void BattleTowerUtil(void) { u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -1789,7 +1789,7 @@ void sub_81358A4(void) } } -void sub_8135A14(void) +void SetBattleTowerParty(void) { s32 i; @@ -1954,7 +1954,7 @@ void sub_8135AC4(void) sub_8135A3C(); } -void sub_8135BA0(void) +void SaveBattleTowerProgress(void) { u8 battleTowerLevelType = gSaveBlock2.battleTower.battleTowerLevelType; @@ -2336,7 +2336,7 @@ void PrintEReaderTrainerFarewellMessage(void) } } -void sub_813610C(void) +void TryEnableBravoTrainerBattleTower(void) { s32 i; diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 1a4ebe1af..28ed5dcfc 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -688,7 +688,7 @@ void GetRivalSonDaughterString(void) } } -u8 sub_810E300(void) +u8 GetBattleOutcome(void) { return gBattleOutcome; } @@ -958,11 +958,11 @@ void EndLotteryCornerComputerEffect(void) } static void sub_810E874(void); -void sub_810E944(void); +void DisplayCurrentElevatorFloor(void); void sub_810E984(u8); bool8 sub_810EAC8(u8, u8); void sub_810EB90(u8, u8); -void sub_810EBEC(void); +void ShakeScreenInElevator(void); void sub_810EC34(u8); void sub_810EC9C(u8); void sub_810ECB0(void); @@ -1074,11 +1074,11 @@ static void sub_810E874(void) { MenuPrint(gUnknown_083F8380[gUnknown_03000760[i].var0], 1, 2 * i + 1); } - sub_810E944(); + DisplayCurrentElevatorFloor(); CreateTask(sub_810E984, 8); } -void sub_810E944(void) +void DisplayCurrentElevatorFloor(void) { MenuDrawTextWindow(20, 0, 29, 5); sub_8072BD8(gOtherText_NowOn, 21, 1, 64); @@ -1116,7 +1116,7 @@ void sub_810E984(u8 taskId) { gSpecialVar_Result = 1; gSpecialVar_0x8005 = gUnknown_0203925B; - sub_810EBEC(); + ShakeScreenInElevator(); FieldObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); sub_810EEDC(); MenuZeroFillScreen(); @@ -1300,7 +1300,7 @@ void sub_810EB90(u8 newPos, u8 maxItems) } } -void sub_810EBEC(void) +void ShakeScreenInElevator(void) { u8 taskId = CreateTask(sub_810EC34, 9); gTasks[taskId].data[0] = 1; @@ -1779,12 +1779,12 @@ void GetSecretBaseNearbyMapName(void) GetMapSectionName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); } -u16 sub_810F404(void) +u16 GetBestBattleTowerStreak(void) { return GetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK); } -void sub_810F414(void) +void BufferEReaderTrainerName(void) { SetEReaderTrainerName(gStringVar1); } @@ -1793,7 +1793,7 @@ const u8 gUnknown_083F83E0[] = {12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6}; const u8 gUnknown_083F83EC[] = {0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5}; const u8 gUnknown_083F83F8[] = {3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5}; -u8 sub_810F424(void) +u8 GetSlotMachineId(void) { u32 v0 = gSaveBlock1.easyChatPairs[0].unk0_0 + gSaveBlock1.easyChatPairs[0].unk2 + gUnknown_083F83E0[gSpecialVar_0x8004]; if (GetPriceReduction(2)) @@ -1803,10 +1803,10 @@ u8 sub_810F424(void) return gUnknown_083F83EC[v0 % 12]; } -bool8 sub_810F488(void) +bool8 FoundAbandonedShipRoom1Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x277; + u16 flag = FLAG_HIDDEN_ITEM_1F; *specVar = flag; if (!FlagGet(flag)) { @@ -1815,10 +1815,10 @@ bool8 sub_810F488(void) return TRUE; } -bool8 sub_810F4B0(void) +bool8 FoundAbandonedShipRoom2Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x278; + u16 flag = FLAG_HIDDEN_ITEM_20; *specVar = flag; if (!FlagGet(flag)) { @@ -1827,10 +1827,10 @@ bool8 sub_810F4B0(void) return TRUE; } -bool8 sub_810F4D4(void) +bool8 FoundAbandonedShipRoom4Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x279; + u16 flag = FLAG_HIDDEN_ITEM_21; *specVar = flag; if (!FlagGet(flag)) { @@ -1839,10 +1839,10 @@ bool8 sub_810F4D4(void) return TRUE; } -bool8 sub_810F4FC(void) +bool8 FoundAbandonedShipRoom6Key(void) { u16 *specVar = &gSpecialVar_0x8004; - u16 flag = 0x27a; + u16 flag = FLAG_HIDDEN_ITEM_22; *specVar = flag; if (!FlagGet(flag)) { @@ -1874,7 +1874,7 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void) return FALSE; } -u8 sub_810F5BC(void) +u8 TryUpdateRusturfTunnelState(void) { if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) { @@ -2040,7 +2040,7 @@ void sub_810F8FC(void) sub_805ADDC(6); } -u16 sub_810F908(void) +u16 GetDaysUntilPacifidlogTMAvailable(void) { u16 tmReceivedDay = VarGet(VAR_PACIFIDLOG_TM_RECEIVED_DAY); if (gLocalTime.days - tmReceivedDay >= 7) @@ -2054,13 +2054,13 @@ u16 sub_810F908(void) return 7 - (gLocalTime.days - tmReceivedDay); } -u16 sub_810F950(void) +u16 SetPacifidlogTMReceivedDay(void) { VarSet(VAR_PACIFIDLOG_TM_RECEIVED_DAY, gLocalTime.days); return gLocalTime.days; } -bool8 sub_810F96C(void) +bool8 MonOTNameMatchesPlayer(void) { GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1); if (!StringCompareWithoutExtCtrlCodes(gSaveBlock2.playerName, gStringVar1)) @@ -2070,7 +2070,7 @@ bool8 sub_810F96C(void) return TRUE; } -void sub_810F9AC(void) +void BufferLottoTicketNumber(void) { if (gSpecialVar_Result >= 10000) { @@ -2109,10 +2109,10 @@ const u8 gUnknown_083F8408[] = {8, 9, 10, 11, 12, 13, 14, 15}; const u8 gUnknown_083F8410[] = {8, 13, 14, 11, 10, 12, 15, 9}; bool8 sub_810FF30(void); -void sub_810FCE8(void); +void UpdateMovedLilycoveFanClubMembers(void); void sub_810FF48(void); void sub_810FD80(void); -u16 sub_810FCB0(void); +u16 GetNumMovedLilycoveFanClubMembers(void); int sub_810FB9C(void); void ResetFanClub(void) @@ -2125,7 +2125,7 @@ void sub_810FA74(void) { if (sub_810FF30()) { - sub_810FCE8(); + UpdateMovedLilycoveFanClubMembers(); gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours; } } @@ -2137,10 +2137,10 @@ void sub_810FAA0(void) sub_810FF48(); sub_810FD80(); gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours; - FlagClear(0x315); - FlagClear(0x316); - FlagClear(0x317); - FlagClear(0x318); + FlagClear(FLAG_HIDE_FANCLUB_OLD_LADY); + FlagClear(FLAG_HIDE_FANCLUB_BOY); + FlagClear(FLAG_HIDE_FANCLUB_LITTLE_BOY); + FlagClear(FLAG_HIDE_FANCLUB_LADY); VarSet(VAR_LILYCOVE_FAN_CLUB_STATE, 1); } } @@ -2151,7 +2151,7 @@ u8 sub_810FB10(u8 a0) { if ((gSaveBlock1.vars[0x41] & 0x7f) + gUnknown_083F8404[a0] >= 20) { - if (sub_810FCB0() < 3) + if (GetNumMovedLilycoveFanClubMembers() < 3) { sub_810FB9C(); gSaveBlock1.vars[0x41] &= 0xff80; @@ -2193,7 +2193,7 @@ int sub_810FC18(void) { u8 i; int retval = 0; - if (sub_810FCB0() == TRUE) + if (GetNumMovedLilycoveFanClubMembers() == 1) { return 0; } @@ -2216,28 +2216,29 @@ int sub_810FC18(void) return retval; } -u16 sub_810FCB0(void) +u16 GetNumMovedLilycoveFanClubMembers(void) { u8 i; u8 retval = 0; - for (i=0; i<8; i++) + for (i = 0; i < 8; i++) { if ((gSaveBlock1.vars[0x41] >> (i + 8)) & 1) { - retval ++; + retval++; } } + return retval; } -void sub_810FCE8(void) +void UpdateMovedLilycoveFanClubMembers(void) { u8 i = 0; if (gSaveBlock2.playTimeHours < 999) { while (1) { - if (sub_810FCB0() < 5) + if (GetNumMovedLilycoveFanClubMembers() < 5) { gSaveBlock1.vars[0x42] = gSaveBlock2.playTimeHours; break; @@ -2257,7 +2258,7 @@ void sub_810FCE8(void) } } -bool8 sub_810FD60(void) +bool8 ShouldMoveLilycoveFanClubMember(void) { return (gSaveBlock1.vars[0x41] >> gSpecialVar_0x8004) & 0x01; } @@ -2271,7 +2272,7 @@ void sub_810FD80(void) void sub_810FE1C(void *, u8, u8); -void sub_810FDAC(void) +void BufferStreakTrainerText(void) { u8 a = 0; u8 b = 0; diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index 393c7d75a..ce5fc6c0e 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -608,14 +608,14 @@ bool32 sub_8069D34(s16 x, s16 y) return FALSE; } -void sub_8069D78(void) +void SetSootopolisGymCrackedIceMetatiles(void) { s32 x, y; s32 width = gMapHeader.mapData->width; s32 height = gMapHeader.mapData->height; - for (x=0; x<width; x++) + for (x = 0; x < width; x++) { - for (y=0; y<height; y++) + for (y = 0; y < height; y++) { if (sub_8069D34(x, y) == TRUE) { diff --git a/src/field/money.c b/src/field/money.c index f277ac905..d0f0ab1f6 100644 --- a/src/field/money.c +++ b/src/field/money.c @@ -291,12 +291,12 @@ void CloseMoneyWindow(u8 x, u8 y) MenuZeroFillWindowRect(x, y, x + 13, y + 3); } -bool8 sub_80B7CE8(void) +bool8 HasEnoughMoneyFor(void) { return IsEnoughMoney(gSaveBlock1.money, gSpecialVar_0x8005); } -void sub_80B7D0C(void) +void PayMoneyFor(void) { RemoveMoney(&gSaveBlock1.money, gSpecialVar_0x8005); } diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 4a904fbb1..640d4731f 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -426,7 +426,7 @@ void sub_810BADC(void) SetMainCallback2(sub_810B96C); } -void sub_810BAF4(void) +void OpenPokeblockCaseOnFeeder(void) { sub_810BA7C(3); SetMainCallback2(sub_810B96C); @@ -1041,7 +1041,7 @@ u8 sub_810C9E8(struct Pokeblock *pokeblock) return feel; } -s8 sub_810CA00(void) +s8 GetFirstFreePokeblockSlot(void) { u8 i; for (i=0; i<ARRAY_COUNT(gSaveBlock1.pokeblocks); i++) @@ -1056,7 +1056,7 @@ s8 sub_810CA00(void) bool8 sub_810CA34(struct Pokeblock *pokeblock) { - s8 idx = sub_810CA00(); + s8 idx = GetFirstFreePokeblockSlot(); if (idx == -1) { return FALSE; diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 5c53e1e28..2e4138a3b 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -575,7 +575,7 @@ u8 *GetSecretBaseMapName(u8 *dest) { return sub_80BC190(dest, VarGet(VAR_CURRENT_SECRET_BASE)); } -void sub_80BC224(void) { +void BufferSecretBaseOwnerName(void) { u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_CURRENT_SECRET_BASE)].playerName; u8 *var1 = gStringVar1; u8 var2 = sub_80BB8A8(var0); @@ -830,7 +830,7 @@ void sub_80BC474(void) } } -void sub_80BC50C(void) +void MoveSecretBase(void) { u16 backupValue; sub_80BC474(); diff --git a/src/field/tv.c b/src/field/tv.c index 93fe6a0f5..d7a75a709 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -686,7 +686,7 @@ void GabbyAndTyBeforeInterview(void) FlagSet(FLAG_TEMP_1); } -void sub_80BDC14(void) +void GabbyAndTyAfterInterview(void) { gSaveBlock1.gabbyAndTyData.valB_0 = gSaveBlock1.gabbyAndTyData.valA_0; gSaveBlock1.gabbyAndTyData.valB_1 = gSaveBlock1.gabbyAndTyData.valA_1; @@ -725,7 +725,7 @@ bool8 GabbyAndTyGetLastQuote(void) return TRUE; } -u8 sub_80BDD18(void) +u8 GabbyAndTyGetLastBattleTrivia(void) { if (!gSaveBlock1.gabbyAndTyData.valB_0) return 1; @@ -2073,9 +2073,9 @@ bool8 TV_PutNameRaterShowOnTheAirIfNicnkameChanged(void) return TRUE; } -void c2_080CC144(void); +void ChangePokemonNickname_CB(void); -void sub_80BF9F8(void) +void ChangePokemonNickname(void) { u16 spec; u16 gender; @@ -2086,10 +2086,10 @@ void sub_80BF9F8(void) spec = GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_SPECIES, 0); gender = GetMonGender(&(gPlayerParty[gSpecialVar_0x8004])); pval = GetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_PERSONALITY, 0); - DoNamingScreen(3, gStringVar2, spec, gender, pval, c2_080CC144); + DoNamingScreen(3, gStringVar2, spec, gender, pval, ChangePokemonNickname_CB); } -void c2_080CC144(void) +void ChangePokemonNickname_CB(void) { SetMonData(&(gPlayerParty[gSpecialVar_0x8004]), MON_DATA_NICKNAME, gStringVar2); c2_exit_to_overworld_1_continue_scripts_restart_music(); diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 5eee45b23..ef1d66349 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -239,7 +239,7 @@ void VBlankCB_LearnMove(void) TransferPlttBuffer(); } -void sub_8132670(void) +void TeachMoveTutorMove(void) { ScriptContext2_Enable(); CreateTask(sub_813269C, 10); diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index a4d84bebd..1c1c71454 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -4109,7 +4109,7 @@ u16 GetHoennPokedexCount(u8 caseID) return count; } -bool8 sub_8090FC0(void) +bool8 CompletedHoennPokedex(void) { u16 i; diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index d147d11ce..53308e856 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -200,7 +200,7 @@ void sub_80A6978(void); u8 sub_80A7DEC(u8 berryId, u8 x, u8 y, bool8 animate); void sub_814A880(u8 a1, u8 a2); u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5); -s8 sub_810CA00(void); +s8 GetFirstFreePokeblockSlot(void); bool8 sub_810CA34(struct Pokeblock *pokeblock); #ifdef GERMAN extern void de_sub_8073110(); @@ -933,7 +933,7 @@ static void sub_804E4FC(void) REG_BG1VOFS = 0; } -void sub_804E538(void) +void DoBerryBlending(void) { u8* field6F; //this temp value is needed to match @@ -2621,7 +2621,7 @@ static void sub_8050954(void) gBerryBlenderData->field_7C = 2; gSendCmd[1] = 0x9999; } - else if (sub_810CA00() == -1) + else if (GetFirstFreePokeblockSlot() == -1) { gBerryBlenderData->field_7C = 3; gSendCmd[1] = 0xAAAA; @@ -2816,7 +2816,7 @@ static void sub_8050E30(void) if (!gPaletteFade.active) { if (gBerryBlenderData->field_70[0] == 0x2222) - SetMainCallback2(sub_804E538); + SetMainCallback2(DoBerryBlending); else { gBerryBlenderData->framesToWait = 0; @@ -2880,7 +2880,7 @@ static void sub_80510E8(void) if (!gPaletteFade.active) { if (gBerryBlenderData->field_7C == 0) - SetMainCallback2(sub_804E538); + SetMainCallback2(DoBerryBlending); else SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index b58363d31..df83d3e2d 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -39,7 +39,7 @@ void sub_80F99CC(void) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); } -void sub_80F9A0C(void) +void SelectMonForNPCTrade(void) { u8 taskId; @@ -49,7 +49,7 @@ void sub_80F9A0C(void) BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); } -void sub_80F9A4C(void) +void SelectMoveTutorMon(void) { u8 taskId; @@ -272,7 +272,7 @@ void HandleMoveTutorPartyMenu(u8 var) } } -void sub_80F9EEC(void) +void SelectMove(void) { ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, c2_exit_to_overworld_2_switch, 0); UNK_2018000_STRUCT.unk8 = 3; @@ -321,7 +321,7 @@ void sub_80F9FDC(struct Pokemon *pkmn, u8 moveIndex1, u8 moveIndex2) SetMonData(pkmn, MON_DATA_PP_BONUSES, &bonuses); } -void sub_80FA0DC(void) +void DeleteMonMove(void) { u16 i; @@ -332,7 +332,7 @@ void sub_80FA0DC(void) sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1); } -void sub_80FA148(void) +void IsSelectedMonEgg(void) { struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004]; gSpecialVar_Result = 0; |