diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-06-25 02:10:37 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-06-25 02:10:37 +0200 |
| commit | 5efce10789bc8291ca5517bdeaacab95459b3fdb (patch) | |
| tree | 94eaaa56e9c7d869dd6ffe86be1abc0af3ccc2b9 /mobile | |
| parent | 0cbe04da44744073c4c164df970b1571b1fda1a6 (diff) | |
Remove even more address comments
That should be all of them this time
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_12.asm | 19 | ||||
| -rw-r--r-- | mobile/mobile_12_2.asm | 12 | ||||
| -rw-r--r-- | mobile/mobile_22.asm | 69 | ||||
| -rw-r--r-- | mobile/mobile_22_2.asm | 42 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 37 | ||||
| -rw-r--r-- | mobile/mobile_41.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_42.asm | 21 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 30 | ||||
| -rw-r--r-- | mobile/mobile_46.asm | 67 | ||||
| -rw-r--r-- | mobile/mobile_menu.asm | 14 |
10 files changed, 114 insertions, 201 deletions
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 927b9dbaa..08466e0cb 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -551,41 +551,38 @@ MobileDesc_Age: db "How old are you?@" MobileDesc_Address: db "Where do you live?@" MobileDesc_ZipCode: db "Your zip code?@" -MenuHeader_0x484f1: ; 0x484f1 +MenuHeader_0x484f1: db MENU_BACKUP_TILES ; flags menu_coords 11, 2, SCREEN_WIDTH - 1, 7 dw MenuData_0x484f9 db 1 ; default option -; 0x484f9 -MenuData_0x484f9: ; 0x484f9 +MenuData_0x484f9: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 2 ; items Strings_484fb: String_484fb: db "Boy@" String_484ff: db "Girl@" -; 0x48504 -MenuHeader_0x48504: ; 0x48504 +MenuHeader_0x48504: db MENU_BACKUP_TILES ; flags menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -MenuHeader_0x48509: ; 0x48509 +MenuHeader_0x48509: db MENU_BACKUP_TILES ; flags menu_coords 10, 5, SCREEN_WIDTH - 1, 7 -MenuHeader_0x4850e: ; 0x4850e +MenuHeader_0x4850e: db MENU_BACKUP_TILES ; flags menu_coords 10, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 -MenuHeader_0x48513: ; 0x48513 +MenuHeader_0x48513: db MENU_BACKUP_TILES ; flags menu_coords 11, 1, 18, 12 dw MenuData_0x4851b db 1 ; default option -; 0x4851b -MenuData_0x4851b: ; 0x4851b +MenuData_0x4851b: db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags db 6 ; items @@ -1252,7 +1249,7 @@ Function48a9a: scf ret -MenuHeader_0x48a9c: ; 0x48a9c +MenuHeader_0x48a9c: db MENU_BACKUP_TILES ; flags menu_coords 10, 8, SCREEN_WIDTH - 1, 13 diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index f2b548b55..c89cffb14 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -239,11 +239,10 @@ Function4a94e: call PrintText jr .asm_4a974 -UnknownText_0x4a9be: ; 0x4a9be +UnknownText_0x4a9be: ; Pick three #MON for battle. text_jump UnknownText_0x1c51d7 db "@" -; 0x4a9c3 Function4a9c3: ld hl, wd002 @@ -293,11 +292,10 @@ Function4a9d7: call YesNoBox ret -UnknownText_0x4aa1d: ; 0x4aa1d +UnknownText_0x4aa1d: ; , @ and @ . Use these three? text_jump UnknownText_0x1c51f4 db "@" -; 0x4aa22 Function4aa22: call ClearBGPalettes @@ -694,12 +692,11 @@ Function4ac58: and a ret -MenuHeader_0x4aca2: ; 0x4aca2 +MenuHeader_0x4aca2: db MENU_BACKUP_TILES ; flags menu_coords 11, 9, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 1 ; default option -; 0x4acaa Function4acaa: .asm_4acaa @@ -795,11 +792,10 @@ Function4ad17: call Function4adc2 ret -UnknownText_0x4ad51: ; 0x4ad51 +UnknownText_0x4ad51: ; Only three #MON may enter. text_jump UnknownText_0x1c521c db "@" -; 0x4ad56 Function4ad56: farcall OpenPartyStats diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 3535b90e5..f556a6291 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -261,19 +261,17 @@ Function89261: scf ret -MenuHeader_0x892a3: ; 0x892a3 +MenuHeader_0x892a3: db MENU_BACKUP_TILES ; flags menu_coords 10, 5, 15, 9 dw MenuData_0x892ab db 1 ; default option -; 0x892ab -MenuData_0x892ab: ; 0x892ab +MenuData_0x892ab: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 ; items db "はい@" db "いいえ@" -; 0x892b4 Function892b4: call Function8931b @@ -1004,7 +1002,7 @@ Function896f5: inc hl ld b, 2 -ClearScreenArea: ; 0x896ff +ClearScreenArea: ; clears an area of the screen ; INPUT: ; hl = address of upper left corner of the area @@ -1039,7 +1037,6 @@ ClearScreenArea: ; 0x896ff dec c jr nz, .asm_89713 ; 0x8971c $f5 ret -; 0x8971f Function8971f: ld a, $2c @@ -2659,29 +2656,25 @@ Function8a0f5: Function8a0ff: jp Function89e36 -UnknownText_0x8a102: ; 0x8a102 +UnknownText_0x8a102: ; The CARD FOLDER stores your and your friends' CARDS. A CARD contains information like the person's name, phone number and profile. text_jump UnknownText_0x1c5238 db "@" -; 0x8a107 -UnknownText_0x8a107: ; 0x8a107 +UnknownText_0x8a107: ; This is your CARD. Once you've entered your phone number, you can trade CARDS with your friends. text_jump UnknownText_0x1c52bc db "@" -; 0x8a10c -UnknownText_0x8a10c: ; 0x8a10c +UnknownText_0x8a10c: ; If you have your friend's CARD, you can use it to make a call from a mobile phone on the 2nd floor of a #MON CENTER. text_jump UnknownText_0x1c531e db "@" -; 0x8a111 -UnknownText_0x8a111: ; 0x8a111 +UnknownText_0x8a111: ; To safely store your collection of CARDS, you must set a PASSCODE for your CARD FOLDER. text_jump UnknownText_0x1c5394 db "@" -; 0x8a116 Function8a116: ld a, $1 @@ -2729,7 +2722,7 @@ Function8a116: scf ret -MenuHeader_0x8a176: ; 0x8a176 +MenuHeader_0x8a176: db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 @@ -2749,20 +2742,18 @@ Function8a17b: ld d, a ret -MenuHeader_0x8a19a: ; 0x8a19a +MenuHeader_0x8a19a: db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 dw MenuData_0x8a1a2 db 1 ; default option -; 0x8a1a2 -MenuData_0x8a1a2: ; 0x8a1a2 +MenuData_0x8a1a2: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 3 ; items db "ひらく@" db "すてる@" db "もどる@" -; 0x8a1b0 Function8a1b0: hlcoord 0, 12 @@ -2810,23 +2801,20 @@ Function8a20d: and a ret -UnknownText_0x8a232: ; 0x8a232 +UnknownText_0x8a232: ; If the CARD FOLDER is deleted, all its CARDS and the PASSCODE will also be deleted. Beware--a deleted CARD FOLDER can't be restored. Want to delete your CARD FOLDER? text_jump UnknownText_0x1c53ee db "@" -; 0x8a237 -UnknownText_0x8a237: ; 0x8a237 +UnknownText_0x8a237: ; Are you sure you want to delete it? text_jump UnknownText_0x1c5494 db "@" -; 0x8a23c -UnknownText_0x8a23c: ; 0x8a23c +UnknownText_0x8a23c: ; The CARD FOLDER has been deleted. text_jump UnknownText_0x1c54b9 db "@" -; 0x8a241 Function8a241: call LoadStandardMenuHeader @@ -2904,21 +2892,19 @@ Function8a2aa: scf ret -MenuHeader_0x8a2ef: ; 0x8a2ef +MenuHeader_0x8a2ef: db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -UnknownText_0x8a2f4: ; 0x8a2f4 +UnknownText_0x8a2f4: ; There is an older CARD FOLDER from a previous journey. Do you want to open it? text_jump UnknownText_0x1c54dd db "@" -; 0x8a2f9 -UnknownText_0x8a2f9: ; 0x8a2f9 +UnknownText_0x8a2f9: ; Delete the old CARD FOLDER? text_jump UnknownText_0x1c552d db "@" -; 0x8a2fe Function8a2fe: call Function8a313 @@ -3063,36 +3049,32 @@ Function8a400: Unknown_8a408: db 1, 2, -1 Unknown_8a40b: db 1, 2, 3, -1 -MenuHeader_0x8a40f: ; 0x8a40f +MenuHeader_0x8a40f: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 10, TEXTBOX_Y - 1 dw MenuData_0x8a417 db 1 ; default option -; 0x8a417 -MenuData_0x8a417: ; 0x8a417 +MenuData_0x8a417: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 ; items db "めいしりスト@" db "じぶんの めいし@" db "めいしこうかん@" db "やめる@" -; 0x8a435 -MenuHeader_0x8a435: ; 0x8a435 +MenuHeader_0x8a435: db MENU_BACKUP_TILES ; flags menu_coords 0, 2, 10, 9 dw MenuData_0x8a43d db 1 ; default option -; 0x8a43d -MenuData_0x8a43d: ; 0x8a43d +MenuData_0x8a43d: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "めいしりスト@" db "じぶんの めいし@" db "やめる@" -; 0x8a453 Function8a453: hlcoord 0, 12 @@ -3788,7 +3770,7 @@ Jumptable_8a9c5: dw Function8aa0a dw Function8ab3b -MenuHeader_0x8a9c9: ; 0x8a9c9 +MenuHeader_0x8a9c9: db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 @@ -3815,20 +3797,18 @@ Function8a9ce: scf ret -MenuHeader_0x8a9f2: ; 0x8a9f2 +MenuHeader_0x8a9f2: db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 dw MenuData_0x8a9fa db 1 ; default option -; 0x8a9fa -MenuData_0x8a9fa: ; 0x8a9fa +MenuData_0x8a9fa: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" db "みる@" db "やめる@" -; 0x8aa09 Function8aa09: ret @@ -4198,11 +4178,10 @@ Function8ac7c: scf ret -UnknownText_0x8ad06: ; 0x8ad06 +UnknownText_0x8ad06: ; Finish registering CARDS? text_jump UnknownText_0x1c554a db "@" -; 0x8ad0b Function8ad0b: .asm_8ad0b diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index e6c7959f9..9aa3f2715 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -458,35 +458,30 @@ Function8b555: pop af ret -UnknownText_0x8b5ce: ; 0x8b5ce +UnknownText_0x8b5ce: ; Please enter any four-digit number. text_jump UnknownText_0x1bc187 db "@" -; 0x8b5d3 -UnknownText_0x8b5d3: ; 0x8b5d3 +UnknownText_0x8b5d3: ; Enter the same number to confirm. text_jump UnknownText_0x1bc1ac db "@" -; 0x8b5d8 -UnknownText_0x8b5d8: ; 0x8b5d8 +UnknownText_0x8b5d8: ; That's not the same number. text_jump UnknownText_0x1bc1cf db "@" -; 0x8b5dd -UnknownText_0x8b5dd: ; 0x8b5dd +UnknownText_0x8b5dd: ; Your PASSCODE has been set. Enter this number next time to open the CARD FOLDER. text_jump UnknownText_0x1bc1eb db "@" -; 0x8b5e2 -UnknownText_0x8b5e2: ; 0x8b5e2 +UnknownText_0x8b5e2: ; 0000 is invalid! text_jump UnknownText_0x1bc23e db "@" -; 0x8b5e7 Function8b5e7: ld bc, wd013 @@ -528,19 +523,17 @@ Function8b5e7: pop af ret -UnknownText_0x8b642: ; 0x8b642 +UnknownText_0x8b642: ; Enter the CARD FOLDER PASSCODE. text_jump UnknownText_0x1bc251 db "@" -; 0x8b647 -UnknownText_0x8b647: ; 0x8b647 +UnknownText_0x8b647: ; Incorrect PASSCODE! text_jump UnknownText_0x1bc272 db "@" -; 0x8b64c -UnknownText_0x8b64c: ; 0x8b64c +UnknownText_0x8b64c: ; CARD FOLDER open.@ @ text_jump UnknownText_0x1bc288 start_asm @@ -880,16 +873,15 @@ Function8b855: ld [hl], a ret -MenuHeader_0x8b867: ; 0x8b867 +MenuHeader_0x8b867: db MENU_BACKUP_TILES ; flags menu_coords 1, 3, 18, 13 dw MenuData_0x8b870 db 1 ; default option -; 0x8b86f db 0 -MenuData_0x8b870: ; 0x8b870 +MenuData_0x8b870: db SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT ; flags db 5 ; items db 3, 1 @@ -1044,33 +1036,30 @@ Function8b99f: Function8b9ab: ret -MenuHeader_0x8b9ac: ; 0x8b9ac +MenuHeader_0x8b9ac: db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 -MenuHeader_0x8b9b1: ; 0x8b9b1 +MenuHeader_0x8b9b1: db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, 7 dw MenuData_0x8b9b9 db 1 ; default option -; 0x8b9b9 -MenuData_0x8b9b9: ; 0x8b9b9 +MenuData_0x8b9b9: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 ; items db "へんしゅう@" ; EDIT db "いれかえ@" ; REPLACE db "やめる@" ; QUIT -; 0x8b9ca -MenuHeader_0x8b9ca: ; 0x8b9ca +MenuHeader_0x8b9ca: db MENU_BACKUP_TILES ; flags menu_coords 11, 0, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw MenuData_0x8b9d2 db 1 ; default option -; 0x8b9d2 -MenuData_0x8b9d2: ; 0x8b9d2 +MenuData_0x8b9d2: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 5 ; items db "みる@" ; VIEW @@ -1078,7 +1067,6 @@ MenuData_0x8b9d2: ; 0x8b9d2 db "いれかえ@" ; REPLACE db "けす@" ; ERASE db "やめる@" ; QUIT -; 0x8b9e9 Function8b9e9: call OpenSRAMBank4 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 2a2c034c2..1b7a15be2 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -90,7 +90,6 @@ EnableMobile: ei ret -; 0x1000a4 DisableMobile: di @@ -7507,34 +7506,27 @@ MenuData_10374f: db "やめる@" db "せつめい@" -UnknownText_0x10375d: ; 0x10375d +UnknownText_0x10375d: text_jump UnknownText_0x1c422a db "@" -; 0x103762 -UnknownText_0x103762: ; 0x103762 +UnknownText_0x103762: text_jump UnknownText_0x1c4275 db "@" -; 0x103767 -UnknownText_0x103767: ; 0x103767 +UnknownText_0x103767: text_jump UnknownText_0x1c4298 db "@" -; 0x10376c -UnknownText_0x10376c: ; 0x10376c +UnknownText_0x10376c: text_jump UnknownText_0x1c439c db "@" -; 0x103771 -UnknownText_0x103771: ; 0x103771 +UnknownText_0x103771: text_jump UnknownText_0x1c43dc db "@" -; 0x103776 -UnknownText_0x103776: ; 0x103776 +UnknownText_0x103776: text_jump UnknownText_0x1c4419 db "@" -; 0x10377b -UnknownText_0x10377b: ; 0x10377b +UnknownText_0x10377b: text_jump UnknownText_0x1c445a db "@" -; 0x103780 Function103780: ld a, [wd265] @@ -7596,10 +7588,9 @@ Function1037c2: ld [wScriptVar], a ret -UnknownText_0x1037e6: ; 0x1037e6 +UnknownText_0x1037e6: text_jump UnknownText_0x1c449c db "@" -; 0x1037eb Function1037eb: call Function103823 @@ -7627,15 +7618,13 @@ Function1037eb: ld [wScriptVar], a ret -UnknownText_0x103819: ; 0x103819 +UnknownText_0x103819: text_jump UnknownText_0x1c44c0 db "@" -; 0x10381e -UnknownText_0x10381e: ; 0x10381e +UnknownText_0x10381e: text_jump UnknownText_0x1c44e7 db "@" -; 0x103823 Function103823: farcall Mobile_AlwaysReturnNotCarry @@ -7681,10 +7670,9 @@ Function10383c: ld [wScriptVar], a ret -UnknownText_0x103876: ; 0x103876 +UnknownText_0x103876: text_jump UnknownText_0x1c4508 db "@" -; 0x10387b Function10387b: farcall Mobile_AlwaysReturnNotCarry @@ -7698,7 +7686,6 @@ Function10387b: call JoyWaitAorB ret -UnknownText_0x103898: ; 0x103898 +UnknownText_0x103898: text_jump UnknownText_0x1c4525 db "@" -; 0x10389d diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index a1f7f51e0..98dfe5ebd 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -2,7 +2,7 @@ ; which were used for Trainer Rankings in Pokémon News. ; Copies certain values at the time the player enters the Hall of Fame. -StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6 +StubbedTrainerRankings_HallOfFame2:: ret ld a, BANK(sTrainerRankingGameTimeHOF) call GetSRAMBank @@ -287,7 +287,7 @@ StubbedTrainerRankings_Unused1: ld hl, sTrainerRankingUnused1 jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_HallOfFame:: ; 0x106078 +StubbedTrainerRankings_HallOfFame:: ret ld hl, sTrainerRankingHOFEntries jp StubbedTrainerRankings_Increment3Byte diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 60e59b5eb..3f53146bb 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1549,20 +1549,17 @@ Function108bec: call DelayFrames ret -.PlayerWillTradeMon: ; 0x108c07 +.PlayerWillTradeMon: text_jump UnknownText_0x1bc787 db "@" -; 0x108c0c -.ForPartnersMon: ; 0x108c0c +.ForPartnersMon: text_jump UnknownText_0x1bc79d db "@" -; 0x108c11 -.UnusedTextPlayersMonTrade: ; 0x108c11 +.UnusedTextPlayersMonTrade: text_jump UnknownText_0x1bc7b0 db "@" -; 0x108c16 Function108c16: ld a, $90 @@ -1573,10 +1570,9 @@ Function108c16: call DelayFrames ret -.TakeGoodCareOfMon: ; 0x108c26 +.TakeGoodCareOfMon: text_jump UnknownText_0x1bc7c3 db "@" -; 0x108c2b Function108c2b: ld a, $90 @@ -1587,10 +1583,9 @@ Function108c2b: call DelayFrames ret -.PlayersMonTrade: ; 0x108c3b +.PlayersMonTrade: text_jump UnknownText_0x1bc7dd db "@" -; 0x108c40 Function108c40: ld a, $90 @@ -1611,15 +1606,13 @@ Function108c40: call DelayFrames ret -.TakeGoodCareOf: ; 0x108c63 +.TakeGoodCareOf: text_jump UnknownText_0x1bc7f0 db "@" -; 0x108c68 -.CameBack: ; 0x108c68 +.CameBack: text_jump UnknownText_0x1bc80a db "@" -; 0x108c6d Function108c6d: ld hl, LZ_108fe7 diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 12eab3aa2..a5d172415 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7224,7 +7224,7 @@ INCBIN "data/mobile/ascii-sym.txt" ; everything from here to the end of the bank is related to the ; Mobile Stadium option from the continue/newgame menu. ; Needs better function names -MobileStudium: ; 0x117a7f +MobileStudium: ld a, [hInMenu] push af ld a, $1 @@ -7234,16 +7234,14 @@ MobileStudium: ; 0x117a7f ld [hInMenu], a ret -; 0x117a8d -Function117a8d: ; 0x117a8d +Function117a8d: call Function117a94 call Function117acd ret -; 0x117a94 -Function117a94: ; 0x117a94 +Function117a94: xor a ld [wJumptableIndex], a ld [wcf64], a @@ -7255,9 +7253,8 @@ Function117a94: ; 0x117a94 farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret -; 0x117ab4 -Function117ab4: ; 0x117ab4 +Function117ab4: call ClearBGPalettes call ClearSprites farcall Function172e78 @@ -7265,9 +7262,8 @@ Function117ab4: ; 0x117ab4 farcall ReloadMapPart ret -; 0x117acd -Function117acd: ; 0x117acd +Function117acd: call JoyTextDelay ld a, [wJumptableIndex] bit 7, a @@ -7281,7 +7277,7 @@ Function117acd: ; 0x117acd call ClearSprites ret -Function117ae9: ; 0x117ae9 +Function117ae9: ld a, [wJumptableIndex] ld e, a ld d, $0 @@ -7293,7 +7289,7 @@ Function117ae9: ; 0x117ae9 ld l, a jp hl -.Jumptable: ; 0x117af8 +.Jumptable: dw Function117b06 dw Function117b14 dw Function117b28 @@ -7530,31 +7526,31 @@ Function117c89: call CloseSRAM ret -MenuHeader_117cbc: ; 0x117cbc +MenuHeader_117cbc: db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -MenuHeader_117cc4: ; 0x117cc4 +MenuHeader_117cc4: db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL db 0 ; default item -YesNo117ccc: ; 0x117ccc +YesNo117ccc: db "はい" next "いいえ@" -MobileStadiumEntryText: ; 0x117cd3 +MobileStadiumEntryText: text_jump _MobileStadiumEntryText db "@" -MobileStadiumSuccessText: ; 0x117cd8 +MobileStadiumSuccessText: text_jump _MobileStadiumSuccessText db "@" -MobileStudium_JumptableIncrement: ; 0x117cdd +MobileStudium_JumptableIncrement: ld hl, wJumptableIndex inc [hl] ret diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 50950204f..534835ac2 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1492,19 +1492,19 @@ Function118b9a: charmap " ", $20 ; revert to ascii -ExchangeDownloadURL: ; 0x118ba5 +ExchangeDownloadURL: db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt", 0 -BattleDownloadURL: ; 0x118bf7 +BattleDownloadURL: db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/battle/index.txt", 0 -NewsDownloadURL: ; 0x118c47 +NewsDownloadURL: db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/news/index.txt", 0 -MenuDownloadURL: ; 0x118c95 +MenuDownloadURL: db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/POKESTA/menu.cgb", 0 -IndexDownloadURL: ; 0x118ce5 +IndexDownloadURL: db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0 @@ -5411,64 +5411,54 @@ Function11a9f4: and a ret -Text_SaveFileWillBeSent: ; 0x11aa13 +Text_SaveFileWillBeSent: text "SAVE FILE will be" line "sent." done -; 0x11aa2c -Text_SentSaveFileReadingNews: ; 0x11aa2c +Text_SentSaveFileReadingNews: text "Sent SAVE FILE." line "Reading NEWS…" done -; 0x11aa4b -Text_ReadingNews: ; 0x11aa4b +Text_ReadingNews: text "Reading NEWS…" done -; 0x11aa5a -Text_ReceivedNews: ; 0x11aa5a +Text_ReceivedNews: text "Received NEWS!" done -; 0x11aa6a -Text_QuitReadingNews: ; 0x11aa6a +Text_QuitReadingNews: text "Quit reading NEWS?" done -; 0x11aa7e -Text_CanceledSendingSaveFile: ; 0x11aa7e +Text_CanceledSendingSaveFile: text "Canceled sending" line "SAVE FILE." done -; 0x11aa9b -Text_ReceivedOddEgg: ; 0x11aa9b +Text_ReceivedOddEgg: text "ODD EGG" line "was received!" done -; 0x11aab2 -Text_RegisteringRecord: ; 0x11aab2 +Text_RegisteringRecord: text "Registering your" line "record…" done -; 0x11aacc -Text_BattleRoomVisitLimit: ; 0x11aacc +Text_BattleRoomVisitLimit: text "One visit per day" line "per BATTLE ROOM!" done -; 0x11aaf0 -Text_PartyMonTopsThisLevel: ; 0x11aaf0 +Text_PartyMonTopsThisLevel: text "A party #MON" line "tops this level." done -; 0x11ab0f -Text_UberRestriction: ; 0x11ab0f +Text_UberRestriction: text_from_ram wcd49 text " may go" line "only to BATTLE" @@ -5476,50 +5466,42 @@ Text_UberRestriction: ; 0x11ab0f para "ROOMS that are" line "Lv.70 or higher." done -; 0x11ab4a -Text_CancelBattleRoomChallenge: ; 0x11ab4a +Text_CancelBattleRoomChallenge: text "Cancel your BATTLE" line "ROOM challenge?" done -; 0x11ab6e -Text_ExitGymLeaderHonorRoll: ; 0x11ab6e +Text_ExitGymLeaderHonorRoll: text "Exit GYM LEADER" line "HONOR ROLL?" done -; 0x11ab8b -Text_LinkingWithCenter: ; 0x11ab8b +Text_LinkingWithCenter: text "Linking with the" line "CENTER…" done -; 0x11aba5 -Text_WhatLevelDoYouWantToChallenge: ; 0x11aba5 +Text_WhatLevelDoYouWantToChallenge: text "What level do you" line "want to challenge?" done -; 0x11abcb -Text_CheckBattleRoomListByMaxLevel: ; 0x11abcb +Text_CheckBattleRoomListByMaxLevel: text "Check BATTLE ROOM" line "list by max level?" done -; 0x11abf1 -Text_EnterWhichBattleRoom: ; 0x11abf1 +Text_EnterWhichBattleRoom: text "Enter which" line "BATTLE ROOM?" done -; 0x11ac0b -Text_WhichBattleRoom: ; 0x11ac0b +Text_WhichBattleRoom: text "Which BATTLE ROOM?" done -; 0x11ac1f -Text_ThisBattleRoomPleaseWait: ; 0x11ac1f +Text_ThisBattleRoomPleaseWait: text_from_ram wStringBuffer3 text "'s ROOM" line "@" @@ -5527,7 +5509,6 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f text "?" cont "Please wait…" done -; 0x11ac3e Function11ac3e: call SpeechTextBox diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index afd9cfba8..a8bae8f1c 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -448,7 +448,7 @@ Function4a28a: xor a ret -MenuHeader_0x4a346: ; 0x4a346 +MenuHeader_0x4a346: db MENU_BACKUP_TILES ; flags menu_coords 12, 0, SCREEN_WIDTH - 1, 6 @@ -457,31 +457,27 @@ String_4a34b: next "けす" next "もどる@" -UnknownText_0x4a358: ; 0x4a358 +UnknownText_0x4a358: ; Delete the saved LOG-IN PASSWORD? text_jump UnknownText_0x1c5196 db "@" -; 0x4a35d -UnknownText_0x4a35d: ; 0x4a35d +UnknownText_0x4a35d: ; Deleted the LOG-IN PASSWORD. text_jump UnknownText_0x1c51b9 db "@" -; 0x4a362 -DeletePassword_YesNo_MenuHeader: ; 0x4a362 +DeletePassword_YesNo_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw MenuData_0x4a36a db 2 ; default option -; 0x4a36a -MenuData_0x4a36a: ; 0x4a36a +MenuData_0x4a36a: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 ; items db "はい@" db "いいえ@" -; 0x4a373 Function4a373: ld hl, w2DMenuCursorInitY |
