diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 10ba7ddca..e8d1e9a54 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -49,7 +49,7 @@ SpecialsPointers:: ; c029 add_special Special_MagnetTrain add_special Special_NameRival add_special Special_SetDayOfWeek - add_special Special_TownMap + add_special Special_OverworldTownMap add_special Special_UnownPrinter add_special Special_MapRadio add_special Special_UnownPuzzle @@ -75,10 +75,10 @@ SpecialsPointers:: ; c029 add_special RestartMapMusic ; bank 0 add_special Special_HealMachineAnim add_special Special_SurfStartStep - add_special Special_FindGreaterThanThatLevel - add_special Special_FindAtLeastThatHappy - add_special Special_FindThatSpecies - add_special Special_FindThatSpeciesYourTrainerID + add_special Special_FindPartyMonGreaterThanThatLevel + add_special Special_FindPartyMonAtLeastThatHappy + add_special Special_FindPartyMonThatSpecies + add_special Special_FindPartyMonThatSpeciesYourTrainerID add_special UnusedSpecial_CheckUnusedTwoDayTimer add_special Special_DayCareMon1 add_special Special_DayCareMon2 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index cd2424769..f52cc3b97 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8709,7 +8709,7 @@ IsMobileBattle2: ; 3f830 ret ; 3f836 -DisplayLinkRecord: ; 3f836 +_DisplayLinkRecord: ; 3f836 ld a, BANK(sLinkBattleStats) call GetSRAMBank diff --git a/engine/decorations.asm b/engine/decorations.asm index e004febc3..b3655f064 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91 opentext writetext .TownMapText waitbutton - special Special_TownMap + special Special_OverworldTownMap closetext end ; 0x26f9b diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index b1d12bc5f..8cf85b7cf 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -1655,7 +1655,7 @@ DummySpecial_170bd2: ; 170bd2 ; 170bd3 Special_CheckForBattleTowerRules: ; 170bd3 - farcall CheckForBattleTowerRules + farcall _CheckForBattleTowerRules jr c, .asm_170bde xor a ; FALSE jr .asm_170be0 diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 0e994c27e..250c652e5 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -29,7 +29,7 @@ CheckForMobileBattleRules: ; 8b1e1 db "@" ; 0x8b201 -CheckForBattleTowerRules: ; 8b201 +_CheckForBattleTowerRules: ; 8b201 ld hl, StringBuffer2 ld [hl], "3" inc hl diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 796647f48..ff93c5bb1 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -1,4 +1,4 @@ -NameRater: ; fb6ed +_NameRater: ; fb6ed ; Introduce himself ld hl, NameRaterIntroText call PrintText diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index de3107804..da8d21d60 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -1,4 +1,4 @@ -GiveOddEgg: ; 1fb4b6 +_GiveOddEgg: ; 1fb4b6 ; Figure out which egg to give. ; Compare a random word to diff --git a/engine/events/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm index 285024754..3bc294152 100644 --- a/engine/events/pokerus/check_pokerus.asm +++ b/engine/events/pokerus/check_pokerus.asm @@ -1,4 +1,4 @@ -CheckPokerus: ; 4d860 +_CheckPokerus: ; 4d860 ; Return carry if a monster in your party has Pokerus ; Get number of monsters to iterate over diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 771d3ea5a..b68104402 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -1,4 +1,4 @@ -UnownPrinter: ; 16be4 +_UnownPrinter: ; 16be4 ld a, [UnownDex] and a ret z diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index cd4aa1497..7da52fe2f 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -184,7 +184,7 @@ TownMapScript: opentext farwritetext TownMapText waitbutton - special Special_TownMap + special Special_OverworldTownMap closetext end diff --git a/engine/link.asm b/engine/link.asm index be9d68c9e..c95969116 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -35,7 +35,7 @@ LinkCommunications: ; 28000 cp LINK_TIMECAPSULE jp nz, Gen2ToGen2LinkComms -TimeCapsule: ; 2805d +Gen2ToGen1LinkComms: ; 2805d call ClearLinkData call Link_PrepPartyData_Gen1 call FixDataForLinkTransfer @@ -1970,7 +1970,7 @@ LinkTrade: ; 28b87 call DelayFrames ld a, [wLinkMode] cp LINK_TIMECAPSULE - jp z, TimeCapsule + jp z, Gen2ToGen1LinkComms jp Gen2ToGen2LinkComms ; 28ea3 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 398a3ff59..cc6f08ea0 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2572,7 +2572,7 @@ ContinueSpawnFacing: ; 57db ret ; 57e2 -SetPlayerPalette: ; 57e2 +_SetPlayerPalette: ; 57e2 ld a, d and %10000000 ret z diff --git a/engine/search2.asm b/engine/search2.asm index 9ef5491f0..512dec93a 100755 --- a/engine/search2.asm +++ b/engine/search2.asm @@ -1,18 +1,18 @@ -_FindGreaterThanThatLevel: ; 4dbd2 +_FindPartyMonGreaterThanThatLevel: ; 4dbd2 ld hl, PartyMon1Level call FindGreaterThanThatLevel ret -_FindAtLeastThatHappy: ; 4dbd9 +_FindPartyMonAtLeastThatHappy: ; 4dbd9 ld hl, PartyMon1Happiness call FindAtLeastThatHappy ret -_FindThatSpecies: ; 4dbe0 +_FindPartyMonThatSpecies: ; 4dbe0 ld hl, PartyMon1Species jp FindThatSpecies -_FindThatSpeciesYourTrainerID: ; 4dbe6 +_FindPartyMonThatSpeciesYourTrainerID: ; 4dbe6 ld hl, PartyMon1Species call FindThatSpecies ret z diff --git a/engine/specials.asm b/engine/specials.asm index 0cf0948e7..4824c4b4c 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -23,7 +23,7 @@ DummySpecial_c224: ; c224 Special_SetPlayerPalette: ; c225 ld a, [ScriptVar] ld d, a - farcall SetPlayerPalette + farcall _SetPlayerPalette ret ; c230 @@ -50,31 +50,31 @@ UnusedSpecial_SeenMon: ; c252 ret ; c25a -Special_FindGreaterThanThatLevel: ; c25a +Special_FindPartyMonGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a - farcall _FindGreaterThanThatLevel + farcall _FindPartyMonGreaterThanThatLevel jr z, FoundNone jr FoundOne -Special_FindAtLeastThatHappy: ; c268 +Special_FindPartyMonAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a - farcall _FindAtLeastThatHappy + farcall _FindPartyMonAtLeastThatHappy jr z, FoundNone jr FoundOne -Special_FindThatSpecies: ; c276 +Special_FindPartyMonThatSpecies: ; c276 ld a, [ScriptVar] ld b, a - farcall _FindThatSpecies + farcall _FindPartyMonThatSpecies jr z, FoundNone jr FoundOne -Special_FindThatSpeciesYourTrainerID: ; c284 +Special_FindPartyMonThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a - farcall _FindThatSpeciesYourTrainerID + farcall _FindPartyMonThatSpeciesYourTrainerID jr z, FoundNone jr FoundOne @@ -104,11 +104,11 @@ DefaultRivalName: ; 0xc2b2 db "SILVER@" Special_NameRater: ; c2b9 - farcall NameRater + farcall _NameRater ret ; c2c0 -Special_TownMap: ; c2c0 +Special_OverworldTownMap: ; c2c0 call FadeToMenu farcall _TownMap call ExitAllMenus @@ -117,14 +117,14 @@ Special_TownMap: ; c2c0 Special_UnownPrinter: ; c2cd call FadeToMenu - farcall UnownPrinter + farcall _UnownPrinter call ExitAllMenus ret ; c2da Special_DisplayLinkRecord: ; c2da call FadeToMenu - farcall DisplayLinkRecord + farcall _DisplayLinkRecord call ExitAllMenus ret ; c2e7 @@ -203,7 +203,7 @@ Special_MapRadio: ; c355 Special_UnownPuzzle: ; c360 call FadeToMenu - farcall UnownPuzzle + farcall _UnownPuzzle ld a, [wSolvedUnownPuzzle] ld [ScriptVar], a call ExitAllMenus @@ -343,7 +343,7 @@ StoreSwarmMapIndices:: ; c403 Special_CheckPokerus: ; c419 ; Check if a monster in your party has Pokerus - farcall CheckPokerus + farcall _CheckPokerus jp ScriptReturnCarry ; c422 @@ -356,7 +356,7 @@ Special_ResetLuckyNumberShowFlag: ; c422 ; c434 Special_CheckLuckyNumberShowFlag: ; c434 - farcall CheckLuckyNumberShowFlag + farcall _CheckLuckyNumberShowFlag jp ScriptReturnCarry ; c43d diff --git a/engine/time.asm b/engine/time.asm index 9d1a249c5..1bfe0e9aa 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -261,7 +261,7 @@ RestartLuckyNumberCountdown: ; 1152b ret ; 11542 -CheckLuckyNumberShowFlag: ; 11542 +_CheckLuckyNumberShowFlag: ; 11542 ld hl, wLuckyNumberDayBuffer jp CheckDayDependentEventHL ; 11548 diff --git a/engine/timeset.asm b/engine/timeset.asm index c2ba14ef4..26b6aba60 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -112,7 +112,7 @@ InitClock: ; 90672 (24:4672) jr .HourIsSet .MinutesAreSet: - call SetTimeOfDay + call InitTimeOfDay ld hl, OakText_ResponseToSetTime call PrintText call WaitPressAorB_BlinkCursor @@ -454,7 +454,7 @@ Special_SetDayOfWeek: ; 90913 jr c, .loop ld a, [wTempDayOfWeek] ld [StringBuffer2], a - call SetDayOfWeek + call InitDayOfWeek call LoadStandardFont pop af ld [hInMenu], a diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 36f6dacd2..66ee837fc 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -3,7 +3,7 @@ PUZZLE_VOID EQU $ef puzcoord EQUS "* 6 +" -UnownPuzzle: ; e1190 +_UnownPuzzle: ; e1190 ld a, [hInMenu] push af ld a, $1 diff --git a/home/time.asm b/home/time.asm index 9ed703686..a4d0f0125 100644 --- a/home/time.asm +++ b/home/time.asm @@ -187,14 +187,14 @@ FixTime:: ; 61d ret ; 658 -SetTimeOfDay:: ; 658 +InitTimeOfDay:: ; 658 xor a ld [StringBuffer2], a ld a, $0 ; useless ld [StringBuffer2 + 3], a jr InitTime -SetDayOfWeek:: ; 663 +InitDayOfWeek:: ; 663 call UpdateTime ld a, [hHours] ld [StringBuffer2 + 1], a diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 9322aefe8..7002bd707 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -108,10 +108,10 @@ ElmCheckEverstone: checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE iffalse ElmCheckTogepiEgg writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writetext UnknownText_0x79a40 waitbutton @@ -120,10 +120,10 @@ ElmCheckEverstone: ElmEggHatchedScript: writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID + special Special_FindPartyMonThatSpeciesYourTrainerID iftrue ShowElmTogepiScript jump ElmCheckGotEggAgain diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index f8be7e5ca..85b4308f0 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -52,7 +52,7 @@ GoldenrodCity_MapScripts: .MoveTutorDone: return -MoveTutor: +MoveTutorScript: faceplayer opentext writetext UnknownText_0x199042 @@ -607,4 +607,4 @@ GoldenrodCity_MapEvents: object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c77d823c0..a197dd0e8 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -40,7 +40,7 @@ UnknownScript_0x19a6d7: UnknownScript_0x19a6e0: writebyte MAGIKARP - special Special_FindThatSpecies + special Special_FindPartyMonThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e waitbutton diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index e4984a47f..72b2989b6 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -34,25 +34,25 @@ PlayersHouse2F_MapScripts: db 0, 0, 0 ; filler -Doll1: +Doll1Script: describedecoration DECODESC_LEFT_DOLL -Doll2: +Doll2Script: describedecoration DECODESC_RIGHT_DOLL -BigDoll: +BigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsole: +GameConsoleScript: describedecoration DECODESC_CONSOLE -PlayersHousePoster: +PlayersHousePosterScript: conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script .Script: describedecoration DECODESC_POSTER -PlayersHouseRadio: +PlayersHouseRadioScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -82,10 +82,10 @@ PlayersHouseRadio: closetext end -PlayersHouseBookshelf: +PlayersHouseBookshelfScript: jumpstd picturebookshelf -PlayersHousePC: +PlayersHousePCScript: opentext special Special_PlayersHousePC iftrue .Warp @@ -128,14 +128,14 @@ PlayersHouse2F_MapEvents: .BGEvents: db 4 - bg_event 2, 1, BGEVENT_UP, PlayersHousePC - bg_event 3, 1, BGEVENT_READ, PlayersHouseRadio - bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelf - bg_event 6, 0, BGEVENT_IFSET, PlayersHousePoster + bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript + bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript + bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript + bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript .ObjectEvents: db 4 - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_PLAYERS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_PLAYERS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_PLAYERS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index dffa89c9e..ff6c059c6 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -9,16 +9,16 @@ PlayersNeighborsHouse_MapScripts: .MapCallbacks: db 0 -PlayersNeighborsDaughter: +PlayersNeighborsDaughterScript: jumptextfaceplayer PlayersNeighborsDaughterText -PlayersNeighbor: +PlayersNeighborScript: jumptextfaceplayer PlayersNeighborText -PlayersNeighborsHouseBookshelf: +PlayersNeighborsHouseBookshelfScript: jumpstd magazinebookshelf -PlayersNeighborsHouseRadio: +PlayersNeighborsHouseRadioScript: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .NormalRadio checkevent EVENT_LISTENED_TO_INITIAL_RADIO @@ -112,11 +112,11 @@ PlayersNeighborsHouse_MapEvents: .BGEvents: db 3 - bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf - bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadio + bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript + bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript .ObjectEvents: db 2 - object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughter, -1 - object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighbor, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR + object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1 + object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index ac0292862..882f86aa4 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -6838,7 +6838,7 @@ Unknown_117356: ; 117356 SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 - farcall GiveOddEgg + farcall _GiveOddEgg ret ; 11765d