diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/decorations.asm | 2 | ||||
| -rwxr-xr-x | engine/events/battle_tower/battle_tower.asm | 2 | ||||
| -rw-r--r-- | engine/events/battle_tower/rules.asm | 2 | ||||
| -rw-r--r-- | engine/events/name_rater.asm | 2 | ||||
| -rw-r--r-- | engine/events/odd_egg.asm | 2 | ||||
| -rw-r--r-- | engine/events/pokerus/check_pokerus.asm | 2 | ||||
| -rw-r--r-- | engine/events/print_unown.asm | 2 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 2 | ||||
| -rwxr-xr-x | engine/link.asm | 4 | ||||
| -rw-r--r-- | engine/map_objects.asm | 2 | ||||
| -rwxr-xr-x | engine/search2.asm | 8 | ||||
| -rw-r--r-- | engine/specials.asm | 32 | ||||
| -rwxr-xr-x | engine/time.asm | 2 | ||||
| -rwxr-xr-x | engine/timeset.asm | 4 | ||||
| -rwxr-xr-x | engine/unown_puzzle.asm | 2 |
16 files changed, 36 insertions, 36 deletions
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 |