diff options
Diffstat (limited to 'mobile')
-rw-r--r-- | mobile/fixed_words.asm | 4 | ||||
-rw-r--r-- | mobile/mobile_12.asm | 4 | ||||
-rw-r--r-- | mobile/mobile_12_2.asm | 4 | ||||
-rw-r--r-- | mobile/mobile_22.asm | 29 | ||||
-rw-r--r-- | mobile/mobile_22_2.asm | 6 | ||||
-rw-r--r-- | mobile/mobile_40.asm | 24 | ||||
-rw-r--r-- | mobile/mobile_41.asm | 24 | ||||
-rw-r--r-- | mobile/mobile_42.asm | 8 | ||||
-rw-r--r-- | mobile/mobile_45.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_45_sprite_engine.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_46.asm | 44 | ||||
-rw-r--r-- | mobile/mobile_5c.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_5e.asm | 2 | ||||
-rw-r--r-- | mobile/mobile_5f.asm | 8 | ||||
-rw-r--r-- | mobile/mobile_menu.asm | 20 | ||||
-rw-r--r-- | mobile/news/news.asm | 2 |
16 files changed, 90 insertions, 95 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index b599d8d43..dc60aafe7 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -1334,7 +1334,7 @@ Function11c86e: jr nz, .asm_11c8c2 ret -BCD2String: +BCD2String: ; unreferenced inc a push af and $f @@ -1356,7 +1356,7 @@ BCD2String: ld [hli], a ret -MobileString_Page: +MobileString_Page: ; unreferenced db "ぺージ@" MobileString_Prev: diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 0bf26b8ee..a9ede050a 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -1080,7 +1080,7 @@ asm_48922: call DelayFrames jr asm_48972 -Function4895a: +Function4895a: ; unreferenced ldh a, [hJoyPressed] and a jr z, .asm_48965 @@ -1608,7 +1608,7 @@ Function48c8e: ; unreferenced call WaitBGMap ret -Function48ca3: +Function48ca3: ; unreferenced push af push bc push de diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index b2b3c84c6..88b7d0d72 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -332,7 +332,7 @@ Function4aa34: pop af ret -Function4aa6e: +Function4aa6e: ; unreferenced pop af ld de, SFX_WRONG call PlaySFX @@ -803,7 +803,7 @@ Function4ad60: farcall ManagePokemonMoves ret -Function4ad67: +Function4ad67: ; unreferenced ret Function4ad68: diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index d73977854..dfd23b8b0 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -507,7 +507,7 @@ Function893ef: call FarCopyBytes ret -Function893fe: +Function893fe: ; unreferenced call DisableLCD call Function893ef call EnableLCD @@ -792,7 +792,7 @@ Palette_895de: RGB 07, 07, 06 RGB 00, 00, 00 -Function895e6: +Function895e6: ; unreferenced ld a, 7 hlcoord 0, 0, wAttrmap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT @@ -989,32 +989,33 @@ Function896f5: inc hl ld b, 2 -ClearScreenArea: -; clears an area of the screen +Function896ff: ; unreferenced ; INPUT: ; hl = address of upper left corner of the area ; b = height ; c = width - ld a, " " ; blank tile - ld de, 20 ; screen width -.loop +; clears an area of the screen + ld a, " " + ld de, SCREEN_WIDTH +.row_loop push bc push hl -.innerLoop +.col_loop ld [hli], a dec c - jr nz, .innerLoop + jr nz, .col_loop pop hl pop bc add hl, de dec b - jr nz, .loop + jr nz, .row_loop +; alternates tiles $36 and $18 at the bottom of the area dec hl inc c inc c -.asm_89713 +.bottom_loop ld a, $36 ld [hli], a dec c @@ -1022,7 +1023,7 @@ ClearScreenArea: ld a, $18 ld [hli], a dec c - jr nz, .asm_89713 + jr nz, .bottom_loop ret Function8971f: @@ -1695,7 +1696,7 @@ Function89b07: farcall Function4a3a7 ret -Function89b14: +Function89b14: ; unreferenced call ClearBGPalettes call Function89b07 call Function89b00 @@ -4225,7 +4226,7 @@ Function8adb3: pop af ret -Function8adbf: +Function8adbf: ; unreferenced call OpenSRAMBank4 ld hl, $a603 call Function89b45 diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index c3c1e7f1f..247d582ad 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -32,7 +32,7 @@ Function8b342:: .two ret -Function8b35d: +Function8b35d: ; unreferenced ld a, h cp d ret nz @@ -40,7 +40,7 @@ Function8b35d: cp e ret -Function8b363: +Function8b363: ; unreferenced push bc farcall Mobile_AlwaysReturnNotCarry pop bc @@ -719,7 +719,7 @@ Function8b75d: jr nz, .asm_8b780 jr Function8b79e -Function8b787: +Function8b787: ; unreferenced ret Function8b788: diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index ef3fc1560..0e3bfe145 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -429,7 +429,7 @@ Function100320: farcall Mobile_ReloadMapPart ret -Function100327: +Function100327: ; unreferenced farcall HDMATransferTilemapToWRAMBank3 ret @@ -523,7 +523,7 @@ Function10039c: call FarCopyWRAM ret -Function1003ab: +Function1003ab: ; unreferenced ld hl, w3_d000 ld de, wcc60 ld bc, $54 @@ -2217,29 +2217,29 @@ Function100ed4: Function100edf: ld hl, Unknown_100fc0 ld c, 1 - jr asm_100f02 + jr Function100f02 Function100ee6: ld hl, Unknown_100fc0 ld c, 2 - jr asm_100f02 + jr Function100f02 Function100eed: ld hl, Unknown_100feb ld c, 1 - jr asm_100f02 + jr Function100f02 Function100ef4: ld hl, Unknown_100ff3 ld c, 1 - jr asm_100f02 + jr Function100f02 -Function100efb: +Function100efb: ; unreferenced ld hl, Unknown_10102c ld c, 1 - jr asm_100f02 + jr Function100f02 -asm_100f02: +Function100f02: ld a, c ld [wStringBuffer2], a ; someting that was previously stored in de gets backed up to here @@ -4812,7 +4812,7 @@ Function1021e0: call ExitMenu ret -UnknownText_0x1021ea: +UnknownText_0x1021ea: ; unreferenced text_far UnknownText_0x1bd201 text_end @@ -5169,7 +5169,7 @@ Function10246a: ld [wcd49], a ret -Function102480: +Function102480: ; unreferenced ld c, $32 call DelayFrames ld a, [wcd49] @@ -5183,7 +5183,7 @@ Function10248d: ld [wcd49], a ret -Function102496: +Function102496: ; unreferenced ld hl, wcd4e dec [hl] ret nz diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 8dc755368..c782087cf 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -282,7 +282,7 @@ StubbedTrainerRankings_TrainerBattles: ld hl, sTrainerRankingTrainerBattles jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Unused1: +StubbedTrainerRankings_Unused1: ; unreferenced ret ld hl, sTrainerRankingUnused1 jp StubbedTrainerRankings_Increment3Byte @@ -362,7 +362,7 @@ StubbedTrainerRankings_PhoneCalls: ld hl, sTrainerRankingPhoneCalls jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Unused2: +StubbedTrainerRankings_Unused2: ; unreferenced ret ld hl, sTrainerRankingUnused2 jr StubbedTrainerRankings_Increment3Byte @@ -386,7 +386,7 @@ StubbedTrainerRankings_TreeEncounters: ld hl, sTrainerRankingTreeEncounters jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Unused3: +StubbedTrainerRankings_Unused3: ; unreferenced ret ld hl, sTrainerRankingUnused3 jr StubbedTrainerRankings_Increment3Byte @@ -431,8 +431,7 @@ StubbedTrainerRankings_Increment2Byte: ld bc, 1 jr StubbedTrainerRankings_Increment -; unused -StubbedTrainerRankings_Increment1Byte: +StubbedTrainerRankings_Increment1Byte: ; unreferenced push bc ld bc, 0 @@ -556,9 +555,8 @@ DeleteMobileEventIndex: call CloseSRAM ret -; Used in the Japanese version to initialize Trainer Rankings data -; for a new save file. Unreferenced in the English version. -InitializeTrainerRankings: +InitializeTrainerRankings: ; unreferenced +; Initializes Trainer Rankings data for a new save file in JP Crystal. ld hl, sTrainerRankings ld bc, sTrainerRankingsEnd - sTrainerRankings xor a @@ -807,8 +805,8 @@ Mobile_AlwaysReturnNotCarry: or a ret -Function106331: -; called by Mobile_DummyReturnFalse in Crystal-J +Function106331: ; unreferenced +; called by Mobile_DummyReturnFalse in JP Crystal ; check ~[s4_b000] == [s7_a800] ld a, BANK(s4_b000) call OpenSRAM @@ -1028,7 +1026,7 @@ Function106464:: farcall LoadFrame ret -Function10649b: +Function10649b: ; unreferenced ld a, [wTextboxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE @@ -1063,7 +1061,7 @@ Function1064c3: ldh [rSVBK], a jr asm_1064ed -Function1064d8: +Function1064d8: ; unreferenced ldh a, [rSVBK] push af ld a, $6 @@ -1097,7 +1095,7 @@ asm_1064ed: ldh [rSVBK], a ret -Function10650a: +Function10650a: ; unreferenced ld de, MobilePhoneTilesGFX lb bc, BANK(MobilePhoneTilesGFX), 17 call Get2bpp diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index f609cb74d..358cf2a5a 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -309,7 +309,7 @@ Function108201: predef GetAnimatedFrontpic ret -Function108219: +Function108219: ; unreferenced ld [wCurPartySpecies], a hlcoord 7, 2 ld d, $0 @@ -1557,7 +1557,7 @@ Function108bec: text_far _MobileForPartnersMonText text_end -.MobilePlayersMonTradeText: +.MobilePlayersMonTradeText: ; unreferenced text_far _MobilePlayersMonTradeText text_end @@ -1636,7 +1636,7 @@ Function108c80: ldh [rVBK], a ret -DebugMobileTrade: +DebugMobileTrade: ; unreferenced ; localization error: NAME_LENGTH (11) should be NAME_LENGTH_JAPANESE (6) here ld hl, .DebugTradeData @@ -1741,7 +1741,7 @@ INCBIN "gfx/mobile/mobile_trade.tilemap.lz" MobileTradeAttrmapLZ: INCBIN "gfx/mobile/mobile_trade.attrmap.lz" -UnusedMobilePulsePalettes: +UnusedMobilePulsePalettes: ; unreferenced INCLUDE "gfx/mobile/unused_mobile_pulses.pal" MobileTradeBGPalettes: diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 15dbeddca..9bfd2cf7b 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -1959,7 +1959,7 @@ Function114c0b: jr z, .asm_114c24 jr .asm_114c18 -Function114c55: +Function114c55: ; unreferenced push bc ld bc, $dc00 call Function115d80 diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 54ecede02..fce800e59 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -475,7 +475,7 @@ Function1161d5: ld [wc319], a ret -MenuHeader_11628c: +MenuHeader_11628c: ; unreferenced db MENU_BACKUP_TILES ; flags menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index d5c331cb9..01dde10ee 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -331,7 +331,7 @@ Function118284: call BattleTowerRoomMenu_Cleanup ret -Function1182d5: +Function1182d5: ; unreferenced call BattleTowerRoomMenu_InitRAM ld a, $18 ld [wcd33], a @@ -1039,7 +1039,7 @@ Function118880: ld a, $2 jp Function119e2b -Function118896: +Function118896: ; unreferenced ld a, [wc821] bit 1, a jr nz, .asm_1188a5 @@ -1302,7 +1302,7 @@ BattleTowerRoomMenu_UpdatePickLevelMenu: ld [wMobileInactivityTimerFrames], a ret -Function118a54: +Function118a54: ; unreferenced ld a, [wcd55] ld l, a ld a, [wcd56] @@ -1311,7 +1311,7 @@ Function118a54: ld bc, $0004 jp Function118ae4 -Function118a65: +Function118a65: ; unreferenced ld hl, BattleDownloadURL ld de, wcc60 ld bc, $80 @@ -3530,7 +3530,7 @@ setcharmap ascii XGameCode: db "CGB-BXTJ-00", $0 -XGameResult: +XGameResult: ; unreferenced db "pokemon_crystal", $0 popc @@ -3861,7 +3861,7 @@ MenuHeader_119cf7: dw NULL db 0 ; default option -MenuData_119cff: +MenuData_119cff: ; unreferenced db MENU_BACKUP_TILES ; flags menu_coords 15, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL @@ -4627,7 +4627,7 @@ String_11a2cf: String_11a2d3: db "NO@" -MenuHeader_11a2d6: +MenuHeader_11a2d6: ; unreferenced db MENU_BACKUP_TILES ; flags menu_coords 14, 6, SCREEN_WIDTH - 1, 10 dw NULL @@ -5151,7 +5151,7 @@ String_11a7d7: String_11a7f4: db " @" -MenuHeader_11a804: +MenuHeader_11a804: ; unreferenced db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, 5 dw NULL @@ -5402,7 +5402,7 @@ Function11a9f0: and a ret -Function11a9f4: +Function11a9f4: ; unreferenced ld a, [wcd8a] ld l, a ld a, [wcd8b] @@ -5443,12 +5443,12 @@ Text_QuitReadingNews: text "Quit reading NEWS?" done -Text_CanceledSendingSaveFile: +Text_CanceledSendingSaveFile: ; unreferenced text "Canceled sending" line "SAVE FILE." done -Text_ReceivedOddEgg: +Text_ReceivedOddEgg: ; unreferenced text "ODD EGG" line "was received!" done @@ -5458,7 +5458,7 @@ Text_RegisteringRecord: line "record…" done -Text_BattleRoomVisitLimit: +Text_BattleRoomVisitLimit: ; unreferenced text "One visit per day" line "per BATTLE ROOM!" done @@ -5487,7 +5487,7 @@ Text_ExitGymLeaderHonorRoll: line "HONOR ROLL?" done -Text_LinkingWithCenter: +Text_LinkingWithCenter: ; unreferenced text "Linking with the" line "CENTER…" done @@ -5502,16 +5502,16 @@ Text_CheckBattleRoomListByMaxLevel: line "list by max level?" done -Text_EnterWhichBattleRoom: +Text_EnterWhichBattleRoom: ; unreferenced text "Enter which" line "BATTLE ROOM?" done -Text_WhichBattleRoom: +Text_WhichBattleRoom: ; unreferenced text "Which BATTLE ROOM?" done -Text_ThisBattleRoomPleaseWait: +Text_ThisBattleRoomPleaseWait: ; unreferenced text_ram wStringBuffer3 text "'s ROOM" line "@" @@ -6379,21 +6379,21 @@ Function11b175: scf ret -Function11b1f7: +FillScreenWithTile32: ; unreferenced hlcoord 0, 0 ld a, $32 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ret -Function11b203: -.asm_11b203 +CopyDataUntilFF: ; unreferenced +.loop ld a, [de] cp $ff ret z inc de ld [hli], a - jr .asm_11b203 + jr .loop Function11b20b: ld a, [wc7d1] @@ -6554,10 +6554,10 @@ Function11b295: call PlaceString ret -String_11b2fe: +String_11b2fe: ; unreferenced db "あげる#@" -String_11b303: +String_11b303: ; unreferenced db "ほしい#@" String_11b308: diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index a8d47d913..f9a8b8621 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -93,7 +93,7 @@ Clears5_a89a: call CloseSRAM ret -Function170c06: +Function170c06: ; unreferenced ld a, $5 call OpenSRAM ld hl, $a894 diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index a30ed4983..023ac6178 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -186,7 +186,7 @@ Function17a78f: farcall ReloadMapPart ret -Function17a7a6: +Function17a7a6: ; unreferenced ld a, [$d087] inc a ld [$d087], a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index ed4df965e..c32b4255b 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -1882,7 +1882,7 @@ Function17dc1f: call Function17e40f ret -MenuData_17dc96: +MenuData_17dc96: ; unreferenced db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 db "はい@" @@ -4645,7 +4645,7 @@ Table_17f699: dw MobileErrorCode_101_009_Text dw MobileErrorCode_101_009_Text -Palette_17f6af: +Palette_17f6af: ; unreferenced RGB 5, 5, 16 RGB 8, 19, 28 RGB 0, 0, 0 @@ -4678,7 +4678,7 @@ Function17f6b7: MobileCommunicationErrorText: db "つうしんエラー ー@" -String_17f6e8: +String_17f6e8: ; unreferenced db "みていぎ<NO>エラーです" next "プログラム<WO>" next "かくにん してください" @@ -5115,7 +5115,7 @@ MobileErrorCode_101_005_Text: next "せつめいしょを ごらんください" db "@" -String_17fe9a: ; unused +String_17fe9a: ; unreferenced ; Cannot send your save data because Pokémon News is being updated. ; Please send your save data after loading new Pokémon News. db "ポケモンニュースが" diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index f1d84f519..680b3bb4c 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -108,24 +108,20 @@ MobileString1: db "@" MobileStrings2: - +; string 0 String_0x49fe9: db "めいし¯つくったり" next "ほぞんしておける フォルダーです@" - -String_0x4a004: +; string 1 db "モバイルたいせんや じぶんのめいしで" next "つかう あいさつ¯つくります@" - -String_0x4a026: +; string 2 db "あなた<NO>じゅうしょや ねんれいの" next "せ<TTE>い¯かえられます@" - -String_0x4a042: +; string 3 db "モバイルセンター<NI>せつぞくするとき" next "ひつような こと¯きめます@" - -String_0x4a062: +; string 4 db "まえ<NO>がめん <NI>もどります" next "@" @@ -446,7 +442,7 @@ Function4a28a: xor a ret -MenuHeader_0x4a346: +MenuHeader_0x4a346: ; unreferenced db MENU_BACKUP_TILES ; flags menu_coords 12, 0, SCREEN_WIDTH - 1, 6 @@ -502,7 +498,7 @@ Function4a373: ld [hli], a ret -Function4a39a: +Function4a39a: ; unreferenced call Function4a485 call Function4a492 call Function4a3aa @@ -574,7 +570,7 @@ Function4a3aa: call Function4a6d8 ret -Function4a449: +Function4a449: ; unreferenced ld bc, 3 * SCREEN_WIDTH ld a, $0 hlcoord 0, 0 diff --git a/mobile/news/news.asm b/mobile/news/news.asm index 8f31e5755..f8343f676 100644 --- a/mobile/news/news.asm +++ b/mobile/news/news.asm @@ -28,7 +28,7 @@ Function1f4dbe: ; unreferenced .news_data INCBIN "mobile/news/news_2.bin" -Function1f5d9f: +Function1f5d9f: ; unreferenced ld a, BANK(s6_a000) call OpenSRAM ld hl, .news_data |