diff options
Diffstat (limited to 'mobile')
| -rwxr-xr-x | mobile/battle_tower_5c.asm | 22 | ||||
| -rwxr-xr-x | mobile/fixed_words.asm | 2 | ||||
| -rwxr-xr-x | mobile/mobile_12_2.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 32 | ||||
| -rwxr-xr-x | mobile/mobile_41.asm | 6 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 18 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 6 | ||||
| -rwxr-xr-x | mobile/mobile_menu.asm | 2 |
8 files changed, 45 insertions, 45 deletions
diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index 08d5887b5..9a1634ca0 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -1,11 +1,11 @@ -BattleTowerRoomMenu: ; 1700b0 +Special_BattleTowerRoomMenu: ; 1700b0 ; special call InitBattleTowerChallengeRAM farcall _BattleTowerRoomMenu ret ; 1700ba -Function1700ba: ; 1700ba +Special_Function1700ba: ; 1700ba call InitBattleTowerChallengeRAM farcall Function11811a ret @@ -53,7 +53,7 @@ Function1700c4: ; 1700c4 ret ; 170114 -Function170114: ; 170114 +Special_Function170114: ; 170114 call InitBattleTowerChallengeRAM call .Function170121 farcall Function11805f @@ -182,14 +182,14 @@ Function170139: ; 170139 ret ; 170215 -BattleTowerBattle: ; 170215 +Special_BattleTowerBattle: ; 170215 xor a ld [wBattleTowerBattleEnded], a call _BattleTowerBattle ret ; 17021d -EmptySpecial_17021d: ; 17021d +DummySpecial17021d: ; 17021d ret ; 17021e @@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d xor a ld [wLinkMode], a - farcall TrainerRankings_Healings + farcall Special_TrainerRankings_Healings farcall HealParty call ReadBTTrainerParty call Clears5_a89a @@ -654,7 +654,7 @@ Unreferenced_Function1704ca: ; 1704ca ret ; 1704e1 -Function1704e1: ; 1704e1 +Special_Function1704e1: ; 1704e1 ; unreferenced special call SpeechTextBox call FadeToMenu @@ -936,7 +936,7 @@ Function1704e1: ; 1704e1 db "れきだいりーダーいちらん@" ; 170687 -BattleTowerAction: ; 170687 +Special_BattleTowerAction: ; 170687 ld a, [ScriptVar] ld e, a ld d, 0 @@ -1639,7 +1639,7 @@ BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [ScriptVar], a ret -Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 +Special_LoadOpponentTrainerAndPokemonWithOTSprite: ; 0x170b44 farcall Function_LoadOpponentTrainerAndPokemons ld a, [rSVBK] push af @@ -1752,11 +1752,11 @@ Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44 db SPRITE_OFFICER db SPRITE_ROCKET_GIRL -ret_170bd2: ; 170bd2 +DummySpecial170bd2: ; 170bd2 ret ; 170bd3 -SpecialCheckForBattleTowerRules: ; 170bd3 +Special_CheckForBattleTowerRules: ; 170bd3 farcall CheckForBattleTowerRules jr c, .asm_170bde xor a diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index e1e48fe2e..083a7f3bb 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -274,7 +274,7 @@ CopyMobileEZChatToC608: ; 11c156 jr .copy_string ; 11c1ab -Function11c1ab: ; 11c1ab +Special_Function11c1ab: ; 11c1ab ld a, [hInMenu] push af ld a, $1 diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index ba663cf86..9698e3113 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -159,7 +159,7 @@ MobileCheckOwnMonAnywhere: ; 4a843 ret ; 4a927 -FindItemInPCOrBag: ; 4a927 +UnusedSpecial_FindItemInPCOrBag: ; 4a927 ld a, [ScriptVar] ld [CurItem], a ld hl, PCItems diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 0c2b363df..7ff964a67 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -2804,7 +2804,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ret ; 1011f1 -Function1011f1: ; 1011f1 +Special_Function1011f1: ; 1011f1 ld a, $04 call GetSRAMBank ld a, [$a60c] @@ -2828,20 +2828,20 @@ Function1011f1: ; 1011f1 ret ; 101220 -Function101220: ; 101220 +Special_Function101220: ; 101220 xor a ld [wLinkMode], a ret ; 101225 -Function101225: ; 101225 +Special_Function101225: ; 101225 ld d, 1 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 call Function100000 jr Function10123d -Function101231: ; 101231 +Special_Function101231: ; 101231 ld d, 2 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 @@ -2872,7 +2872,7 @@ Function101251: ; 101251 call Function1021e0 call Function1020ea ret c - call Function102142 + call Special_Function102142 ret ; 101265 @@ -5025,7 +5025,7 @@ Function102112: ; 102112 ret ; 102142 -Function102142: ; 102142 +Special_Function102142: ; 102142 call Function10218d call Function102180 ld hl, UnknownText_0x1021d1 @@ -7724,9 +7724,9 @@ Unknown_1035d7: ; 1035d7 dw Unknown_103608 dw Unknown_103608 dw Unknown_1035fe - dw AskMobileOrCable - dw AskMobileOrCable - dw AskMobileOrCable + dw Special_AskMobileOrCable + dw Special_AskMobileOrCable + dw Special_AskMobileOrCable Unknown_1035e7: ; 1035e7 dwcoord 0, 6 @@ -7757,7 +7757,7 @@ Unknown_103608: ; 103608 db 2, 2, 3 ; 103612 -AskMobileOrCable: ; 103612 +Special_AskMobileOrCable: ; 103612 ld hl, MenuDataHeader_103640 call LoadMenuDataHeader ld a, [wMobileOrCable_LastSelection] @@ -7814,7 +7814,7 @@ Function103654: ; 103654 ret ; 10366e -Mobile_SelectThreeMons: ; 10366e +Special_Mobile_SelectThreeMons: ; 10366e farcall Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b @@ -7983,7 +7983,7 @@ UnknownText_0x10377b: ; 0x10377b db "@" ; 0x103780 -Function103780: ; 103780 +Special_Function103780: ; 103780 ld a, [wd265] push af call Function10378c @@ -8025,7 +8025,7 @@ Function10378c: ; 10378c ret ; 1037c2 -Function1037c2: ; 1037c2 +Special_Function1037c2: ; 1037c2 call Function103823 jr c, .nope ld a, [wdc5f] @@ -8051,7 +8051,7 @@ UnknownText_0x1037e6: ; 0x1037e6 db "@" ; 0x1037eb -Function1037eb: ; 1037eb +Special_Function1037eb: ; 1037eb call Function103823 jr nc, .asm_103807 ld hl, UnknownText_0x103819 @@ -8106,7 +8106,7 @@ Function103823: ; 103823 ret ; 10383c -Function10383c: ; 10383c +Special_Function10383c: ; 10383c ld a, $01 ld [wdc60], a xor a @@ -8139,7 +8139,7 @@ UnknownText_0x103876: ; 0x103876 db "@" ; 0x10387b -Function10387b: ; 10387b +Special_Function10387b: ; 10387b farcall Mobile_AlwaysReturnNotCarry bit 7, c ret nz diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index f873cdb69..bae2f2ce4 100755 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -304,7 +304,7 @@ TrainerRankings_FruitPicked: mobile ; 10609b ld hl, sTrainerRankingFruitPicked jp TrainerRankings_Increment3Byte -TrainerRankings_Healings: mobile ; 1060a2 +Special_TrainerRankings_Healings: mobile ; 1060a2 ld hl, sTrainerRankingHealings jp TrainerRankings_Increment3Byte @@ -773,7 +773,7 @@ endr ; functions related to the cable club and various NPC scripts referencing mobile communications -Mobile_DummyReturnFalse: ; 10630f +Special_Mobile_DummyReturnFalse: ; 10630f xor a ld [ScriptVar], a ret @@ -798,7 +798,7 @@ Mobile_AlwaysReturnNotCarry: ; 10632f or a ret -Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J +Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J ; check ~[4:b000] == [7:a800] ld a, $4 call GetSRAMBank diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 02986d57d..cc4518435 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1672,7 +1672,7 @@ Function118ded: ; 118ded push af ld a, $1 ld [rSVBK], a - farcall Function11b93b + farcall Special_Function11b93b pop af ld [rSVBK], a @@ -5729,7 +5729,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f done ; 0x11ac3e -Function11ac3e: ; 11ac3e +Special_Function11ac3e: ; 11ac3e call SpeechTextBox call FadeToMenu callfar ClearSpriteAnims2 @@ -7060,7 +7060,7 @@ Function11b3d9: ; 11b3d9 ret ; 11b444 -Function11b444: ; 11b444 +Special_Function11b444: ; 11b444 ; special call Mobile46_InitJumptable call Mobile46_RunJumptable @@ -7349,7 +7349,7 @@ Function11b5e7: ; 11b5e7 ret ; 11b5e8 -Function11b5e8: ; 11b5e8 +Special_Function11b5e8: ; 11b5e8 ld a, $0 call GetSRAMBank ld hl, wRTC @@ -7585,7 +7585,7 @@ Function11b6b4: ; 11b6b4 ret ; 11b7e5 -Function11b7e5: ; 11b7e5 +Special_Function11b7e5: ; 11b7e5 ld a, [$c60d] ; species ld [wOTTrademonSpecies], a ld [CurPartySpecies], a @@ -7644,7 +7644,7 @@ Function11b7e5: ; 11b7e5 ret ; 11b879 -Function11b879: ; 11b879 +Special_Function11b879: ; 11b879 farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a @@ -7737,7 +7737,7 @@ Function11b879: ; 11b879 ret ; 11b920 -Function11b920: ; 11b920 +Special_Function11b920: ; 11b920 call Mobile46_InitJumptable ld a, $5 call GetSRAMBank @@ -7750,7 +7750,7 @@ Function11b920: ; 11b920 ret ; 11b93b -Function11b93b: ; 11b93b +Special_Function11b93b: ; 11b93b ld a, $5 call GetSRAMBank xor a @@ -7894,7 +7894,7 @@ AddMobileMonToParty: ; 11b98f ret ; 11ba38 -Function11ba38: ; 11ba38 +Special_Function11ba38: ; 11ba38 farcall CheckCurPartyMonFainted ret c xor a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 79714a45f..603d30af0 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -513,7 +513,7 @@ MenuData2_ChallengeExplanationCancel: ; 17d297 db "Cancel@" ; 17d2b6 -Function17d2b6: ; 17d2b6 +Special_Function17d2b6: ; 17d2b6 call Function17d2c0 farcall Function1181da ret @@ -528,7 +528,7 @@ Function17d2c0: ; 17d2c0 ret ; 17d2ce -Function17d2ce: ; 17d2ce +Special_Function17d2ce: ; 17d2ce ld a, $5 call GetSRAMBank ld a, [$aa72] @@ -4619,7 +4619,7 @@ Function17f524: ; 17f524 jr .asm_17f536 ; 17f53d -BattleTowerMobileError: ; 17f53d +Special_BattleTowerMobileError: ; 17f53d call FadeToMenu xor a ld [wc303], a diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index e36e779ae..ca7e971f4 100755 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -847,7 +847,7 @@ Function4a6ab: ; 4a6ab (12:66ab) call ClearBGPalettes ld b, SCGB_DIPLOMA call GetSGBLayout - farcall Function11c1ab + farcall Special_Function11c1ab pop bc call LoadFontsExtra jp Function4a4c4 |