From 768b3bdec15ac9f79e43f88695514494c93f2f99 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Thu, 27 Jul 2023 01:59:00 +0100 Subject: [PATCH] Improve mobile-related labels (#1061) --- constants/battle_tower_constants.asm | 6 +- constants/engine_flags.asm | 2 +- constants/event_flags.asm | 2 +- data/events/special_pointers.asm | 2 +- engine/battle/core.asm | 4 +- engine/events/battle_tower/battle_tower.asm | 8 +-- engine/link/link.asm | 2 +- engine/link/mystery_gift.asm | 4 +- engine/menus/intro_menu.asm | 18 +++--- engine/menus/save.asm | 32 +++++----- maps/CeruleanPokecenter1F.asm | 2 +- maps/EcruteakPokecenter1F.asm | 2 +- maps/ElmsLab.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/GoldenrodPokecenter1F.asm | 42 ++++++------- maps/Pokecenter2F.asm | 4 +- maps/Route40.asm | 2 +- maps/SaffronPokecenter1F.asm | 2 +- mobile/mobile_22_2.asm | 2 +- mobile/mobile_40.asm | 11 ++-- mobile/mobile_41.asm | 70 +++++++++++---------- mobile/mobile_5f.asm | 2 +- ram/sram.asm | 14 ++--- 23 files changed, 117 insertions(+), 120 deletions(-) diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index ca21172b45b..d65a5edbf2b 100644 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -20,7 +20,7 @@ DEF BATTLE_TOWER_STRUCT_LENGTH EQU NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICK const BATTLETOWERACTION_LOADLEVELGROUP const BATTLETOWERACTION_CHECKSAVEFILEISYOURS const BATTLETOWERACTION_0A - const BATTLETOWERACTION_CHECKMOBILEEVENT + const BATTLETOWERACTION_GSBALL const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5 const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5 const BATTLETOWERACTION_EGGTICKET @@ -43,8 +43,8 @@ DEF BATTLE_TOWER_STRUCT_LENGTH EQU NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICK const BATTLETOWERACTION_SAVEOPTIONS ; BattleTowerAction return values -; - from BATTLETOWERACTION_CHECKMOBILEEVENT -DEF MOBILE_EVENT_OBJECT_GS_BALL EQU $b +; - from BATTLETOWERACTION_GSBALL +DEF GS_BALL_AVAILABLE EQU $b ; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm) const_def 1 diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index bc029d5cdc5..2503b3f27c2 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -22,7 +22,7 @@ const ENGINE_CAUGHT_POKERUS const ENGINE_ROCKET_SIGNAL_ON_CH20 const ENGINE_CREDITS_SKIP - const ENGINE_MAIN_MENU_MOBILE_CHOICES + const ENGINE_MOBILE_SYSTEM ; unused ; wStatusFlags2 const ENGINE_BUG_CONTEST_TIMER const ENGINE_SAFARI_ZONE diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 1a17badd9f9..c4512521e34 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -509,7 +509,7 @@ const EVENT_MET_BUENA const EVENT_GOT_ODD_EGG const_skip ; unused - const EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + const EVENT_GOT_GS_BALL_FROM_GOLDENROD_POKEMON_CENTER ; Unused: next 167 events const_next 1000 diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index 36fa6d14c2f..71e6a8ffd0c 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -173,7 +173,7 @@ SpecialsPointers:: add_special StubbedTrainerRankings_Healings add_special RefreshSprites add_special Function1037c2 - add_special Mobile_DummyReturnFalse + add_special CheckMobileAdapterStatusSpecial add_special Function103780 add_special Function10387b add_special AskRememberPassword diff --git a/engine/battle/core.asm b/engine/battle/core.asm index e1ca02770f1..8445560ed58 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8350,7 +8350,7 @@ CheckPayDay: ShowLinkBattleParticipantsAfterEnd: farcall StubbedTrainerRankings_LinkBattles - farcall BackupMobileEventIndex + farcall BackupGSBallFlag ld a, [wCurOTMon] ld hl, wOTPartyMon1Status call GetPartyLocation @@ -8396,7 +8396,7 @@ DisplayLinkBattleResult: .store_result hlcoord 6, 8 call PlaceString - farcall BackupMobileEventIndex + farcall BackupGSBallFlag ld c, 200 call DelayFrames diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 0891f81f40d..a1a8eeeefc1 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -864,7 +864,7 @@ BattleTowerAction: dw LoadBattleTowerLevelGroup dw BattleTower_CheckSaveFileExistsAndIsYours dw BattleTowerAction_0A - dw CheckMobileEventIndex + dw BattleTowerAction_GSBall dw BattleTowerAction_0C dw BattleTowerAction_0D dw BattleTowerAction_EggTicket @@ -1174,10 +1174,10 @@ BattleTowerAction_0A: call MaxVolume ret -CheckMobileEventIndex: ; something to do with GS Ball - ld a, BANK(sMobileEventIndex) +BattleTowerAction_GSBall: + ld a, BANK(sGSBallFlag) call OpenSRAM - ld a, [sMobileEventIndex] + ld a, [sGSBallFlag] ld [wScriptVar], a call CloseSRAM ret diff --git a/engine/link/link.asm b/engine/link/link.asm index 6b03696ed54..6c4e725fd57 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2034,7 +2034,7 @@ LinkTrade: .save farcall SaveAfterLinkTrade farcall StubbedTrainerRankings_Trades - farcall BackupMobileEventIndex + farcall BackupGSBallFlag ld c, 40 call DelayFrames hlcoord 0, 12 diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 6786dc35b54..e12f27a1f07 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -100,9 +100,9 @@ endc cp RESERVED_GAME_VERSION jr z, .skip_append_save call .SaveMysteryGiftTrainerName - farcall RestoreMobileEventIndex + farcall RestoreGSBallFlag farcall StubbedTrainerRankings_MysteryGift - farcall BackupMobileEventIndex + farcall BackupGSBallFlag .skip_append_save ld a, [wMysteryGiftPartnerSentDeco] and a diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index ae0dd259fde..7acff3a5dec 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -63,7 +63,7 @@ NewGame: ld [wDebugFlags], a call ResetWRAM call NewGame_ClearTilemapEtc - call AreYouABoyOrAreYouAGirl + call PlayerProfileSetup call OakSpeech call InitializeWorld @@ -77,15 +77,14 @@ NewGame: ldh [hMapEntryMethod], a jp FinishContinueFunction -AreYouABoyOrAreYouAGirl: - farcall Mobile_AlwaysReturnNotCarry ; mobile +PlayerProfileSetup: + farcall CheckMobileAdapterStatus jr c, .ok farcall InitGender ret - .ok ld c, 0 - farcall InitMobileProfile ; mobile + farcall InitMobileProfile ret if DEF(_DEBUG) @@ -220,7 +219,7 @@ endc farcall DeletePartyMonMail - farcall DeleteMobileEventIndex + farcall ClearGSBallFlag call ResetGameTime ret @@ -400,12 +399,9 @@ PostCreditsSpawn: ldh [hMapEntryMethod], a ret -Continue_MobileAdapterMenu: - farcall Mobile_AlwaysReturnNotCarry ; mobile check +Continue_MobileAdapterMenu: ; unused + farcall CheckMobileAdapterStatus ret nc - -; the rest of this stuff is never reached because -; the previous function returns with carry not set ld hl, wd479 bit 1, [hl] ret nz diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 3df36a70c50..4275d4b38a2 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -104,7 +104,7 @@ MoveMonWOMail_InsertMon_SaveGame: call SaveBackupPokemonData call SaveBackupChecksum farcall BackupPartyMonMail - farcall BackupMobileEventIndex + farcall BackupGSBallFlag farcall SaveRTC call LoadBox call ResumeGameLogic @@ -161,17 +161,17 @@ AddHallOfFameEntry: ld bc, wHallOfFamePokemonListEnd - wHallOfFamePokemonList + 1 call CopyBytes call CloseSRAM -; This vc_hook causes the Virtual Console to set [sMobileEventIndex] and [sMobileEventIndexBackup] -; to MOBILE_EVENT_OBJECT_GS_BALL, which enables you to get the GS Ball, take it to Kurt, and -; encounter Celebi. It assumes that sMobileEventIndex and sMobileEventIndexBackup are at their +; This vc_hook causes the Virtual Console to set [sGSBallFlag] and [sGSBallFlagBackup] +; to GS_BALL_AVAILABLE, which enables you to get the GS Ball, take it to Kurt, and +; encounter Celebi. It assumes that sGSBallFlag and sGSBallFlagBackup are at their ; original addresses. vc_hook Enable_GS_Ball_mobile_event - vc_assert BANK(sMobileEventIndex) == $1 && sMobileEventIndex == $be3c, \ - "sMobileEventIndex is no longer located at 01:be3c." - vc_assert BANK(sMobileEventIndexBackup) == $1 && sMobileEventIndexBackup == $be44, \ - "sMobileEventIndexBackup is no longer located at 01:be44." - vc_assert MOBILE_EVENT_OBJECT_GS_BALL == $0b, \ - "MOBILE_EVENT_OBJECT_GS_BALL is no longer equal to $0b." + vc_assert BANK(sGSBallFlag) == $1 && sGSBallFlag == $be3c, \ + "sGSBallFlag is no longer located at 01:be3c." + vc_assert BANK(sGSBallFlagBackup) == $1 && sGSBallFlagBackup == $be44, \ + "sGSBallFlagBackup is no longer located at 01:be44." + vc_assert GS_BALL_AVAILABLE == $b, \ + "GS_BALL_AVAILABLE is no longer equal to $b." ret SaveGameData: @@ -281,7 +281,7 @@ _SaveGameData: call SaveBackupChecksum call UpdateStackTop farcall BackupPartyMonMail - farcall BackupMobileEventIndex + farcall BackupGSBallFlag farcall SaveRTC ld a, BANK(sBattleTowerChallengeState) call OpenSRAM @@ -459,11 +459,11 @@ Function14d83: ; unreferenced call CloseSRAM ret -Function14d93: ; unreferenced - ld a, BANK(s7_a000) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 +DisableMobileStadium: ; unreferenced + ld a, BANK(sMobileStadiumFlag) call OpenSRAM xor a - ld [s7_a000], a ; address of MBC30 bank + ld [sMobileStadiumFlag], a call CloseSRAM ret @@ -600,7 +600,7 @@ TryLoadSaveFile: call LoadPokemonData call LoadBox farcall RestorePartyMonMail - farcall RestoreMobileEventIndex + farcall RestoreGSBallFlag farcall RestoreMysteryGift call ValidateBackupSave call SaveBackupOptions @@ -617,7 +617,7 @@ TryLoadSaveFile: call LoadBackupPokemonData call LoadBox farcall RestorePartyMonMail - farcall RestoreMobileEventIndex + farcall RestoreGSBallFlag farcall RestoreMysteryGift call ValidateSave call SaveOptions diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 885cdc6634d..613219ac693 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -12,7 +12,7 @@ CeruleanPokecenter1FNurseScript: jumpstd PokecenterNurseScript CeruleanPokecenter1FSuperNerdScript: - special Mobile_DummyReturnFalse + special CheckMobileAdapterStatusSpecial iftrue .mobile jumptextfaceplayer CeruleanPokecenter1FSuperNerdText diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 1eef618eb30..9b8b6167ac8 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -59,7 +59,7 @@ EcruteakPokecenter1FNurseScript: jumpstd PokecenterNurseScript EcruteakPokecenter1FPokefanMScript: - special Mobile_DummyReturnFalse + special CheckMobileAdapterStatusSpecial iftrue .mobile jumptextfaceplayer EcruteakPokecenter1FPokefanMText diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 55e10c860e0..5bead9e4d02 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -339,7 +339,7 @@ ElmAfterTheftScript: writetext ElmAfterTheftText5 promptbutton setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - setflag ENGINE_MAIN_MENU_MOBILE_CHOICES + setflag ENGINE_MOBILE_SYSTEM setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 339d0519d2f..e9124dff5fe 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -47,7 +47,7 @@ TrainerGuitaristClyde: .Script: endifjustbattled - special Mobile_DummyReturnFalse + special CheckMobileAdapterStatusSpecial iftrue .mobile opentext writetext GuitaristClydeAfterBattleText diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 9483b813348..400ef9fbba2 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,6 +1,6 @@ object_const_def const GOLDENRODPOKECENTER1F_NURSE - const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + const GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST const GOLDENRODPOKECENTER1F_GAMEBOY_KID const GOLDENRODPOKECENTER1F_LASS const GOLDENRODPOKECENTER1F_POKEFAN_F @@ -15,65 +15,65 @@ GoldenrodPokecenter1FNurseScript: jumpstd PokecenterNurseScript GoldenrodPokecenter1F_GSBallSceneLeft: - setval BATTLETOWERACTION_CHECKMOBILEEVENT + setval BATTLETOWERACTION_GSBALL special BattleTowerAction - ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball + ifequal GS_BALL_AVAILABLE, .gsball end .gsball - checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + checkevent EVENT_GOT_GS_BALL_FROM_GOLDENROD_POKEMON_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7 - disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST - appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + moveobject GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST, 0, 7 + disappear GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST + appear GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtLeftDoorwayTileMovement + applymovement GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtLeftDoorwayTileMovement turnobject PLAYER, UP opentext writetext GoldenrodPokeCenter1FLinkReceptionistPleaseAcceptGSBallText waitbutton verbosegiveitem GS_BALL - setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + setevent EVENT_GOT_GS_BALL_FROM_GOLDENROD_POKEMON_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT writetext GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText waitbutton closetext - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromLeftDoorwayTileMovement + applymovement GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromLeftDoorwayTileMovement special RestartMapMusic - disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + disappear GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST playsound SFX_EXIT_BUILDING .cancel end GoldenrodPokecenter1F_GSBallSceneRight: - setval BATTLETOWERACTION_CHECKMOBILEEVENT + setval BATTLETOWERACTION_GSBALL special BattleTowerAction - ifequal MOBILE_EVENT_OBJECT_GS_BALL, .gsball + ifequal GS_BALL_AVAILABLE, .gsball end .gsball - checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + checkevent EVENT_GOT_GS_BALL_FROM_GOLDENROD_POKEMON_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveobject GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, 0, 7 - disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST - appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + moveobject GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST, 0, 7 + disappear GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST + appear GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtRightDoorwayTileMovement + applymovement GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistApproachPlayerAtRightDoorwayTileMovement turnobject PLAYER, UP opentext writetext GoldenrodPokeCenter1FLinkReceptionistPleaseAcceptGSBallText waitbutton verbosegiveitem GS_BALL - setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER + setevent EVENT_GOT_GS_BALL_FROM_GOLDENROD_POKEMON_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT writetext GoldenrodPokeCenter1FLinkReceptionistPleaseDoComeAgainText waitbutton closetext - applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement + applymovement GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST, GoldenrodPokeCenter1FLinkReceptionistWalkToStairsFromRightDoorwayTileMovement special RestartMapMusic - disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + disappear GOLDENRODPOKECENTER1F_PCC_TRADE_CORNER_RECEPTIONIST playsound SFX_EXIT_BUILDING .cancel end diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index e4175fd2a54..6f657e8e87d 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -73,7 +73,7 @@ LinkReceptionistScript_Trade: writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel - special Mobile_DummyReturnFalse ; always returns false + special CheckMobileAdapterStatusSpecial iffalse .NoMobile writetext Text_TradeReceptionistMobile special AskMobileOrCable @@ -175,7 +175,7 @@ LinkReceptionistScript_Battle: writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel - special Mobile_DummyReturnFalse ; always returns false + special CheckMobileAdapterStatusSpecial iffalse .NoMobile writetext Text_BattleReceptionistMobile special AskMobileOrCable diff --git a/maps/Route40.asm b/maps/Route40.asm index b8641c6d263..9f846b71688 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -77,7 +77,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text Route40PokefanMScript: - special Mobile_DummyReturnFalse + special CheckMobileAdapterStatusSpecial iftrue .mobile jumptextfaceplayer Route40PokefanMText diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index a7d483d7470..f9c1cfb1368 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -13,7 +13,7 @@ SaffronPokecenter1FNurseScript: jumpstd PokecenterNurseScript SaffronPokecenter1FTeacherScript: - special Mobile_DummyReturnFalse + special CheckMobileAdapterStatusSpecial iftrue .mobile jumptextfaceplayer SaffronPokecenter1FTeacherText diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 2eb183cb56e..040283881a2 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -42,7 +42,7 @@ Function8b35d: ; unreferenced Function8b363: ; unreferenced push bc - farcall Mobile_AlwaysReturnNotCarry + farcall CheckMobileAdapterStatus pop bc ret diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 2371fc9bed5..4df8ee47278 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -5162,7 +5162,7 @@ Function102423: ret nc farcall SaveAfterLinkTrade farcall StubbedTrainerRankings_Trades - farcall BackupMobileEventIndex + farcall BackupGSBallFlag ld hl, wcd4b set 1, [hl] ld a, 0 @@ -7350,7 +7350,7 @@ MenuData_103648: db "ケーブル@" Function103654: - farcall Mobile_AlwaysReturnNotCarry + farcall CheckMobileAdapterStatus bit 7, c jr nz, .asm_103666 ld hl, wcd2a @@ -7365,7 +7365,7 @@ Function103654: ret Mobile_SelectThreeMons: - farcall Mobile_AlwaysReturnNotCarry + farcall CheckMobileAdapterStatus bit 7, c jr z, .asm_10369b ld hl, MobileBattleMustPickThreeMonText @@ -7625,8 +7625,7 @@ MobileBattleNoTimeLeftForLinkingText: text_end MobileCheckRemainingBattleTime: -; Returns carry if less than one minute remains - farcall Mobile_AlwaysReturnNotCarry + farcall CheckMobileAdapterStatus bit 7, c jr nz, .ok farcall MobileBattleGetRemainingTime @@ -7674,7 +7673,7 @@ PickThreeMonForMobileBattleText: text_end Function10387b: - farcall Mobile_AlwaysReturnNotCarry + farcall CheckMobileAdapterStatus bit 7, c ret nz farcall MobileBattleGetRemainingTime diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 0450a41ef8a..0900c94750e 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -512,27 +512,27 @@ CalculateTrainerRankingsChecksum: pop bc ret -BackupMobileEventIndex: - ld a, BANK(sMobileEventIndex) +BackupGSBallFlag: + ld a, BANK(sGSBallFlag) call OpenSRAM - ld a, [sMobileEventIndex] + ld a, [sGSBallFlag] push af - ld a, BANK(sMobileEventIndexBackup) + ld a, BANK(sGSBallFlagBackup) call OpenSRAM pop af - ld [sMobileEventIndexBackup], a + ld [sGSBallFlagBackup], a call CloseSRAM ret -RestoreMobileEventIndex: - ld a, BANK(sMobileEventIndexBackup) +RestoreGSBallFlag: + ld a, BANK(sGSBallFlagBackup) call OpenSRAM - ld a, [sMobileEventIndexBackup] + ld a, [sGSBallFlagBackup] push af - ld a, BANK(sMobileEventIndex) + ld a, BANK(sGSBallFlag) call OpenSRAM pop af - ld [sMobileEventIndex], a + ld [sGSBallFlag], a call CloseSRAM ret @@ -547,11 +547,11 @@ VerifyTrainerRankingsChecksum: ; unreferenced cp [hl] ret -DeleteMobileEventIndex: - ld a, BANK(sMobileEventIndex) +ClearGSBallFlag: + ld a, BANK(sGSBallFlag) call OpenSRAM xor a - ld [sMobileEventIndex], a + ld [sGSBallFlag], a call CloseSRAM ret @@ -789,53 +789,55 @@ endr ; functions related to the cable club and various NPC scripts referencing communications -Mobile_DummyReturnFalse: +CheckMobileAdapterStatusSpecial: ; unused + ; this routine calls CheckMobileAdapterStatus + ; in the Japanese version xor a ld [wScriptVar], a ret -Stubbed_Function106314: +SetMobileAdapterStatus: ; unused ret - ld a, BANK(s4_b000) + ; the instructions below are the + ; original Japanese version code + ld a, BANK(sMobileAdapterStatus) call OpenSRAM ld a, c cpl - ld [s4_b000], a + ld [sMobileAdapterStatus], a call CloseSRAM - ld a, BANK(s7_a800) + ld a, BANK(sMobileAdapterStatus2) call OpenSRAM ld a, c - ld [s7_a800], a + ld [sMobileAdapterStatus2], a call CloseSRAM ret -Mobile_AlwaysReturnNotCarry: +CheckMobileAdapterStatus: ; unused or a ret - -Function106331: ; unreferenced -; called by Mobile_DummyReturnFalse in JP Crystal - ; check ~[s4_b000] == [s7_a800] - ld a, BANK(s4_b000) + ; the instructions below are the + ; original Japanese version code + ld a, BANK(sMobileAdapterStatus) call OpenSRAM - ld a, [s4_b000] + ld a, [sMobileAdapterStatus] cpl ld b, a call CloseSRAM - ld a, BANK(s7_a800) + ld a, BANK(sMobileAdapterStatus2) call OpenSRAM - ld a, [s7_a800] + ld a, [sMobileAdapterStatus2] ld c, a call CloseSRAM ld a, c cp b jr nz, .nope - ; check [s7_a800] != 0 + ; check [sMobileAdapterStatus2] != 0 and a jr z, .nope - ; check !([s7_a800] & %01110000) + ; check !([sMobileAdapterStatus2] & %01110000) and %10001111 cp c jr nz, .nope @@ -891,7 +893,7 @@ Function106392: ret .asm_1063a2 - call Mobile_AlwaysReturnNotCarry + call CheckMobileAdapterStatus ld a, c and a jr nz, .asm_1063b4 @@ -966,14 +968,14 @@ Function106403: or c inc a ld c, a - call Stubbed_Function106314 + call SetMobileAdapterStatus ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret .asm_106426 - call Mobile_AlwaysReturnNotCarry + call CheckMobileAdapterStatus ld a, c and a jr z, .asm_106435 @@ -984,7 +986,7 @@ Function106403: .asm_106435 ld c, $0 - call Stubbed_Function106314 + call SetMobileAdapterStatus ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index ab5e346a4da..192c77a153f 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -2976,7 +2976,7 @@ IncCrashCheckPointer_SaveChecksum: inc_crash_check_pointer_farcall SaveChecksum IncCrashCheckPointer_SaveTrainerRankingsChecksum: - inc_crash_check_pointer_farcall UpdateTrainerRankingsChecksum2, BackupMobileEventIndex + inc_crash_check_pointer_farcall UpdateTrainerRankingsChecksum2, BackupGSBallFlag Function17e3e0: call IncCrashCheckPointer diff --git a/ram/sram.asm b/ram/sram.asm index 2621f2ebfd1..81cdd627060 100644 --- a/ram/sram.asm +++ b/ram/sram.asm @@ -137,11 +137,11 @@ sHallOfFameEnd:: SECTION "SRAM Crystal Data", SRAM -sMobileEventIndex:: db +sGSBallFlag:: db sCrystalData:: ds wCrystalDataEnd - wCrystalData -sMobileEventIndexBackup:: db +sGSBallFlagBackup:: db SECTION "SRAM Battle Tower", SRAM @@ -226,12 +226,12 @@ sMobileBattleTimer:: ds 3 ds $7fd -s4_b000:: db +sMobileAdapterStatus:: db SECTION "SRAM Mobile 2", SRAM - ds 1 ; JP: location of sMobileEventIndex +sGSBallFlagJP:: db ; unused sTrainerRankings:: sTrainerRankingGameTimeHOF:: ds 4 @@ -279,7 +279,7 @@ sTrainerRankingBugContestScore:: ds 2 sTrainerRankingsChecksum:: ds 2 sTrainerRankingsEnd:: - ds 1 ; JP: location of sMobileEventIndexBackup +sGSBallFlagBackupJP:: db ; unused sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings @@ -393,9 +393,9 @@ s6_a006:: ds $1000 SECTION "SRAM Mobile 4", SRAM -s7_a000:: db +sMobileStadiumFlag:: db s7_a001:: db ds $7fe -s7_a800:: db +sMobileAdapterStatus2:: db