diff options
author | mid-kid <esteve.varela@gmail.com> | 2018-06-24 16:09:41 +0200 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2018-06-24 16:13:22 +0200 |
commit | 1d9a68dbdd0132035f1fc7b7ea8f7fdc24741507 (patch) | |
tree | 3af0a92f5f7dc10f32eed04d9daae52749fc33c2 /mobile | |
parent | 131875d3e37044ec995287af7c93decd86a0d659 (diff) |
Remove all address comments
Diffstat (limited to 'mobile')
-rw-r--r-- | mobile/fixed_words.asm | 327 | ||||
-rw-r--r-- | mobile/mobile_12.asm | 145 | ||||
-rw-r--r-- | mobile/mobile_12_2.asm | 101 | ||||
-rw-r--r-- | mobile/mobile_22.asm | 671 | ||||
-rw-r--r-- | mobile/mobile_22_2.asm | 161 | ||||
-rw-r--r-- | mobile/mobile_40.asm | 1500 | ||||
-rw-r--r-- | mobile/mobile_41.asm | 177 | ||||
-rw-r--r-- | mobile/mobile_42.asm | 230 | ||||
-rw-r--r-- | mobile/mobile_45.asm | 592 | ||||
-rw-r--r-- | mobile/mobile_45_sprite_engine.asm | 99 | ||||
-rw-r--r-- | mobile/mobile_46.asm | 857 | ||||
-rw-r--r-- | mobile/mobile_5b.asm | 135 | ||||
-rw-r--r-- | mobile/mobile_5c.asm | 112 | ||||
-rw-r--r-- | mobile/mobile_5e.asm | 123 | ||||
-rw-r--r-- | mobile/mobile_5f.asm | 485 | ||||
-rw-r--r-- | mobile/mobile_menu.asm | 119 | ||||
-rw-r--r-- | mobile/news/news.asm | 6 | ||||
-rw-r--r-- | mobile/print_opp_message.asm | 2 |
18 files changed, 2167 insertions, 3675 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 602639b82..839529faf 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -1,7 +1,7 @@ ; These functions seem to be related to the selection of preset phrases ; for use in mobile communications. Annoyingly, they separate the ; Battle Tower function above from the data it references. -Function11c05d: ; 11c05d +Function11c05d: ld a, e or d jr z, .error @@ -21,9 +21,8 @@ Function11c05d: ; 11c05d ld b, h scf ret -; 11c075 -Function11c075: ; 11c075 +Function11c075: push de ld a, c call Function11c254 @@ -31,9 +30,8 @@ Function11c075: ; 11c075 ld bc, wcd36 call Function11c08f ret -; 11c082 -Unreferenced_Function11c082: ; 11c082 +Unreferenced_Function11c082: push de ld a, c call Function11c254 @@ -41,9 +39,8 @@ Unreferenced_Function11c082: ; 11c082 ld bc, wcd36 call PrintEZChatBattleMessage ret -; 11c08f -Function11c08f: ; 11c08f +Function11c08f: ld l, e ld h, d push hl @@ -93,9 +90,8 @@ Function11c08f: ; 11c08f dec a jr nz, .loop2 ret -; 11c0c6 -PrintEZChatBattleMessage: ; 11c0c6 +PrintEZChatBattleMessage: ; Use up to 6 words from bc to print text starting at de. ; Preserve $cf63, $cf64 ld a, [wJumptableIndex] @@ -210,9 +206,8 @@ PrintEZChatBattleMessage: ; 11c0c6 ld a, h ld [wcf64], a ret -; 11c14a -GetLengthOfWordAtC608: ; 11c14a +GetLengthOfWordAtC608: ld c, $0 ld hl, $c608 .loop @@ -221,9 +216,8 @@ GetLengthOfWordAtC608: ; 11c14a ret z inc c jr .loop -; 11c156 -CopyMobileEZChatToC608: ; 11c156 +CopyMobileEZChatToC608: ld a, [rSVBK] push af ld a, $1 @@ -272,9 +266,8 @@ CopyMobileEZChatToC608: ; 11c156 ld hl, wStringBuffer1 ld bc, MON_NAME_LENGTH - 1 jr .copy_string -; 11c1ab -Function11c1ab: ; 11c1ab +Function11c1ab: ld a, [hInMenu] push af ld a, $1 @@ -283,9 +276,8 @@ Function11c1ab: ; 11c1ab pop af ld [hInMenu], a ret -; 11c1b9 -Function11c1b9: ; 11c1b9 +Function11c1b9: call .InitKanaMode ld a, [rSVBK] push af @@ -295,9 +287,8 @@ Function11c1b9: ; 11c1b9 pop af ld [rSVBK], a ret -; 11c1ca -.InitKanaMode: ; 11c1ca +.InitKanaMode: xor a ld [wJumptableIndex], a ld [wcf64], a @@ -345,9 +336,8 @@ Function11c1b9: ; 11c1b9 call EZChat_GetCategoryWordsByKana call EZChat_GetSeenPokemonByKana ret -; 11c254 -Function11c254: ; 11c254 +Function11c254: push af ld a, $4 call GetSRAMBank @@ -366,16 +356,15 @@ Function11c254: ; 11c254 call CopyBytes call CloseSRAM ret -; 11c277 -EZChat_ClearBottom12Rows: ; 11c277 (47:4277) +EZChat_ClearBottom12Rows: ld a, " " hlcoord 0, 6 ld bc, (SCREEN_HEIGHT - 6) * SCREEN_WIDTH call ByteFill ret -EZChat_MasterLoop: ; 11c283 +EZChat_MasterLoop: .loop call JoyTextDelay ld a, [hJoyPressed] @@ -392,13 +381,11 @@ EZChat_MasterLoop: ; 11c283 farcall ClearSpriteAnims call ClearSprites ret -; 11c2ac -.DoJumptableFunction: ; 11c2ac +.DoJumptableFunction: jumptable .Jumptable, wJumptableIndex -; 11c2bb -.Jumptable: ; 11c2bb (47:42bb) +.Jumptable: dw .SpawnObjects ; 00 dw .InitRAM ; 01 dw Function11c35f ; 02 @@ -423,7 +410,7 @@ EZChat_MasterLoop: ; 11c283 dw Function11ce0b ; 15 dw Function11ce2b ; 16 -.SpawnObjects: ; 11c2e9 (47:42e9) +.SpawnObjects: depixel 3, 1, 2, 5 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct @@ -473,7 +460,7 @@ EZChat_MasterLoop: ; 11c283 set 2, [hl] jp Function11cfb5 -.InitRAM: ; 11c346 (47:4346) +.InitRAM: ld a, $9 ld [wcd2d], a ld a, $2 @@ -484,7 +471,7 @@ EZChat_MasterLoop: ; 11c283 call Function11cfce jp Function11cfb5 -Function11c35f: ; 11c35f (47:435f) +Function11c35f: ld hl, wcd2f inc [hl] inc [hl] @@ -498,7 +485,7 @@ Function11c35f: ; 11c35f (47:435f) ret nz jp Function11cfb5 -Function11c373: ; 11c373 (47:4373) +Function11c373: ld hl, wcd30 inc [hl] inc [hl] @@ -513,7 +500,7 @@ Function11c373: ; 11c373 (47:4373) call Function11c38a jp Function11cfb5 -Function11c38a: ; 11c38a (47:438a) +Function11c38a: ld hl, Unknown_11c986 ld bc, wcd36 ld a, $6 @@ -551,13 +538,11 @@ Function11c38a: ; 11c38a (47:438a) dec a jr nz, .asm_11c392 ret -; 11c3bc (47:43bc) -String_11c3bc: ; 11c3bc +String_11c3bc: db "ーーーーー@" -; 11c3c2 -Function11c3c2: ; 11c3c2 (47:43c2) +Function11c3c2: call EZChat_ClearBottom12Rows ld de, Unknown_11cfbe call Function11d035 @@ -574,7 +559,7 @@ Function11c3c2: ; 11c3c2 (47:43c2) res 0, [hl] call Function11cfb5 -Function11c3ed: ; 11c3ed (47:43ed) +Function11c3ed: ld hl, wcd20 ; wcd20 ld de, hJoypadPressed ; $ffa3 ld a, [de] @@ -692,7 +677,7 @@ Function11c3ed: ; 11c3ed (47:43ed) ld [hl], a ret -Function11c4a5: ; 11c4a5 (47:44a5) +Function11c4a5: ld hl, wcd23 res 0, [hl] ld a, [wcd2b] @@ -709,7 +694,7 @@ Function11c4a5: ; 11c4a5 (47:44a5) ld a, $15 ret -Function11c4be: ; 11c4be (47:44be) +Function11c4be: ld a, $1 hlcoord 0, 6, wAttrMap ld bc, $a0 @@ -720,21 +705,18 @@ Function11c4be: ; 11c4be (47:44be) call ByteFill farcall ReloadMapPart ret -; 11c4db (47:44db) -String_11c4db: ; 11c4db +String_11c4db: db "6つのことば¯くみあわせます" next "かえたいところ¯えらぶと でてくる" next "ことばのグループから いれかえたい" next "たんご¯えらんでください" db "@" -; 11c51b -String_11c51b: ; 11c51b +String_11c51b: db "ぜんぶけす やめる けってい@" -; 11c52c -Function11c52c: ; 11c52c (47:452c) +Function11c52c: call EZChat_ClearBottom12Rows call EZChat_PlaceCategoryNames call Function11c618 @@ -742,7 +724,7 @@ Function11c52c: ; 11c52c (47:452c) res 1, [hl] call Function11cfb5 -Function11c53d: ; 11c53d (47:453d) +Function11c53d: ld hl, wcd21 ld de, hJoypadPressed ; $ffa3 @@ -879,9 +861,8 @@ Function11c53d: ; 11c53d (47:453d) .finish_dpad ld [hl], a ret -; 11c5f0 -EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0) +EZChat_PlaceCategoryNames: ld de, MobileEZChatCategoryNames ld bc, Coords_11c63a ld a, 15 @@ -912,20 +893,18 @@ EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0) call PlaceString ret -Function11c618: ; 11c618 (47:4618) +Function11c618: ld a, $2 hlcoord 0, 6, wAttrMap ld bc, $c8 call ByteFill farcall ReloadMapPart ret -; 11c62a (47:462a) -EZChatString_Stop_Mode_Cancel: ; 11c62a +EZChatString_Stop_Mode_Cancel: db "けす モード やめる@" -; 11c63a -Coords_11c63a: ; 11c63a +Coords_11c63a: dwcoord 1, 7 dwcoord 7, 7 dwcoord 13, 7 @@ -941,9 +920,8 @@ Coords_11c63a: ; 11c63a dwcoord 1, 15 dwcoord 7, 15 dwcoord 13, 15 -; 11c658 -Function11c658: ; 11c658 (47:4658) +Function11c658: call EZChat_ClearBottom12Rows call Function11c770 ld de, Unknown_11cfc2 @@ -955,7 +933,7 @@ Function11c658: ; 11c658 (47:4658) res 3, [hl] call Function11cfb5 -Function11c675: ; 11c675 (47:4675) +Function11c675: ld hl, wMobileCommsJumptableIndex ld de, hJoypadPressed ; $ffa3 ld a, [de] @@ -1114,7 +1092,7 @@ Function11c675: ; 11c675 (47:4675) ld [hl], a ret -Function11c770: ; 11c770 (47:4770) +Function11c770: xor a ld [wMobileCommsJumptableIndex], a ld [wcd26], a @@ -1165,7 +1143,7 @@ Function11c770: ; 11c770 (47:4770) ld [wcd28], a jr .div_12 -Function11c7bc: ; 11c7bc (47:47bc) +Function11c7bc: ld bc, Unknown_11c854 ld a, [wcd2b] and a @@ -1284,9 +1262,8 @@ Function11c7bc: ; 11c7bc (47:47bc) pop hl pop de ret -; 11c854 (47:4854) -Unknown_11c854: ; 11c854 +Unknown_11c854: dwcoord 2, 8 dwcoord 8, 8 dwcoord 14, 8 @@ -1300,9 +1277,8 @@ Unknown_11c854: ; 11c854 dwcoord 8, 14 dwcoord 14, 14 dw -1 -; 11c86e -Function11c86e: ; 11c86e (47:486e) +Function11c86e: ld a, [wcd26] and a jr z, .asm_11c88a @@ -1357,9 +1333,8 @@ Function11c86e: ; 11c86e (47:486e) dec c jr nz, .asm_11c8c2 ret -; 11c8c7 (47:48c7) -BCD2String: ; 11c8c7 +BCD2String: inc a push af and $f @@ -1380,21 +1355,17 @@ BCD2String: ; 11c8c7 add "0" ld [hli], a ret -; 11c8ec -MobileString_Page: ; 11c8ec +MobileString_Page: db "ぺージ@" -; 11c8f0 -MobileString_Prev: ; 11c8f0 +MobileString_Prev: db "まえ@" -; 11c8f3 -MobileString_Next: ; 11c8f3 +MobileString_Next: db "つぎ@" -; 11c8f6 -Function11c8f6: ; 11c8f6 (47:48f6) +Function11c8f6: ld a, [wcd20] ; wcd20 call Function11c95d push hl @@ -1464,7 +1435,7 @@ Function11c8f6: ; 11c8f6 (47:48f6) ld d, a jr .asm_11c912 -Function11c95d: ; 11c95d (47:495d) +Function11c95d: sla a ld c, a ld b, 0 @@ -1496,7 +1467,6 @@ Function11c95d: ; 11c95d (47:495d) jr nz, .asm_11c980 pop hl ret -; 11c986 (47:4986) Unknown_11c986: dwcoord 1, 2 @@ -1505,9 +1475,8 @@ Unknown_11c986: dwcoord 1, 4 dwcoord 7, 4 dwcoord 13, 4 -; 11c992 -Function11c992: ; 11c992 (47:4992) +Function11c992: ld a, $8 hlcoord 2, 7 .asm_11c997 @@ -1524,7 +1493,7 @@ Function11c992: ; 11c992 (47:4992) jr nz, .asm_11c997 ret -Function11c9ab: ; 11c9ab (47:49ab) +Function11c9ab: ld a, $7 hlcoord 0, 6, wAttrMap ld bc, $c8 @@ -1532,11 +1501,11 @@ Function11c9ab: ; 11c9ab (47:49ab) farcall ReloadMapPart ret -Function11c9bd: ; 11c9bd (47:49bd) +Function11c9bd: ld de, String_11ca38 call Function11ca7f -Function11c9c3: ; 11c9c3 (47:49c3) +Function11c9c3: ld hl, wcd2a ld de, hJoypadPressed ; $ffa3 ld a, [de] @@ -1582,7 +1551,7 @@ Function11c9c3: ; 11c9c3 (47:49c3) inc [hl] ret -Function11ca01: ; 11ca01 (47:4a01) +Function11ca01: hlcoord 14, 7, wAttrMap ld de, $14 ld a, $5 @@ -1601,7 +1570,7 @@ Function11ca01: ; 11ca01 (47:4a01) dec c jr nz, .asm_11ca0a -Function11ca19: ; 11ca19 (47:4a19) +Function11ca19: hlcoord 0, 12, wAttrMap ld de, $14 ld a, $6 @@ -1621,19 +1590,16 @@ Function11ca19: ; 11ca19 (47:4a19) jr nz, .asm_11ca22 farcall ReloadMapPart ret -; 11ca38 (47:4a38) -String_11ca38: ; 11ca38 +String_11ca38: db "とうろくちゅう<NO>あいさつ¯ぜんぶ" next "けしても よろしいですか?@" -; 11ca57 -String_11ca57: ; 11ca57 +String_11ca57: db "はい" next "いいえ@" -; 11ca5e -Function11ca5e: ; 11ca5e (47:4a5e) +Function11ca5e: xor a .loop push af @@ -1644,7 +1610,7 @@ Function11ca5e: ; 11ca5e (47:4a5e) jr nz, .loop ret -Function11ca6a: ; 11ca6a (47:4a6a) +Function11ca6a: ld hl, wcd36 ld c, a ld b, $0 @@ -1658,7 +1624,7 @@ Function11ca6a: ; 11ca6a (47:4a6a) call PlaceString ret -Function11ca7f: ; 11ca7f (47:4a7f) +Function11ca7f: push de ld de, Unknown_11cfc6 call Function11cfce @@ -1678,11 +1644,11 @@ Function11ca7f: ; 11ca7f (47:4a7f) call Function11cfb5 ret -Function11caad: ; 11caad (47:4aad) +Function11caad: ld de, String_11cb1c call Function11ca7f -Function11cab3: ; 11cab3 (47:4ab3) +Function11cab3: ld hl, wcd2a ld de, hJoypadPressed ; $ffa3 ld a, [de] @@ -1750,19 +1716,16 @@ Function11cab3: ; 11cab3 (47:4ab3) ret nz inc [hl] ret -; 11cb1c (47:4b1c) -String_11cb1c: ; 11cb1c +String_11cb1c: db "あいさつ<NO>とうろく¯ちゅうし" next "しますか?@" -; 11cb31 -String_11cb31: ; 11cb31 +String_11cb31: db "とうろくちゅう<NO>あいさつ<WA>ほぞん" next "されません<GA>よろしい ですか?@" -; 11cb52 -Function11cb52: ; 11cb52 (47:4b52) +Function11cb52: ld hl, Unknown_11cc01 ld a, [wMenuCursorY] .asm_11cb58 @@ -1778,7 +1741,7 @@ Function11cb52: ; 11cb52 (47:4b52) ld d, a call Function11ca7f -Function11cb66: ; 11cb66 (47:4b66) +Function11cb66: ld hl, wcd2a ld de, hJoypadPressed ; $ffa3 ld a, [de] @@ -1872,7 +1835,7 @@ Function11cb66: ; 11cb66 (47:4b66) inc [hl] ret -Function11cbf5: ; 11cbf5 (47:4bf5) +Function11cbf5: call WaitSFX ld hl, wcf64 dec [hl] @@ -1880,55 +1843,52 @@ Function11cbf5: ; 11cbf5 (47:4bf5) dec hl set 7, [hl] ret -; 11cc01 (47:4c01) -Unknown_11cc01: ; 11cc01 +Unknown_11cc01: dw String_11cc09 dw String_11cc23 dw String_11cc42 dw String_11cc60 -String_11cc09: ; 11cc09 +String_11cc09: db "じこしょうかい は" next "この あいさつで いいですか?@" -String_11cc23: ; 11cc23 +String_11cc23: db "たいせん <GA>はじまるとき は" next "この あいさつで いいですか?@" -String_11cc42: ; 11cc42 +String_11cc42: db "たいせん <NI>かったとき は" next "この あいさつで いいですか?@" -String_11cc60: ; 11cc60 +String_11cc60: db "たいせん <NI>まけたとき は" next "この あいさつで いいですか?@" -; 11cc7e -Unknown_11cc7e: ; 11cc7e +Unknown_11cc7e: dw String_11cc86 dw String_11cc9d dw String_11ccb9 dw String_11ccd4 -String_11cc86: ; 11cc86 +String_11cc86: db "じこしょうかい の" next "あいさつ¯とうろくした!@" -String_11cc9d: ; 11cc9d +String_11cc9d: db "たいせん <GA>はじまるとき の" next "あいさつ¯とうろくした!@" -String_11ccb9: ; 11ccb9 +String_11ccb9: db "たいせん <NI>かったとき の" next "あいさつ¯とうろくした!@" -String_11ccd4: ; 11ccd4 +String_11ccd4: db "たいせん <NI>まけたとき の" next "あいさつ¯とうろくした!@" -; 11ccef -Function11ccef: ; 11ccef (47:4cef) +Function11ccef: ld de, Unknown_11cfc6 call Function11cfce hlcoord 1, 14 @@ -1937,7 +1897,7 @@ Function11ccef: ; 11ccef (47:4cef) call Function11ca19 call Function11cfb5 -Function11cd04: ; 11cd04 (47:4d04) +Function11cd04: ld de, hJoypadPressed ; $ffa3 ld a, [de] and a @@ -1945,13 +1905,11 @@ Function11cd04: ; 11cd04 (47:4d04) ld a, $4 ld [wJumptableIndex], a ret -; 11cd10 (47:4d10) -String_11cd10: ; 11cd10 +String_11cd10: db "なにか ことば¯いれてください@" -; 11cd20 -Function11cd20: ; 11cd20 (47:4d20) +Function11cd20: call EZChat_ClearBottom12Rows ld de, Unknown_11cfc6 call Function11cfce @@ -1974,7 +1932,7 @@ Function11cd20: ; 11cd20 (47:4d20) res 5, [hl] call Function11cfb5 -Function11cd54: ; 11cd54 (47:4d54) +Function11cd54: ld hl, wcd2c ld de, hJoypadPressed ; $ffa3 ld a, [de] @@ -2033,7 +1991,7 @@ Function11cd54: ; 11cd54 (47:4d54) call PlaceString ret -Function11cdaa: ; 11cdaa (47:4daa) +Function11cdaa: ld a, $2 hlcoord 0, 6, wAttrMap ld bc, 6 * SCREEN_WIDTH @@ -2044,26 +2002,22 @@ Function11cdaa: ; 11cdaa (47:4daa) call ByteFill farcall ReloadMapPart ret -; 11cdc7 (47:4dc7) -String_11cdc7: ; 11cdc7 +String_11cdc7: ; Words will be displayed by category db "ことば¯しゅるいべつに" next "えらべます@" -; 11cdd9 -String_11cdd9: ; 11cdd9 +String_11cdd9: ; Words will be displayed in alphabetical order db "ことば¯アイウエオ の" next "じゅんばんで ひょうじ します@" -; 11cdf5 -String_11cdf5: ; 11cdf5 +String_11cdf5: db "しゅるいべつ モード" ; Category mode next "アイウエオ モード@" ; ABC mode -; 11ce0b -Function11ce0b: ; 11ce0b (47:4e0b) +Function11ce0b: call EZChat_ClearBottom12Rows hlcoord 1, 7 ld de, String_11cf79 @@ -2076,7 +2030,7 @@ Function11ce0b: ; 11ce0b (47:4e0b) res 2, [hl] call Function11cfb5 -Function11ce2b: ; 11ce2b (47:4e2b) +Function11ce2b: ld a, [wcd22] sla a sla a @@ -2172,9 +2126,8 @@ Function11ce2b: ; 11ce2b (47:4e2b) ret z ld [wcd22], a ret -; 11ceb9 (47:4eb9) -Unknown_11ceb9: ; 11ceb9 +Unknown_11ceb9: ; up left down right db $ff, $01 db $05, $ff @@ -2272,22 +2225,19 @@ Unknown_11ceb9: ; 11ceb9 db $ff, $2d db $2c, $ff db $ff, $2e -; 11cf79 -String_11cf79: ; 11cf79 +String_11cf79: ; Hiragana table db "あいうえお なにぬねの や ゆ よ" next "かきくけこ はひふへほ わ" next "さしすせそ まみむめも そのた" next "たちつてと らりるれろ" db "@" -; 11cfb5 -Function11cfb5: ; 11cfb5 (47:4fb5) +Function11cfb5: ld hl, wJumptableIndex inc [hl] ret -; 11cfba (47:4fba) Unknown_11cfba: db 0, 0 ; start coords @@ -2308,9 +2258,8 @@ Unknown_11cfc6: Unknown_11cfca: db 14, 7 ; start coords db 6, 5 ; end coords -; 11cfce -Function11cfce: ; 11cfce (47:4fce) +Function11cfce: hlcoord 0, 0 ld bc, SCREEN_WIDTH ld a, [de] @@ -2397,7 +2346,7 @@ Function11cfce: ; 11cfce (47:4fce) ld [hl], a ret -Function11d035: ; 11d035 (47:5035) +Function11d035: hlcoord 0, 0 ld bc, SCREEN_WIDTH ld a, [de] @@ -2493,7 +2442,7 @@ Function11d035: ; 11d035 (47:5035) jr nz, .loop3 ret -.AddNMinusOneTimes: ; 11d0ac (47:50ac) +.AddNMinusOneTimes: ld a, [de] dec a ld bc, SCREEN_WIDTH @@ -2503,7 +2452,7 @@ Function11d035: ; 11d035 (47:5035) jr nz, .add_n_minus_one_times ret -AnimateEZChatCursor: ; 11d0b6 (47:50b6) +AnimateEZChatCursor: ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -2530,21 +2479,21 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) dw .nine dw .ten -.zero ; 11d0dd (47:50dd) +.zero ld a, [wcd20] ; wcd20 sla a ld hl, .Coords_Zero ld e, $1 jr .load -.one ; 11d0e9 (47:50e9) +.one ld a, [wcd21] sla a ld hl, .Coords_One ld e, $2 jr .load -.two ; 11d0f5 (47:50f5) +.two ld hl, .FramesetsIDs_Two ld a, [wcd22] ld e, a @@ -2559,14 +2508,14 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld e, $4 jr .load -.three ; 11d10f (47:510f) +.three ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 call ReinitSpriteAnimFrame ld a, [wMobileCommsJumptableIndex] sla a ld hl, .Coords_Three ld e, $8 -.load ; 11d11e (47:511e) +.load push de ld e, a ld d, $0 @@ -2585,7 +2534,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) call .UpdateObjectFlags ret -.four ; 11d134 (47:5134) +.four ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 call ReinitSpriteAnimFrame ld a, [wcd2a] @@ -2594,7 +2543,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld e, $10 jr .load -.five ; 11d145 (47:5145) +.five ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 call ReinitSpriteAnimFrame ld a, [wcd2c] @@ -2603,7 +2552,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld e, $20 jr .load -.six ; 11d156 (47:5156) +.six ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_5 call ReinitSpriteAnimFrame ; X = [wcd4a] * 8 + 24 @@ -2624,7 +2573,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) call .UpdateObjectFlags ret -.seven ; 11d175 (47:5175) +.seven ld a, [wEZChatCursorYCoord] cp $4 jr z, .cursor0 @@ -2682,15 +2631,15 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) call .UpdateObjectFlags ret -.nine ; 11d1d1 (47:51d1) +.nine ld d, -13 * 8 ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_7 jr .eight_nine_load -.eight ; 11d1d7 (47:51d7) +.eight ld d, 2 * 8 ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_6 -.eight_nine_load ; 11d1db (47:51db) +.eight_nine_load push de call ReinitSpriteAnimFrame ld a, [wcd4a] @@ -2711,16 +2660,15 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) call .UpdateObjectFlags ret -.ten ; 11d1fc (47:51fc) +.ten ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 call ReinitSpriteAnimFrame ld a, $8 ld e, a call .UpdateObjectFlags ret -; 11d208 (47:5208) -.Coords_Zero: ; 11d208 +.Coords_Zero: dbpixel 1, 3, 5, 2 dbpixel 7, 3, 5, 2 dbpixel 13, 3, 5, 2 @@ -2731,7 +2679,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) dbpixel 7, 17, 5, 2 dbpixel 13, 17, 5, 2 -.Coords_One: ; 11d21a +.Coords_One: dbpixel 1, 8, 5, 2 dbpixel 7, 8, 5, 2 dbpixel 13, 8, 5, 2 @@ -2751,7 +2699,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) dbpixel 7, 18, 5, 2 dbpixel 13, 18, 5, 2 -.Coords_Two: ; 11d23e +.Coords_Two: dbpixel 2, 9 ; 00 dbpixel 3, 9 ; 01 dbpixel 4, 9 ; 02 @@ -2801,7 +2749,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) dbpixel 7, 18, 5, 2 ; 2e dbpixel 13, 18, 5, 2 ; 2f -.Coords_Three: ; 11d29e +.Coords_Three: dbpixel 2, 10 dbpixel 8, 10 dbpixel 14, 10 @@ -2815,15 +2763,15 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) dbpixel 8, 16 dbpixel 14, 16 -.Coords_Four: ; 11d2b6 +.Coords_Four: dbpixel 16, 10 dbpixel 16, 12 -.Coords_Five: ; 11d2ba +.Coords_Five: dbpixel 4, 10 dbpixel 4, 12 -.FramesetsIDs_Two: ; 11d2be +.FramesetsIDs_Two: db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 00 db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 01 db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 02 @@ -2873,7 +2821,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 2e db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 2f -.UpdateObjectFlags: ; 11d2ee (47:52ee) +.UpdateObjectFlags: ld hl, wcd24 and [hl] jr nz, .update_y_offset @@ -2914,7 +2862,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld [hl], a ret -Function11d323: ; 11d323 +Function11d323: ld a, [rSVBK] push af ld a, $5 @@ -2926,7 +2874,6 @@ Function11d323: ; 11d323 pop af ld [rSVBK], a ret -; 11d33a Palette_11d33a: RGB 31, 31, 31 @@ -3008,9 +2955,8 @@ Palette_11d33a: RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 -; 11d3ba -EZChat_GetSeenPokemonByKana: ; 11d3ba +EZChat_GetSeenPokemonByKana: ld a, [rSVBK] push af ld hl, $c648 @@ -3039,7 +2985,7 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba ld hl, EZChat_SortedWords ld a, (EZChat_SortedWords.End - EZChat_SortedWords) / 4 -.MasterLoop: ; 11d3ef +.MasterLoop: push af ; read row ; offset @@ -3186,9 +3132,8 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba pop af ld [rSVBK], a ret -; 11d493 -.CheckSeenMon: ; 11d493 +.CheckSeenMon: push hl push bc push de @@ -3204,9 +3149,8 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba pop bc pop hl ret -; 11d4aa -EZChat_GetCategoryWordsByKana: ; 11d4aa +EZChat_GetCategoryWordsByKana: ld a, [rSVBK] push af ld a, $3 @@ -3289,19 +3233,16 @@ EZChat_GetCategoryWordsByKana: ; 11d4aa pop af ld [rSVBK], a ret -; 11d4fe INCLUDE "data/pokemon/ezchat_order.asm" GFX_11d67e: INCBIN "gfx/pokedex/select_start.2bpp" -; 11d6de LZ_11d6de: INCBIN "gfx/pokedex/slowpoke.2bpp.lz" -; 11da52 -MobileEZChatCategoryNames: ; 11da52 +MobileEZChatCategoryNames: ; Fixed message categories db "ポケモン@@" ; 00 db "タイプ@@@" ; 01 @@ -3318,9 +3259,8 @@ MobileEZChatCategoryNames: ; 11da52 db "じかん@@@" ; 0c db "むすび@@@" ; 0d db "あれこれ@@" ; 0e -; 11daac -MobileEZChatCategoryPointers: ; 11daac +MobileEZChatCategoryPointers: ; entries correspond to EZCHAT_* constants dw .Types ; 01 dw .Greetings ; 02 @@ -3337,7 +3277,7 @@ MobileEZChatCategoryPointers: ; 11daac dw .Farewells ; 0d dw .ThisAndThat ; 0e -.Types: ; 11dac8 +.Types: db "あく@@@", $26, $0, $0 db "いわ@@@", $aa, $0, $0 db "エスパー@", $da, $0, $0 @@ -3357,7 +3297,7 @@ MobileEZChatCategoryPointers: ; 11daac db "みず@@@", $f4, $4, $0 db "むし@@@", $12, $5, $0 -.Greetings: ; 11db58 +.Greetings: db "ありがと@", $58, $0, $0 db "ありがとう", $5a, $0, $0 db "いくぜ!@", $80, $0, $0 @@ -3395,7 +3335,7 @@ MobileEZChatCategoryPointers: ; 11daac db "よろしく@", $80, $5, $0 db "らっしゃい", $94, $5, $0 -.People: ; 11dc78 +.People: db "あいて@@", $1c, $0, $0 db "あたし@@", $36, $0, $0 db "あなた@@", $40, $0, $0 @@ -3466,7 +3406,7 @@ MobileEZChatCategoryPointers: ; 11daac db "わたしは@", $ca, $5, $0 db "わたしを@", $cc, $5, $0 -.Battle: ; 11dea0 +.Battle: db "あいしょう", $18, $0, $0 db "いけ!@@", $88, $0, $0 db "いちばん@", $96, $0, $0 @@ -3537,7 +3477,7 @@ MobileEZChatCategoryPointers: ; 11daac db "レべル@@", $a6, $5, $0 db "わざ@@@", $be, $5, $0 -.Exclamations: ; 11e0c8 +.Exclamations: db "!@@@@", $0, $0, $0 db "!!@@@", $2, $0, $0 db "!?@@@", $4, $0, $0 @@ -3605,7 +3545,7 @@ MobileEZChatCategoryPointers: ; 11daac db "わっ!!@", $ce, $5, $0 db "わははは!", $d0, $5, $0 -.Conversation: ; 11e2d8 +.Conversation: db "あのね@@", $50, $0, $0 db "あんまり@", $6e, $0, $0 db "いじわる@", $8e, $0, $0 @@ -3673,7 +3613,7 @@ MobileEZChatCategoryPointers: ; 11daac db "より@@@", $7c, $5, $0 db "れば@@@", $a4, $5, $0 -.Feelings: ; 11e4e8 +.Feelings: db "あいたい@", $1a, $0, $0 db "あそびたい", $32, $0, $0 db "いきたい@", $7c, $0, $0 @@ -3744,7 +3684,7 @@ MobileEZChatCategoryPointers: ; 11daac db "わかり@@", $b6, $5, $0 db "わくわく@", $ba, $5, $0 -.Conditions: ; 11e710 +.Conditions: db "あつい@@", $38, $0, $0 db "あった@@", $3a, $0, $0 db "あり@@@", $56, $0, $0 @@ -3812,7 +3752,7 @@ MobileEZChatCategoryPointers: ; 11daac db "らしい@@", $90, $5, $0 db "わるい@@", $d4, $5, $0 -.Life: ; 11e920 +.Life: db "アルバイト", $64, $0, $0 db "うち@@@", $ba, $0, $0 db "おかね@@", $ee, $0, $0 @@ -3853,7 +3793,7 @@ MobileEZChatCategoryPointers: ; 11daac db "ラジオ@@", $92, $5, $0 db "ワールド@", $ae, $5, $0 -.Hobbies: ; 11ea58 +.Hobbies: db "アイドル@", $1e, $0, $0 db "アニメ@@", $4c, $0, $0 db "うた@@@", $b8, $0, $0 @@ -3894,7 +3834,7 @@ MobileEZChatCategoryPointers: ; 11daac db "やすみ@@", $44, $5, $0 db "よてい@@", $74, $5, $0 -.Actions: ; 11eb90 +.Actions: db "あう@@@", $20, $0, $0 db "あきらめ@", $24, $0, $0 db "あげる@@", $28, $0, $0 @@ -3965,7 +3905,7 @@ MobileEZChatCategoryPointers: ; 11daac db "わかる@@", $b8, $5, $0 db "わすれ@@", $c0, $5, $0 -.Time: ; 11edb8 +.Time: db "あき@@@", $22, $0, $0 db "あさ@@@", $2a, $0, $0 db "あした@@", $2c, $0, $0 @@ -4006,7 +3946,7 @@ MobileEZChatCategoryPointers: ; 11daac db "よる@@@", $7e, $5, $0 db "らいしゅう", $88, $5, $0 -.Farewells: ; 11eef0 +.Farewells: db "いたします", $92, $0, $0 db "おります@", $32, $1, $0 db "か!?@@", $3c, $1, $0 @@ -4074,7 +4014,7 @@ MobileEZChatCategoryPointers: ; 11daac db "わけ@@@", $bc, $5, $0 db "わよ!@@", $d2, $5, $0 -.ThisAndThat: ; 11f100 +.ThisAndThat: db "ああ@@@", $12, $0, $0 db "あっち@@", $3c, $0, $0 db "あの@@@", $4e, $0, $0 @@ -4111,7 +4051,6 @@ MobileEZChatCategoryPointers: ; 11daac db "なんで@@", $f6, $3, $0 db "なんなんだ", $0, $4, $0 db "なんの@@", $2, $4, $0 -; 11f220 MobileEZChatData_WordAndPageCounts: macro_11f220: MACRO diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index 9e2e35dec..927b9dbaa 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -1,4 +1,4 @@ -InitMobileProfile: ; 4802f (12:402f) +InitMobileProfile: xor a set 6, a ld [wd002], a @@ -120,12 +120,12 @@ InitMobileProfile: ; 4802f (12:402f) push bc jr asm_4815f -Function48157: ; 48157 (12:4157) +Function48157: call ScrollingMenuJoypad ld hl, wMenuCursorY ld b, [hl] push bc -asm_4815f: ; 4815f (12:415f) +asm_4815f: bit A_BUTTON_F, a jp nz, Function4820d ld b, a @@ -148,7 +148,7 @@ asm_4815f: ; 4815f (12:415f) ld a, $ff ret -Function48187: ; 48187 (12:4187) +Function48187: ld a, [wd479] bit 1, a jr nz, .asm_481f1 @@ -207,13 +207,11 @@ Function48187: ; 48187 (12:4187) call PlaceString .asm_48201 ret -; 48202 (12:4202) -.String_TellLater: ; 48202 +.String_TellLater: db "Tell Later@" -; 4820d -Function4820d: ; 4820d (12:420d) +Function4820d: call PlaceHollowCursor ld hl, wMenuCursorY ld a, [hl] @@ -240,7 +238,6 @@ Function4820d: ; 4820d (12:420d) bit 6, a jr z, .asm_4825c jr .asm_4825c -; 48241 (12:4241) hlcoord 1, 15 ld b, $2 @@ -265,21 +262,19 @@ Function4820d: ; 4820d (12:420d) xor a ret -Function48272: ; 48272 (12:4272) +Function48272: jp Function4840c -; 48275 (12:4275) -MobileString_PersonalInfo: ; 48275 +MobileString_PersonalInfo: db "Personal Info@" -; 48283 -Function48283: ; 48283 (12:4283) +Function48283: lb bc, 2, 18 hlcoord 1, 15 call ClearBox ret -asm_4828d: ; 4828d (12:428d) +asm_4828d: call Function48283 hlcoord 1, 16 ld de, MobileDesc_Gender @@ -331,7 +326,7 @@ asm_4828d: ; 4828d (12:428d) ld [wd003], a jp Function4840c -Function48304: ; 48304 (12:4304) +Function48304: call Function48283 hlcoord 1, 16 ld de, MobileDesc_Address @@ -388,7 +383,7 @@ Function48304: ; 48304 (12:4304) farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap jp Function4840c -Function48383: ; 48383 (12:4383) +Function48383: push bc push af bit 5, a @@ -425,7 +420,7 @@ Function48383: ; 48383 (12:4383) pop bc ret -Function483bb: ; 483bb (12:43bb) +Function483bb: ld hl, wScrollingMenuCursorPosition ld a, [hl] inc a @@ -454,9 +449,8 @@ Function483bb: ; 483bb (12:43bb) hlcoord 11, 8 call PlaceString ret -; 483e8 (12:43e8) -Function483e8: ; 483e8 +Function483e8: push de ld hl, Prefectures ld a, [wMenuSelection] @@ -483,9 +477,8 @@ Function483e8: ; 483e8 pop hl call PlaceString ret -; 4840c -Function4840c: ; 4840c (12:440c) +Function4840c: call Function48187 call Function48283 hlcoord 1, 16 @@ -511,7 +504,7 @@ Function4840c: ; 4840c (12:440c) call ClearBox jp Function48157 -Mobile12_Bin2Dec: ; 48444 (12:4444) +Mobile12_Bin2Dec: push bc push af push de @@ -533,10 +526,8 @@ Mobile12_Bin2Dec: ; 48444 (12:4444) pop af pop bc ret -; 4845d (12:445d) -.DigitStrings: ; 4845d -; 4845d +.DigitStrings: db "0@" db "1@" db "2@" @@ -547,7 +538,6 @@ Mobile12_Bin2Dec: ; 48444 (12:4444) db "7@" db "8@" db "9@" -; 48471 MobileProfileString: db " Mobile Profile@" MobileString_Gender: db "Gender@" @@ -560,7 +550,6 @@ MobileDesc_Gender: db "Boy or girl?@" MobileDesc_Age: db "How old are you?@" MobileDesc_Address: db "Where do you live?@" MobileDesc_ZipCode: db "Your zip code?@" -; 484f1 MenuHeader_0x484f1: ; 0x484f1 db MENU_BACKUP_TILES ; flags @@ -600,7 +589,7 @@ MenuData_0x4851b: ; 0x4851b db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_CALL_FUNCTION1_CANCEL ; flags db 6 ; items -Unknown_4851d: ; 4851d +Unknown_4851d: db $00, $01, $12, $2b, $45, $12, $e8, $43, $00, $00, $00, $00, $00, $00, $2e, $00, $01, $02, $03, $04 db $05, $06, $07, $08, $09, $0a, $0b, $0c, $0d, $0e, $0f, $10, $11, $12, $13, $14, $15, $16, $17, $18 db $19, $1a, $1b, $1c, $1d, $1e, $1f, $20, $21, $22, $23, $24, $25, $26, $27, $28, $29, $2a, $2b, $2c @@ -654,9 +643,8 @@ Yamagata: db "やまがたけん@" ; Yamagata Yamaguchi: db "やまぐちけん@" ; Yamaguchi Yamanashi: db "やまなしけん@" ; Yamanashi Wakayama: db "わかやまけん@" ; Wakayama -; 48689 -Function48689: ; 48689 (12:4689) +Function48689: ld c, 7 call DelayFrames ld b, $1 @@ -681,7 +669,7 @@ Function48689: ; 48689 (12:4689) call Function48cdc ret -Function486bf: ; 486bf (12:46bf) +Function486bf: ld hl, w2DMenuCursorInitY ld a, [wd002] bit 6, a @@ -752,7 +740,7 @@ Function486bf: ; 486bf (12:46bf) ld [hli], a ; cursor tile + 1 ret -Function48725: ; 48725 (12:4725) +Function48725: ; ld a, [wd003] ; and $f ; cp $f @@ -779,7 +767,7 @@ Function48725: ; 48725 (12:4725) and a ret -Function4873c: ; 4873c (12:473c) +Function4873c: ld hl, w2DMenuCursorInitY ld a, 4 ld [hli], a @@ -820,7 +808,7 @@ Function4873c: ; 4873c (12:473c) ld [hli], a ; cursor tile + 1 ret -Function4876f: ; 4876f (12:476f) +Function4876f: call Function48283 hlcoord 1, 16 ld de, MobileDesc_Age @@ -879,7 +867,7 @@ Function4876f: ; 4876f (12:476f) ld [hInMenu], a jp Function4840c -Function487ec: ; 487ec (12:47ec) +Function487ec: push hl ld de, wd473 call Function487ff @@ -891,7 +879,7 @@ endr call PlaceString ret -Function487ff: ; 487ff (12:47ff) +Function487ff: push hl ld a, " " ld [hli], a @@ -901,13 +889,11 @@ Function487ff: ; 487ff (12:47ff) ld c, 3 call PrintNum ret -; 4880d (12:480d) -String_4880d: ; 4880d +String_4880d: db "@" -; 4880e -Function4880e: ; 4880e (12:480e) +Function4880e: ld a, [hJoyPressed] and A_BUTTON jp nz, Function488b9 @@ -1001,27 +987,26 @@ Function4880e: ; 4880e (12:480e) and a ret -Function488b4: ; 488b4 (12:48b4) +Function488b4: ld a, $0 and a scf ret -Function488b9: ; 488b9 (12:48b9) +Function488b9: ld a, [wd003] set 1, a ld [wd003], a scf ret -; 488c3 (12:48c3) -MobileUpArrowGFX: ; 488c3 +MobileUpArrowGFX: INCBIN "gfx/mobile/up_arrow.2bpp" -MobileDownArrowGFX: ; 488cb +MobileDownArrowGFX: INCBIN "gfx/mobile/down_arrow.2bpp" -Function488d3: ; 488d3 (12:48d3) +Function488d3: call Function48283 hlcoord 1, 16 ld de, MobileDesc_ZipCode @@ -1057,7 +1042,7 @@ Function488d3: ; 488d3 (12:48d3) ld d, $0 ld b, $0 -asm_48922: ; 48922 (12:4922) +asm_48922: push bc call JoyTextDelay ld a, [hJoyDown] @@ -1089,9 +1074,8 @@ asm_48922: ; 48922 (12:4922) ld c, 10 call DelayFrames jr asm_48972 -; 4895a (12:495a) -Function4895a: ; 4895a +Function4895a: ld a, [hJoyPressed] and a jr z, .asm_48965 @@ -1109,12 +1093,12 @@ Function4895a: ; 4895a ld b, $1 push bc -Function4896e: ; 4896e (12:496e) +Function4896e: pop bc ld b, $0 push bc -asm_48972: ; 48972 (12:4972) +asm_48972: call Function48ab5 push af cp $f0 @@ -1181,7 +1165,7 @@ asm_48972: ; 48972 (12:4972) ld [hInMenu], a jp Function4840c -Function489ea: ; 489ea (12:49ea) +Function489ea: push de ld a, [wd475] and $f @@ -1218,13 +1202,11 @@ Function489ea: ; 489ea (12:49ea) call Mobile12_Bin2Dec pop de ret -; 48a38 (12:4a38) -String_48a38: ; 48a38 +String_48a38: db "-@" -; 48a3a -Function48a3a: ; 48a3a (12:4a3a) +Function48a3a: ld hl, MenuHeader_0x48a9c call LoadMenuHeader call Function4873c @@ -1266,22 +1248,20 @@ Function48a3a: ; 48a3a (12:4a3a) and a ret -Function48a9a: ; 48a9a (12:4a9a) +Function48a9a: scf ret -; 48a9c (12:4a9c) MenuHeader_0x48a9c: ; 0x48a9c db MENU_BACKUP_TILES ; flags menu_coords 10, 8, SCREEN_WIDTH - 1, 13 -String_48aa1: ; 48aa1 +String_48aa1: db "Tell Now" next "Tell Later@" -; 48ab5 -Function48ab5: ; 48ab5 (12:4ab5) +Function48ab5: ld a, [hJoyPressed] and A_BUTTON jp nz, Function48c0f @@ -1457,7 +1437,7 @@ Function48ab5: ; 48ab5 (12:4ab5) ld a, [hl] and $f -asm_48bc7: ; 48bc7 (12:4bc7) +asm_48bc7: hlcoord 11, 10 push af ld a, d @@ -1470,7 +1450,7 @@ asm_48bc7: ; 48bc7 (12:4bc7) ld a, $f jr Function48c00 -Function48bd7: ; 48bd7 (12:4bd7) +Function48bd7: push de hlcoord 10, 9 ld b, $1 @@ -1501,7 +1481,7 @@ Function48bd7: ; 48bd7 (12:4bd7) and $f jr asm_48bc7 -Function48c00: ; 48c00 (12:4c00) +Function48c00: push af hlcoord 11, 10 call Function489ea @@ -1511,15 +1491,15 @@ Function48c00: ; 48c00 (12:4c00) ld a, b ret -Function48c0d: ; 48c0d (12:4c0d) +Function48c0d: xor a and a -Function48c0f: ; 48c0f (12:4c0f) +Function48c0f: scf ret -Function48c11: ; 48c11 (12:4c11) +Function48c11: ld a, [wd002] bit 7, a jr z, .asm_48c20 @@ -1556,7 +1536,7 @@ Function48c11: ; 48c11 (12:4c11) ld [wd002], a ret -Function48c4d: ; 48c4d (12:4c4d) +Function48c4d: swap a and $f0 push af @@ -1568,7 +1548,7 @@ Function48c4d: ; 48c4d (12:4c4d) ld [hl], a ret -Function48c5a: ; 48c5a (12:4c5a) +Function48c5a: push af ld a, [hl] and $f0 @@ -1578,7 +1558,7 @@ Function48c5a: ; 48c5a (12:4c5a) ld [hl], a ret -Function48c63: ; 48c63 +Function48c63: ld a, "@" ld [de], a ld a, c @@ -1613,9 +1593,8 @@ Function48c63: ; 48c63 .asm_48c8c scf ret -; 48c8e -Unreferenced_Function48c8e: ; 48c8e +Unreferenced_Function48c8e: ld hl, wd019 + $11 ld d, h ld e, l @@ -1624,9 +1603,8 @@ Unreferenced_Function48c8e: ; 48c8e call PlaceString call WaitBGMap ret -; 48ca3 -Function48ca3: ; 48ca3 +Function48ca3: push af push bc push de @@ -1669,13 +1647,12 @@ Function48ca3: ; 48ca3 pop bc pop af ret -; 48cda -Function48cda: ; 48cda (12:4cda) +Function48cda: ld h, d ld l, e -Function48cdc: ; 48cdc (12:4cdc) +Function48cdc: push bc push hl call Function48cfd @@ -1703,7 +1680,7 @@ Function48cdc: ; 48cdc (12:4cdc) jr nz, .asm_48ced ret -Function48cfd: ; 48cfd (12:4cfd) +Function48cfd: push hl ld a, $4 ld [hli], a @@ -1733,7 +1710,7 @@ Function48cfd: ; 48cfd (12:4cfd) ld [hl], $b ret -Function48d2a: ; 48d2a (12:4d2a) +Function48d2a: ld d, c .asm_48d2b ld [hli], a @@ -1741,21 +1718,21 @@ Function48d2a: ; 48d2a (12:4d2a) jr nz, .asm_48d2b ret -Function48d30: ; 48d30 (12:4d30) +Function48d30: ld hl, wd475 call Function48d4a ld hl, wd477 call Function48d4a ret -Function48d3d: ; 48d3d (12:4d3d) +Function48d3d: ld hl, wd475 call Function48d94 ld hl, wd477 call Function48d94 ret -Function48d4a: ; 48d4a (12:4d4a) +Function48d4a: inc hl ld a, [hl] ld b, a @@ -1805,7 +1782,7 @@ Function48d4a: ; 48d4a (12:4d4a) ld [hl], b ret -Function48d94: ; 48d94 (12:4d94) +Function48d94: xor a ld [hDividend + 0], a ld [hDividend + 1], a diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 47eb2f3bf..f2b548b55 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -1,4 +1,4 @@ -MobileCheckOwnMonAnywhere: ; 4a843 +MobileCheckOwnMonAnywhere: ; Like CheckOwnMonAnywhere, but only check for species. ; OT/ID don't matter. @@ -103,9 +103,8 @@ MobileCheckOwnMonAnywhere: ; 4a843 call CloseSRAM and a ret -; 4a8dc -.CheckMatch: ; 4a8dc +.CheckMatch: push bc push hl push de @@ -130,9 +129,8 @@ MobileCheckOwnMonAnywhere: ; 4a843 pop bc scf ret -; 4a8f4 -.BoxAddrs: ; 4a8f4 +.BoxAddrs: dba sBox1 dba sBox2 dba sBox3 @@ -147,9 +145,8 @@ MobileCheckOwnMonAnywhere: ; 4a843 dba sBox12 dba sBox13 dba sBox14 -; 4a91e -.CopyName: ; 4a91e +.CopyName: push hl ld hl, NAME_LENGTH add hl, bc @@ -157,9 +154,8 @@ MobileCheckOwnMonAnywhere: ; 4a843 ld c, l pop hl ret -; 4a927 -UnusedFindItemInPCOrBag: ; 4a927 +UnusedFindItemInPCOrBag: ld a, [wScriptVar] ld [wCurItem], a ld hl, wPCItems @@ -180,9 +176,8 @@ UnusedFindItemInPCOrBag: ; 4a927 ld a, 1 ld [wScriptVar], a ret -; 4a94e -Function4a94e: ; 4a94e +Function4a94e: call FadeToMenu ld a, -1 ld hl, wd002 @@ -243,7 +238,6 @@ Function4a94e: ; 4a94e ld hl, UnknownText_0x4a9be call PrintText jr .asm_4a974 -; 4a9be UnknownText_0x4a9be: ; 0x4a9be ; Pick three #MON for battle. @@ -251,7 +245,7 @@ UnknownText_0x4a9be: ; 0x4a9be db "@" ; 0x4a9c3 -Function4a9c3: ; 4a9c3 +Function4a9c3: ld hl, wd002 ld a, $ff cp [hl] @@ -268,9 +262,8 @@ Function4a9c3: ; 4a9c3 .asm_4a9d5 scf ret -; 4a9d7 -Function4a9d7: ; 4a9d7 +Function4a9d7: ld a, [wd002] ld hl, wPartyMonNicknames call GetNick @@ -299,7 +292,6 @@ Function4a9d7: ; 4a9d7 call PrintText call YesNoBox ret -; 4aa1d UnknownText_0x4aa1d: ; 0x4aa1d ; , @ and @ . Use these three? @@ -307,15 +299,15 @@ UnknownText_0x4aa1d: ; 0x4aa1d db "@" ; 0x4aa22 -Function4aa22: ; 4aa22 +Function4aa22: call ClearBGPalettes -Function4aa25: ; 4aa25 +Function4aa25: farcall LoadPartyMenuGFX farcall InitPartyMenuWithCancel call Function4aad3 -Function4aa34: ; 4aa34 +Function4aa34: ld a, PARTYMENUACTION_MOBILE ld [wPartyMenuActionText], a farcall WritePartyMenuTilemap @@ -343,17 +335,15 @@ Function4aa34: ; 4aa34 set 1, [hl] pop af ret -; 4aa6e -Function4aa6e: ; 4aa6e +Function4aa6e: pop af ld de, SFX_WRONG call PlaySFX call WaitSFX jr Function4aa34 -; 4aa7a -Function4aa7a: ; 4aa7a +Function4aa7a: ld hl, wd002 ld d, $3 .loop @@ -406,9 +396,8 @@ Function4aa7a: ; 4aa7a .finished ret -; 4aab6 -Function4aab6: ; 4aab6 +Function4aab6: ld hl, wd002 ld d, $3 .loop @@ -428,9 +417,8 @@ Function4aab6: ; 4aab6 .done ret -; 4aad3 -Function4aad3: ; 4aad3 +Function4aad3: ld hl, wPartyCount ld a, [hli] and a @@ -455,9 +443,8 @@ Function4aad3: ; 4aad3 call Function4aa7a farcall PlaySpriteAnimations ret -; 4aafb -Function4aafb: ; 4aafb +Function4aafb: ld a, [wCurPartySpecies] cp EGG jr z, .egg @@ -467,9 +454,8 @@ Function4aafb: ; 4aafb .egg scf ret -; 4ab06 -Function4ab06: ; 4ab06 +Function4ab06: ld a, [wCurPartyMon] ld bc, PARTYMON_STRUCT_LENGTH ld hl, wPartyMon1HP @@ -483,9 +469,8 @@ Function4ab06: ; 4ab06 .NotFainted: ret -; 4ab1a -Function4ab1a: ; 4ab1a +Function4ab1a: .asm_4ab1a ld a, $fb ld [wMenuJoypadFilter], a @@ -549,9 +534,8 @@ Function4ab1a: ; 4ab1a ld [wd018], a and a ret -; 4ab99 -Function4ab99: ; 4ab99 +Function4ab99: bit 1, a jr z, .asm_4aba6 ld a, [wd002] @@ -563,9 +547,8 @@ Function4ab99: ; 4ab99 .asm_4aba6 and a ret -; 4aba8 -Function4aba8: ; 4aba8 +Function4aba8: ld hl, wd004 ld a, [hl] cp $ff @@ -586,9 +569,8 @@ Function4aba8: ; 4aba8 ld [hl], a scf ret -; 4abc3 -Function4abc3: ; 4abc3 +Function4abc3: bit 3, a jr z, .asm_4abd5 ld a, [wPartyCount] @@ -677,9 +659,8 @@ Function4abc3: ; 4abc3 .asm_4ac56 and a ret -; 4ac58 -Function4ac58: ; 4ac58 +Function4ac58: lb bc, 2, 18 hlcoord 1, 15 call ClearBox @@ -712,7 +693,6 @@ Function4ac58: ; 4ac58 call ExitMenu and a ret -; 4aca2 MenuHeader_0x4aca2: ; 0x4aca2 db MENU_BACKUP_TILES ; flags @@ -721,7 +701,7 @@ MenuHeader_0x4aca2: ; 0x4aca2 db 1 ; default option ; 0x4acaa -Function4acaa: ; 4acaa +Function4acaa: .asm_4acaa ld a, $a0 ld [wMenuDataFlags], a @@ -780,7 +760,7 @@ Function4acaa: ; 4acaa jr z, Function4ad56 jr .asm_4acf3 -Function4ad17: ; 4ad17 +Function4ad17: call Function4adb2 jr z, .asm_4ad4a ld hl, wd002 @@ -821,22 +801,19 @@ UnknownText_0x4ad51: ; 0x4ad51 db "@" ; 0x4ad56 -Function4ad56: ; 4ad56 +Function4ad56: farcall OpenPartyStats call WaitBGMap2 ret -; 4ad60 -Function4ad60: ; 4ad60 +Function4ad60: farcall ManagePokemonMoves ret -; 4ad67 -Function4ad67: ; 4ad67 +Function4ad67: ret -; 4ad68 -Function4ad68: ; 4ad68 +Function4ad68: hlcoord 13, 12 ld de, String_4ad88 call PlaceString @@ -853,28 +830,23 @@ Function4ad68: ; 4ad68 .asm_4ad84 call PlaceString ret -; 4ad88 -String_4ad88: ; 4ad88 +String_4ad88: db "つよさをみる" next "つかえるわざ" next "もどる@" -; 4ad9a -String_4ad9a: ; 4ad9a +String_4ad9a: db "さんかする@" -; 4ada0 -String_4ada0: ; 4ada0 +String_4ada0: db "さんかしない@" -; 4ada7 -String_4ada7: ; 4ada7 +String_4ada7: db "つよさをみる" next "もどる@" ; BACK -; 4adb2 -Function4adb2: ; 4adb2 +Function4adb2: ld hl, wd002 ld a, [wCurPartyMon] cp [hl] @@ -887,9 +859,8 @@ Function4adb2: ; 4adb2 ret z scf ret -; 4adc2 -Function4adc2: ; 4adc2 +Function4adc2: ld a, [wd002] cp $ff jr nz, .skip @@ -917,9 +888,8 @@ Function4adc2: ; 4adc2 ld a, b ld [wd004], a ret -; 4adf7 -Function4adf7: ; 4adf7 +Function4adf7: ld a, [wd019] bit 0, a ret z @@ -932,4 +902,3 @@ Function4adf7: ; 4adf7 res 0, a ld [wd019], a ret -; 4ae12 diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 99963bceb..3535b90e5 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1,52 +1,48 @@ String_89116: db "-----@" -String_8911c: ; 8911c +String_8911c: db "でんわばんごうが ただしく" ; Phone number is not next "はいって いません!@" ; entered correctly! -; 89135 -String_89135: ; 89135 +String_89135: db "データが かわって いますが" ; The data has changed. next "かきかえないで やめますか?@" ; Quit anyway? -; 89153 -String_89153: ; 89153 +String_89153: db "メッセージは ありません@" ; No message -; 89160 -OpenSRAMBank4: ; 89160 +OpenSRAMBank4: push af ld a, $4 call GetSRAMBank pop af ret -; 89168 -Function89168: ; 89168 (22:5168) +Function89168: ld hl, wGameTimerPause set GAMETIMERPAUSE_MOBILE_7_F, [hl] ret -Function8916e: ; 8916e (22:516e) +Function8916e: ld hl, wGameTimerPause res GAMETIMERPAUSE_MOBILE_7_F, [hl] ret -Function89174: ; 89174 (22:5174) +Function89174: ld hl, wGameTimerPause bit GAMETIMERPAUSE_MOBILE_7_F, [hl] ret -Function8917a: ; 8917a (22:517a) +Function8917a: ld hl, wd002 ld bc, $32 xor a call ByteFill ret -Function89185: ; 89185 (22:5185) +Function89185: ; strcmp(hl, de, c) ; Compares c bytes starting at de and hl and incrementing together until a mismatch is found. ; Preserves hl and de. @@ -65,7 +61,7 @@ Function89185: ; 89185 (22:5185) pop de ret -Function89193: ; 89193 +Function89193: ; copy(hl, de, 4) ; Copies c bytes from hl to de. ; Preserves hl and de. @@ -80,10 +76,9 @@ Function89193: ; 89193 pop hl pop de ret -; 8919e -Function8919e: ; 8919e (22:519e) +Function8919e: ; Searches for the c'th string starting at de. Returns the pointer in de. ld a, c and a @@ -97,14 +92,13 @@ Function8919e: ; 8919e (22:519e) jr nz, .loop ret -Function891ab: ; 891ab +Function891ab: call Mobile22_SetBGMapMode1 farcall ReloadMapPart call Mobile22_SetBGMapMode0 ret -; 891b8 -Function891b8: ; 891b8 +Function891b8: call Mobile22_SetBGMapMode0 hlcoord 0, 0 ld a, " " @@ -112,17 +106,16 @@ Function891b8: ; 891b8 call ByteFill call DelayFrame ret -; 891ca -Function891ca: ; 891ca (22:51ca) +Function891ca: push bc call Function891b8 call WaitBGMap pop bc ret -Function891d3: ; 891d3 (22:51d3) +Function891d3: push bc call Function891ca ld c, $10 @@ -130,7 +123,7 @@ Function891d3: ; 891d3 (22:51d3) pop bc ret -Function891de: ; 891de +Function891de: call Mobile22_SetBGMapMode0 call ClearPalettes hlcoord 0, 0, wAttrMap @@ -143,30 +136,26 @@ Function891de: ; 891de call ByteFill call Function891ab ret -; 891fe -Function891fe: ; 891fe +Function891fe: push bc call Function891de ld c, $10 call DelayFrames pop bc ret -; 89209 -Function89209: ; 89209 +Function89209: ld a, 1 ld [wSpriteUpdatesEnabled], a ret -; 8920f -Function8920f: ; 8920f +Function8920f: ld a, 0 ld [wSpriteUpdatesEnabled], a ret -; 89215 -Function89215: ; 89215 +Function89215: push hl push bc ld bc, wAttrMap - wTileMap @@ -175,10 +164,9 @@ Function89215: ; 89215 pop bc pop hl ret -; 8921f -Function8921f: ; 8921f (22:521f) +Function8921f: push de ld de, SCREEN_WIDTH add hl, de @@ -199,43 +187,41 @@ Function8921f: ; 8921f (22:521f) pop de ret -Mobile22_ButtonSound: ; 89235 (22:5235) +Mobile22_ButtonSound: call JoyWaitAorB call PlayClickSFX ret -Mobile22_SetBGMapMode0: ; 8923c +Mobile22_SetBGMapMode0: xor a ld [hBGMapMode], a ret -; 89240 -Mobile22_SetBGMapMode1: ; 89240 +Mobile22_SetBGMapMode1: ld a, $1 ld [hBGMapMode], a ret -; 89245 -Function89245: ; 89245 (22:5245) +Function89245: farcall TryLoadSaveFile ret c farcall _LoadData and a ret -Function89254: ; 89254 (22:5254) +Function89254: ld bc, $d07 jr Function89261 -Function89259: ; 89259 +Function89259: ld bc, $0e07 jr Function89261 -Function8925e: ; 8925e +Function8925e: ld bc, $0e0c -Function89261: ; 89261 +Function89261: push af push bc ld hl, MenuHeader_0x892a3 @@ -274,7 +260,6 @@ Function89261: ; 89261 .done scf ret -; 892a3 MenuHeader_0x892a3: ; 0x892a3 db MENU_BACKUP_TILES ; flags @@ -290,10 +275,10 @@ MenuData_0x892ab: ; 0x892ab db "いいえ@" ; 0x892b4 -Function892b4: ; 892b4 (22:52b4) +Function892b4: call Function8931b -Function892b7: ; 892b7 +Function892b7: ld d, b ld e, c ld hl, 0 @@ -340,10 +325,9 @@ Function892b7: ; 892b7 dec e jr nz, .loop ret -; 89305 -Function89305: ; 89305 (22:5305) +Function89305: xor a ld [wMenuSelection], a ld c, 40 @@ -358,7 +342,7 @@ Function89305: ; 89305 (22:5305) jr nz, .loop ret -Function8931b: ; 8931b +Function8931b: push hl ld hl, $a03b ; 4:a03b ld a, [wMenuSelection] @@ -369,13 +353,12 @@ Function8931b: ; 8931b ld c, l pop hl ret -; 8932d -Function8932d: ; 8932d +Function8932d: ld hl, 0 add hl, bc -Function89331: ; 89331 +Function89331: ; Scans up to 5 characters starting at hl, looking for a nonspace character up to the next terminator. ; Sets carry if it does not find a nonspace character. ; Returns the location of the following character in hl. @@ -400,15 +383,14 @@ Function89331: ; 89331 .done pop bc ret -; 89346 -Function89346: ; 89346 (22:5346) +Function89346: ld h, b ld l, c jr _incave -Function8934a: ; 8934a +Function8934a: ld hl, NAME_LENGTH_JAPANESE add hl, bc _incave: @@ -434,9 +416,8 @@ _incave: .done pop bc ret -; 89363 -Function89363: ; 89363 +Function89363: ; Scans six byte pairs starting at bc to find $ff. Sets carry if it does not find a $ff. Returns the location of the byte after the first $ff found in hl. ld h, b ld l, c @@ -466,9 +447,8 @@ Function89363: ; 89363 .done pop de ret -; 89381 -Function89381: ; 89381 +Function89381: push bc push de call Function89b45 @@ -485,9 +465,8 @@ Function89381: ; 89381 call Function89193 pop bc ret -; 8939a -Function8939a: ; 8939a +Function8939a: push bc ld hl, 0 add hl, bc @@ -500,10 +479,9 @@ Function8939a: ; 8939a ld de, wd008 call Function89381 ret -; 893b3 -Function893b3: ; 893b3 (22:53b3) +Function893b3: call DisableLCD call ClearSprites call LoadStandardFont @@ -514,7 +492,7 @@ Function893b3: ; 893b3 (22:53b3) call EnableLCD ret -Function893cc: ; 893cc +Function893cc: call DisableLCD call ClearSprites call LoadStandardFont @@ -523,38 +501,34 @@ Function893cc: ; 893cc call Function89464 call EnableLCD ret -; 893e2 -Function893e2: ; 893e2 (22:53e2) +Function893e2: call Function89b1e call Function893b3 call Function8a5b6 call Function8949c ret -Function893ef: ; 893ef +Function893ef: ld de, vTiles0 ld hl, GFX_8940b ld bc, $20 ld a, BANK(GFX_8940b) call FarCopyBytes ret -; 893fe -Function893fe: ; 893fe +Function893fe: call DisableLCD call Function893ef call EnableLCD call DelayFrame ret -; 8940b -GFX_8940b: ; 8940b +GFX_8940b: INCBIN "gfx/unknown/08940b.2bpp" -; 8942b -Function8942b: ; 8942b (22:542b) +Function8942b: ld de, vTiles0 tile $02 ld hl, MobileAdapterGFX + $7d tiles ld bc, 8 tiles @@ -567,7 +541,7 @@ Function8942b: ; 8942b (22:542b) call FarCopyBytes ret -Function89448: ; 89448 (22:5448) +Function89448: ; Clears the sprite array push af ld hl, wVirtualOAM @@ -580,7 +554,7 @@ Function89448: ; 89448 (22:5448) pop af ret -Function89455: ; 89455 (22:5455) +Function89455: ld hl, MobileAdapterGFX + $7d tiles ld de, vTiles2 tile $0c ld bc, $49 tiles @@ -588,7 +562,7 @@ Function89455: ; 89455 (22:5455) call FarCopyBytes ret -Function89464: ; 89464 +Function89464: ld hl, MobileAdapterGFX ld de, vTiles2 ld bc, $20 tiles @@ -600,9 +574,8 @@ Function89464: ; 89464 ld a, BANK(MobileAdapterGFX) call FarCopyBytes ret -; 89481 -Function89481: ; 89481 +Function89481: ld d, 2 call Function8934a ret c @@ -613,10 +586,9 @@ Function89481: ; 89481 ret z inc d ret -; 89492 -Function89492: ; 89492 (22:5492) +Function89492: ld d, 0 ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a @@ -624,7 +596,7 @@ Function89492: ; 89492 (22:5492) inc d ret -Function8949c: ; 8949c +Function8949c: ld a, [rSVBK] push af ld a, 5 @@ -636,16 +608,14 @@ Function8949c: ; 8949c pop af ld [rSVBK], a ret -; 894b3 -Palette_894b3: ; 894b3 +Palette_894b3: RGB 31, 31, 31 RGB 31, 31, 31 RGB 31, 31, 31 RGB 00, 00, 00 -; 894bb -Function894bb: ; 894bb +Function894bb: call Function894dc push bc call Function8956f @@ -653,10 +623,9 @@ Function894bb: ; 894bb call Function8a60d pop bc ret -; 894ca -Function894ca: ; 894ca (22:54ca) +Function894ca: push bc call Function894dc call Function895c7 @@ -666,7 +635,7 @@ Function894ca: ; 894ca (22:54ca) pop bc ret -Function894dc: ; 894dc +Function894dc: push bc ld a, [rSVBK] push af @@ -693,15 +662,13 @@ Function894dc: ; 894dc ld [rSVBK], a pop bc ret -; 89509 -.PalettePointers: ; 89509 +.PalettePointers: dw .Pals012a dw .Pals012b dw .Pals012c -; 8950f -.Pals012a: ; 8950f +.Pals012a: RGB 31, 31, 31 RGB 10, 17, 13 RGB 10, 08, 22 @@ -717,7 +684,7 @@ Function894dc: ; 894dc RGB 10, 17, 13 RGB 00, 00, 00 -.Pals012b: ; 89527 +.Pals012b: RGB 31, 31, 31 RGB 30, 22, 11 RGB 31, 08, 15 @@ -733,7 +700,7 @@ Function894dc: ; 894dc RGB 30, 22, 11 RGB 00, 00, 00 -.Pals012c: ; 8953f +.Pals012c: RGB 31, 31, 31 RGB 15, 20, 26 RGB 25, 07, 20 @@ -749,7 +716,7 @@ Function894dc: ; 894dc RGB 15, 20, 26 RGB 00, 00, 00 -.Pals345: ; 89557 +.Pals345: RGB 31, 31, 31 RGB 31, 31, 31 RGB 31, 13, 00 @@ -764,9 +731,8 @@ Function894dc: ; 894dc RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 -; 8956f -Function8956f: ; 8956f +Function8956f: push bc ld hl, 16 add hl, bc @@ -819,10 +785,9 @@ Function8956f: ; 8956f ld [rSVBK], a pop bc ret -; 895c7 -Function895c7: ; 895c7 (22:55c7) +Function895c7: ld a, [rSVBK] push af ld a, 5 @@ -834,24 +799,21 @@ Function895c7: ; 895c7 (22:55c7) pop af ld [rSVBK], a ret -; 895de (22:55de) -Palette_895de: ; 895de +Palette_895de: RGB 31, 31, 31 RGB 07, 07, 06 RGB 07, 07, 06 RGB 00, 00, 00 -; 895e6 -Function895e6: ; 895e6 +Function895e6: ld a, 7 hlcoord 0, 0, wAttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ret -; 895f2 -Function895f2: ; 895f2 +Function895f2: push bc xor a hlcoord 0, 0, wAttrMap @@ -861,9 +823,8 @@ Function895f2: ; 895f2 call Function89655 pop bc ret -; 89605 -Function89605: ; 89605 +Function89605: hlcoord 19, 2, wAttrMap ld a, 1 ld de, SCREEN_WIDTH @@ -899,9 +860,8 @@ Function89605: ; 89605 ld bc, 14 call ByteFill ret -; 8963d -Function8963d: ; 8963d +Function8963d: hlcoord 12, 3, wAttrMap ld a, 6 ld de, SCREEN_WIDTH @@ -918,9 +878,8 @@ Function8963d: ; 8963d dec b jr nz, .loop ret -; 89655 -Function89655: ; 89655 +Function89655: hlcoord 1, 12, wAttrMap ld de, SCREEN_WIDTH ld a, 5 @@ -937,9 +896,8 @@ Function89655: ; 89655 dec b jr nz, .loop ret -; 8966c -Function8966c: ; 8966c +Function8966c: push bc call Function89688 hlcoord 4, 0 @@ -947,10 +905,9 @@ Function8966c: ; 8966c call Function896f5 pop bc ret -; 8967a -Function8967a: ; 8967a (22:567a) +Function8967a: push bc call Function89688 hlcoord 2, 0 @@ -959,7 +916,7 @@ Function8967a: ; 8967a (22:567a) pop bc ret -Function89688: ; 89688 +Function89688: hlcoord 0, 0 ld a, 1 ld e, SCREEN_WIDTH @@ -997,9 +954,8 @@ Function89688: ; 89688 ld e, SCREEN_WIDTH call Function896eb ret -; 896cb -Function896cb: ; 896cb +Function896cb: ld de, SCREEN_WIDTH - 1 ld a, 7 ld [hl], a @@ -1007,9 +963,8 @@ Function896cb: ; 896cb ld a, 9 ld [hli], a ret -; 896d6 -Function896d6: ; 896d6 +Function896d6: ld de, SCREEN_WIDTH - 1 ld a, 10 ld [hl], a @@ -1017,9 +972,8 @@ Function896d6: ; 896d6 ld a, 11 ld [hli], a ret -; 896e1 -Function896e1: ; 896e1 +Function896e1: .loop ld [hli], a inc a @@ -1030,9 +984,8 @@ Function896e1: ; 896e1 dec e jr nz, .loop ret -; 896eb -Function896eb: ; 896eb +Function896eb: .loop ld [hli], a dec a @@ -1043,9 +996,8 @@ Function896eb: ; 896eb dec e jr nz, .loop ret -; 896f5 -Function896f5: ; 896f5 +Function896f5: call Function8971f call Function89736 inc hl @@ -1089,7 +1041,7 @@ ClearScreenArea: ; 0x896ff ret ; 0x8971f -Function8971f: ; 8971f +Function8971f: ld a, $2c ld [hli], a ld a, $2d @@ -1106,9 +1058,8 @@ Function8971f: ; 8971f ld [hl], a pop hl ret -; 89736 -Function89736: ; 89736 +Function89736: push hl inc hl inc hl @@ -1130,17 +1081,15 @@ Function89736: ; 89736 ld [hl], a pop hl ret -; 89753 -Function89753: ; 89753 +Function89753: ld a, $c ld [hl], a xor a call Function89215 ret -; 8975b -Function8975b: ; 8975b +Function8975b: ld a, $1d ld [hli], a inc a @@ -1157,17 +1106,15 @@ Function8975b: ; 8975b dec e jr nz, .asm_89769 ret -; 89771 -Function89771: ; 89771 +Function89771: ld a, $12 ld [hl], a ld a, $3 call Function89215 ret -; 8977a -Function8977a: ; 8977a +Function8977a: ld e, $4 ld d, $13 .asm_8977e @@ -1189,9 +1136,8 @@ Function8977a: ; 8977a dec e jr nz, .asm_8978c ret -; 89797 -Function89797: ; 89797 +Function89797: push bc ld a, $e ld [hl], a @@ -1209,9 +1155,8 @@ Function89797: ; 89797 ld [hl], a pop bc ret -; 897af -Function897af: ; 897af +Function897af: push bc ld hl, $0010 add hl, bc @@ -1230,9 +1175,8 @@ Function897af: ; 897af farcall GetTrainerPic pop bc ret -; 897d5 -Function897d5: ; 897d5 +Function897d5: push bc call Function8934a jr nc, .asm_897f3 @@ -1263,10 +1207,9 @@ Function897d5: ; 897d5 call Function8963d pop bc ret -; 89807 -Function89807: ; 89807 (22:5807) +Function89807: ld hl, MobileAdapterGFX + $20 tiles ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a @@ -1282,7 +1225,7 @@ Function89807: ; 89807 (22:5807) call DelayFrame ret -Function89829: ; 89829 (22:5829) +Function89829: push bc ld bc, $705 ld de, $14 @@ -1304,7 +1247,7 @@ Function89829: ; 89829 (22:5829) pop bc ret -Function89844: ; 89844 +Function89844: call Function89481 call Function894bb call Function897af @@ -1313,9 +1256,8 @@ Function89844: ; 89844 call SetPalettes pop bc ret -; 89856 -Function89856: ; 89856 +Function89856: push bc call Function891b8 pop bc @@ -1333,10 +1275,9 @@ Function89856: ; 89856 pop bc call Function897d5 ret -; 8987f -Function8987f: ; 8987f (22:587f) +Function8987f: call Function891b8 call Function895f2 call Function8967a @@ -1353,7 +1294,7 @@ Function8987f: ; 8987f (22:587f) call Function89975 ret -Function898aa: ; 898aa +Function898aa: ld a, [wMenuSelection] and a ret z @@ -1364,9 +1305,8 @@ Function898aa: ; 898aa call PrintNum pop bc ret -; 898be -Function898be: ; 898be +Function898be: push bc ld de, wd002 ld hl, wd002 @@ -1385,9 +1325,8 @@ Function898be: ; 898be call PlaceString pop bc ret -; 898dc -Function898dc: ; 898dc +Function898dc: ld hl, $0006 add hl, bc push bc @@ -1402,9 +1341,8 @@ Function898dc: ; 898dc call PlaceString pop bc ret -; 898f3 -Function898f3: ; 898f3 +Function898f3: push bc ld hl, $000c add hl, bc @@ -1425,9 +1363,8 @@ Function898f3: ; 898f3 .asm_89913 pop bc ret -; 89915 -Function89915: ; 89915 +Function89915: push bc push hl ld de, Unknown_89942 @@ -1461,15 +1398,13 @@ Function89915: ; 89915 jr nz, .asm_89932 pop bc ret -; 89942 -Unknown_89942: ; 89942 +Unknown_89942: db $24, $25, $26, " ", $27, $28, $29, $2a -Unknown_8994a: ; 8994a +Unknown_8994a: db $24, $27, $29, $ff -; 8994e -Function8994e: ; 8994e +Function8994e: push hl push de ld de, SCREEN_WIDTH @@ -1486,9 +1421,8 @@ Function8994e: ; 8994e pop de pop hl ret -; 89962 -Function89962: ; 89962 +Function89962: push bc ld c, $4 ld b, $20 @@ -1503,9 +1437,8 @@ Function89962: ; 89962 jr nz, .asm_89967 pop bc ret -; 89975 -Function89975: ; 89975 +Function89975: push bc ld e, $8 .asm_89978 @@ -1522,9 +1455,8 @@ Function89975: ; 89975 jr nz, .asm_89978 pop bc ret -; 8998b -Function8998b: ; 8998b +Function8998b: push bc and $f cp $a @@ -1540,10 +1472,9 @@ Function8998b: ; 8998b ld [hl], a pop bc ret -; 8999c -Function8999c: ; 8999c (22:599c) +Function8999c: ld de, wPlayerName call PlaceString inc bc @@ -1552,13 +1483,11 @@ Function8999c: ; 8999c (22:599c) ld de, String_899ac call PlaceString ret -; 899ac (22:59ac) -String_899ac: ; 899ac +String_899ac: db "の めいし@" -; 899b2 -Function899b2: ; 899b2 (22:59b2) +Function899b2: ld bc, wPlayerName call Function89346 jr c, .asm_899bf @@ -1571,13 +1500,13 @@ Function899b2: ; 899b2 (22:59b2) call PlaceString ret -Function899c9: ; 899c9 (22:59c9) +Function899c9: ld de, wPlayerID lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum ret -Function899d3: ; 899d3 +Function899d3: hlcoord 1, 4 call Function89753 hlcoord 2, 5 @@ -1593,9 +1522,8 @@ Function899d3: ; 899d3 hlcoord 2, 9 call Function89915 ret -; 899fe -Function899fe: ; 899fe +Function899fe: push bc push hl ld hl, $0019 @@ -1606,9 +1534,8 @@ Function899fe: ; 899fe call Function89a0c pop bc ret -; 89a0c -Function89a0c: ; 89a0c +Function89a0c: push hl call Function89363 pop hl @@ -1622,17 +1549,16 @@ Function89a0c: ; 89a0c ld de, String_89153 call PlaceString ret -; 89a23 -Function89a23: ; 89a23 (22:5a23) +Function89a23: hlcoord 0, 11 ld b, $4 ld c, $12 call Function8921f ret -Function89a2e: ; 89a2e (22:5a2e) +Function89a2e: hlcoord 11, 12 ld b, $2 ld c, $6 @@ -1645,17 +1571,14 @@ Function89a2e: ; 89a2e (22:5a2e) call PlaceString call Function89655 ret -; 89a4e (22:5a4e) -String_89a4e: ; 89a4e +String_89a4e: db "けってい@" -; 89a53 -String_89a53: ; 89a53 +String_89a53: db "やめる@" -; 89a57 -Function89a57: ; 89a57 +Function89a57: call JoyTextDelay_ForcehJoyDown ; joypad bit D_UP_F, c jr nz, .d_up @@ -1691,31 +1614,27 @@ Function89a57: ; 89a57 call nc, .PlayPocketSwitchSFX ld a, $0 ret -; 89a8a -.PlayPocketSwitchSFX: ; 89a8a +.PlayPocketSwitchSFX: push af ld de, SFX_SWITCH_POCKETS call PlaySFX pop af ret -; 89a93 -.MoveCursorDown: ; 89a93 +.MoveCursorDown: ld d, 40 ld e, 1 call .ApplyCursorMovement ret -; 89a9b -.MoveCursorUp: ; 89a9b +.MoveCursorUp: ld d, 1 ld e, -1 call .ApplyCursorMovement ret -; 89aa3 -.ApplyCursorMovement: ; 89aa3 +.ApplyCursorMovement: ld a, [wMenuSelection] ld c, a push bc @@ -1742,17 +1661,15 @@ Function89a57: ; 89a57 ld [wMenuSelection], a scf ret -; 89ac7 -.Function89ac7: ; 89ac7 +.Function89ac7: call OpenSRAMBank4 call Function8931b call .Function89ad4 call CloseSRAM ret -; 89ad4 -.Function89ad4: ; 89ad4 +.Function89ad4: push de call Function8932d ; find a non-space character within 5 bytes of bc jr c, .no_nonspace_character @@ -1767,9 +1684,8 @@ Function89a57: ; 89a57 .finish_decode pop de ret -; 89ae6 -.Function89ae6: ; 89ae6 +.Function89ae6: ld hl, wd031 xor a ld [hl], a @@ -1788,34 +1704,30 @@ Function89a57: ; 89a57 .load_and_ret ld [wd030], a ret -; 89b00 -Function89b00: ; 89b00 (22:5b00) +Function89b00: farcall MG_Mobile_Layout_LoadPals ret -; 89b07 (22:5b07) -Function89b07: ; 89b07 +Function89b07: call Mobile22_SetBGMapMode0 call DelayFrame farcall Function4a3a7 ret -; 89b14 -Function89b14: ; 89b14 +Function89b14: call ClearBGPalettes call Function89b07 call Function89b00 ret -; 89b1e -Function89b1e: ; 89b1e (22:5b1e) +Function89b1e: farcall Function4a485 call Function89b00 ret -Function89b28: ; 89b28 (22:5b28) +Function89b28: call Function891de call ClearBGPalettes call Function893e2 @@ -1824,12 +1736,12 @@ Function89b28: ; 89b28 (22:5b28) call SetPalettes ret -Function89b3b: ; 89b3b (22:5b3b) +Function89b3b: call Mobile22_SetBGMapMode0 farcall Function48cda ret -Function89b45: ; 89b45 +Function89b45: ; some sort of decoder? ; BCD? push hl @@ -1877,10 +1789,9 @@ Function89b45: ; 89b45 pop bc pop hl ret -; 89b78 -Function89b78: ; 89b78 (22:5b78) +Function89b78: push bc ld a, [wd010] cp $10 @@ -1904,7 +1815,7 @@ Function89b78: ; 89b78 (22:5b78) pop bc ret -Function89b97: ; 89b97 (22:5b97) +Function89b97: call Function89c34 jr c, .asm_89ba0 call Function89448 @@ -1955,45 +1866,42 @@ Function89b97: ; 89b97 (22:5b97) ld c, $4 add hl, bc jr .asm_89bb4 -; 89bd8 (22:5bd8) -Unknown_89bd8: ; 89bd8 +Unknown_89bd8: dw Unknown_89be0 dw Unknown_89bf5 dw Unknown_89c0a dw Unknown_89c1f -; 89be0 -Unknown_89be0: ; 89be0 +Unknown_89be0: db $01, $12, $4e, $01, 0 db $01, $19, $4e, $01, 0 | Y_FLIP db $01, $12, $72, $01, 0 | X_FLIP db $01, $19, $72, $01, 0 | X_FLIP | Y_FLIP db -1 ; end -Unknown_89bf5: ; 89bf5 +Unknown_89bf5: db $01, $60, $16, $01, 0 db $01, $62, $16, $01, 0 | Y_FLIP db $01, $60, $92, $01, 0 | X_FLIP db $01, $62, $92, $01, 0 | X_FLIP | Y_FLIP db -1 ; end -Unknown_89c0a: ; 89c0a +Unknown_89c0a: db $01, $78, $66, $01, 0 db $01, $78, $66, $01, 0 | Y_FLIP db $01, $78, $92, $01, 0 | X_FLIP db $01, $78, $92, $01, 0 | X_FLIP | Y_FLIP db -1 ; end -Unknown_89c1f: ; 89c1f +Unknown_89c1f: db $01, $80, $66, $01, 0 db $01, $80, $66, $01, 0 | Y_FLIP db $01, $80, $92, $01, 0 | X_FLIP db $01, $80, $92, $01, 0 | X_FLIP | Y_FLIP db -1 ; end -; 89c34 -Function89c34: ; 89c34 (22:5c34) +Function89c34: push bc ld a, [wd012] ld c, a @@ -2005,7 +1913,7 @@ Function89c34: ; 89c34 (22:5c34) pop bc ret -Function89c44: ; 89c44 (22:5c44) +Function89c44: call Function89c34 jr c, .asm_89c4f push de @@ -2035,7 +1943,7 @@ Function89c44: ; 89c44 (22:5c44) ld [hli], a ; attributes ret -Function89c67: ; 89c67 (22:5c67) +Function89c67: ; menu scrolling? call JoyTextDelay_ForcehJoyDown ; joypad ld b, $0 @@ -2099,22 +2007,20 @@ Function89c67: ; 89c67 (22:5c67) xor a ld [wd012], a ret -; 89cbf (22:5cbf) -.ScrollData0: ; 89cbf +.ScrollData0: db 0, 2, 0, 0 db 1, 3, 0, 0 db 2, 4, 0, 0 db 3, 0, 0, 0 -.ScrollData1: ; 89ccf +.ScrollData1: db 0, 0, 0, 0 db 0, 3, 0, 0 db 2, 4, 0, 0 db 3, 0, 0, 0 -; 89cdf -Function89cdf: ; 89cdf (22:5cdf) +Function89cdf: ld a, $10 add b ld b, a @@ -2152,7 +2058,7 @@ Function89cdf: ; 89cdf (22:5cdf) jr nz, .asm_89cee ret -Function89d0d: ; 89d0d (22:5d0d) +Function89d0d: call Mobile22_SetBGMapMode0 ld a, [rSVBK] push af @@ -2185,23 +2091,20 @@ Function89d0d: ; 89d0d (22:5d0d) call DelayFrames call RestartMapMusic ret -; 89d4e (22:5d4e) -.Palette1: ; 89d4e +.Palette1: RGB 31, 31, 31 RGB 19, 19, 19 RGB 15, 15, 15 RGB 00, 00, 00 -; 89d56 -.Palette2: ; 89d56 +.Palette2: RGB 31, 31, 31 RGB 19, 19, 19 RGB 19, 19, 19 RGB 00, 00, 00 -; 89d5e -Function89d5e: ; 89d5e (22:5d5e) +Function89d5e: push af call CopyMenuHeader pop af @@ -2213,7 +2116,7 @@ Function89d5e: ; 89d5e (22:5d5e) set 7, [hl] ret -Function89d75: ; 89d75 (22:5d75) +Function89d75: push hl call Mobile22_SetBGMapMode0 call _hl_ @@ -2221,14 +2124,14 @@ Function89d75: ; 89d75 (22:5d75) pop hl jr asm_89d90 -Function89d85: ; 89d85 (22:5d85) +Function89d85: push hl call Mobile22_SetBGMapMode0 call _hl_ call CGBOnly_CopyTilemapAtOnce pop hl -asm_89d90: ; 89d90 (22:5d90) +asm_89d90: call Mobile22_SetBGMapMode0 push hl call _hl_ @@ -2246,7 +2149,7 @@ asm_89d90: ; 89d90 (22:5d90) and a ret -Function89dab: ; 89dab (22:5dab) +Function89dab: call Mobile22_SetBGMapMode0 farcall MobileMenuJoypad call Mobile22_SetBGMapMode0 @@ -2276,7 +2179,7 @@ Function89dab: ; 89dab (22:5dab) and a ret -Function89de0: ; 89de0 (22:5de0) +Function89de0: call ClearSprites call Function89e0a jr c, .asm_89e00 @@ -2299,13 +2202,13 @@ Function89de0: ; 89de0 (22:5de0) call Function8917a ret -Jumptable_89e04: ; 89e04 (22:5e04) +Jumptable_89e04: dw Function8a62c dw Function8a999 dw Function8ab93 -Function89e0a: ; 89e0a (22:5e0a) +Function89e0a: call OpenSRAMBank4 call Function8b3b0 call CloseSRAM @@ -2313,32 +2216,32 @@ Function89e0a: ; 89e0a (22:5e0a) rst JumpTable ret -Jumptable_89e18: ; 89e18 (22:5e18) +Jumptable_89e18: dw Function89e1e dw Function8a116 dw Function8a2aa -Function89e1e: ; 89e1e (22:5e1e) +Function89e1e: call OpenSRAMBank4 - ld bc, $a037 ; 4:a037 + ld bc, $a037 call Function8b36c call CloseSRAM xor a ld [wd02d], a -asm_89e2e: ; 89e2e (22:5e2e) +asm_89e2e: ld a, [wd02d] ld hl, Jumptable_89e3c rst JumpTable ret -Function89e36: ; 89e36 (22:5e36) +Function89e36: ld hl, wd02d inc [hl] jr asm_89e2e -Jumptable_89e3c: ; 89e3c (22:5e3c) +Jumptable_89e3c: dw Function89e6f dw Function89fed dw Function89ff6 @@ -2355,7 +2258,7 @@ Jumptable_89e3c: ; 89e3c (22:5e3c) dw Function89e68 -Function89e58: ; 89e58 (22:5e58) +Function89e58: ld a, $1 call Function8a2fe call Function891fe @@ -2364,13 +2267,13 @@ Function89e58: ; 89e58 (22:5e58) and a ret -Function89e68: ; 89e68 (22:5e68) +Function89e68: call Function891fe ld a, $1 scf ret -Function89e6f: ; 89e6f (22:5e6f) +Function89e6f: call Function891de call Function89245 call Function89ee1 @@ -2387,7 +2290,7 @@ Function89e6f: ; 89e6f (22:5e6f) call SetPalettes jp Function89e36 -Function89e9a: ; 89e9a (22:5e9a) +Function89e9a: ld a, [rSVBK] push af ld a, $5 @@ -2399,16 +2302,14 @@ Function89e9a: ; 89e9a (22:5e9a) pop af ld [rSVBK], a ret -; 89eb1 (22:5eb1) -Palette_89eb1: ; 89eb1 +Palette_89eb1: RGB 31, 31, 31 RGB 31, 31, 31 RGB 27, 19, 00 RGB 00, 00, 00 -; 89eb9 -Function89eb9: ; 89eb9 (22:5eb9) +Function89eb9: call Function891fe call Function89ee1 call Function89e9a @@ -2424,7 +2325,7 @@ Function89eb9: ; 89eb9 (22:5eb9) call SetPalettes jp Function89e36 -Function89ee1: ; 89ee1 (22:5ee1) +Function89ee1: call ClearBGPalettes call Function893e2 call Mobile22_SetBGMapMode0 @@ -2434,7 +2335,7 @@ Function89ee1: ; 89ee1 (22:5ee1) call Function8a53d ret -Function89efd: ; 89efd (22:5efd) +Function89efd: ld hl, wd012 ld a, $ff ld [hli], a @@ -2508,7 +2409,7 @@ endr jr nz, .asm_89f60 jp Function89e36 -Function89f6a: ; 89f6a (22:5f6a) +Function89f6a: push af ld de, $10 call Function89f9a @@ -2519,7 +2420,7 @@ Function89f6a: ; 89f6a (22:5f6a) pop af ret -Function89f77: ; 89f77 (22:5f77) +Function89f77: push af ld de, $10 call Function89f9a @@ -2548,7 +2449,7 @@ Function89f77: ; 89f77 (22:5f77) pop af ret -Function89f9a: ; 89f9a (22:5f9a) +Function89f9a: dec a ld hl, wVirtualOAM and a @@ -2559,7 +2460,7 @@ Function89f9a: ; 89f9a (22:5f9a) jr nz, .asm_89fa0 ret -Function89fa5: ; 89fa5 (22:5fa5) +Function89fa5: ld de, $10 call Function89f9a ld e, $2 @@ -2592,7 +2493,7 @@ Function89fa5: ; 89fa5 (22:5fa5) jr nz, .asm_89faf ret -Function89fce: ; 89fce (22:5fce) +Function89fce: call Function8a5b6 ld a, $5 hlcoord 7, 4, wAttrMap @@ -2605,12 +2506,12 @@ Function89fce: ; 89fce (22:5fce) call Function891ab jp Function89e36 -Function89fed: ; 89fed (22:5fed) +Function89fed: ld hl, UnknownText_0x8a102 call PrintText jp Function89e36 -Function89ff6: ; 89ff6 (22:5ff6) +Function89ff6: call Function891fe call ClearBGPalettes call Function893cc @@ -2636,19 +2537,19 @@ Function89ff6: ; 89ff6 (22:5ff6) call Mobile22_ButtonSound jp Function89e36 -Function8a03d: ; 8a03d (22:603d) +Function8a03d: ld hl, UnknownText_0x8a107 call Function89209 call PrintText call Function8920f jp Function89e36 -Function8a04c: ; 8a04c (22:604c) +Function8a04c: ld hl, UnknownText_0x8a10c call PrintText jp Function89e36 -Function8a055: ; 8a055 (22:6055) +Function8a055: ld c, $7 ld b, $4 .asm_8a059 @@ -2687,7 +2588,7 @@ Function8a055: ; 8a055 (22:6055) call CGBOnly_CopyTilemapAtOnce jp Function89e36 -Function8a0a1: ; 8a0a1 (22:60a1) +Function8a0a1: call Mobile22_SetBGMapMode0 push bc call Function8a0c9 @@ -2708,7 +2609,7 @@ Function8a0a1: ; 8a0a1 (22:60a1) pop bc ret -Function8a0c1: ; 8a0c1 (22:60c1) +Function8a0c1: push hl ld bc, wAttrMap - wTileMap add hl, bc @@ -2716,7 +2617,7 @@ Function8a0c1: ; 8a0c1 (22:60c1) pop hl ret -Function8a0c9: ; 8a0c9 (22:60c9) +Function8a0c9: push bc hlcoord 0, 0 ld de, $14 @@ -2734,30 +2635,29 @@ Function8a0c9: ; 8a0c9 (22:60c9) pop bc ret -Function8a0de: ; 8a0de (22:60de) +Function8a0de: call Function8a0c9 ld de, wAttrMap - wTileMap add hl, de ret -Function8a0e6: ; 8a0e6 (22:60e6) +Function8a0e6: call Function8b539 jp Function89e36 -Function8a0ec: ; 8a0ec (22:60ec) +Function8a0ec: ld hl, UnknownText_0x8a111 call PrintText jp Function89e36 -Function8a0f5: ; 8a0f5 (22:60f5) +Function8a0f5: call Function8b555 jp nc, Function8a0ff ld hl, wd02d inc [hl] -Function8a0ff: ; 8a0ff (22:60ff) +Function8a0ff: jp Function89e36 -; 8a102 (22:6102) UnknownText_0x8a102: ; 0x8a102 ; The CARD FOLDER stores your and your friends' CARDS. A CARD contains information like the person's name, phone number and profile. @@ -2783,7 +2683,7 @@ UnknownText_0x8a111: ; 0x8a111 db "@" ; 0x8a116 -Function8a116: ; 8a116 (22:6116) +Function8a116: ld a, $1 ld [wd030], a ld hl, MenuHeader_0x8a176 @@ -2828,14 +2728,12 @@ Function8a116: ; 8a116 (22:6116) call Function8920f scf ret -; 8a176 (22:6176) MenuHeader_0x8a176: ; 0x8a176 db MENU_BACKUP_TILES ; flags menu_coords 14, 0, SCREEN_WIDTH - 1, 6 -; 8a17b -Function8a17b: ; 8a17b (22:617b) +Function8a17b: decoord 14, 0 ld b, $5 ld c, $4 @@ -2850,7 +2748,6 @@ Function8a17b: ; 8a17b (22:617b) .asm_8a198 ld d, a ret -; 8a19a (22:619a) MenuHeader_0x8a19a: ; 0x8a19a db MENU_BACKUP_TILES ; flags @@ -2867,7 +2764,7 @@ MenuData_0x8a1a2: ; 0x8a1a2 db "もどる@" ; 0x8a1b0 -Function8a1b0: ; 8a1b0 +Function8a1b0: hlcoord 0, 12 ld b, $4 ld c, $12 @@ -2880,9 +2777,8 @@ Function8a1b0: ; 8a1b0 call Function8919e call PlaceString ret -; 8a1cc -Strings_8a1cc: ; 8a1cc +Strings_8a1cc: db "めいし<NO>せいりと へんしゅうを" next "おこないます" db "@" @@ -2893,10 +2789,9 @@ Strings_8a1cc: ; 8a1cc db "まえ<NO>がめん<NI>もどります" db "@" -; 8a20d -Function8a20d: ; 8a20d (22:620d) +Function8a20d: ld hl, UnknownText_0x8a232 call PrintText ld a, $2 @@ -2914,7 +2809,6 @@ Function8a20d: ; 8a20d (22:620d) xor a and a ret -; 8a232 (22:6232) UnknownText_0x8a232: ; 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? @@ -2934,7 +2828,7 @@ UnknownText_0x8a23c: ; 0x8a23c db "@" ; 0x8a241 -Function8a241: ; 8a241 (22:6241) +Function8a241: call LoadStandardMenuHeader call Function891fe call Function8a262 @@ -2951,7 +2845,7 @@ Function8a241: ; 8a241 (22:6241) and a ret -Function8a262: ; 8a262 (22:6262) +Function8a262: call ClearBGPalettes call Function893e2 call Mobile22_SetBGMapMode0 @@ -2977,7 +2871,7 @@ Function8a262: ; 8a262 (22:6262) call Function8b5e7 ret -Function8a2aa: ; 8a2aa (22:62aa) +Function8a2aa: ld hl, MenuHeader_0x8a2ef call LoadMenuHeader ld hl, UnknownText_0x8a2f4 @@ -3009,12 +2903,10 @@ Function8a2aa: ; 8a2aa (22:62aa) .asm_8a2ed scf ret -; 8a2ef (22:62ef) MenuHeader_0x8a2ef: ; 0x8a2ef db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -; 8a2f4 UnknownText_0x8a2f4: ; 0x8a2f4 ; There is an older CARD FOLDER from a previous journey. Do you want to open it? @@ -3028,7 +2920,7 @@ UnknownText_0x8a2f9: ; 0x8a2f9 db "@" ; 0x8a2fe -Function8a2fe: ; 8a2fe (22:62fe) +Function8a2fe: call Function8a313 call Function89305 ld hl, $a603 @@ -3038,14 +2930,14 @@ Function8a2fe: ; 8a2fe (22:62fe) call CloseSRAM ret -Function8a313: ; 8a313 (22:6313) +Function8a313: ld c, a call OpenSRAMBank4 ld a, c ld [$a60b], a ret -Function8a31c: ; 8a31c (22:631c) +Function8a31c: push bc call Mobile22_SetBGMapMode0 farcall Function4a3a7 @@ -3090,7 +2982,7 @@ Function8a31c: ; 8a31c (22:631c) and a ret -Function8a383: ; 8a383 (22:6383) +Function8a383: farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter @@ -3110,7 +3002,7 @@ Function8a383: ; 8a383 (22:6383) call PlayClickSFX ret -Function8a3a2: ; 8a3a2 (22:63a2) +Function8a3a2: ld a, [wMenuCursorY] dec a ld hl, wd002 @@ -3121,7 +3013,7 @@ Function8a3a2: ; 8a3a2 (22:63a2) ld [wMenuSelection], a ret -Function8a3b2: ; 8a3b2 (22:63b2) +Function8a3b2: ld a, $1 ld [wMenuSelection], a call Function8a4fc @@ -3143,7 +3035,7 @@ Function8a3b2: ; 8a3b2 (22:63b2) call CopyMenuHeader ret -Function8a3df: ; 8a3df (22:63df) +Function8a3df: call OpenSRAMBank4 ld hl, $a603 call Function89b45 @@ -3160,14 +3052,13 @@ Function8a3df: ; 8a3df (22:63df) and a ret -Function8a400: ; 8a400 (22:6400) +Function8a400: ld a, [de] inc de ld [hli], a cp $ff jr nz, Function8a400 ret -; 8a408 (22:6408) Unknown_8a408: db 1, 2, -1 Unknown_8a40b: db 1, 2, 3, -1 @@ -3203,7 +3094,7 @@ MenuData_0x8a43d: ; 0x8a43d db "やめる@" ; 0x8a453 -Function8a453: ; 8a453 (22:6453) +Function8a453: hlcoord 0, 12 ld b, $4 ld c, $12 @@ -3220,13 +3111,11 @@ Function8a453: ; 8a453 (22:6453) .asm_8a472 call PlaceString ret -; 8a476 (22:6476) -String_8a476: ; 8a476 +String_8a476: db "まえ<NO>がめん<NI>もどります@" -; 8a483 -Strings_8a483: ; 8a483 +Strings_8a483: db "おともだち<NO>めいしは" next "ここ<NI>いれておきます@" @@ -3235,9 +3124,8 @@ Strings_8a483: ; 8a483 db "ともだちと じぶん<NO>めいしを" next "せきがいせんで こうかん します@" -; 8a4d3 -Function8a4d3: ; 8a4d3 (22:64d3) +Function8a4d3: ld a, [wMenuSelection] cp $1 jr nz, .asm_8a4eb @@ -3257,7 +3145,7 @@ Function8a4d3: ; 8a4d3 (22:64d3) call Function8a5a3 ret -Function8a4fc: ; 8a4fc (22:64fc) +Function8a4fc: ld a, [wMenuSelection] cp $3 jr nz, asm_8a529 @@ -3273,7 +3161,7 @@ Function8a4fc: ; 8a4fc (22:64fc) call Function8a515 ret -Function8a515: ; 8a515 (22:6515) +Function8a515: ld hl, wd012 ld a, [hl] cp $38 @@ -3287,7 +3175,7 @@ Function8a515: ; 8a515 (22:6515) ld [wd013], a ret -asm_8a529: ; 8a529 (22:6529) +asm_8a529: ld hl, wd012 ld a, $3c ld [hli], a @@ -3299,7 +3187,7 @@ asm_8a529: ; 8a529 (22:6529) call ByteFill ret -Function8a53d: ; 8a53d (22:653d) +Function8a53d: push hl ld a, $15 ld c, $8 @@ -3328,7 +3216,7 @@ Function8a53d: ; 8a53d (22:653d) ld a, $27 ld c, $6 -Function8a573: ; 8a573 (22:6573) +Function8a573: ld [hl], a call Function8a584 inc a @@ -3336,14 +3224,14 @@ Function8a573: ; 8a573 (22:6573) jr nz, Function8a573 ret -Function8a57c: ; 8a57c (22:657c) +Function8a57c: ld [hl], a call Function8a584 dec c jr nz, Function8a57c ret -Function8a584: ; 8a584 (22:6584) +Function8a584: push af ld a, $4 call Function89215 @@ -3351,7 +3239,7 @@ Function8a584: ; 8a584 (22:6584) pop af ret -Function8a58d: ; 8a58d (22:658d) +Function8a58d: ld a, $2d ld bc, $606 ld de, $14 @@ -3370,7 +3258,7 @@ Function8a58d: ; 8a58d (22:658d) jr nz, .asm_8a595 ret -Function8a5a3: ; 8a5a3 (22:65a3) +Function8a5a3: ld bc, $603 ld de, $14 .asm_8a5a9 @@ -3387,7 +3275,7 @@ Function8a5a3: ; 8a5a3 (22:65a3) jr nz, .asm_8a5a9 ret -Function8a5b6: ; 8a5b6 (22:65b6) +Function8a5b6: ld a, [rSVBK] push af ld a, $5 @@ -3407,9 +3295,8 @@ Function8a5b6: ; 8a5b6 (22:65b6) pop af ld [rSVBK], a ret -; 8a5e5 (22:65e5) -Palette_8a5e5: ; 8a5e5 +Palette_8a5e5: RGB 31, 31, 31 RGB 27, 19, 00 RGB 07, 11, 22 @@ -3424,23 +3311,20 @@ Palette_8a5e5: ; 8a5e5 RGB 31, 00, 00 RGB 27, 19, 00 RGB 00, 00, 00 -; 8a5fd -Palette_8a5fd: ; 8a5fd +Palette_8a5fd: RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 RGB 31, 31, 31 -; 8a605 -Palette_8a605: ; 8a605 +Palette_8a605: RGB 00, 00, 00 RGB 14, 18, 31 RGB 16, 16, 31 RGB 31, 31, 31 -; 8a60d -Function8a60d: ; 8a60d +Function8a60d: ld a, [rSVBK] push af ld a, $5 @@ -3452,16 +3336,14 @@ Function8a60d: ; 8a60d pop af ld [rSVBK], a ret -; 8a624 -Palette_8a624: ; 8a624 +Palette_8a624: RGB 31, 31, 31 RGB 31, 31, 31 RGB 31, 31, 31 RGB 00, 00, 00 -; 8a62c -Function8a62c: ; 8a62c (22:662c) +Function8a62c: call LoadStandardMenuHeader call Function891fe xor a @@ -3499,14 +3381,14 @@ Function8a62c: ; 8a62c (22:662c) call Function89b28 ret -Jumptable_8a671: ; 8a671 (22:6671) +Jumptable_8a671: dw Function8a679 dw Function8a6cd dw Function8a8c3 dw Function8a930 -Function8a679: ; 8a679 (22:6679) +Function8a679: call Function891de call ClearBGPalettes call Function893cc @@ -3535,23 +3417,23 @@ Function8a679: ; 8a679 (22:6679) call Function89448 ret -Jumptable_8a6bc: ; 8a6bc (22:66bc) +Jumptable_8a6bc: dw Function8a6c0 dw Function8a6c5 -Function8a6c0: ; 8a6c0 (22:66c0) +Function8a6c0: call PlayClickSFX and a ret -Function8a6c5: ; 8a6c5 (22:66c5) +Function8a6c5: call PlayClickSFX call Function89d0d scf ret -Function8a6cd: ; 8a6cd (22:66cd) +Function8a6cd: call Function891de call ClearBGPalettes call Function893cc @@ -3607,14 +3489,14 @@ Function8a6cd: ; 8a6cd (22:66cd) call Function8b677 ret -Jumptable_8a74f: ; 8a74f (22:674f) +Jumptable_8a74f: dw Function8a78c dw Function8a7cb dw Function8a818 dw Function8a8a1 -Function8a757: ; 8a757 (22:6757) +Function8a757: call Function8939a xor a ld [wd010], a @@ -3622,7 +3504,7 @@ Function8a757: ; 8a757 (22:6757) ld [wd012], a ret -Function8a765: ; 8a765 (22:6765) +Function8a765: call Function8931b push bc ld hl, $0 @@ -3646,7 +3528,7 @@ Function8a765: ; 8a765 (22:6765) scf ret -Function8a78c: ; 8a78c (22:678c) +Function8a78c: call Function891fe ld de, wd002 ld b, $5 @@ -3673,7 +3555,7 @@ Function8a78c: ; 8a78c (22:678c) and a ret -Function8a7cb: ; 8a7cb (22:67cb) +Function8a7cb: ld a, [wMenuSelection] push af call Function891de @@ -3706,7 +3588,7 @@ Function8a7cb: ; 8a7cb (22:67cb) and a ret -Function8a818: ; 8a818 (22:6818) +Function8a818: call Function89a23 ld hl, wd002 call Function89331 @@ -3743,7 +3625,6 @@ Function8a818: ; 8a818 (22:6818) call CloseSRAM scf ret -; 8a868 (22:6868) .string_8a868 db "めいし<WO>かきかえ まし<TA!>@" @@ -3760,14 +3641,12 @@ Function8a818: ; 8a818 (22:6818) call JoyWaitAorB and a ret -; 8a88b (22:688b) -String_8a88b: ; 8a88b +String_8a88b: db "おともだち<NO>なまえが" next "かかれて いません!@" -; 8a8a1 -Function8a8a1: ; 8a8a1 (22:68a1) +Function8a8a1: call OpenSRAMBank4 call Function8a765 call CloseSRAM @@ -3786,7 +3665,7 @@ Function8a8a1: ; 8a8a1 (22:68a1) and a ret -Function8a8c3: ; 8a8c3 (22:68c3) +Function8a8c3: call Function891de call ClearBGPalettes call Function893cc @@ -3818,17 +3697,14 @@ Function8a8c3: ; 8a8c3 (22:68c3) call Function891fe call Function8b677 ret -; 8a919 (22:6919) -String_8a919: ; 8a919 +String_8a919: db "このデータ<WO>けしますか?@" -; 8a926 -String_8a926: ; 8a926 +String_8a926: db "データ<WO>けしまし<TA!>@" -; 8a930 -Function8a930: ; 8a930 (22:6930) +Function8a930: ld a, [wMenuSelection] push af xor a @@ -3883,7 +3759,7 @@ Function8a930: ; 8a930 (22:6930) call CloseSRAM ret -Function8a999: ; 8a999 (22:6999) +Function8a999: ld hl, MenuHeader_0x8a9c9 call LoadMenuHeader ld c, $1 @@ -3908,17 +3784,15 @@ Function8a999: ; 8a999 (22:6999) call Function8920f ret -Jumptable_8a9c5: ; 8a9c5 (22:69c5) +Jumptable_8a9c5: dw Function8aa0a dw Function8ab3b -; 8a9c9 (22:69c9) MenuHeader_0x8a9c9: ; 0x8a9c9 db MENU_BACKUP_TILES ; flags menu_coords 11, 4, 18, TEXTBOX_Y - 1 -; 8a9ce -Function8a9ce: ; 8a9ce (22:69ce) +Function8a9ce: push bc decoord 11, 4 ld b, $6 @@ -3940,7 +3814,6 @@ Function8a9ce: ; 8a9ce (22:69ce) ld e, $0 scf ret -; 8a9f2 (22:69f2) MenuHeader_0x8a9f2: ; 0x8a9f2 db MENU_BACKUP_TILES ; flags @@ -3957,11 +3830,10 @@ MenuData_0x8a9fa: ; 0x8a9fa db "やめる@" ; 0x8aa09 -Function8aa09: ; 8aa09 +Function8aa09: ret -; 8aa0a -Function8aa0a: ; 8aa0a (22:6a0a) +Function8aa0a: ld a, $1 ld [wd02f], a ld [wd011], a @@ -4006,13 +3878,13 @@ Function8aa0a: ; 8aa0a (22:6a0a) call Function89448 ret -Jumptable_8aa6d: ; 8aa6d (22:6a6d) +Jumptable_8aa6d: dw Function8aa73 dw Function8aab6 dw Function8ab11 -Function8aa73: ; 8aa73 (22:6a73) +Function8aa73: ld a, [wMenuSelection] ld e, a push de @@ -4043,7 +3915,7 @@ Function8aa73: ; 8aa73 (22:6a73) and a ret -Function8aab6: ; 8aab6 (22:6ab6) +Function8aab6: call Function89a23 ld hl, wd008 call Function89b45 @@ -4067,13 +3939,11 @@ Function8aab6: ; 8aab6 (22:6ab6) call CloseSRAM scf ret -; 8aaf0 (22:6af0) -String_8aaf0: ; 8aaf0 +String_8aaf0: db "あたらしい めいし<PKMN>できまし<LNBRK>@" -; 8ab00 -Function8ab00: ; 8ab00 +Function8ab00: ld de, String_8911c hlcoord 1, 13 call PlaceString @@ -4082,7 +3952,7 @@ Function8ab00: ; 8ab00 and a ret -Function8ab11: ; 8ab11 (22:6b11) +Function8ab11: call OpenSRAMBank4 ld hl, $a603 ld de, wd008 @@ -4104,7 +3974,7 @@ Function8ab11: ; 8ab11 (22:6b11) and a ret -Function8ab3b: ; 8ab3b (22:6b3b) +Function8ab3b: .pressed_start call Function891fe call ClearBGPalettes @@ -4128,7 +3998,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) jr c, .pressed_start ret -.JoypadLoop: ; 8ab77 (22:6b77) +.JoypadLoop: call JoyTextDelay_ForcehJoyDown bit A_BUTTON_F, c jr nz, .a_b_button @@ -4146,7 +4016,7 @@ Function8ab3b: ; 8ab3b (22:6b3b) and a ret -Function8ab93: ; 8ab93 (22:6b93) +Function8ab93: call ClearBGPalettes call LoadStandardMenuHeader farcall Function105688 @@ -4154,9 +4024,8 @@ Function8ab93: ; 8ab93 (22:6b93) call Function891fe call Function89b28 ret -; 8aba9 (22:6ba9) -Function8aba9: ; 8aba9 +Function8aba9: ld a, $2 call Function8b94a ld a, $1 @@ -4223,14 +4092,12 @@ Function8aba9: ; 8aba9 ld a, [wMenuSelection] ld c, a ret -; 8ac3b -String_8ac3b: ; 8ac3b +String_8ac3b: db "こ<NO>ともだち<NI>でんわを" next "かけますか?@" -; 8ac4e -Function8ac4e: ; 8ac4e +Function8ac4e: xor a ld [wMenuSelection], a push de @@ -4245,18 +4112,17 @@ Function8ac4e: ; 8ac4e call Function899fe call Function891ab ret -; 8ac70 -Function8ac70: ; 8ac70 +Function8ac70: push de ld a, $3 call Function8b94a -Function8ac76: ; 8ac76 +Function8ac76: call Function891fe call Function8b677 -Function8ac7c: ; 8ac7c +Function8ac7c: call Function8b7bd jr z, .asm_8acf0 ld a, c @@ -4331,7 +4197,6 @@ Function8ac7c: ; 8ac7c ld c, $0 scf ret -; 8ad06 UnknownText_0x8ad06: ; 0x8ad06 ; Finish registering CARDS? @@ -4339,7 +4204,7 @@ UnknownText_0x8ad06: ; 0x8ad06 db "@" ; 0x8ad0b -Function8ad0b: ; 8ad0b +Function8ad0b: .asm_8ad0b ld a, [wMenuSelection] ld [wd02f], a @@ -4401,36 +4266,31 @@ Function8ad0b: ; 8ad0b .asm_8ad87 pop bc ret -; 8ad89 -String_8ad89: ; 8ad89 +String_8ad89: db "こ<NO>めいし<WO>けして" next "いれかえますか?@" -; 8ad9c -String_8ad9c: ; 8ad9c +String_8ad9c: db "おともだち<NO>なまえを" next "のこして おきますか?@" -; 8adb3 -Function8adb3: ; 8adb3 +Function8adb3: call Function891de call Function8a262 push af call Function891de pop af ret -; 8adbf -Function8adbf: ; 8adbf +Function8adbf: call OpenSRAMBank4 ld hl, $a603 call Function89b45 call CloseSRAM ret -; 8adcc -Function8adcc: ; 8adcc +Function8adcc: call OpenSRAMBank4 call Function8b3b0 call CloseSRAM @@ -4439,4 +4299,3 @@ Function8adcc: ; 8adcc ret z scf ret -; 8addb diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 974836b88..e6c7959f9 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -1,4 +1,4 @@ -Function8b342:: ; 8b342 +Function8b342:: ; Loads the map data pointer, then runs through a ; dw with three dummy functions. Spends a lot of energy ; doing pretty much nothing. @@ -17,43 +17,36 @@ Function8b342:: ; 8b342 cp 3 jr nz, .loop ret -; 8b354 -.dw ; 8b354 +.dw dw .zero dw .one dw .two -; 8b35a -.zero ; 8b35a +.zero ret -; 8b35b -.one ; 8b35b +.one ret -; 8b35c -.two ; 8b35c +.two ret -; 8b35d -Function8b35d: ; 8b35d +Function8b35d: ld a, h cp d ret nz ld a, l cp e ret -; 8b363 -Function8b363: ; 8b363 +Function8b363: push bc farcall Mobile_AlwaysReturnNotCarry pop bc ret -; 8b36c -Function8b36c: ; 8b36c (22:736c) +Function8b36c: ; [bc + (0:4)] = -1 push bc ld h, b @@ -64,7 +57,7 @@ Function8b36c: ; 8b36c (22:736c) pop bc ret -Function8b379: ; 8b379 (22:7379) +Function8b379: ; d = [bc + e] push bc ld a, c @@ -78,7 +71,7 @@ Function8b379: ; 8b379 (22:7379) pop bc ret -Function8b385: ; 8b385 (22:7385) +Function8b385: ; [bc + e] = d push bc ld a, c @@ -92,7 +85,7 @@ Function8b385: ; 8b385 (22:7385) pop bc ret -Function8b391: ; 8b391 (22:7391) +Function8b391: ; find first e in range(4) such that [bc + e] == -1 ; if none exist, return carry push bc @@ -112,7 +105,7 @@ Function8b391: ; 8b391 (22:7391) pop bc ret -Function8b3a4: ; 8b3a4 (22:73a4) +Function8b3a4: ; strcmp(hl, bc, 4) push de push bc @@ -124,7 +117,7 @@ Function8b3a4: ; 8b3a4 (22:73a4) pop de ret -Function8b3b0: ; 8b3b0 (22:73b0) +Function8b3b0: ld bc, $a037 ; 4:a037 ld a, [$a60b] and a @@ -141,7 +134,7 @@ Function8b3b0: ; 8b3b0 (22:73b0) ld a, [$a60b] ret -Function8b3cd: ; 8b3cd (22:73cd) +Function8b3cd: push de push bc ld e, $4 @@ -156,7 +149,7 @@ Function8b3cd: ; 8b3cd (22:73cd) pop de ret -Function8b3dd: ; 8b3dd (22:73dd) +Function8b3dd: push de push bc call JoyTextDelay_ForcehJoyDown ; joypad @@ -246,7 +239,7 @@ Function8b3dd: ; 8b3dd (22:73dd) ld [wd010], a ret -Function8b45c: ; 8b45c (22:745c) +Function8b45c: call Function8b36c xor a ld [wd010], a @@ -274,7 +267,7 @@ Function8b45c: ; 8b45c (22:745c) scf ret -Function8b493: ; 8b493 (22:7493) +Function8b493: push bc call Mobile22_SetBGMapMode0 call Function8b521 @@ -283,12 +276,12 @@ Function8b493: ; 8b493 (22:7493) rst JumpTable ret -Jumptable_8b4a0: ; 8b4a0 (22:74a0) +Jumptable_8b4a0: dw Function8b4a4 dw Function8b4b8 -Function8b4a4: ; 8b4a4 (22:74a4) +Function8b4a4: push bc push de call Function8b4d8 @@ -300,7 +293,7 @@ Function8b4a4: ; 8b4a4 (22:74a4) call Function8b3cd ret -Function8b4b8: ; 8b4b8 (22:74b8) +Function8b4b8: push bc push de call Function8b4ea @@ -312,7 +305,7 @@ Function8b4b8: ; 8b4b8 (22:74b8) call Function8b3cd ret -Function8b4cc: ; 8b4cc (22:74cc) +Function8b4cc: push bc ld hl, Unknown_8b529 call Function8b50a @@ -322,7 +315,7 @@ Function8b4cc: ; 8b4cc (22:74cc) pop bc ret -Function8b4d8: ; 8b4d8 (22:74d8) +Function8b4d8: ld hl, Unknown_8b529 call Function8b50a push hl @@ -338,7 +331,7 @@ Function8b4d8: ; 8b4d8 (22:74d8) ld l, a ret -Function8b4ea: ; 8b4ea (22:74ea) +Function8b4ea: ld hl, Unknown_8b529 call Function8b50a push hl @@ -355,7 +348,7 @@ Function8b4ea: ; 8b4ea (22:74ea) ld d, a ret -Function8b4fd: ; 8b4fd (22:74fd) +Function8b4fd: ld hl, Unknown_8b529 + 4 call Function8b50a ld a, [hli] @@ -366,7 +359,7 @@ Function8b4fd: ; 8b4fd (22:74fd) ld d, a ret -Function8b50a: ; 8b50a (22:750a) +Function8b50a: ld a, [wd02e] and a ret z @@ -378,7 +371,7 @@ Function8b50a: ; 8b50a (22:750a) jr nz, .asm_8b513 ret -Function8b518: ; 8b518 (22:7518) +Function8b518: push de ld d, $0 ld e, $14 @@ -387,21 +380,19 @@ Function8b518: ; 8b518 (22:7518) pop de ret -Function8b521: ; 8b521 (22:7521) +Function8b521: ld hl, Unknown_8b529 + 7 call Function8b50a ld a, [hl] ret -; 8b529 (22:7529) -Unknown_8b529: ; 8b529 +Unknown_8b529: dwcoord 2, 5 db 1, 4, $20, $49, 0, 1 dwcoord 7, 4 db 1, 4, $48, $41, 0, 0 -; 8b539 -Function8b539: ; 8b539 (22:7539) +Function8b539: ld bc, wd017 call Function8b36c xor a @@ -414,7 +405,7 @@ Function8b539: ; 8b539 (22:7539) call CGBOnly_CopyTilemapAtOnce ret -Function8b555: ; 8b555 (22:7555) +Function8b555: .loop ld hl, UnknownText_0x8b5ce call PrintText @@ -466,7 +457,6 @@ Function8b555: ; 8b555 (22:7555) call Function89448 pop af ret -; 8b5ce (22:75ce) UnknownText_0x8b5ce: ; 0x8b5ce ; Please enter any four-digit number. @@ -498,7 +488,7 @@ UnknownText_0x8b5e2: ; 0x8b5e2 db "@" ; 0x8b5e7 -Function8b5e7: ; 8b5e7 (22:75e7) +Function8b5e7: ld bc, wd013 call Function8b36c xor a @@ -537,7 +527,6 @@ Function8b5e7: ; 8b5e7 (22:75e7) call Function89448 pop af ret -; 8b642 (22:7642) UnknownText_0x8b642: ; 0x8b642 ; Enter the CARD FOLDER PASSCODE. @@ -564,9 +553,8 @@ UnknownText_0x8b64c: ; 0x8b64c ret .string_8b663 db "@" -; 8b664 -Function8b664: ; 8b664 (22:7664) +Function8b664: push bc ld de, $4 .asm_8b668 @@ -583,7 +571,7 @@ Function8b664: ; 8b664 (22:7664) cp $4 ret -Function8b677: ; 8b677 +Function8b677: call ClearBGPalettes call DisableLCD call Function8b690 @@ -593,9 +581,8 @@ Function8b677: ; 8b677 call Function891ab call SetPalettes ret -; 8b690 -Function8b690: ; 8b690 +Function8b690: ld hl, GFX_17afa5 + $514 ld de, vTiles2 ld bc, $160 @@ -612,9 +599,8 @@ Function8b690: ; 8b690 ld a, BANK(GFX_17afa5) call FarCopyBytes ret -; 8b6bb -Function8b6bb: ; 8b6bb +Function8b6bb: ld a, [rSVBK] push af ld a, $5 @@ -627,9 +613,8 @@ Function8b6bb: ; 8b6bb ld [rSVBK], a call Function8949c ret -; 8b6d5 -Palette_8b6d5: ; 8b6d5 +Palette_8b6d5: RGB 31, 31, 31 RGB 31, 21, 00 RGB 14, 07, 03 @@ -642,9 +627,8 @@ Palette_8b6d5: ; 8b6d5 RGB 31, 21, 00 RGB 06, 24, 08 RGB 00, 00, 00 -; 8b6ed -Function8b6ed: ; 8b6ed +Function8b6ed: hlcoord 0, 0, wAttrMap ld bc, $012c xor a @@ -654,9 +638,8 @@ Function8b6ed: ; 8b6ed ld a, $7 call ByteFill ret -; 8b703 -Function8b703: ; 8b703 +Function8b703: call Mobile22_SetBGMapMode0 push hl ld a, $c @@ -687,9 +670,8 @@ Function8b703: ; 8b703 pop bc pop hl jr Function8b744 -; 8b732 -Function8b732: ; 8b732 +Function8b732: ld a, $12 ld [hli], a ld a, $13 @@ -697,18 +679,16 @@ Function8b732: ; 8b732 ld a, $14 ld [hl], a ret -; 8b73e -Function8b73e: ; 8b73e +Function8b73e: ld d, c .asm_8b73f ld [hli], a dec d jr nz, .asm_8b73f ret -; 8b744 -Function8b744: ; 8b744 +Function8b744: ld de, wAttrMap - wTileMap add hl, de inc b @@ -730,9 +710,8 @@ Function8b744: ; 8b744 dec b jr nz, .asm_8b74d ret -; 8b75d -Function8b75d: ; 8b75d +Function8b75d: call Mobile22_SetBGMapMode0 hlcoord 0, 0 ld a, $1 @@ -753,13 +732,11 @@ Function8b75d: ; 8b75d dec e jr nz, .asm_8b780 jr Function8b79e -; 8b787 -Function8b787: ; 8b787 +Function8b787: ret -; 8b788 -Function8b788: ; 8b788 +Function8b788: .asm_8b788 ld a, $2 ld [hli], a @@ -778,9 +755,8 @@ Function8b788: ; 8b788 dec c jr nz, .asm_8b788 ret -; 8b79e -Function8b79e: ; 8b79e +Function8b79e: hlcoord 0, 1, wAttrMap ld a, $1 ld [hli], a @@ -804,9 +780,8 @@ Function8b79e: ; 8b79e dec e jr nz, .asm_8b7a9 ret -; 8b7bd -Function8b7bd: ; 8b7bd +Function8b7bd: call Function8b855 ld hl, MenuHeader_0x8b867 call CopyMenuHeader @@ -867,18 +842,16 @@ Function8b7bd: ; 8b7bd ld a, [wMenuScrollPosition] ld [wd031], a ret -; 8b832 -Function8b832: ; 8b832 +Function8b832: ld a, [wMenuScrollPosition] ld hl, wMenuDataItems sub [hl] jr nc, Function8b84b xor a jr Function8b84b -; 8b83e -Function8b83e: ; 8b83e +Function8b83e: ld a, [wMenuScrollPosition] ld hl, wMenuDataItems add [hl] @@ -886,14 +859,13 @@ Function8b83e: ; 8b83e jr c, Function8b84b ld a, $24 -Function8b84b: ; 8b84b +Function8b84b: ld [wMenuScrollPosition], a ld a, [wMenuCursorY] ld [wMenuCursorBuffer], a ret -; 8b855 -Function8b855: ; 8b855 +Function8b855: ld a, $28 ld hl, wd002 ld [hli], a @@ -907,7 +879,6 @@ Function8b855: ; 8b855 ld a, $ff ld [hl], a ret -; 8b867 MenuHeader_0x8b867: ; 0x8b867 db MENU_BACKUP_TILES ; flags @@ -926,18 +897,16 @@ MenuData_0x8b870: ; 0x8b870 dba Function8b880 dba Function8b88c dba Function8b8c8 -; 8b880 -Function8b880: ; 8b880 +Function8b880: ld h, d ld l, e ld de, wMenuSelection lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ret -; 8b88c -Function8b88c: ; 8b88c +Function8b88c: call OpenSRAMBank4 ld h, d ld l, e @@ -974,9 +943,8 @@ Function8b88c: ; 8b88c call PlaceString call CloseSRAM ret -; 8b8c8 -Function8b8c8: ; 8b8c8 +Function8b8c8: hlcoord 0, 14 ld b, $2 ld c, $12 @@ -1007,9 +975,8 @@ Function8b8c8: ; 8b8c8 ld c, $12 call Function8b732 ret -; 8b903 -Unknown_8b903: ; 8b903 +Unknown_8b903: dw String_8b90b dw String_8b919 dw String_8b92a @@ -1019,9 +986,8 @@ String_8b90b: db "めいしを えらんでください@" ; Please sele String_8b919: db "どの めいしと いれかえますか?@" ; OK to swap with any noun? String_8b92a: db "あいてを えらんでください@" ; Please select an opponent. String_8b938: db "いれる ところを えらんでください@" ; Please select a location. -; 8b94a -Function8b94a: ; 8b94a +Function8b94a: ld [wd033], a xor a ld [wMenuScrollPosition], a @@ -1031,10 +997,9 @@ Function8b94a: ; 8b94a ld a, $1 ld [wd030], a ret -; 8b960 -Function8b960: ; 8b960 (22:7960) +Function8b960: ld hl, MenuHeader_0x8b9ac call LoadMenuHeader call Function8b9e9 @@ -1066,7 +1031,7 @@ Function8b960: ; 8b960 (22:7960) ld c, a ret -Function8b99f: ; 8b99f (22:799f) +Function8b99f: ld hl, wd002 dec a ld c, a @@ -1075,11 +1040,9 @@ Function8b99f: ; 8b99f (22:799f) ld a, [hl] cp $ff ret -; 8b9ab (22:79ab) -Function8b9ab: ; 8b9ab +Function8b9ab: ret -; 8b9ac MenuHeader_0x8b9ac: ; 0x8b9ac db MENU_BACKUP_TILES ; flags @@ -1117,7 +1080,7 @@ MenuData_0x8b9d2: ; 0x8b9d2 db "やめる@" ; QUIT ; 0x8b9e9 -Function8b9e9: ; 8b9e9 (22:79e9) +Function8b9e9: call OpenSRAMBank4 call Function8931b call Function8932d @@ -1148,11 +1111,9 @@ Function8b9e9: ; 8b9e9 (22:79e9) call CloseSRAM pop af ret -; 8ba1c (22:7a1c) -Unknown_8ba1c: ; 8b1ac +Unknown_8ba1c: db 2, 4, -1 -Unknown_8ba1f: ; 8ba1f +Unknown_8ba1f: db 1, 2, 4, 3, -1 -; 8ba24 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index f82f3d2d3..2a2c034c2 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1,6 +1,6 @@ SECTION "mobile_40", ROMX -Function100000: ; 100000 +Function100000: ; d: 1 or 2 ; e: bank ; bc: addr @@ -23,9 +23,8 @@ Function100000: ; 100000 pop af ld [rSVBK], a ret -; 100022 -Function100022: ; 100022 +Function100022: push de push bc call SetRAMStateForMobile @@ -46,17 +45,15 @@ Function100022: ; 100022 ld hl, wVramState set 1, [hl] ret -; 100057 -Function100057: ; 100057 +Function100057: call DisableMobile call ReturnToMapFromSubmenu ld hl, wVramState res 1, [hl] ret -; 100063 -SetRAMStateForMobile: ; 100063 +SetRAMStateForMobile: xor a ld hl, wBGMapBuffer ld bc, $65 @@ -71,9 +68,8 @@ SetRAMStateForMobile: ; 100063 ld [hMapAnims], a ld [hLCDCPointer], a ret -; 100082 -EnableMobile: ; 100082 +EnableMobile: xor a ld hl, wOverworldMapBlocks ld bc, wOverworldMapBlocksEnd - wOverworldMapBlocks @@ -96,7 +92,7 @@ EnableMobile: ; 100082 ret ; 0x1000a4 -DisableMobile: ; 1000a4 +DisableMobile: di xor a ld [hMobileReceive], a @@ -110,9 +106,8 @@ DisableMobile: ; 1000a4 ld [rIE], a ei ret -; 1000ba -Function1000ba: ; 1000ba +Function1000ba: .loop ; call [wcd22]:([wcd23][wcd24] + [wMobileCommsJumptableIndex]) ld hl, wcd23 @@ -138,9 +133,8 @@ Function1000ba: ; 1000ba jr z, .loop call DelayFrame ret -; 1000e8 -Function1000e8: ; 1000e8 +Function1000e8: ld hl, wcd29 bit 7, [hl] ret z @@ -148,9 +142,8 @@ Function1000e8: ; 1000e8 ld hl, wcd29 set 6, [hl] ret -; 1000fa -Function1000fa: ; 1000fa +Function1000fa: ld a, [wc30d] and a ret z @@ -189,9 +182,8 @@ Function1000fa: ; 1000fa pop af ld [wLinkMode], a ret -; 100144 -Function100144: ; 100144 +Function100144: ld hl, wcd29 bit 5, [hl] jr z, .asm_100155 @@ -208,18 +200,16 @@ Function100144: ; 100144 res 6, [hl] farcall HDMATransferTileMapToWRAMBank3 ret -; 100163 -Function100163: ; 100163 +Function100163: ld hl, wcd29 bit 6, [hl] ret z res 6, [hl] call DelayFrame ret -; 10016f -Function10016f: ; 10016f +Function10016f: ld a, [wcd2b] cp $01 ret z @@ -313,9 +303,8 @@ Function10016f: ; 10016f ld [wc301], a call Function10020b ret -; 10020b -Function10020b: ; 10020b +Function10020b: xor a ld [wc303], a farcall FadeOutPalettes @@ -333,9 +322,8 @@ Function10020b: ; 10020b pop af ld [rSVBK], a ret -; 100232 -Function100232: ; 100232 +Function100232: push de farcall Function106464 call Function3f20 @@ -346,18 +334,15 @@ Function100232: ; 100232 call Function100320 call JoyWaitAorB ret -; 10024d -String10024d: ; 10024d +String10024d: db "つうしんを キャンセル しました@" -; 10025e -String10025e: ; 10025e +String10025e: db "おともだちと えらんだ へやが" next "ちがうようです@" -; 100276 -Function100276: ; 100276 +Function100276: ld a, [wcd2b] cp $01 jr z, .asm_10029f @@ -406,18 +391,16 @@ Function100276: ; 100276 call Function1002dc ld c, $01 ret -; 1002c9 -Function1002c9: ; 1002c9 +Function1002c9: ld hl, wcd2a bit 0, [hl] ret z farcall CleanUpBattleRAM farcall LoadPokemonData ret -; 1002dc -Function1002dc: ; 1002dc +Function1002dc: ld a, MAPSETUP_LINKRETURN ld [hMapEntryMethod], a farcall RunMapSetupScript @@ -425,18 +408,16 @@ Function1002dc: ; 1002dc ld [hMapEntryMethod], a call LoadStandardFont ret -; 1002ed -Function1002ed: ; 1002ed +Function1002ed: farcall LoadOW_BGPal7 farcall ApplyPals ld a, $01 ld [hCGBPalUpdate], a call DelayFrame ret -; 100301 -Function100301: ; 100301 +Function100301: ld hl, wcd2a bit 1, [hl] ret z @@ -446,28 +427,24 @@ Function100301: ; 100301 call Function100320 call JoyWaitAorB ret -; 100320 -Function100320: ; 100320 +Function100320: farcall Mobile_ReloadMapPart ret -; 100327 -Function100327: ; 100327 +Function100327: farcall HDMATransferTileMapToWRAMBank3 ret -; 100327 -Function10032e: ; 10032e +Function10032e: call Function10034d ld e, a ret nc ld [wcd2b], a ret -; 100337 -Function100337: ; 100337 +Function100337: call Function10032e ret c ld a, [wc821] @@ -483,9 +460,8 @@ Function100337: ; 100337 ld [wcd2b], a scf ret -; 10034d -Function10034d: ; 10034d +Function10034d: ld a, [wc821] bit 1, a jr nz, .asm_10036a @@ -524,66 +500,58 @@ Function10034d: ; 10034d ld a, $fe scf ret -; 100382 -Function100382: ; 100382 +Function100382: ld a, [wcd27] ld hl, Jumptable_10044e rst JumpTable ret -; 10038a -Function10038a: ; 10038a +Function10038a: ld hl, wccb4 ld a, $2e call Function3e32 ret -; 100393 -Function100393: ; 100393 +Function100393: ld hl, wcc60 ld a, $3a call Function3e32 ret -; 10039c -Function10039c: ; 10039c +Function10039c: ld hl, wcc60 ld de, w3_d000 ld bc, $54 ld a, $03 call FarCopyWRAM ret -; 1003ab -Function1003ab: ; 1003ab +Function1003ab: ld hl, w3_d000 ld de, wcc60 ld bc, $54 ld a, $03 call FarCopyWRAM ret -; 1003ba -Function1003ba: ; 1003ba +Function1003ba: ld hl, wccb4 ld de, w3_d080 ld bc, $54 ld a, $03 call FarCopyWRAM ret -; 1003c9 -Function1003c9: ; 1003c9 +Function1003c9: ld hl, w3_d080 ld de, wccb4 ld bc, $54 ld a, $03 call FarCopyWRAM ret -; 1003d8 -Function1003d8: ; 1003d8 +Function1003d8: ld hl, wccb4 ld a, [hli] ld c, a @@ -603,9 +571,8 @@ Function1003d8: ; 1003d8 add $02 ld [wccb4], a ret -; 1003f5 -Function1003f5: ; 1003f5 +Function1003f5: ld a, [wcc60] sub $03 ld [wcc60], a @@ -613,9 +580,8 @@ Function1003f5: ; 1003f5 sub $03 ld [wccb4], a ret -; 100406 -Function100406: ; 100406 +Function100406: ld a, [wcc60] sub $02 ld c, a @@ -652,9 +618,8 @@ Function100406: ; 100406 pop hl scf ret -; 10043a -Function10043a: ; 10043a +Function10043a: push hl push bc ld de, 0 @@ -672,10 +637,9 @@ Function10043a: ; 10043a pop bc pop hl ret -; 10044e -Jumptable_10044e: ; 10044e (40:444e) +Jumptable_10044e: dw Function10046a dw Function10047c dw Function100493 @@ -691,7 +655,7 @@ Jumptable_10044e: ; 10044e (40:444e) dw Function1004f4 dw Function1004a4 -Function10046a: ; 10046a +Function10046a: ld hl, wBGMapPalBuffer inc [hl] call Function1003d8 @@ -700,9 +664,8 @@ Function10046a: ; 10046a inc a ld [wcd27], a ret -; 10047c -Function10047c: ; 10047c +Function10047c: call Function100337 ret c ret z @@ -719,12 +682,11 @@ Function10047c: ; 10047c ld a, $02 ld [wcd27], a ret -; 100493 -Function100493: ; 100493 +Function100493: jr asm_100497 -Function100495: ; 100495 +Function100495: jr asm_100497 asm_100497 @@ -735,9 +697,8 @@ asm_100497 inc a ld [wcd27], a ret -; 1004a4 -Function1004a4: ; 1004a4 +Function1004a4: call Function100406 jr c, .asm_1004b8 call Function1003c9 @@ -750,9 +711,8 @@ Function1004a4: ; 1004a4 .asm_1004b8 scf ret -; 1004ba -Function1004ba: ; 1004ba +Function1004ba: call Function10038a and a jr nz, .asm_1004c8 @@ -765,9 +725,8 @@ Function1004ba: ; 1004ba ld a, $08 ld [wcd27], a ret -; 1004ce -Function1004ce: ; 1004ce +Function1004ce: call Function100337 ret c ret z @@ -777,25 +736,22 @@ Function1004ce: ; 1004ce inc a ld [wcd27], a ret -; 1004de -Function1004de: ; 1004de +Function1004de: call Function100393 ld a, [wcd27] inc a ld [wcd27], a ret -; 1004e9 -Function1004e9: ; 1004e9 +Function1004e9: call Function10038a ld a, [wcd27] inc a ld [wcd27], a ret -; 1004f4 -Function1004f4: ; 1004f4 +Function1004f4: call Function100337 ret c ret z @@ -804,9 +760,8 @@ Function1004f4: ; 1004f4 ld [wcd27], a call Function10039c ret -; 100504 -Function100504: ; 100504 +Function100504: push de call Function3f20 call UpdateSprites @@ -814,33 +769,29 @@ Function100504: ; 100504 hlcoord 4, 2 call PlaceString ret -; 100513 -Function100513: ; 100513 +Function100513: call Function3f7c call PlaceVerticalMenuItems call InitVerticalMenuCursor ld hl, w2DMenuFlags1 set 7, [hl] ret -; 100522 -Function100522: ; 100522 +Function100522: ld a, [wcd28] ld hl, Jumptable_10052a rst JumpTable ret -; 10052a -Jumptable_10052a: ; 10052a +Jumptable_10052a: dw Function100534 dw Function100545 dw Function100545 dw Function100545 dw Function10054d -; 100534 -Function100534: ; 100534 +Function100534: call Function100513 call UpdateSprites call ApplyTilemap @@ -848,16 +799,14 @@ Function100534: ; 100534 inc a ld [wcd28], a ret -; 100545 -Function100545: ; 100545 +Function100545: ld a, [wcd28] inc a ld [wcd28], a ret -; 10054d -Function10054d: ; 10054d +Function10054d: farcall MobileMenuJoypad ld a, c ld hl, wMenuJoypadFilter @@ -883,21 +832,18 @@ Function10054d: ; 10054d ld [wcd28], a scf ret -; 100579 -Function100579: ; 100579 +Function100579: ld a, [wcd26] ld hl, Jumptable_100581 rst JumpTable ret -; 100581 -Jumptable_100581: ; 100581 +Jumptable_100581: dw Function100585 dw Function100597 -; 100585 -Function100585: ; 100585 +Function100585: ld hl, MenuHeader_1005b2 call LoadMenuHeader ld a, 0 @@ -906,7 +852,7 @@ Function100585: ; 100585 inc a ld [wcd26], a -Function100597: ; 100597 +Function100597: call Function100522 ld a, [wcd28] bit 7, a @@ -921,9 +867,8 @@ Function100597: ; 100597 set 7, a ld [wcd26], a ret -; 1005b2 -MenuHeader_1005b2: ; 1005b2 +MenuHeader_1005b2: db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 @@ -935,21 +880,18 @@ MenuData_1005ba: db 2 db "はい@" db "いいえ@" -; 1005c3 -Function1005c3: ; 1005c3 +Function1005c3: ld a, [wcd26] ld hl, Jumptable_1005cb rst JumpTable ret -; 1005cb -Jumptable_1005cb: ; 1005cb +Jumptable_1005cb: dw Function1005cf dw Function1005e1 -; 1005cf -Function1005cf: ; 1005cf +Function1005cf: ld hl, MenuHeader_1005fc call LoadMenuHeader ld a, 0 @@ -958,7 +900,7 @@ Function1005cf: ; 1005cf inc a ld [wcd26], a -Function1005e1: ; 1005e1 +Function1005e1: call Function100522 ld a, [wcd28] bit 7, a @@ -972,23 +914,21 @@ Function1005e1: ; 1005e1 set 7, a ld [wcd26], a ret -; 1005fc -MenuHeader_1005fc: ; 1005fc +MenuHeader_1005fc: db MENU_BACKUP_TILES ; flags db 6, 14 db 10, 19 dw MenuData_100604 db 1 ; default option -MenuData_100604: ; 100604 +MenuData_100604: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 2 db "かける@" db "まつ@" -; 10060d -Mobile_CommunicationStandby: ; 10060d +Mobile_CommunicationStandby: hlcoord 3, 10 ld b, 1 ld c, 11 @@ -997,13 +937,11 @@ Mobile_CommunicationStandby: ; 10060d hlcoord 4, 11 call PlaceString ret -; 100621 -.String: ; 100621 +.String: db "つうしんたいきちゅう!@" -; 10062d -AdvanceMobileInactivityTimerAndCheckExpired: ; 10062d +AdvanceMobileInactivityTimerAndCheckExpired: push bc call IncrementMobileInactivityTimerByCFrames pop bc @@ -1018,19 +956,17 @@ AdvanceMobileInactivityTimerAndCheckExpired: ; 10062d ld [wcd2b], a scf ret -; 100641 -StartMobileInactivityTimer: ; 100641 +StartMobileInactivityTimer: xor a ld [wMobileInactivityTimerMinutes], a ld [wMobileInactivityTimerSeconds], a ld [wMobileInactivityTimerFrames], a ret -; 10064c -IncrementMobileInactivityTimerBy1Frame: ; 10064c +IncrementMobileInactivityTimerBy1Frame: ld c, 1 -IncrementMobileInactivityTimerByCFrames: ; 10064e +IncrementMobileInactivityTimerByCFrames: ld hl, wMobileInactivityTimerFrames ; timer? ld a, [hl] add c @@ -1052,9 +988,8 @@ IncrementMobileInactivityTimerByCFrames: ; 10064e ret c inc [hl] ret -; 100665 -Function100665: ; 100665 +Function100665: call UpdateTime ld hl, wcd36 ld a, [hHours] @@ -1064,18 +999,16 @@ Function100665: ; 100665 ld a, [hSeconds] ld [hl], a ret -; 100675 -Function100675: ; 100675 +Function100675: ld hl, wcd2a bit 2, [hl] set 2, [hl] ret nz call Function1006d3 ret -; 100681 -Function100681: ; 100681 +Function100681: push hl ld hl, wcd2a bit 2, [hl] @@ -1089,7 +1022,7 @@ Function100681: ; 100681 .asm_100694 ld de, wcd32 -Function100697: ; 100697 +Function100697: ld a, [de] and a jr nz, .asm_1006bb @@ -1116,22 +1049,20 @@ Function100697: ; 100697 ld de, String1006ca call PlaceString ret -; 1006c2 -String1006c2: ; 1006c2 +String1006c2: db "ふん @" -String1006c6: ; 1006c6 +String1006c6: db "びょう@" -String1006ca: ; 1006ca +String1006ca: db "1じかんいじょう@" -; 1006d3 -Function1006d3: ; 1006d3 +Function1006d3: call UpdateTime ld de, wcd34 ld hl, wcd38 -Function1006dc: ; 1006dc +Function1006dc: ld a, [hld] ld c, a ld a, [hSeconds] @@ -1162,9 +1093,8 @@ Function1006dc: ; 1006dc .asm_1006fb ld [de], a ret -; 1006fd -Function1006fd: ; 1006fd +Function1006fd: ld a, $04 ld hl, $a800 call GetSRAMBank @@ -1174,9 +1104,8 @@ Function1006fd: ; 1006fd ld [hli], a call CloseSRAM ret -; 10070d -Function10070d: ; 10070d +Function10070d: ld a, $04 ld hl, $a800 call GetSRAMBank @@ -1188,9 +1117,8 @@ Function10070d: ; 10070d ld [hli], a call CloseSRAM ret -; 100720 -Function100720: ; 100720 +Function100720: xor a ld [wcd6a], a call UpdateTime @@ -1213,9 +1141,8 @@ Function100720: ; 100720 ld a, [wcd6d] ld [wcd6b], a ret -; 100754 -Function100754: ; 100754 +Function100754: call UpdateTime ld a, [hHours] ld [wcd72], a @@ -1228,9 +1155,8 @@ Function100754: ; 100754 ld hl, wcd2a res 6, [hl] ret -; 100772 -Function100772: ; 100772 +Function100772: push de ld hl, wcd6c ld a, [de] @@ -1263,10 +1189,9 @@ Function100772: ; 100772 .asm_10079a pop de ret -; 10079c -Function10079c: ; 10079c +Function10079c: ld a, [wcd21] cp $01 jr nz, .dont_quit @@ -1322,9 +1247,8 @@ Function10079c: ; 10079c .dont_quit and a ret -; 1007f6 -Function1007f6: ; 1007f6 +Function1007f6: call UpdateTime ld hl, wcd74 ld de, wcd71 @@ -1343,9 +1267,8 @@ Function1007f6: ; 1007f6 ld a, [hSeconds] ld [wcd74], a ret -; 100826 -Function100826: ; 100826 +Function100826: ld a, [wcd71] add [hl] sub $3c @@ -1370,9 +1293,8 @@ Function100826: ; 100826 ld [hl], a ld c, a ret -; 100846 -Function100846: ; 100846 +Function100846: ld hl, wcd2a bit 5, [hl] jr nz, .asm_10087c @@ -1409,18 +1331,15 @@ Function100846: ; 100846 ld de, String_10089f call PlaceString ret -; 10088e -String_10088e: ; 10088e +String_10088e: db "モバイルたいせん できる" next "じかん@" -; 10089f -String_10089f: ; 10089f +String_10089f: db " むせいげん@" -; 1008a6 -Function1008a6: ; 1008a6 +Function1008a6: ld a, $04 ld hl, $a800 call GetSRAMBank @@ -1455,10 +1374,9 @@ Function1008a6: ; 1008a6 call Function10070d ld c, 0 ret -; 1008e0 -Function1008e0: ; 1008e0 +Function1008e0: ld a, [hBGMapMode] ld b, a ld a, [hVBlank] @@ -1478,9 +1396,8 @@ Function1008e0: ; 1008e0 ld a, b ld [hBGMapMode], a ret -; 100902 -Function100902: ; 100902 +Function100902: hlcoord 3, 10 ld b, $01 ld c, $0b @@ -1515,16 +1432,14 @@ Function100902: ; 100902 ld c, 120 call DelayFrames ret -; 10095a -.string_10095a ; 10095a +.string_10095a db "たいせん しゅうりょう@" -.string_100966 ; 100966 +.string_100966 db "のこり ふん!@" -; 100970 -Function100970: ; 100970 +Function100970: hlcoord 0, 0 ld de, w3_dc00 call Function1009a5 @@ -1534,9 +1449,8 @@ Function100970: ; 100970 call Function1009d2 call Function1009ae ret -; 100989 -Function100989: ; 100989 +Function100989: ld hl, w3_dc00 decoord 0, 0 call Function1009a5 @@ -1546,16 +1460,14 @@ Function100989: ; 100989 decoord 0, 0, wAttrMap call Function1009a5 ret -; 1009a5 -Function1009a5: ; 1009a5 +Function1009a5: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $03 call FarCopyWRAM ret -; 1009ae -Function1009ae: ; 1009ae +Function1009ae: ld a, [rSVBK] push af ld a, $03 @@ -1582,9 +1494,8 @@ Function1009ae: ; 1009ae pop af ld [rSVBK], a ret -; 1009d2 -Function1009d2: ; 1009d2 +Function1009d2: ld a, [rSVBK] push af ld a, $03 @@ -1606,9 +1517,8 @@ Function1009d2: ; 1009d2 pop af ld [rSVBK], a ret -; 1009f3 -Function1009f3: ; 1009f3 +Function1009f3: ld a, [hJoyDown] and SELECT + A_BUTTON cp SELECT + A_BUTTON @@ -1623,9 +1533,8 @@ Function1009f3: ; 1009f3 .select_a xor a ret -; 100a09 -_LinkBattleSendReceiveAction: ; 100a09 +_LinkBattleSendReceiveAction: call .StageForSend ld [wd431], a farcall PlaceWaitingText @@ -1643,9 +1552,8 @@ _LinkBattleSendReceiveAction: ; 100a09 .done ret -; 100a2e -.StageForSend: ; 100a2e +.StageForSend: ld a, [wBattlePlayerAction] and a jr nz, .switch @@ -1670,9 +1578,8 @@ _LinkBattleSendReceiveAction: ; 100a09 .use_move and $0f ret -; 100a53 -.LinkBattle_SendReceiveAction: ; 100a53 +.LinkBattle_SendReceiveAction: ld a, [wd431] ld [wPlayerLinkAction], a ld a, $ff @@ -1701,9 +1608,8 @@ _LinkBattleSendReceiveAction: ; 100a09 ld a, [wOtherPlayerLinkAction] ld [wBattleAction], a ret -; 100a87 -.MobileBattle_SendReceiveAction: ; 100a87 +.MobileBattle_SendReceiveAction: call Function100acf call StartMobileInactivityTimer ld a, 0 @@ -1739,9 +1645,8 @@ _LinkBattleSendReceiveAction: ; 100a09 .asm_100ace ret -; 100acf -Function100acf: ; 100acf +Function100acf: ld de, Unknown_100b0a ld hl, wccb5 ld a, [wd431] @@ -1757,9 +1662,8 @@ Function100acf: ; 100acf ld a, c ld [wccb4], a ret -; 100ae7 -Function100ae7: ; 100ae7 +Function100ae7: ld de, Unknown_100b0a ld hl, wcc62 .asm_100aed @@ -1783,21 +1687,19 @@ Function100ae7: ; 100ae7 ld a, $f1 ld [wcd2b], a ret -; 100b0a SECTION "tetsuji", ROMX charmap " ", $20 ; revert to ascii -Unknown_100b0a: ; 100b0a +Unknown_100b0a: db "tetsuji", 0 -; 100b12 SECTION "bank40_2", ROMX -Function100b12: ; 100b12 +Function100b12: call Function100dd8 ret c ld hl, BattleMenuHeader @@ -1816,9 +1718,8 @@ Function100b12: ; 100b12 ld [wBattleMenuCursorBuffer], a call ExitMenu ret -; 100b45 -Function100b45: ; 100b45 +Function100b45: call Function100b7a .loop call Mobile_SetOverworldDelay @@ -1842,9 +1743,8 @@ Function100b45: ; 100b45 ld [wMenuCursorBuffer], a and a ret -; 100b7a -Function100b7a: ; 100b7a +Function100b7a: ld hl, CopyMenuData ld a, [wMenuData_2DMenuItemStringsBank] rst FarCall @@ -1856,9 +1756,8 @@ Function100b7a: ; 100b7a ld hl, w2DMenuFlags1 set 7, [hl] ret -; 100b9f -MobileMoveSelectionScreen: ; 100b9f +MobileMoveSelectionScreen: xor a ld [wMoveSwapBuffer], a farcall CheckPlayerHasUsableMoves @@ -1872,9 +1771,8 @@ MobileMoveSelectionScreen: ; 100b9f call Function100ed4 pop af ret -; 100bc2 -.GetMoveSelection: ; 100bc2 +.GetMoveSelection: xor a ld [hBGMapMode], a call Function100c74 @@ -1971,9 +1869,8 @@ MobileMoveSelectionScreen: ; 100b9f call StdBattleTextBox call Call_LoadTempTileMapToTileMap jp .GetMoveSelection -; 100c74 -Function100c74: ; 100c74 +Function100c74: hlcoord 0, 8 ld b, 8 ld c, 8 @@ -1987,9 +1884,8 @@ Function100c74: ; 100c74 hlcoord 2, 10 predef ListMoves ret -; 100c98 -Function100c98: ; 100c98 +Function100c98: ld de, .attrs call SetMenuAttributes ld a, [wNumMoves] @@ -1999,16 +1895,15 @@ Function100c98: ; 100c98 inc a ld [wMenuCursorY], a ret -; 100cad -.attrs ; 100cad +.attrs db 10, 1 db 255, 1 db $a0, $00 dn 2, 0 db D_UP | D_DOWN | A_BUTTON | B_BUTTON -Mobile_PartyMenuSelect: ; 100cb5 +Mobile_PartyMenuSelect: call Function100dd8 ret c ld hl, w2DMenuFlags1 @@ -2059,9 +1954,8 @@ Mobile_PartyMenuSelect: ; 100cb5 call WaitSFX scf ret -; 100d22 -MobileBattleMonMenu: ; 100d22 +MobileBattleMonMenu: call Function100dd8 ret c call Function100d67 @@ -2100,9 +1994,8 @@ MobileBattleMonMenu: ; 100d22 .asm_100d65 and a ret -; 100d67 -Function100d67: ; 100d67 +Function100d67: ld hl, .MenuHeader call CopyMenuHeader xor a @@ -2116,31 +2009,28 @@ Function100d67: ; 100d67 ld hl, w2DMenuFlags1 set 6, [hl] ret -; 100d88 -.MenuHeader: ; 100d88 +.MenuHeader: db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw .MenuData db 1 ; default option -.MenuData: ; 100d90 +.MenuData: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "いれかえる@" ; TRADE db "つよさをみる@" ; STATS db "キャンセル@" ; CANCEL -; 100da5 -Function100da5: ; 100da5 +Function100da5: ld hl, wcd2a res 3, [hl] ld hl, wcd29 res 0, [hl] ret -; 100db0 -Function100db0: ; 100db0 +Function100db0: ld hl, wcd2a bit 3, [hl] jr nz, .asm_100dbe @@ -2152,11 +2042,10 @@ Function100db0: ; 100db0 .asm_100dbe xor a ret -; 100dc0 -Function100dc0: ; 100dc0 +Function100dc0: ld a, [wLinkMode] cp LINK_MOBILE jr nz, .mobile @@ -2169,15 +2058,13 @@ Function100dc0: ; 100dc0 .mobile xor a ret -; 100dd2 -Mobile_SetOverworldDelay: ; 100dd2 +Mobile_SetOverworldDelay: ld a, 30 ld [wOverworldDelay], a ret -; 100dd8 -Function100dd8: ; 100dd8 +Function100dd8: ld c, $01 ld b, $03 farcall AdvanceMobileInactivityTimerAndCheckExpired @@ -2196,9 +2083,8 @@ Function100dd8: ; 100dd8 .asm_100dfb scf ret -; 100dfd -MobileComms_CheckInactivityTimer: ; 100dfd +MobileComms_CheckInactivityTimer: ld a, [wOverworldDelay] ld c, a ld a, 30 @@ -2224,9 +2110,8 @@ MobileComms_CheckInactivityTimer: ; 100dfd .quit scf ret -; 100e2d -Function100e2d: ; 100e2d +Function100e2d: ld a, [wOverworldDelay] ld c, a ld a, 30 @@ -2254,9 +2139,8 @@ Function100e2d: ; 100e2d .asm_100e61 scf ret -; 100e63 -Function100e63: ; 100e63 +Function100e63: ld a, e cp $02 ret nz @@ -2265,9 +2149,8 @@ Function100e63: ; 100e63 ld de, SFX_ELEVATOR_END call PlaySFX ret -; 100e72 -Function100e72: ; 100e72 +Function100e72: xor a ld hl, wcd29 bit 0, [hl] @@ -2279,17 +2162,15 @@ Function100e72: ; 100e72 xor a ld [wcd68], a ret -; 100e84 -Function100e84: ; 100e84 +Function100e84: ld a, [wcd67] ld hl, Jumptable_100e8c rst JumpTable ret -; 100e8c -Jumptable_100e8c: ; 100e8c (40:4e8c) +Jumptable_100e8c: dw Function100ea2 dw Function100eae dw Function100eb4 @@ -2303,7 +2184,7 @@ Jumptable_100e8c: ; 100e8c (40:4e8c) dw Function100ec4 -Function100ea2: ; 100ea2 (40:4ea2) +Function100ea2: call Function100dc0 ret nc ld hl, wcd29 @@ -2311,12 +2192,12 @@ Function100ea2: ; 100ea2 (40:4ea2) call Function100ec5 -Function100eae: ; 100eae +Function100eae: scf call Function100eca jr asm_100eb8 -Function100eb4: ; 100eb4 +Function100eb4: and a call Function100eca @@ -2329,49 +2210,46 @@ asm_100eb8: ld [hl], 0 jr Function100ec5 -Function100ec4: ; 100ec4 +Function100ec4: ret Function100ec5: ld hl, wcd67 inc [hl] ret -; 100eca -Function100eca: ; 100eca +Function100eca: farcall Mobile_InitPartyMenuBGPal7 call Function100ed4 ret -; 100ed4 -Function100ed4: ; 100ed4 +Function100ed4: farcall ApplyPals ld a, $01 ld [hCGBPalUpdate], a ret -; 100edf -Function100edf: ; 100edf +Function100edf: ld hl, Unknown_100fc0 ld c, 1 jr asm_100f02 -Function100ee6: ; 100ee6 +Function100ee6: ld hl, Unknown_100fc0 ld c, 2 jr asm_100f02 -Function100eed: ; 100eed +Function100eed: ld hl, Unknown_100feb ld c, 1 jr asm_100f02 -Function100ef4: ; 100ef4 +Function100ef4: ld hl, Unknown_100ff3 ld c, 1 jr asm_100f02 -Function100efb: ; 100efb +Function100efb: ld hl, Unknown_10102c ld c, 1 jr asm_100f02 @@ -2423,9 +2301,8 @@ asm_100f02: ld a, [wStringBuffer2 + 5] ld b, a ret -; 100f3d -Function100f3d: ; 100f3d +Function100f3d: ; parameter ld a, [wStringBuffer2] cp $02 @@ -2484,9 +2361,8 @@ Function100f3d: ; 100f3d ld a, d ld [wStringBuffer2 + 2], a ret -; 100f8d -Function100f8d: ; 100f8d +Function100f8d: push hl ld a, [wStringBuffer2 + 4] ld l, a @@ -2517,9 +2393,8 @@ Function100f8d: ; 100f8d call CopyBytes call CloseSRAM ret -; 100fc0 -Unknown_100fc0: ; 100fc0 +Unknown_100fc0: ; first byte: ; Bit 7 set: Not SRAM ; Lower 7 bits: Bank @@ -2532,11 +2407,11 @@ Unknown_100fc0: ; 100fc0 dbwww $80, wPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, wOTPartyMonNicknames db -1 -Unknown_100feb: ; 100feb +Unknown_100feb: dbwww $00, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL db -1 -Unknown_100ff3: ; 100ff3 +Unknown_100ff3: dbwww $80, wdc41, 1, NULL dbwww $80, wPlayerName, NAME_LENGTH, NULL dbwww $80, wPlayerName, NAME_LENGTH, NULL @@ -2547,16 +2422,15 @@ Unknown_100ff3: ; 100ff3 dbwww $04, $a007, PARTYMON_STRUCT_LENGTH, NULL db -1 -Unknown_10102c: ; 10102c +Unknown_10102c: dbwww $80, wOTPlayerName, NAME_LENGTH, NULL dbwww $80, wOTPlayerID, 2, NULL dbwww $80, wOTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL dbwww $80, wOTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL dbwww $80, wOTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL db -1 -; 10104f -Function101050: ; 101050 +Function101050: call Function10107d ld a, [wOTPartyCount] rept 2 ; ??? @@ -2576,9 +2450,8 @@ endr call CopyBytes call CloseSRAM ret -; 10107d -Function10107d: ; 10107d +Function10107d: xor a ld hl, wc608 ld bc, wc7bd - wc608 @@ -2609,9 +2482,8 @@ Function10107d: ; 10107d ld a, $33 ld [wc7ba], a ret -; 1010cd -.CopyAllFromOT: ; 1010cd +.CopyAllFromOT: push hl ld hl, 0 ld a, [wOTPartyCount] @@ -2621,9 +2493,8 @@ Function10107d: ; 10107d pop hl call CopyBytes ret -; 1010de -Function1010de: ; 1010de +Function1010de: push hl push bc ld de, 0 @@ -2641,9 +2512,8 @@ Function1010de: ; 1010de pop bc pop hl ret -; 1010f2 -LoadSelectedPartiesForColosseum: ; 1010f2 +LoadSelectedPartiesForColosseum: xor a ld hl, wStringBuffer2 ld bc, 9 @@ -2673,9 +2543,8 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ld de, wOTPartyMonNicknames call .CopyName ret -; 101145 -.CopyThreeSpecies: ; 101145 +.CopyThreeSpecies: ; Load the 3 choices to the buffer push de ld bc, wStringBuffer2 + NAME_LENGTH_JAPANESE @@ -2700,9 +2569,8 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ld a, $ff ld [de], a ret -; 101168 -.GetNthSpecies: ; 101168 +.GetNthSpecies: ; Preserves hl and de ; Get the index of the Nth selection push hl @@ -2724,13 +2592,12 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ld a, [de] pop de ret -; 10117c -.CopyPartyStruct: ; 10117c +.CopyPartyStruct: ld bc, PARTYMON_STRUCT_LENGTH jr .ContinueCopy -.CopyName: ; 101181 +.CopyName: ld bc, NAME_LENGTH .ContinueCopy: @@ -2785,25 +2652,22 @@ LoadSelectedPartiesForColosseum: ; 1010f2 ld hl, wc608 call CopyBytes ret -; 1011df -.GetDestinationAddress: ; 1011df +.GetDestinationAddress: ld a, [wStringBuffer2 + 4] ld l, a ld a, [wStringBuffer2 + 5] ld h, a ret -; 1011e8 -.GetCopySize: ; 1011e8 +.GetCopySize: ld a, [wStringBuffer2 + 2] ld c, a ld a, [wStringBuffer2 + 3] ld b, a ret -; 1011f1 -Function1011f1: ; 1011f1 +Function1011f1: ld a, $04 call GetSRAMBank ld a, [$a60c] @@ -2825,46 +2689,42 @@ Function1011f1: ; 1011f1 ld a, LINK_MOBILE ld [wLinkMode], a ret -; 101220 -Function101220: ; 101220 +Function101220: xor a ld [wLinkMode], a ret -; 101225 -Function101225: ; 101225 +Function101225: ld d, 1 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 call Function100000 jr Function10123d -Function101231: ; 101231 +Function101231: ld d, 2 ld e, BANK(Jumptable_101297) ld bc, Jumptable_101297 call Function100000 jr Function10123d -Function10123d: ; 10123d +Function10123d: xor a ld [wScriptVar], a ld a, c ld hl, Jumptable_101247 rst JumpTable ret -; 101247 -Jumptable_101247: ; 101247 +Jumptable_101247: dw Function101251 dw Function10127d dw Function10127c dw Function10126c dw Function101265 -; 101251 -Function101251: ; 101251 +Function101251: call UpdateSprites call RefreshScreen ld hl, UnknownText_0x1021f4 @@ -2873,31 +2733,26 @@ Function101251: ; 101251 ret c call Function102142 ret -; 101265 -Function101265: ; 101265 +Function101265: ld hl, UnknownText_0x1021ef call Function1021e0 ret -; 10126c -Function10126c: ; 10126c +Function10126c: call UpdateSprites farcall Script_reloadmappart ld hl, UnknownText_0x1021f4 call Function1021e0 ret -; 10127c -Function10127c: ; 10127c +Function10127c: ret -; 10127d -Function10127d: ; 10127d +Function10127d: ret -; 10127e -Function10127e: ; 10127e +Function10127e: ld a, [wdc5f] and a jr z, .zero @@ -2913,9 +2768,8 @@ Function10127e: ; 10127e ld a, c ld [wMobileCommsJumptableIndex], a ret -; 101297 -Jumptable_101297: ; 101297 +Jumptable_101297: dw Function101a97 ; 00 dw Function101ab4 ; 01 dw Function101475 ; 02 @@ -3038,9 +2892,8 @@ Jumptable_101297: ; 101297 dw Function101ca0 ; 77 dw Function101475 ; 78 dw Function101cbc ; 79 -; 10138b -Function10138b: ; 10138b +Function10138b: farcall Function8adcc ld c, 0 jr c, .asm_101396 @@ -3062,9 +2915,8 @@ Function10138b: ; 10138b .asm_1013a9 ret -; 1013aa -Function1013aa: ; 1013aa +Function1013aa: call ClearBGPalettes call Call_ExitMenu call ReloadTilesetAndPalettes @@ -3072,27 +2924,23 @@ Function1013aa: ; 1013aa call UpdateSprites call FinishExitMenu ret -; 1013c0 -Function1013c0: ; 1013c0 +Function1013c0: farcall BlankScreen farcall Stubbed_Function106462 farcall Function106464 call FinishExitMenu ret -; 1013d6 -Function1013d6: ; 1013d6 +Function1013d6: farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret -; 1013dd -Function1013dd: ; 1013dd +Function1013dd: call CGBOnly_CopyTilemapAtOnce ret -; 1013e1 -Unreferenced_Function1013e1: ; 1013e1 +Unreferenced_Function1013e1: push de inc de ld b, a @@ -3113,9 +2961,8 @@ Unreferenced_Function1013e1: ; 1013e1 ld a, c ld [de], a ret -; 1013f5 -Function1013f5: ; 1013f5 +Function1013f5: ld a, [hli] ld [de], a inc de @@ -3127,16 +2974,15 @@ Function1013f5: ; 1013f5 dec c jr nz, .asm_1013f9 ret -; 101400 -Unreferenced_Function101400: ; 101400 +Unreferenced_Function101400: ld a, [de] inc de cp [hl] jr nz, asm_101416 inc hl -Function101406: ; 101406 +Function101406: ld c, a ld b, 0 .asm_101409 @@ -3155,9 +3001,8 @@ Function101406: ; 101406 asm_101416 scf ret -; 101418 -Function101418: ; 101418 +Function101418: call GetJoypad ld a, [hJoyDown] and SELECT + A_BUTTON @@ -3171,16 +3016,14 @@ Function101418: ; 101418 ld [wcd2b], a scf ret -; 10142c -Function10142c: ; 10142c +Function10142c: ld a, $01 ld [wc305], a farcall Function115e18 ret -; 101438 -Function101438: ; 101438 +Function101438: ld hl, wcd29 set 6, [hl] ld a, [wcd26] @@ -3195,21 +3038,19 @@ Function101438: ; 101438 inc a ld [wMobileCommsJumptableIndex], a ret -; 101457 -Jumptable_101457: ; 101457 +Jumptable_101457: dw Function10145b dw Function101467 -; 10145b -Function10145b: ; 10145b +Function10145b: ld a, $3c ld [wcd42], a ld a, [wcd26] inc a ld [wcd26], a -Function101467: ; 101467 +Function101467: ld hl, wcd42 dec [hl] ret nz @@ -3217,9 +3058,8 @@ Function101467: ; 101467 set 7, a ld [wcd26], a ret -; 101475 -Function101475: ; 101475 +Function101475: ld hl, wcd29 set 6, [hl] ld a, [wcd26] @@ -3234,22 +3074,20 @@ Function101475: ; 101475 inc a ld [wMobileCommsJumptableIndex], a ret -; 101494 -Jumptable_101494: ; 101494 +Jumptable_101494: dw Function10149a dw Function1014a6 dw Function1014b7 -; 10149a -Function10149a: ; 10149a +Function10149a: ld a, $28 ld [wcd42], a ld a, [wcd26] inc a ld [wcd26], a -Function1014a6: ; 1014a6 +Function1014a6: ld hl, wcd42 dec [hl] ret nz @@ -3259,7 +3097,7 @@ Function1014a6: ; 1014a6 inc a ld [wcd26], a -Function1014b7: ; 1014b7 +Function1014b7: call GetJoypad ld a, [hJoyPressed] and $03 @@ -3273,18 +3111,16 @@ Function1014b7: ; 1014b7 set 7, a ld [wcd26], a ret -; 1014ce -Function1014ce: ; 1014ce +Function1014ce: farcall Function100720 farcall StartMobileInactivityTimer ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 1014e2 -Function1014e2: ; 1014e2 +Function1014e2: ld hl, wcd29 set 6, [hl] ld a, 0 @@ -3293,9 +3129,8 @@ Function1014e2: ; 1014e2 inc a ld [wMobileCommsJumptableIndex], a ret -; 1014f4 -Function1014f4: ; 1014f4 +Function1014f4: farcall EnableMobile ld hl, wcd29 set 6, [hl] @@ -3303,9 +3138,8 @@ Function1014f4: ; 1014f4 inc a ld [wMobileCommsJumptableIndex], a ret -; 101507 -Function101507: ; 101507 +Function101507: ld de, wcd30 ld hl, $40 ld bc, $40 @@ -3315,36 +3149,32 @@ Function101507: ; 101507 inc a ld [wMobileCommsJumptableIndex], a ret -; 10151d -Unreferenced_Function10151d: ; 10151d +Unreferenced_Function10151d: ld a, $34 call Function3e32 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 10152a -Function10152a: ; 10152a +Function10152a: ld a, $36 call Function3e32 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101537 -Function101537: ; 101537 +Function101537: ld a, $0a call Function3e32 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101544 -Function101544: ; 101544 +Function101544: farcall StartMobileInactivityTimer ld a, $12 call Function3e32 @@ -3352,9 +3182,8 @@ Function101544: ; 101544 inc a ld [wMobileCommsJumptableIndex], a ret -; 101557 -Function101557: ; 101557 +Function101557: farcall StartMobileInactivityTimer ld hl, wcd53 ld a, $08 @@ -3363,13 +3192,12 @@ Function101557: ; 101557 inc a ld [wMobileCommsJumptableIndex], a ret -; 10156d -Function10156d: ; 10156d +Function10156d: call Function101418 ret c -Function101571: ; 101571 +Function101571: farcall Function10032e ret c ret z @@ -3384,9 +3212,8 @@ Function101571: ; 101571 inc a ld [wMobileCommsJumptableIndex], a ret -; 10158a -Function10158a: ; 10158a +Function10158a: farcall IncrementMobileInactivityTimerBy1Frame ld a, [wMobileInactivityTimerMinutes] cp $0a @@ -3394,9 +3221,8 @@ Function10158a: ; 10158a ld a, $fb ld [wcd2b], a ret -; 10159d -Function10159d: ; 10159d +Function10159d: ld de, wc608 farcall Function100edf ld de, wc608 @@ -3409,9 +3235,8 @@ Function10159d: ; 10159d inc a ld [wMobileCommsJumptableIndex], a ret -; 1015be -Function1015be: ; 1015be +Function1015be: ld de, wc608 farcall Function100eed ld de, wc608 @@ -3424,9 +3249,8 @@ Function1015be: ; 1015be inc a ld [wMobileCommsJumptableIndex], a ret -; 1015df -Function1015df: ; 1015df +Function1015df: ld de, wc608 farcall Function100ef4 ld de, wc608 @@ -3439,9 +3263,8 @@ Function1015df: ; 1015df inc a ld [wMobileCommsJumptableIndex], a ret -; 101600 -Function101600: ; 101600 +Function101600: ld hl, w5_d800 ld de, wc608 ld bc, $1e0 @@ -3453,39 +3276,34 @@ Function101600: ; 101600 inc a ld [wMobileCommsJumptableIndex], a ret -; 10161f -Function10161f: ; 10161f +Function10161f: call Function101649 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 10162a -Function10162a: ; 10162a +Function10162a: call Function101663 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101635 -Function101635: ; 101635 +Function101635: ld de, wc608 ld bc, $1e0 call FarCopyWRAM ret -; 10163f -Function10163f: ; 10163f +Function10163f: ld hl, wc608 ld bc, $1e0 call FarCopyWRAM ret -; 101649 -Function101649: ; 101649 +Function101649: ld a, $05 ld hl, w5_d800 call Function101635 @@ -3493,16 +3311,14 @@ Function101649: ; 101649 ld de, w5_da00 call Function10163f ret -; 10165a -Function10165a: ; 10165a +Function10165a: ld a, $05 ld hl, w5_da00 call Function101635 ret -; 101663 -Function101663: ; 101663 +Function101663: ld a, $05 ld hl, w5_d800 call Function101635 @@ -3510,29 +3326,26 @@ Function101663: ; 101663 ld de, w5_dc00 call Function10163f ret -; 101674 -Unreferenced_Function101674: ; 101674 +Unreferenced_Function101674: ld a, $05 ld hl, w5_dc00 call Function101635 ret -; 10167d -Function10167d: ; 10167d +Function10167d: ld a, 0 ld [wcd26], a ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 10168a -Function10168a: ; 10168a +Function10168a: call Function101418 ret c -Function10168e: ; 10168e +Function10168e: ld b, 0 ld c, $01 farcall Function10079c @@ -3555,18 +3368,16 @@ Function10168e: ; 10168e inc a ld [wMobileCommsJumptableIndex], a ret -; 1016c3 -Jumptable_1016c3: ; 1016c3 +Jumptable_1016c3: dw Function1016cf dw Function1016de dw Function1016f8 dw Function101705 dw Function101719 dw Function101724 -; 1016cf -Function1016cf: ; 1016cf +Function1016cf: ld hl, wcd3a inc [hl] call Function10176f @@ -3574,9 +3385,8 @@ Function1016cf: ; 1016cf inc a ld [wcd26], a ret -; 1016de -Function1016de: ; 1016de +Function1016de: call Function10177b jr nc, .asm_1016eb ld a, [wcd26] @@ -3591,18 +3401,16 @@ Function1016de: ; 1016de inc a ld [wcd26], a ret -; 1016f8 -Function1016f8: ; 1016f8 +Function1016f8: ld a, 0 ld [wcd27], a ld a, [wcd26] inc a ld [wcd26], a ret -; 101705 -Function101705: ; 101705 +Function101705: farcall Function100382 ld a, [wcd27] bit 7, a @@ -3611,17 +3419,15 @@ Function101705: ; 101705 inc a ld [wcd26], a ret -; 101719 -Function101719: ; 101719 +Function101719: call Function1017c7 ld a, [wcd26] inc a ld [wcd26], a ret -; 101724 -Function101724: ; 101724 +Function101724: ld a, [wcd39] cp $ff jr z, .asm_101731 @@ -3634,12 +3440,11 @@ Function101724: ; 101724 set 7, a ld [wcd26], a ret -; 10173a Unknown_10173a: db $50 -Function10173b: ; 10173b +Function10173b: push bc push af ld a, [hli] @@ -3652,9 +3457,8 @@ Function10173b: ; 10173b call AddNTimes pop bc ret -; 10174c -Function10174c: ; 10174c +Function10174c: ld [wcd3d], a ld a, l ld [wcd3e], a @@ -3672,17 +3476,15 @@ Function10174c: ; 10174c ld [wcd39], a ld [wcd3a], a ret -; 10176f -Function10176f: ; 10176f +Function10176f: ld hl, wccb4 ld bc, $54 ld a, $11 call ByteFill ret -; 10177b -Function10177b: ; 10177b +Function10177b: ld a, [Unknown_10173a] ld c, a ld b, 0 @@ -3719,9 +3521,8 @@ Function10177b: ; 10177b call Function1017b0 xor a ret -; 1017b0 -Function1017b0: ; 1017b0 +Function1017b0: ld a, c ld [wccb4], a push bc @@ -3733,9 +3534,8 @@ Function1017b0: ; 1017b0 ld de, wccb5 call CopyBytes ret -; 1017c7 -Function1017c7: ; 1017c7 +Function1017c7: ld a, [wcc60] ld c, a ld b, 0 @@ -3750,22 +3550,20 @@ Function1017c7: ; 1017c7 call FarCopyWRAM and a ret -; 1017e4 -Function1017e4: ; 1017e4 +Function1017e4: ld a, 0 ld [wcd27], a ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 1017f1 -Function1017f1: ; 1017f1 +Function1017f1: call Function101418 ret c -Function1017f5: ; 1017f5 +Function1017f5: ld b, 0 ld c, $01 farcall Function10079c @@ -3787,9 +3585,8 @@ Function1017f5: ; 1017f5 inc a ld [wMobileCommsJumptableIndex], a ret -; 101826 -Function101826: ; 101826 +Function101826: ld a, [wcd21] cp $02 jr z, .asm_101833 @@ -3829,7 +3626,6 @@ Function101826: ; 101826 ld a, $fe ld [wcd2b], a ret -; 10186f SECTION "ascii 10186f", ROMX @@ -3850,12 +3646,11 @@ Unknown_101895: db .end - @ db $19, $67, $10, $01, "limit_crystal" .end db 0 -; 1018a8 SECTION "bank40_3", ROMX -Function1018a8: ; 1018a8 +Function1018a8: ld hl, wccb5 ld de, wcc61 ld a, $04 @@ -3880,25 +3675,22 @@ Function1018a8: ; 1018a8 ld a, $f5 ld [wcd2b], a ret -; 1018d6 -Function1018d6: ; 1018d6 +Function1018d6: call Function1018ec ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 1018e1 -Function1018e1: ; 1018e1 +Function1018e1: call Function1018fb ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 1018ec -Function1018ec: ; 1018ec +Function1018ec: ld a, $0a ld hl, wccb4 ld [hli], a @@ -3909,9 +3701,8 @@ Function1018ec: ; 1018ec dec c jr nz, .asm_1018f3 ret -; 1018fb -Function1018fb: ; 1018fb +Function1018fb: ld a, [wcd2f] and a jr z, .asm_101906 @@ -3926,9 +3717,8 @@ Function1018fb: ; 1018fb ld bc, 10 call CopyBytes ret -; 101913 -Function101913: ; 101913 +Function101913: ld hl, wcd2a set 0, [hl] xor a @@ -3959,9 +3749,8 @@ Function101913: ; 101913 ld a, $65 ld [wMobileCommsJumptableIndex], a ret -; 10194b -Function10194b: ; 10194b +Function10194b: call DisableSpriteUpdates call ClearSprites farcall Function1021f9 @@ -3977,9 +3766,8 @@ Function10194b: ; 10194b ld a, $60 ld [wMobileCommsJumptableIndex], a ret -; 10196d -_SelectMonsForMobileBattle: ; 10196d +_SelectMonsForMobileBattle: farcall BlankScreen farcall Mobile_CommunicationStandby ld hl, wcd29 @@ -4003,9 +3791,8 @@ _SelectMonsForMobileBattle: ; 10196d inc a ld [wMobileCommsJumptableIndex], a ret -; 1019ab -_StartMobileBattle: ; 1019ab +_StartMobileBattle: call CopyOtherPlayersBattleMonSelection farcall Function100754 xor a @@ -4029,9 +3816,8 @@ _StartMobileBattle: ; 1019ab inc a ld [wMobileCommsJumptableIndex], a ret -; 1019ee -.CopyOTDetails: ; 1019ee +.CopyOTDetails: ld a, [rSVBK] push af ld a, 5 @@ -4058,9 +3844,8 @@ _StartMobileBattle: ; 1019ab .got_link_player_number ld [hSerialConnectionStatus], a ret -; 101a21 -StartMobileBattle: ; 101a21 +StartMobileBattle: ; force stereo and fast text speed ld hl, wOptions ld a, [hl] @@ -4080,9 +3865,8 @@ StartMobileBattle: ; 101a21 pop af ld [wOptions], a ret -; 101a4f -Function101a4f: ; 101a4f +Function101a4f: ld a, 1 ld [wDisableTextAcceleration], a farcall DisplayLinkBattleResult @@ -4095,9 +3879,8 @@ Function101a4f: ; 101a4f inc a ld [wMobileCommsJumptableIndex], a ret -; 101a75 -CopyOtherPlayersBattleMonSelection: ; 101a75 +CopyOtherPlayersBattleMonSelection: ld hl, wcc61 ld de, wOTMonSelection ld bc, 3 @@ -4107,9 +3890,8 @@ CopyOtherPlayersBattleMonSelection: ; 101a75 farcall Function101050 farcall LoadSelectedPartiesForColosseum ret -; 101a97 -Function101a97: ; 101a97 +Function101a97: farcall Function115d99 ld hl, wcd29 set 7, [hl] @@ -4121,9 +3903,8 @@ Function101a97: ; 101a97 inc a ld [wMobileCommsJumptableIndex], a ret -; 101ab4 -Function101ab4: ; 101ab4 +Function101ab4: ld e, $01 call Function101ee4 ld hl, wcd29 @@ -4132,9 +3913,8 @@ Function101ab4: ; 101ab4 inc a ld [wMobileCommsJumptableIndex], a ret -; 101ac6 -Function101ac6: ; 101ac6 +Function101ac6: farcall Function115d99 ld hl, wcd29 set 7, [hl] @@ -4150,9 +3930,8 @@ Function101ac6: ; 101ac6 inc a ld [wMobileCommsJumptableIndex], a ret -; 101aed -Function101aed: ; 101aed +Function101aed: farcall Function115d99 ld hl, wcd29 set 7, [hl] @@ -4166,9 +3945,8 @@ Function101aed: ; 101aed inc a ld [wMobileCommsJumptableIndex], a ret -; 101b0f -Function101b0f: ; 101b0f +Function101b0f: ld c, 0 call Function10142c ld e, $03 @@ -4181,9 +3959,8 @@ Function101b0f: ; 101b0f ld a, 0 ld [wcd26], a ret -; 101b2b -Function101b2b: ; 101b2b +Function101b2b: farcall Function100579 ld hl, wcd29 set 2, [hl] @@ -4205,9 +3982,8 @@ Function101b2b: ; 101b2b inc a ld [wMobileCommsJumptableIndex], a ret -; 101b59 -Function101b59: ; 101b59 +Function101b59: ld c, $02 call Function10142c ld e, $02 @@ -4218,9 +3994,8 @@ Function101b59: ; 101b59 inc a ld [wMobileCommsJumptableIndex], a ret -; 101b70 -Function101b70: ; 101b70 +Function101b70: ld c, $02 call Function10142c ld e, $04 @@ -4234,9 +4009,8 @@ Function101b70: ; 101b70 ld a, 0 ld [wcd26], a ret -; 101b8f -Function101b8f: ; 101b8f +Function101b8f: farcall Function1005c3 ld hl, wcd29 set 2, [hl] @@ -4263,9 +4037,8 @@ Function101b8f: ; 101b8f inc a ld [wMobileCommsJumptableIndex], a ret -; 101bc8 -Function101bc8: ; 101bc8 +Function101bc8: ld c, $02 call Function10142c ld e, $08 @@ -4278,9 +4051,8 @@ Function101bc8: ; 101bc8 inc a ld [wMobileCommsJumptableIndex], a ret -; 101be5 -Function101be5: ; 101be5 +Function101be5: farcall Function100579 ld hl, wcd29 set 2, [hl] @@ -4301,9 +4073,8 @@ Function101be5: ; 101be5 ld a, $02 ld [wcd2b], a ret -; 101c11 -Function101c11: ; 101c11 +Function101c11: ld a, $01 ld [wdc5f], a ld e, $09 @@ -4315,9 +4086,8 @@ Function101c11: ; 101c11 inc a ld [wMobileCommsJumptableIndex], a ret -; 101c2b -Function101c2b: ; 101c2b +Function101c2b: ld a, $02 ld [wdc5f], a ld e, $07 @@ -4328,18 +4098,16 @@ Function101c2b: ; 101c2b inc a ld [wMobileCommsJumptableIndex], a ret -; 101c42 -Function101c42: ; 101c42 +Function101c42: ld hl, wcd2a set 1, [hl] call Function100665 ld a, $47 ld [wMobileCommsJumptableIndex], a ret -; 101c50 -Function101c50: ; 101c50 +Function101c50: ld e, $0a call Function101ee4 ld hl, wcd29 @@ -4348,9 +4116,8 @@ Function101c50: ; 101c50 inc a ld [wMobileCommsJumptableIndex], a ret -; 101c62 -Function101c62: ; 101c62 +Function101c62: farcall Function115d99 ld hl, wcd29 set 7, [hl] @@ -4370,17 +4137,15 @@ Function101c62: ; 101c62 ld a, 0 ld [wcd26], a ret -; 101c92 -Function101c92: ; 101c92 +Function101c92: farcall Function100675 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101ca0 -Function101ca0: ; 101ca0 +Function101ca0: ld c, $02 call Function10142c ld e, $0c @@ -4393,21 +4158,18 @@ Function101ca0: ; 101ca0 ld a, 0 ld [wcd26], a ret -; 101cbc -Function101cbc: ; 101cbc +Function101cbc: ld a, $01 ld [wcd2b], a ret -; 101cc2 -Unreferenced_Function101cc2: ; 101cc2 +Unreferenced_Function101cc2: ld a, $02 ld [wcd2b], a ret -; 101cc8 -Function101cc8: ; 101cc8 +Function101cc8: ld a, $01 ld [wc314], a ld a, $01 @@ -4418,9 +4180,8 @@ Function101cc8: ; 101cc8 inc a ld [wMobileCommsJumptableIndex], a ret -; 101cdf -Function101cdf: ; 101cdf +Function101cdf: ld a, $06 ld [wc314], a ld a, $01 @@ -4431,27 +4192,24 @@ Function101cdf: ; 101cdf inc a ld [wMobileCommsJumptableIndex], a ret -; 101cf6 -Function101cf6: ; 101cf6 +Function101cf6: ld a, $0b ld [wc314 + 1], a ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101d03 -Function101d03: ; 101d03 +Function101d03: ld a, $0e ld [wc314 + 1], a ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101d10 -Function101d10: ; 101d10 +Function101d10: ld c, $01 call Function10142c ld a, [wMobileCommsJumptableIndex] @@ -4459,14 +4217,14 @@ Function101d10: ; 101d10 ld [wMobileCommsJumptableIndex], a jr Function101d2a -Function101d1e: ; 101d1e +Function101d1e: ld c, $03 call Function10142c ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a -Function101d2a: ; 101d2a +Function101d2a: call Function101418 ret c ld hl, wcd29 @@ -4483,21 +4241,19 @@ Function101d2a: ; 101d2a inc a ld [wMobileCommsJumptableIndex], a ret -; 101d4d -Jumptable_101d4d: ; 101d4d +Jumptable_101d4d: dw Function101d51 dw Function101d5d -; 101d51 -Function101d51: ; 101d51 +Function101d51: ld a, $3c ld [wcd42], a ld a, [wcd26] inc a ld [wcd26], a -Function101d5d: ; 101d5d +Function101d5d: ld hl, wcd42 dec [hl] ret nz @@ -4505,9 +4261,8 @@ Function101d5d: ; 101d5d set 7, a ld [wcd26], a ret -; 101d6b -Function101d6b: ; 101d6b +Function101d6b: ld a, [wc30d] and a ret nz @@ -4516,9 +4271,8 @@ Function101d6b: ; 101d6b ld a, $64 ld [wMobileCommsJumptableIndex], a ret -; 101d7b -Function101d7b: ; 101d7b +Function101d7b: farcall Function10138b ld b, 0 ld hl, Unknown_101d8d @@ -4527,13 +4281,11 @@ Function101d7b: ; 101d7b ld a, c ld [wMobileCommsJumptableIndex], a ret -; 101d8d -Unknown_101d8d: ; 101d8d +Unknown_101d8d: db $15, $15, $1f, $1f, $0c, $12, $3a, $3a -; 101d95 -Function101d95: ; 101d95 +Function101d95: call Function101ee2 call LoadStandardMenuHeader ld e, $0e @@ -4546,9 +4298,8 @@ Function101d95: ; 101d95 ld a, 0 ld [wcd26], a ret -; 101db2 -Function101db2: ; 101db2 +Function101db2: farcall Function103302 call ExitMenu ld hl, wcd29 @@ -4563,9 +4314,8 @@ Function101db2: ; 101db2 ld a, $02 ld [wcd2b], a ret -; 101dd0 -Function101dd0: ; 101dd0 +Function101dd0: ld hl, wdc41 bit 1, [hl] jr nz, .asm_101ddd @@ -4577,9 +4327,8 @@ Function101dd0: ; 101dd0 ld a, $1b ld [wMobileCommsJumptableIndex], a ret -; 101de3 -Function101de3: ; 101de3 +Function101de3: call Function101ecc call Function101ead jr c, .asm_101df3 @@ -4601,9 +4350,8 @@ Function101de3: ; 101de3 ld a, $02 ld [wcd2b], a ret -; 101e09 -Function101e09: ; 101e09 +Function101e09: call Function101ead jr c, .asm_101e16 ld a, [wMobileCommsJumptableIndex] @@ -4627,15 +4375,13 @@ Function101e09: ; 101e09 ld a, $02 ld [wcd2b], a ret -; 101e31 -Function101e31: ; 101e31 +Function101e31: ld a, $3a ld [wMobileCommsJumptableIndex], a jp Function101c2b -; 101e39 -Function101e39: ; 101e39 +Function101e39: call Function1020bf push af call Function101ed3 @@ -4649,9 +4395,8 @@ Function101e39: ; 101e39 ld a, $02 ld [wcd2b], a ret -; 101e4f -Function101e4f: ; 101e4f +Function101e4f: ld e, $06 call Function101ee4 call Function1013d6 @@ -4661,9 +4406,8 @@ Function101e4f: ; 101e4f ld a, 0 ld [wcd26], a ret -; 101e64 -Function101e64: ; 101e64 +Function101e64: call Function101ecc call Function1020a8 push af @@ -4680,25 +4424,22 @@ Function101e64: ; 101e64 ld a, $02 ld [wcd2b], a ret -; 101e82 -Unreferenced_Function101e82: ; 101e82 +Unreferenced_Function101e82: call Function101ecc ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101e8d -Unreferenced_Function101e8d: ; 101e8d +Unreferenced_Function101e8d: call Function101ed3 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a ret -; 101e98 -Function101e98: ; 101e98 +Function101e98: call ClearSprites farcall Function8adb3 ret c @@ -4707,9 +4448,8 @@ Function101e98: ; 101e98 ld hl, wdc41 set 4, [hl] ret -; 101ead -Function101ead: ; 101ead +Function101ead: ld hl, wGameTimerPause bit GAMETIMERPAUSE_MOBILE_7_F, [hl] jr nz, .asm_101ec8 @@ -4730,26 +4470,23 @@ Function101ead: ; 101ead .asm_101eca scf ret -; 101ecc -Function101ecc: ; 101ecc +Function101ecc: call Function101ee2 call FadeToMenu ret -; 101ed3 -Function101ed3: ; 101ed3 +Function101ed3: call Function1013aa farcall Function115d99 ld hl, wcd29 set 7, [hl] ret -; 101ee2 -Function101ee2: ; 101ee2 +Function101ee2: ld e, 0 -Function101ee4: ; 101ee4 +Function101ee4: ld d, 0 ld hl, Unknown_101ef5 add hl, de @@ -4759,9 +4496,8 @@ Function101ee4: ; 101ee4 ld e, a farcall Function100504 ret -; 101ef5 -Unknown_101ef5: ; 101ef5 +Unknown_101ef5: dw String_101f13 dw String_101f14 dw String_101f32 @@ -4778,62 +4514,61 @@ Unknown_101ef5: ; 101ef5 dw String_10200c dw String_102014 -String_101f13: ; 101f13 +String_101f13: db "@" -String_101f14: ; 101f14 +String_101f14: db "モバイルアダプタを つかって" next "おともだちと つうしんします@" -String_101f32: ; 101f32 +String_101f32: db "でんわを かけるひとには" next "つうわりょうきんが かかります@" -String_101f4f: ; 101f4f +String_101f4f: db "モバイルアダプタの じゅんびは" next "できて いますか?@" -String_101f69: ; 101f69 +String_101f69: db "あなたが おともだちに" next "でんわを かけますか?@" -String_101f81: ; 101f81 +String_101f81: db "めいしフォルダーを" next "つかいますか?@" -String_101f93: ; 101f93 +String_101f93: db "でんわばんごうを にゅうりょく" next "してください@" -String_101faa: ; 101faa +String_101faa: db "それでは おともだちからの" next "でんわを おまちします⋯@" -String_101fc5: ; 101fc5 +String_101fc5: next "に でんわを かけます@" -String_101fd2: ; 101fd2 +String_101fd2: next "に でんわを かけています@" -String_101fe1: ; 101fe1 +String_101fe1: db "でんわが つながりました!@" -String_101fef: ; 101fef +String_101fef: db "つうわを" next "しゅうりょう します⋯@" -String_102000: ; 102000 +String_102000: db "つうしん しゅうりょう@" -String_10200c: ; 10200c +String_10200c: db "つうわ じかん@" -String_102014: ; 102014 +String_102014: db "それでは つうしんの" next "せっていを してください@" -; 10202c -Function10202c: ; 10202c +Function10202c: farcall Function115d99 ld hl, wcd29 set 7, [hl] @@ -4844,14 +4579,12 @@ Function10202c: ; 10202c hlcoord 4, 4 call Function100681 ret -; 102048 -Function102048: ; 102048 +Function102048: call Function10204c ret -; 10204c -Function10204c: ; 10204c +Function10204c: hlcoord 3, 2 ld c, $10 ld de, wcd53 @@ -4871,9 +4604,8 @@ Function10204c: ; 10204c .asm_102067 ret -; 102068 -Function102068: ; 102068 +Function102068: ld hl, wcd53 ld c, $08 .asm_10206d @@ -4890,9 +4622,8 @@ Function102068: ; 102068 .asm_10207f ret -; 102080 -Function102080: ; 102080 +Function102080: and $0f cp $0f jr z, .asm_10208a @@ -4904,9 +4635,8 @@ Function102080: ; 102080 ld [hl], 0 scf ret -; 10208e -Function10208e: ; 10208e +Function10208e: push de ld h, d ld l, e @@ -4915,17 +4645,15 @@ Function10208e: ; 10208e call CopyBytes pop de ret -; 10209c -Function10209c: ; 10209c +Function10209c: ld a, $ff ld hl, wdc42 ld bc, 8 call ByteFill ret -; 1020a8 -Function1020a8: ; 1020a8 +Function1020a8: call Function10209c ld c, $01 ld de, wdc42 @@ -4935,9 +4663,8 @@ Function1020a8: ; 1020a8 call Function102068 xor a ret -; 1020bf -Function1020bf: ; 1020bf +Function1020bf: call ClearSprites farcall Function8aba9 ld a, c @@ -4960,9 +4687,8 @@ Function1020bf: ; 1020bf .asm_1020e8 scf ret -; 1020ea -Function1020ea: ; 1020ea +Function1020ea: ld hl, wdc41 bit 4, [hl] jr z, .quit @@ -4984,9 +4710,8 @@ Function1020ea: ; 1020ea .quit scf ret -; 102112 -Function102112: ; 102112 +Function102112: ld a, $04 call GetSRAMBank ld hl, $a041 @@ -5022,9 +4747,8 @@ Function102112: ; 102112 call CloseSRAM pop af ret -; 102142 -Function102142: ; 102142 +Function102142: call Function10218d call Function102180 ld hl, UnknownText_0x1021d1 @@ -5049,17 +4773,15 @@ Function102142: ; 102142 .asm_10217c call Function1013d6 ret -; 102180 -Function102180: ; 102180 +Function102180: ld hl, wc608 + 1 ld de, wStringBuffer2 ld bc, 11 call CopyBytes ret -; 10218d -Function10218d: ; 10218d +Function10218d: ld hl, w5_dc00 ld de, wc608 ld bc, $26 @@ -5067,9 +4789,8 @@ Function10218d: ; 10218d call FarCopyWRAM ld de, wc608 + 1 ; useless ret -; 10219f -Function10219f: ; 10219f +Function10219f: call FadeToMenu call Function10218d ld de, wc608 + 1 @@ -5078,9 +4799,8 @@ Function10219f: ; 10219f call PlayClickSFX call Function1013aa ret -; 1021b8 -Function1021b8: ; 1021b8 +Function1021b8: call FadeToMenu call Function10218d ld de, wPlayerMoveStruct @@ -5091,29 +4811,26 @@ Function1021b8: ; 1021b8 call Function1013aa pop af ret -; 1021d1 -UnknownText_0x1021d1: ; 1021d1 +UnknownText_0x1021d1: text_jump UnknownText_0x1bd19a db "@" -UnknownText_0x1021d6: ; 1021d1 +UnknownText_0x1021d6: text_jump UnknownText_0x1bd1ba db "@" -UnknownText_0x1021db: ; 1021d1 +UnknownText_0x1021db: text_jump UnknownText_0x1bd1dd db "@" -; 1021e0 -Function1021e0: ; 1021e0 +Function1021e0: call MenuTextBox call JoyWaitAorB call ExitMenu ret -; 1021ea -UnknownText_0x1021ea: ; 1021ea +UnknownText_0x1021ea: text_jump UnknownText_0x1bd201 db "@" @@ -5124,9 +4841,8 @@ UnknownText_0x1021ef: UnknownText_0x1021f4: text_jump UnknownText_0x1bd223 db "@" -; 1021f9 -Function1021f9: ; 1021f9 +Function1021f9: call Function102233 ld a, $0 ; Function10234b ld [wcd49], a @@ -5158,25 +4874,22 @@ Function1021f9: ; 1021f9 .asm_102231 xor a ret -; 102233 -Function102233: ; 102233 +Function102233: ld hl, wcd49 ld bc, 10 xor a call ByteFill call Function10304f ret -; 102241 -Function102241: ; 102241 +Function102241: call Function10226a call Function102274 call Function10224b ret -; 10224b -Function10224b: ; 10224b +Function10224b: ld hl, wcd4b bit 1, [hl] jr nz, .asm_10225e @@ -5193,17 +4906,15 @@ Function10224b: ; 10224b farcall Mobile_ReloadMapPart scf ret -; 10226a -Function10226a: ; 10226a +Function10226a: ld hl, wcd4b bit 0, [hl] ret z call Function10305d ret -; 102274 -Function102274: ; 102274 +Function102274: ld hl, wcd4b bit 3, [hl] ret z @@ -5211,25 +4922,22 @@ Function102274: ; 102274 ld de, 8 call PlaySFX ret -; 102283 -Function102283: ; 102283 +Function102283: ld a, $01 ld [wAttrMapEnd], a ld hl, wcd4b set 0, [hl] ret -; 10228e -Function10228e: ; 10228e +Function10228e: xor a ld [wAttrMapEnd], a ld hl, wcd4b res 0, [hl] ret -; 102298 -Function102298: ; 102298 +Function102298: ld a, e cp $02 ret nz @@ -5257,15 +4965,13 @@ Function102298: ; 102298 ld a, $01 ld [wAttrMapEnd], a ret -; 1022ca -Function1022ca: ; 1022ca +Function1022ca: ld a, 30 ld [wOverworldDelay], a ret -; 1022d0 -Function1022d0: ; 1022d0 +Function1022d0: farcall Function10032e ld a, [wcd2b] and a @@ -5285,9 +4991,8 @@ Function1022d0: ; 1022d0 .asm_1022f3 scf ret -; 1022f5 -Jumptable_1022f5: ; 1022f5 +Jumptable_1022f5: dw Function10234b ; 00 dw Function102361 ; 01 dw Function10236e ; 02 @@ -5331,9 +5036,8 @@ Jumptable_1022f5: ; 1022f5 dw Function1028da ; 28 dw Function1024a8 ; 29 dw Function10248d ; 2a -; 10234b -Function10234b: ; 10234b +Function10234b: call Function102d9a call Function102dd3 call Function102dec @@ -5343,18 +5047,16 @@ Function10234b: ; 10234b inc a ld [wcd49], a ret -; 102361 -Function102361: ; 102361 +Function102361: ld a, $cc call Function1028e8 ld a, [wcd49] inc a ld [wcd49], a ret -; 10236e -Function10236e: ; 10236e +Function10236e: call Function1028fc ret nc ld a, [wcd51] @@ -5369,9 +5071,8 @@ Function10236e: ; 10236e inc a ld [wcd49], a ret -; 102387 -Function102387: ; 102387 +Function102387: ld hl, wcd4b set 6, [hl] xor a @@ -5383,7 +5084,7 @@ Function102387: ; 102387 ld a, $01 ld [wMenuCursorY], a -Function1023a1: ; 1023a1 +Function1023a1: call Function102283 call Function102db7 call Function102dec @@ -5392,9 +5093,8 @@ Function1023a1: ; 1023a1 ld a, $1d ld [wcd49], a ret -; 1023b5 -Function1023b5: ; 1023b5 +Function1023b5: call Function10228e call Function102a3b call Function102b12 @@ -5402,9 +5102,8 @@ Function1023b5: ; 1023b5 inc a ld [wcd49], a ret -; 1023c6 -Function1023c6: ; 1023c6 +Function1023c6: call Function102c48 call Function102c87 ld a, [wcd4c] @@ -5438,18 +5137,16 @@ Function1023c6: ; 1023c6 inc a ld [wcd49], a ret -; 102416 -Function102416: ; 102416 +Function102416: ld a, $aa call Function1028e8 ld a, [wcd49] inc a ld [wcd49], a ret -; 102423 -Function102423: ; 102423 +Function102423: call Function102921 ret nc farcall SaveAfterLinkTrade @@ -5463,9 +5160,8 @@ Function102423: ; 102423 inc a ld [wcd49], a ret -; 10244b -Function10244b: ; 10244b +Function10244b: call Function102f32 ld hl, wcd4b set 1, [hl] @@ -5479,9 +5175,8 @@ Function10244b: ; 10244b inc a ld [wcd49], a ret -; 10246a -Function10246a: ; 10246a +Function10246a: call Function102d9a ld hl, wcd29 set 3, [hl] @@ -5491,25 +5186,22 @@ Function10246a: ; 10246a ld a, $2a ld [wcd49], a ret -; 102480 -Function102480: ; 102480 +Function102480: ld c, $32 call DelayFrames ld a, [wcd49] inc a ld [wcd49], a ret -; 10248d -Function10248d: ; 10248d +Function10248d: ld a, [wcd49] set 7, a ld [wcd49], a ret -; 102496 -Function102496: ; 102496 +Function102496: ld hl, wcd4e dec [hl] ret nz @@ -5519,34 +5211,31 @@ Function102496: ; 102496 inc a ld [wcd49], a ret -; 1024a8 -Function1024a8: ; 1024a8 +Function1024a8: farcall Function1009f3 ret c -Function1024af: ; 1024af +Function1024af: call GetJoypad ld a, [wcd4a] ld hl, Jumptable_1024ba rst JumpTable ret -; 1024ba -Jumptable_1024ba: ; 1024ba +Jumptable_1024ba: dw Function1024c0 dw Function1024cb dw Function1024de -; 1024c0 -Function1024c0: ; 1024c0 +Function1024c0: ld hl, wcd4e inc [hl] ld a, [wcd4a] inc a ld [wcd4a], a -Function1024cb: ; 1024cb +Function1024cb: ld hl, wcd4e dec [hl] ret nz @@ -5557,7 +5246,7 @@ Function1024cb: ; 1024cb inc a ld [wcd4a], a -Function1024de: ; 1024de +Function1024de: ld hl, wcd4e dec [hl] jr z, .asm_1024e9 @@ -5572,9 +5261,8 @@ Function1024de: ; 1024de inc a ld [wcd49], a ret -; 1024f6 -Function1024f6: ; 1024f6 +Function1024f6: call PlaceHollowCursor ld hl, wcd4b set 1, [hl] @@ -5584,9 +5272,8 @@ Function1024f6: ; 1024f6 inc a ld [wcd49], a ret -; 10250c -Function10250c: ; 10250c +Function10250c: call Function1028fc ret nc ld a, [wcd51] @@ -5653,9 +5340,8 @@ Function10250c: ; 10250c ld a, $09 ld [wcd49], a ret -; 102591 -Function102591: ; 102591 +Function102591: call Function102ee7 ld hl, wcd4b set 1, [hl] @@ -5669,26 +5355,23 @@ Function102591: ; 102591 inc a ld [wcd49], a ret -; 1025b0 -Function1025b0: ; 1025b0 +Function1025b0: ld a, $09 call Function1028e8 ld a, [wcd49] inc a ld [wcd49], a ret -; 1025bd -Function1025bd: ; 1025bd +Function1025bd: call Function1028fc ret nc ld a, $04 ld [wcd49], a ret -; 1025c7 -Function1025c7: ; 1025c7 +Function1025c7: call Function102f6d ld hl, wcd4b set 1, [hl] @@ -5698,18 +5381,16 @@ Function1025c7: ; 1025c7 inc a ld [wcd49], a ret -; 1025dc -Function1025dc: ; 1025dc +Function1025dc: call Function1028fc ret nc ld a, [wcd49] set 7, a ld [wcd49], a ret -; 1025e9 -Function1025e9: ; 1025e9 +Function1025e9: nop ld hl, wcd4b set 6, [hl] @@ -5720,9 +5401,8 @@ Function1025e9: ; 1025e9 inc a ld [wcd49], a ret -; 1025ff -Function1025ff: ; 1025ff +Function1025ff: ld hl, wcd4b set 2, [hl] farcall Function1009f3 @@ -5766,9 +5446,8 @@ Function1025ff: ; 1025ff ld a, $23 ; Function1026b7 ld [wcd49], a ret -; 102652 -Function102652: ; 102652 +Function102652: nop ld hl, wcd4b set 6, [hl] @@ -5782,9 +5461,8 @@ Function102652: ; 102652 inc a ld [wcd49], a ret -; 10266b -Function10266b: ; 10266b +Function10266b: ld hl, wcd4b set 2, [hl] farcall Function1009f3 @@ -5826,9 +5504,8 @@ Function10266b: ; 10266b ld a, $23 ; Function1026b7 ld [wcd49], a ret -; 1026b7 -Function1026b7: ; 1026b7 +Function1026b7: ld hl, wcd4b set 6, [hl] ld a, [wcd49] @@ -5837,7 +5514,7 @@ Function1026b7: ; 1026b7 ld a, 0 ld [wcd4a], a -Function1026c8: ; 1026c8 +Function1026c8: call GetJoypad farcall Function1009f3 ret c @@ -5845,14 +5522,12 @@ Function1026c8: ; 1026c8 ld hl, Jumptable_1026da rst JumpTable ret -; 1026da -Jumptable_1026da: ; 1026da +Jumptable_1026da: dw Function1026de dw Function1026f3 -; 1026de -Function1026de: ; 1026de +Function1026de: call HideCursor hlcoord 9, 17 ld [hl], $ed @@ -5862,9 +5537,8 @@ Function1026de: ; 1026de ld hl, wcd4b set 1, [hl] ret -; 1026f3 -Function1026f3: ; 1026f3 +Function1026f3: ld a, [hJoyPressed] bit A_BUTTON_F, a jr nz, .asm_102723 @@ -5902,9 +5576,8 @@ Function1026f3: ; 1026f3 ld a, $5 ; Function1025c7 ld [wcd49], a ret -; 102738 -Function102738: ; 102738 +Function102738: ld hl, wcd4b set 6, [hl] call PlaceHollowCursor @@ -5917,7 +5590,7 @@ Function102738: ; 102738 ld a, 0 ld [wcd4a], a -Function102754: ; 102754 +Function102754: call GetJoypad farcall Function1009f3 ret c @@ -5925,21 +5598,19 @@ Function102754: ; 102754 ld hl, Jumptable_102766 rst JumpTable ret -; 102766 -Jumptable_102766: ; 102766 +Jumptable_102766: dw Function102770 dw Function102775 dw Function10278c dw Function1027a0 dw Function1027b7 -; 102770 -Function102770: ; 102770 +Function102770: ld a, $01 ld [wcd4a], a -Function102775: ; 102775 +Function102775: hlcoord 1, 16 ld [hl], "▶" hlcoord 11, 16 @@ -5950,9 +5621,8 @@ Function102775: ; 102775 inc a ld [wcd4a], a ret -; 10278c -Function10278c: ; 10278c +Function10278c: ld a, [hJoyPressed] bit A_BUTTON_F, a jr nz, asm_1027c6 @@ -5965,7 +5635,7 @@ Function10278c: ; 10278c .asm_10279b ld a, $03 ld [wcd4a], a -Function1027a0: ; 1027a0 +Function1027a0: hlcoord 1, 16 ld [hl], " " hlcoord 11, 16 @@ -5977,7 +5647,7 @@ Function1027a0: ; 1027a0 ld [wcd4a], a ret -Function1027b7: ; 1027b7 +Function1027b7: ld a, [hJoyPressed] bit A_BUTTON_F, a jr nz, asm_1027d1 @@ -6008,9 +5678,8 @@ asm_1027e2: ld a, $1d ; Function102652 ld [wcd49], a ret -; 1027eb -Function1027eb: ; 1027eb +Function1027eb: hlcoord 0, 14 ld b, 2 ld c, 18 @@ -6021,13 +5690,11 @@ Function1027eb: ; 1027eb hlcoord 2, 16 call PlaceString ret -; 102804 -.Stats_Trade: ; 102804 +.Stats_Trade: db "STATS TRADE@" -; 102814 -Function102814: ; 102814 +Function102814: ld a, [wMenuCursorY] ld [wcd52], a ld a, [wcd4c] @@ -6045,7 +5712,7 @@ Function102814: ; 102814 ld hl, wcd4b set 1, [hl] -Function10283c: ; 10283c +Function10283c: ld hl, wcd4b set 2, [hl] call Function1029c3 @@ -6065,18 +5732,16 @@ Function10283c: ; 10283c ld hl, wcd4b set 1, [hl] ret -; 102862 -Function102862: ; 102862 +Function102862: ld a, $08 call Function1028e8 ld a, [wcd49] inc a ld [wcd49], a ret -; 10286f -Function10286f: ; 10286f +Function10286f: call Function1028fc ret nc ld a, [wcd52] @@ -6102,15 +5767,13 @@ Function10286f: ; 10286f inc a ld [wcd49], a ret -; 1028a5 -Function1028a5: ; 1028a5 +Function1028a5: ld a, $4 ; Function1023a1 ld [wcd49], a ret -; 1028ab -Function1028ab: ; 1028ab +Function1028ab: ld a, [wcd52] ld [wMenuCursorY], a call Function102f15 @@ -6119,37 +5782,34 @@ Function1028ab: ; 1028ab ld a, $c ; Function1025b0 ld [wcd49], a ret -; 1028bf -Function1028bf: ; 1028bf +Function1028bf: ld a, [wcd49] inc a ld [wcd49], a -Function1028c6: ; 1028c6 +Function1028c6: xor a ld [wMonType], a call Function102bac ld a, $1d ; Function102652 ld [wcd49], a ret -; 1028d3 -Function1028d3: ; 1028d3 +Function1028d3: ld a, [wcd49] inc a ld [wcd49], a -Function1028da: ; 1028da +Function1028da: ld a, OTPARTYMON ld [wMonType], a call Function102bac ld a, $1f ; Function1025e9 ld [wcd49], a ret -; 1028e8 -Function1028e8: ; 1028e8 +Function1028e8: ld hl, wcd4b res 6, [hl] ld [wcd50], a @@ -6157,9 +5817,8 @@ Function1028e8: ; 1028e8 ld a, 0 ld [wcd4a], a ret -; 1028fc -Function1028fc: ; 1028fc +Function1028fc: call GetJoypad farcall Function1009f3 jr nc, .asm_102909 @@ -6174,17 +5833,15 @@ Function1028fc: ; 1028fc ld a, 0 ld [wcd4a], a ret -; 102917 -Jumptable_102917: ; 102917 +Jumptable_102917: dw Function102933 dw Function10294f dw Function10295d dw Function10296e dw Function102996 -; 102921 -Function102921: ; 102921 +Function102921: ld a, [wcd4a] ld hl, Jumptable_10292f rst JumpTable @@ -6192,14 +5849,12 @@ Function102921: ; 102921 ld a, 0 ld [wcd4a], a ret -; 10292f -Jumptable_10292f: ; 10292f +Jumptable_10292f: dw Function10295d dw Function102984 -; 102933 -Function102933: ; 102933 +Function102933: ld hl, MenuHeader_1029bb call LoadMenuHeader call Function102e07 @@ -6212,9 +5867,8 @@ Function102933: ; 102933 ld [wcd4a], a and a ret -; 10294f -Function10294f: ; 10294f +Function10294f: ld a, [wTextDelayFrames] and a ret nz @@ -6223,9 +5877,8 @@ Function10294f: ; 10294f ld [wcd4a], a and a ret -; 10295d -Function10295d: ; 10295d +Function10295d: call Function10299e ld a, 0 ld [wcd27], a @@ -6234,9 +5887,8 @@ Function10295d: ; 10295d ld [wcd4a], a and a ret -; 10296e -Function10296e: ; 10296e +Function10296e: farcall Function100382 and a ld a, [wcd27] @@ -6247,9 +5899,8 @@ Function10296e: ; 10296e ld [wcd4a], a and a ret -; 102984 -Function102984: ; 102984 +Function102984: farcall Function100382 and a ld a, [wcd27] @@ -6258,16 +5909,14 @@ Function102984: ; 102984 call Function1029af scf ret -; 102996 -Function102996: ; 102996 +Function102996: call Function1029af call ExitMenu scf ret -; 10299e -Function10299e: ; 10299e +Function10299e: ld a, $01 ld [wccb4], a ld a, [wcd50] @@ -6275,36 +5924,31 @@ Function10299e: ; 10299e ld a, $aa ld [wcd51], a ret -; 1029af -Function1029af: ; 1029af +Function1029af: ld hl, wcd4b res 7, [hl] ld a, [wcc61] ld [wcd51], a ret -; 1029bb -MenuHeader_1029bb: ; 1029bb +MenuHeader_1029bb: db MENU_BACKUP_TILES ; flags menu_coords 3, 10, 15, 12 dw NULL db 1 ; default option -; 1029c3 -Function1029c3: ; 1029c3 +Function1029c3: ld a, [wcd4a] ld hl, Jumptable_1029cb rst JumpTable ret -; 1029cb -Jumptable_1029cb: ; 1029cb +Jumptable_1029cb: dw Function1029cf dw Function1029fe -; 1029cf -Function1029cf: ; 1029cf +Function1029cf: call LoadStandardMenuHeader hlcoord 10, 7 ld b, 3 @@ -6324,9 +5968,8 @@ Function1029cf: ; 1029cf ld [wcd4a], a xor a ret -; 1029fe -Function1029fe: ; 1029fe +Function1029fe: farcall Function1009f3 ret c farcall MobileMenuJoypad @@ -6349,13 +5992,11 @@ Function1029fe: ; 1029fe and a scf ret -; 102a26 -String_102a26: ; 102a26 +String_102a26: db "TRADE" next "CANCEL" db "@" -; 102a33 MenuData3_102a33: db 8, 11 @@ -6364,7 +6005,7 @@ MenuData3_102a33: dn 2, 0 db A_BUTTON -Function102a3b: ; 102a3b +Function102a3b: ld a, [wcd30] ld [wc74e], a ld hl, wPlayerName @@ -6457,9 +6098,8 @@ Function102a3b: ; 102a3b ld a, c ld [wOTTrademonCaughtData], a ret -; 102b12 -Function102b12: ; 102b12 +Function102b12: ld c, 100 call DelayFrames call Function102d9a @@ -6475,9 +6115,8 @@ Function102b12: ; 102b12 .asm_102b31 ret -; 102b32 -Function102b32: ; 102b32 +Function102b32: ld a, [wcd4c] dec a ld [wCurPartyMon], a @@ -6488,9 +6127,8 @@ Function102b32: ; 102b32 call Function102dd3 call Function102dec ret -; 102b4e -Function102b4e: ; 102b4e +Function102b4e: ld a, OTPARTYMON ld [wMonType], a ld a, [wMenuCursorY] @@ -6502,15 +6140,13 @@ Function102b4e: ; 102b4e ld a, [wOTPartyCount] ld [w2DMenuNumRows], a ret -; 102b68 -Unreferenced_Function102b68: ; 102b68 +Unreferenced_Function102b68: xor a ld hl, wWindowStackPointer ld bc, $10 call ByteFill ret -; 102b73 Unknown_102b73: db 9, 6 @@ -6519,7 +6155,7 @@ Unknown_102b73: dn 1, 0 db D_UP | D_DOWN | A_BUTTON -Function102b7b: ; 102b7b +Function102b7b: xor a ld [wMonType], a ld a, [wMenuCursorY] @@ -6531,7 +6167,6 @@ Function102b7b: ; 102b7b ld a, [wPartyCount] ld [w2DMenuNumRows], a ret -; 102b94 Unknown_102b94: db 1, 6 @@ -6540,7 +6175,7 @@ Unknown_102b94: dn 1, 0 db D_UP | D_DOWN | A_BUTTON -Function102b9c: ; 102b9c +Function102b9c: ld a, [wcd4d] dec a hlcoord 6, 9 @@ -6548,9 +6183,8 @@ Function102b9c: ; 102b9c call AddNTimes ld [hl], $ec ret -; 102bac -Function102bac: ; 102bac +Function102bac: ld a, [wMenuCursorY] dec a ld [wCurPartyMon], a @@ -6568,9 +6202,8 @@ Function102bac: ; 102bac call Function102dec call Function102db7 ret -; 102bdc -Function102bdc: ; 102bdc +Function102bdc: ld a, [wcd4d] dec a ld hl, wOTPartyMon1Species @@ -6600,49 +6233,43 @@ Function102bdc: ; 102bdc .asm_102c05 scf ret -; 102c07 -Function102c07: ; 102c07 +Function102c07: call Function102c14 call Function102c3b call Function102c21 call Function102c2e ret -; 102c14 -Function102c14: ; 102c14 +Function102c14: ld hl, wPartySpecies ld de, wOTPartySpecies ld bc, 1 call Function102c71 ret -; 102c21 -Function102c21: ; 102c21 +Function102c21: ld hl, wPartyMonNicknames ld de, wOTPartyMonNicknames ld bc, 11 call Function102c71 ret -; 102c2e -Function102c2e: ; 102c2e +Function102c2e: ld hl, wPartyMonOT ld de, wOTPartyMonOT ld bc, 11 call Function102c71 ret -; 102c3b -Function102c3b: ; 102c3b +Function102c3b: ld hl, wPartyMon1 ld de, wOTPartyMon1 ld bc, $30 call Function102c71 ret -; 102c48 -Function102c48: ; 102c48 +Function102c48: farcall Function10165a ld a, 0 call GetSRAMBank @@ -6657,9 +6284,8 @@ Function102c48: ; 102c48 ld a, $05 call FarCopyWRAM ret -; 102c71 -Function102c71: ; 102c71 +Function102c71: ld a, [wcd4c] dec a call AddNTimes @@ -6672,9 +6298,8 @@ Function102c71: ; 102c71 pop de call SwapBytes ret -; 102c87 -Function102c87: ; 102c87 +Function102c87: ld a, [wJumptableIndex] push af ld a, [wcf64] @@ -6714,9 +6339,8 @@ Function102c87: ; 102c87 pop af ld [wJumptableIndex], a ret -; 102cee -Function102cee: ; 102cee +Function102cee: ld a, [wJumptableIndex] dec a call Function102d34 @@ -6750,23 +6374,20 @@ Function102cee: ; 102cee ld bc, $2f call CopyBytes ret -; 102d34 -Function102d34: ; 102d34 +Function102d34: ld hl, wc608 ld bc, $2f call AddNTimes ret -; 102d3e -Function102d3e: ; 102d3e +Function102d3e: call GetSRAMBank call CopyBytes call CloseSRAM ret -; 102d48 -Function102d48: ; 102d48 +Function102d48: ld a, [wcd4c] ld e, a ld d, 0 @@ -6805,9 +6426,8 @@ Function102d48: ; 102d48 .asm_102d98 and a ret -; 102d9a -Function102d9a: ; 102d9a +Function102d9a: ld a, " " hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT @@ -6818,17 +6438,15 @@ Function102d9a: ; 102d9a call ByteFill farcall HDMATransferAttrMapAndTileMapToWRAMBank3 ret -; 102db7 -Function102db7: ; 102db7 +Function102db7: call Function102e4f call Function102e3e ld hl, wcd4b set 1, [hl] ret -; 102dc3 -Function102dc3: ; 102dc3 +Function102dc3: hlcoord 0, 12 ld b, 4 ld c, 18 @@ -6836,9 +6454,8 @@ Function102dc3: ; 102dc3 ld e, l farcall _LinkTextbox ret -; 102dd3 -Function102dd3: ; 102dd3 +Function102dd3: call DisableLCD ld de, GFX_1032a2 ld hl, vTiles0 @@ -6847,9 +6464,8 @@ Function102dd3: ; 102dd3 farcall __LoadTradeScreenBorder call EnableLCD ret -; 102dec -Function102dec: ; 102dec +Function102dec: ld hl, Palettes_1032e2 ld de, wOBPals1 ld bc, 4 palettes @@ -6859,9 +6475,8 @@ Function102dec: ; 102dec call SetPalettes call DelayFrame ret -; 102e07 -Function102e07: ; 102e07 +Function102e07: hlcoord 3, 10 ld b, 1 ld c, 11 @@ -6885,24 +6500,20 @@ Function102e07: ; 102e07 hlcoord 4, 11 call PlaceString ret -; 102e32 -.waiting ; 102e32 +.waiting db "Waiting...!@" -; 102e3e -Function102e3e: ; 102e3e +Function102e3e: ld de, .CANCEL hlcoord 10, 17 call PlaceString ret -; 102e48 -.CANCEL: ; 102e48 +.CANCEL: db "CANCEL@" -; 102e4f -Function102e4f: ; 102e4f +Function102e4f: farcall Function16d42e farcall _InitMG_Mobile_LinkTradePalMap ld de, wPlayerName @@ -6922,9 +6533,8 @@ Function102e4f: ; 102e4f ld de, wOTPartySpecies call .PlaceSpeciesNames ret -; 102e86 -.PlaceSpeciesNames: ; 102e86 +.PlaceSpeciesNames: ld c, 0 .count_loop ld a, [de] @@ -6948,9 +6558,8 @@ Function102e4f: ; 102e4f pop bc inc c jr .count_loop -; 102ea8 -Function102ea8: ; 102ea8 +Function102ea8: call Function102dc3 ld a, [wcd4c] dec a @@ -6977,75 +6586,64 @@ Function102ea8: ; 102ea8 ld hl, UnknownText_0x102ee2 call PrintTextBoxText ret -; 102ee2 -UnknownText_0x102ee2: ; 102ee2 +UnknownText_0x102ee2: text_jump UnknownText_0x1bd286 db "@" -Function102ee7: ; 102ee7 +Function102ee7: call Function102dc3 ld de, String_102ef4 hlcoord 1, 14 call PlaceString ret -; 102ef4 -String_102ef4: ; 102ef4 +String_102ef4: db "Too bad! The trade" next "was canceled!" db "@" -; 102f15 -Function102f15: ; 102f15 +Function102f15: call Function102dc3 ld de, .TooBadTheTradeWasCanceled hlcoord 1, 14 call PlaceString ret -; 102f22 -.TooBadTheTradeWasCanceled: ; 102f22 +.TooBadTheTradeWasCanceled: db "こうかんを キャンセルしました@" -; 102f32 -Function102f32: ; 102f32 +Function102f32: call Function102dc3 ld de, .TradeCompleted hlcoord 1, 14 call PlaceString ret -; 102f3f -.TradeCompleted: ; 102f3f +.TradeCompleted: db "Trade completed!@" -; 102f50 -Function102f50: ; 102f50 +Function102f50: call Function102dc3 ld de, .PleaseWait hlcoord 1, 14 call PlaceString ret -; 102f5d -.PleaseWait: ; 102f5d +.PleaseWait: db "しょうしょう おまち ください@" -; 102f6d -Function102f6d: ; 102f6d +Function102f6d: call Function102dc3 ld de, .Finished hlcoord 1, 14 call PlaceString ret -; 102f7a -.Finished: ; 102f7a +.Finished: db "しゅうりょう します@" -; 102f85 -Function102f85: ; 102f85 +Function102f85: ld a, [wd003] ld c, a ld b, 0 @@ -7064,70 +6662,60 @@ Function102f85: ; 102f85 ld de, String_102fcc call PlaceString ret -; 102fb2 -String_102fb2: ; 102fb2 +String_102fb2: db "あいてがわ<PKMN>えらんだ " next "いじょう<PKMN>あるようです!!" db "@" -; 102fcc -String_102fcc: ; 102fcc +String_102fcc: db "に@" -; 102fce -Function102fce: ; 102fce +Function102fce: call Function102dc3 ld de, String_102fdb hlcoord 1, 14 call PlaceString ret -; 102fdb -String_102fdb: ; 102fdb +String_102fdb: db "あいてがわ<NO>せんたくに" next "いじょう<PKMN>あるようです!!" done -; 102ff5 -Function102ff5: ; 102ff5 +Function102ff5: call Function102dc3 ld de, String_103002 hlcoord 1, 14 call PlaceString ret -; 103002 -String_103002: ; 103002 +String_103002: db "その#を こうかんすると" next "せんとう できなく なっちゃうよ!" db "@" -; 103021 -Function103021: ; 103021 +Function103021: call Function102dc3 ld de, String_10302e hlcoord 1, 14 call PlaceString ret -; 10302e -String_10302e: ; 10302e +String_10302e: db "あいてが ちゅうしを えらんだので" next "こうかんを ちゅうし します" db "@" -; 10304f -Function10304f: ; 10304f +Function10304f: xor a ld [wAttrMapEnd], a ld [wcf42], a ld [wcf44], a ld [wcf45], a ret -; 10305d -Function10305d: ; 10305d +Function10305d: nop ld a, [wAttrMapEnd] and a @@ -7137,9 +6725,8 @@ Function10305d: ; 10305d call Function103094 call Function10306e ret -; 10306e -Function10306e: ; 10306e +Function10306e: ld a, $01 ld [hOAMUpdate], a call ClearSprites @@ -7148,9 +6735,8 @@ Function10306e: ; 10306e xor a ld [hOAMUpdate], a ret -; 10307f -Function10307f: ; 10307f +Function10307f: ld c, $02 ld hl, wcd4b bit 7, [hl] @@ -7166,9 +6752,8 @@ Function10307f: ; 10307f xor a ld [hl], a ret -; 103094 -Function103094: ; 103094 +Function103094: ld hl, wcd4b bit 7, [hl] jr nz, .asm_1030c0 @@ -7205,9 +6790,8 @@ Function103094: ; 103094 .asm_1030ca ld [hl], $2c ret -; 1030cd -Function1030cd: ; 1030cd +Function1030cd: ld a, [wcf44] ld l, a ld h, 0 @@ -7264,9 +6848,8 @@ Function1030cd: ; 1030cd dec c jr nz, .asm_1030de ret -; 103112 -Unknown_103112: ; 103112 +Unknown_103112: db $00, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 @@ -7312,9 +6895,8 @@ Unknown_103112: ; 103112 db $00, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 db $00, $00, $00, $00, $00, $00, $00, $00 -; 10327a -Unknown_10327a: ; 10327a +Unknown_10327a: db $00, $00, $00, $00 db $00, $00, $01, $00 db $00, $00, $02, $00 @@ -7350,15 +6932,13 @@ Palettes_1032e2: RGB 0, 0, 0 RGB 0, 0, 0 -; 103302 -Function103302: ; 103302 +Function103302: call Function103309 call Function103362 ret -; 103309 -Function103309: ; 103309 +Function103309: xor a ld [hBGMapMode], a ld hl, wBuffer1 @@ -7402,9 +6982,8 @@ Function103309: ; 103309 ld [wd1f0], a call Function10339a ret -; 103362 -Function103362: ; 103362 +Function103362: .asm_103362 ld a, [wd1f0] ld [wd1f1], a @@ -7430,9 +7009,8 @@ Function103362: ; 103362 .asm_103398 scf ret -; 10339a -Function10339a: ; 10339a +Function10339a: ld a, [wd1f0] ld [wd1f2], a ld c, a @@ -7445,9 +7023,8 @@ Function10339a: ; 10339a ld a, [hl] ld [wd1f3], a ret -; 1033af -Function1033af: ; 1033af +Function1033af: call GetJoypad ld a, [hJoyPressed] bit D_LEFT_F, a @@ -7518,18 +7095,16 @@ Function1033af: ; 1033af xor e ld [wBuffer1], a ret -; 10342c -Function10342c: ; 10342c +Function10342c: ld a, [wd1f0] ld [wd1f2], a call Function103490 call Function10343c call Function1034a7 ret -; 10343c -Function10343c: ; 10343c +Function10343c: ld a, [wd1f3] cp $02 jr nz, .asm_103452 @@ -7565,17 +7140,15 @@ Function10343c: ; 10343c ld bc, 11 call Function103487 ret -; 103487 -Function103487: ; 103487 +Function103487: push de call Function1034f7 pop de call PlaceString ret -; 103490 -Function103490: ; 103490 +Function103490: hlcoord 0, 15 ld c, $14 ld b, $03 @@ -7585,9 +7158,8 @@ Function103490: ; 103490 hlcoord 1, 16 call PlaceString ret -; 1034a7 -Function1034a7: ; 1034a7 +Function1034a7: ld a, [wd1f1] ld [wd1f2], a ld bc, 10 @@ -7597,9 +7169,8 @@ Function1034a7: ; 1034a7 call Function1034f1 ld [hl], $ed ret -; 1034be -Function1034be: ; 1034be +Function1034be: ld a, $01 ld [wd1f2], a ld hl, wd1ec @@ -7621,9 +7192,8 @@ Function1034be: ; 1034be jr nz, .asm_1034ca call Function103490 ret -; 1034e0 -Function1034e0: ; 1034e0 +Function1034e0: push bc push hl call ClearBox @@ -7634,13 +7204,12 @@ Function1034e0: ; 1034e0 ld a, $06 call FillBoxWithByte ret -; 1034f1 -Function1034f1: ; 1034f1 +Function1034f1: ld a, [wd1f0] ld [wd1f2], a -Function1034f7: ; 10134f7 +Function1034f7: hlcoord 0, 0 add hl, bc ld a, [wd1ef] @@ -7651,9 +7220,8 @@ Function1034f7: ; 10134f7 ld bc, 40 call AddNTimes ret -; 10350f -Function10350f: ; 10350f +Function10350f: ld a, [wd1f3] push bc ld hl, Unknown_103522 @@ -7665,9 +7233,8 @@ Function10350f: ; 10350f ld d, [hl] ld e, a ret -; 103522 -Unknown_103522: ; 103522 +Unknown_103522: dw String_103546 dw String_103598 dw String_1035a0 @@ -7702,9 +7269,8 @@ String_1035b1: db "すうじで いれる@" String_1035ba: db "する@" String_1035bd: db "しない@" String_1035c1: db "けってい@" -; 1035c6 -Function1035c6: ; 1035c6 +Function1035c6: farcall Function10138b ld b, 0 ld hl, Unknown_1035d7 @@ -7714,9 +7280,8 @@ Function1035c6: ; 1035c6 ld h, [hl] ld l, a ret -; 1035d7 -Unknown_1035d7: ; 1035d7 +Unknown_1035d7: dw Unknown_1035e7 dw Unknown_1035f3 dw Unknown_103608 @@ -7726,36 +7291,35 @@ Unknown_1035d7: ; 1035d7 dw AskMobileOrCable dw AskMobileOrCable -Unknown_1035e7: ; 1035e7 +Unknown_1035e7: dwcoord 0, 6 db $12, $07, $07 dw .this .this db 4, 2, 1, 0, 3 -Unknown_1035f3: ; 1035f3 +Unknown_1035f3: dwcoord 0, 7 db $12, $06, $09 dw .this .this db 3, 2, 1, 3 -Unknown_1035fe: ; 1035fe +Unknown_1035fe: dwcoord 0, 9 db $12, $04, $0b dw .this .this db 2, 0, 3 -Unknown_103608: ; 103608 +Unknown_103608: dwcoord 0, 9 db $12, $04, $0b dw .this .this db 2, 2, 3 -; 103612 -AskMobileOrCable: ; 103612 +AskMobileOrCable: ld hl, MenuHeader_103640 call LoadMenuHeader ld a, [wMobileOrCable_LastSelection] @@ -7780,22 +7344,20 @@ AskMobileOrCable: ; 103612 xor a ld [wScriptVar], a ret -; 103640 -MenuHeader_103640: ; 103640 +MenuHeader_103640: db MENU_BACKUP_TILES ; flags menu_coords 13, 6, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw MenuData_103648 db 1 ; default option -MenuData_103648: ; 103648 +MenuData_103648: db STATICMENU_CURSOR ; flags db 2 db "モバイル@" db "ケーブル@" -; 103654 -Function103654: ; 103654 +Function103654: farcall Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103666 @@ -7809,9 +7371,8 @@ Function103654: ; 103654 set 5, [hl] ld c, $01 ret -; 10366e -Mobile_SelectThreeMons: ; 10366e +Mobile_SelectThreeMons: farcall Mobile_AlwaysReturnNotCarry bit 7, c jr z, .asm_10369b @@ -7883,15 +7444,13 @@ Mobile_SelectThreeMons: ; 10366e xor a ld [wScriptVar], a ret -; 1036f9 -Function1036f9: ; 1036f9 +Function1036f9: ld hl, UnknownText_0x103767 call PrintText ret -; 103700 -Function103700: ; 103700 +Function103700: ld c, $0a ld hl, wSwarmFlags bit SWARMFLAGS_MOBILE_4_F, [hl] @@ -7934,21 +7493,19 @@ Function103700: ; 103700 call JoyWaitAorB scf ret -; 103747 -MenuHeader_103747: ; 103747 +MenuHeader_103747: db MENU_BACKUP_TILES ; flags menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw MenuData_10374f db 1 ; default option -MenuData_10374f: ; 10374f +MenuData_10374f: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 db "はい@" db "やめる@" db "せつめい@" -; 10375d UnknownText_0x10375d: ; 0x10375d text_jump UnknownText_0x1c422a @@ -7979,16 +7536,15 @@ UnknownText_0x10377b: ; 0x10377b db "@" ; 0x103780 -Function103780: ; 103780 +Function103780: ld a, [wd265] push af call Function10378c pop af ld [wd265], a ret -; 10378c -Function10378c: ; 10378c +Function10378c: ld c, 0 ld hl, wSwarmFlags bit SWARMFLAGS_MOBILE_4_F, [hl] @@ -8019,9 +7575,8 @@ Function10378c: ; 10378c ld hl, wSwarmFlags res SWARMFLAGS_MOBILE_4_F, [hl] ret -; 1037c2 -Function1037c2: ; 1037c2 +Function1037c2: call Function103823 jr c, .nope ld a, [wdc5f] @@ -8040,14 +7595,13 @@ Function1037c2: ; 1037c2 ld [wdc5f], a ld [wScriptVar], a ret -; 1037e6 UnknownText_0x1037e6: ; 0x1037e6 text_jump UnknownText_0x1c449c db "@" ; 0x1037eb -Function1037eb: ; 1037eb +Function1037eb: call Function103823 jr nc, .asm_103807 ld hl, UnknownText_0x103819 @@ -8072,7 +7626,6 @@ Function1037eb: ; 1037eb ld a, $02 ld [wScriptVar], a ret -; 103819 UnknownText_0x103819: ; 0x103819 text_jump UnknownText_0x1c44c0 @@ -8084,7 +7637,7 @@ UnknownText_0x10381e: ; 0x10381e db "@" ; 0x103823 -Function103823: ; 103823 +Function103823: farcall Mobile_AlwaysReturnNotCarry bit 7, c jr nz, .asm_103838 @@ -8100,9 +7653,8 @@ Function103823: ; 103823 .asm_10383a scf ret -; 10383c -Function10383c: ; 10383c +Function10383c: ld a, $01 ld [wdc60], a xor a @@ -8128,14 +7680,13 @@ Function10383c: ; 10383c ld a, $01 ld [wScriptVar], a ret -; 103876 UnknownText_0x103876: ; 0x103876 text_jump UnknownText_0x1c4508 db "@" ; 0x10387b -Function10387b: ; 10387b +Function10387b: farcall Mobile_AlwaysReturnNotCarry bit 7, c ret nz @@ -8146,7 +7697,6 @@ Function10387b: ; 10387b call PrintText call JoyWaitAorB ret -; 103898 UnknownText_0x103898: ; 0x103898 text_jump UnknownText_0x1c4525 diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 93c5a6f88..a1f7f51e0 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -32,9 +32,8 @@ StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6 call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 105f33 -StubbedTrainerRankings_MagikarpLength: ; 105f33 +StubbedTrainerRankings_MagikarpLength: ret ld a, BANK(sTrainerRankingLongestMagikarp) call GetSRAMBank @@ -101,9 +100,8 @@ StubbedTrainerRankings_MagikarpLength: ; 105f33 call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 105f79 -StubbedTrainerRankings_BugContestScore: ; 105f79 +StubbedTrainerRankings_BugContestScore: ret ld a, BANK(sTrainerRankingBugContestScore) call GetSRAMBank @@ -131,9 +129,8 @@ StubbedTrainerRankings_BugContestScore: ; 105f79 call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 105f9f -StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f +StubbedTrainerRankings_AddToSlotsWinStreak: ret ld a, BANK(sTrainerRankingCurrentSlotsStreak) call GetSRAMBank @@ -172,9 +169,8 @@ StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 105fd0 -StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0 +StubbedTrainerRankings_EndSlotsWinStreak: ret ld a, BANK(sTrainerRankingCurrentSlotsStreak) call GetSRAMBank @@ -185,9 +181,8 @@ StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0 call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 105fe3 -StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3 +StubbedTrainerRankings_AddToSlotsPayouts: ret ld a, BANK(sTrainerRankingTotalSlotsPayouts) call GetSRAMBank @@ -214,9 +209,8 @@ StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3 call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 106008 -StubbedTrainerRankings_AddToBattlePayouts: ; 106008 +StubbedTrainerRankings_AddToBattlePayouts: ret ld a, BANK(sTrainerRankingTotalBattlePayouts) call GetSRAMBank @@ -245,14 +239,13 @@ StubbedTrainerRankings_AddToBattlePayouts: ; 106008 call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 10602e -StubbedTrainerRankings_StepCount: ; 10602e (41:602e) +StubbedTrainerRankings_StepCount: ret ld hl, sTrainerRankingStepCount jp StubbedTrainerRankings_Increment4Byte -Unreferenced_StubbedTrainerRankings_BattleTowerWins: ; 106035 +Unreferenced_StubbedTrainerRankings_BattleTowerWins: ret ld a, $5 call GetSRAMBank @@ -263,12 +256,12 @@ Unreferenced_StubbedTrainerRankings_BattleTowerWins: ; 106035 ld hl, sTrainerRankingBattleTowerWins jp StubbedTrainerRankings_Increment2Byte -StubbedTrainerRankings_TMsHMsTaught: ; 106049 +StubbedTrainerRankings_TMsHMsTaught: ret ld hl, sTrainerRankingTMsHMsTaught jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Battles: ; 106050 +StubbedTrainerRankings_Battles: ret ld a, [wBattleType] cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle @@ -276,7 +269,7 @@ StubbedTrainerRankings_Battles: ; 106050 ld hl, sTrainerRankingBattles jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_WildBattles: ; 10605d +StubbedTrainerRankings_WildBattles: ret ld a, [wBattleType] cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle @@ -284,12 +277,12 @@ StubbedTrainerRankings_WildBattles: ; 10605d ld hl, sTrainerRankingWildBattles jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_TrainerBattles: ; 10606a +StubbedTrainerRankings_TrainerBattles: ret ld hl, sTrainerRankingTrainerBattles jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Unused1: ; 106071 +StubbedTrainerRankings_Unused1: ret ld hl, sTrainerRankingUnused1 jp StubbedTrainerRankings_Increment3Byte @@ -299,87 +292,87 @@ StubbedTrainerRankings_HallOfFame:: ; 0x106078 ld hl, sTrainerRankingHOFEntries jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_WildMonsCaught: ; 10607f (41:607f) +StubbedTrainerRankings_WildMonsCaught: ret ld hl, sTrainerRankingWildMonsCaught jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_HookedEncounters: ; 106086 +StubbedTrainerRankings_HookedEncounters: ret ld hl, sTrainerRankingHookedEncounters jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_EggsHatched: ; 10608d (41:608d) +StubbedTrainerRankings_EggsHatched: ret ld hl, sTrainerRankingEggsHatched jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_MonsEvolved: ; 106094 +StubbedTrainerRankings_MonsEvolved: ret ld hl, sTrainerRankingMonsEvolved jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_FruitPicked: ; 10609b +StubbedTrainerRankings_FruitPicked: ret ld hl, sTrainerRankingFruitPicked jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Healings: ; 1060a2 +StubbedTrainerRankings_Healings: ret ld hl, sTrainerRankingHealings jp StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_MysteryGift: ; 1060a9 (41:60a9) +StubbedTrainerRankings_MysteryGift: ret ld hl, sTrainerRankingMysteryGift jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Trades: ; 1060af +StubbedTrainerRankings_Trades: ret ld hl, sTrainerRankingTrades jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Fly: ; 1060b5 +StubbedTrainerRankings_Fly: ret ld hl, sTrainerRankingFly jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Surf: ; 1060bb +StubbedTrainerRankings_Surf: ret ld hl, sTrainerRankingSurf jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Waterfall: ; 1060c1 +StubbedTrainerRankings_Waterfall: ret ld hl, sTrainerRankingWaterfall jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_WhiteOuts: ; 1060c7 +StubbedTrainerRankings_WhiteOuts: ret ld hl, sTrainerRankingWhiteOuts jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_LuckyNumberShow: ; 1060cd +StubbedTrainerRankings_LuckyNumberShow: ret ld hl, sTrainerRankingLuckyNumberShow jr StubbedTrainerRankings_Increment2Byte -StubbedTrainerRankings_PhoneCalls: ; 1060d3 +StubbedTrainerRankings_PhoneCalls: ret ld hl, sTrainerRankingPhoneCalls jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Unused2: ; 1060df +StubbedTrainerRankings_Unused2: ret ld hl, sTrainerRankingUnused2 jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_LinkBattles: ; 1060df +StubbedTrainerRankings_LinkBattles: ret ld hl, sTrainerRankingLinkBattles jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Splash: ; 1060e5 +StubbedTrainerRankings_Splash: ret ; Only counts if it’s the player’s turn ld a, [hBattleTurn] @@ -388,12 +381,12 @@ StubbedTrainerRankings_Splash: ; 1060e5 ld hl, sTrainerRankingSplash jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_TreeEncounters: ; 1060ef +StubbedTrainerRankings_TreeEncounters: ret ld hl, sTrainerRankingTreeEncounters jr StubbedTrainerRankings_Increment3Byte -StubbedTrainerRankings_Unused3: ; 1060f5 +StubbedTrainerRankings_Unused3: ret ld hl, sTrainerRankingUnused3 jr StubbedTrainerRankings_Increment3Byte @@ -407,16 +400,14 @@ StubbedTrainerRankings_ColosseumLosses: ; lose ret ld hl, sTrainerRankingColosseumLosses jr StubbedTrainerRankings_Increment3Byte -; 106107 StubbedTrainerRankings_ColosseumDraws: ; draw ret ld hl, sTrainerRankingColosseumDraws jr StubbedTrainerRankings_Increment3Byte -; 10610d ; Counts uses of both Selfdestruct and Explosion. -StubbedTrainerRankings_Selfdestruct: ; 10610d +StubbedTrainerRankings_Selfdestruct: ret ; Only counts if it’s the player’s turn ld a, [hBattleTurn] @@ -424,33 +415,29 @@ StubbedTrainerRankings_Selfdestruct: ; 10610d ret nz ld hl, sTrainerRankingSelfdestruct jr StubbedTrainerRankings_Increment3Byte -; 106117 -StubbedTrainerRankings_Increment4Byte: ; 106117 +StubbedTrainerRankings_Increment4Byte: push bc ld bc, 3 jr StubbedTrainerRankings_Increment -; 10611d -StubbedTrainerRankings_Increment3Byte: ; 10611d +StubbedTrainerRankings_Increment3Byte: push bc ld bc, 2 jr StubbedTrainerRankings_Increment -; 106123 -StubbedTrainerRankings_Increment2Byte: ; 106123 +StubbedTrainerRankings_Increment2Byte: push bc ld bc, 1 jr StubbedTrainerRankings_Increment -; 106129 ; unused -StubbedTrainerRankings_Increment1Byte: ; 106129 +StubbedTrainerRankings_Increment1Byte: push bc ld bc, 0 ; Increments a big-endian value of bc + 1 bytes at hl -StubbedTrainerRankings_Increment: ; 10612d +StubbedTrainerRankings_Increment: ld a, BANK(sTrainerRankings) call GetSRAMBank push hl @@ -484,19 +471,17 @@ StubbedTrainerRankings_Increment: ; 10612d call CloseSRAM pop bc ret -; 106155 ; Used when SRAM bank 5 isn’t already loaded — what’s the point of this? -UpdateTrainerRankingsChecksum2: ; 106155 +UpdateTrainerRankingsChecksum2: ret ld a, BANK(sTrainerRankings) call GetSRAMBank call UpdateTrainerRankingsChecksum call CloseSRAM ret -; 106162 -UpdateTrainerRankingsChecksum: ; 106162 +UpdateTrainerRankingsChecksum: push de call CalculateTrainerRankingsChecksum ld hl, sTrainerRankingsChecksum @@ -505,9 +490,8 @@ UpdateTrainerRankingsChecksum: ; 106162 ld [hl], e pop de ret -; 10616e -CalculateTrainerRankingsChecksum: ; 10616e +CalculateTrainerRankingsChecksum: push bc ld hl, sTrainerRankings ld bc, sTrainerRankingsChecksum - sTrainerRankings @@ -528,10 +512,9 @@ CalculateTrainerRankingsChecksum: ; 10616e jr nz, .asm_106179 pop bc ret -; 106187 -BackupMobileEventIndex: ; 106187 +BackupMobileEventIndex: ld a, BANK(sMobileEventIndex) call GetSRAMBank ld a, [sMobileEventIndex] @@ -542,10 +525,9 @@ BackupMobileEventIndex: ; 106187 ld [sMobileEventIndexBackup], a call CloseSRAM ret -; 10619d -RestoreMobileEventIndex: ; 10619d (41:619d) +RestoreMobileEventIndex: ld a, BANK(sMobileEventIndexBackup) call GetSRAMBank ld a, [sMobileEventIndexBackup] @@ -556,9 +538,8 @@ RestoreMobileEventIndex: ; 10619d (41:619d) ld [sMobileEventIndex], a call CloseSRAM ret -; 1061b3 (41:61b3) -Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3 +Unreferenced_VerifyTrainerRankingsChecksum: call CalculateTrainerRankingsChecksum ld hl, sTrainerRankingsChecksum ld a, d @@ -568,16 +549,14 @@ Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3 ld a, e cp [hl] ret -; 1061c0 -DeleteMobileEventIndex: ; 1061c0 (41:61c0) +DeleteMobileEventIndex: ld a, BANK(sMobileEventIndex) call GetSRAMBank xor a ld [sMobileEventIndex], a call CloseSRAM ret -; 1061cd (41:61cd) ; Used in the Japanese version to initialize Trainer Rankings data ; for a new save file. Unreferenced in the English version. @@ -599,10 +578,9 @@ InitializeTrainerRankings: ld bc, sTrainerRankingsEnd - sTrainerRankings call CopyBytes ret -; 1061ef -_MobilePrintNum:: ; 1061ef +_MobilePrintNum:: ; Supports signed 31-bit integers (up to 10 digits) ; b: Bits 0-4 = # bytes ; Bit 7 = set if negative @@ -723,7 +701,6 @@ endr pop de pop bc ret -; 106292 ._9 dd 1000000000 ._8 dd 100000000 @@ -733,9 +710,8 @@ endr ._4 dd 10000 ._3 dd 1000 ._2 dd 100 -; 1062b2 -.Function1062b2: ; 1062b2 +.Function1062b2: ld c, $0 .asm_1062b4 ld a, [de] @@ -793,9 +769,8 @@ endr ld [hl], -10 ret -; 1062ff -.Function1062ff: ; 1062ff +.Function1062ff: ld a, [hPrintNum10] bit 7, a jr nz, .asm_10630d @@ -808,17 +783,15 @@ endr .asm_10630d inc hl ret -; 10630f ; functions related to the cable club and various NPC scripts referencing communications -Mobile_DummyReturnFalse: ; 10630f +Mobile_DummyReturnFalse: xor a ld [wScriptVar], a ret -; 106314 -Stubbed_Function106314: ; 106314 +Stubbed_Function106314: ret ld a, $4 call GetSRAMBank @@ -832,9 +805,8 @@ Stubbed_Function106314: ; 106314 ld [$a800], a call CloseSRAM ret -; 10632f -Mobile_AlwaysReturnNotCarry: ; 10632f +Mobile_AlwaysReturnNotCarry: or a ret @@ -872,9 +844,8 @@ Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J xor a ld c, a ret -; 10635c -Function10635c: ; 10635c +Function10635c: ld a, [wMobileCommsJumptableIndex] bit 7, a ret nz @@ -882,9 +853,8 @@ Function10635c: ; 10635c ld hl, .Jumptable rst JumpTable ret -; 10636a -.Jumptable: ; 10636a +.Jumptable: dw .init dw Function106392 dw Function1063cc @@ -894,9 +864,8 @@ Function10635c: ; 10635c dw Function106403 dw Function106442 dw Function106453 -; 10637c -.init: ; 10637c +.init: ld de, wcd30 ld hl, $41 ld bc, $41 @@ -906,9 +875,8 @@ Function10635c: ; 10635c inc a ld [wMobileCommsJumptableIndex], a ret -; 106392 -Function106392: ; 106392 +Function106392: xor a ld [wcf64], a ld a, [wc821] @@ -943,16 +911,15 @@ Function106392: ; 106392 inc a ld [wMobileCommsJumptableIndex], a ret -; 1063cc -Function1063cc: ; 1063cc +Function1063cc: ld a, $78 ld [wcd42], a ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a -Function1063d8: ; 1063d8 +Function1063d8: ld hl, wcd42 dec [hl] ret nz @@ -960,9 +927,8 @@ Function1063d8: ; 1063d8 inc a ld [wMobileCommsJumptableIndex], a ret -; 1063e5 -Function1063e5: ; 1063e5 +Function1063e5: ld a, [wcf64] cp $3 ret nz @@ -970,9 +936,8 @@ Function1063e5: ; 1063e5 inc a ld [wMobileCommsJumptableIndex], a ret -; 1063f3 -Function1063f3: ; 1063f3 +Function1063f3: ld de, wcd31 ld a, $32 call Function3e32 @@ -980,9 +945,8 @@ Function1063f3: ; 1063f3 inc a ld [wMobileCommsJumptableIndex], a ret -; 106403 -Function106403: ; 106403 +Function106403: ld a, [wc821] bit 1, a jr nz, .asm_106426 @@ -1021,9 +985,8 @@ Function106403: ; 106403 inc a ld [wMobileCommsJumptableIndex], a ret -; 106442 -Function106442: ; 106442 +Function106442: ld a, $36 call Function3e32 xor a @@ -1033,7 +996,7 @@ Function106442: ; 106442 inc a ld [wMobileCommsJumptableIndex], a -Function106453: ; 106453 +Function106453: ld a, [wMobileCommsJumptableIndex] set 7, a ld [wMobileCommsJumptableIndex], a @@ -1041,14 +1004,12 @@ Function106453: ; 106453 ld a, $4 ld [wcf64], a ret -; 106462 Stubbed_Function106462: ret ret -; 106464 -Function106464:: ; 106464 +Function106464:: ld de, FontsExtra_SolidBlackGFX ld hl, vTiles2 tile "■" ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 @@ -1068,9 +1029,8 @@ Function106464:: ; 106464 call Get2bpp farcall LoadFrame ret -; 10649b -Function10649b: ; 10649b +Function10649b: ld a, [wTextBoxFrame] maskbits NUM_FRAMES ld bc, 6 * LEN_1BPP_TILE @@ -1088,9 +1048,8 @@ Function10649b: ; 10649b ld b, BANK(TextBoxSpaceGFX) call Function1064c3 ret -; 1064c3 -Function1064c3: ; 1064c3 +Function1064c3: ld a, [rSVBK] push af ld a, $6 @@ -1106,7 +1065,7 @@ Function1064c3: ; 1064c3 ld [rSVBK], a jr asm_1064ed -Function1064d8: ; 1064d8 +Function1064d8: ld a, [rSVBK] push af ld a, $6 @@ -1139,14 +1098,12 @@ asm_1064ed pop af ld [rSVBK], a ret -; 10650a -Function10650a: ; 10650a +Function10650a: ld de, MobilePhoneTilesGFX lb bc, BANK(MobilePhoneTilesGFX), 17 call Get2bpp ret -; 106514 GFX_106514: INCBIN "gfx/unknown/106514.2bpp" diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 566b00755..60e59b5eb 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1,9 +1,8 @@ -MobileTradeAnimation_SendGivemonToGTS: ; 108000 +MobileTradeAnimation_SendGivemonToGTS: ld a, $80 ld [wcf65], a ld de, .TradeAnimScript jp RunMobileTradeAnim_NoFrontpics -; 10800b .TradeAnimScript: mobiletradeanim_showgtsgivemon @@ -18,13 +17,12 @@ MobileTradeAnimation_RetrieveGivemonFromGTS: ld a, $80 jr asm_108018 -MobileTradeAnimation_ReceiveGetmonFromGTS: ; 108016 +MobileTradeAnimation_ReceiveGetmonFromGTS: ld a, $0 asm_108018: ld [wcf65], a ld de, .TradeAnimScript jp RunMobileTradeAnim_NoFrontpics -; 108021 .TradeAnimScript: mobiletradeanim_11 @@ -33,18 +31,17 @@ asm_108018: mobiletradeanim_showgtsgetmon mobiletradeanim_end -Function108026: ; 108026 +Function108026: ld a, $0 jr asm_10802c -Function10802a: ; 10802a +Function10802a: ld a, $1 asm_10802c: ld [wcf65], a ld de, .TradeAnimScript jp RunMobileTradeAnim_Frontpics -; 108035 .TradeAnimScript: ; trade mobiletradeanim_showgivemon @@ -56,12 +53,11 @@ asm_10802c: mobiletradeanim_showgetmon mobiletradeanim_end -Function10803d: ; 10803d +Function10803d: ld a, $0 ld [wcf65], a ld de, .TradeAnimScript jp RunMobileTradeAnim_NoFrontpics -; 108048 .TradeAnimScript: mobiletradeanim_11 @@ -70,19 +66,18 @@ Function10803d: ; 10803d mobiletradeanim_showoddegg mobiletradeanim_end -Function10804d: ; 10804d +Function10804d: ld a, $0 ld [wcf65], a ld de, .TradeAnimScript jp RunMobileTradeAnim_NoFrontpics -; 108058 .TradeAnimScript: mobiletradeanim_11 mobiletradeanim_showgtsgetmon mobiletradeanim_end -RunMobileTradeAnim_Frontpics: ; 10805b +RunMobileTradeAnim_Frontpics: ld hl, wTradeAnimAddress ld [hl], e inc hl @@ -110,9 +105,8 @@ RunMobileTradeAnim_Frontpics: ; 10805b pop af ld [hMapAnims], a ret -; 108089 -RunMobileTradeAnim_NoFrontpics: ; 108089 +RunMobileTradeAnim_NoFrontpics: ld hl, wTradeAnimAddress ld [hl], e inc hl @@ -140,9 +134,8 @@ RunMobileTradeAnim_NoFrontpics: ; 108089 pop af ld [hMapAnims], a ret -; 1080b7 -Function1080b7: ; 1080b7 +Function1080b7: xor a ld [wJumptableIndex], a call ClearBGPalettes @@ -216,9 +209,8 @@ Function1080b7: ; 1080b7 call Function108b98 call Function108af4 ret -; 108157 -Function108157: ; 108157 +Function108157: xor a ld [wJumptableIndex], a call ClearBGPalettes @@ -253,9 +245,8 @@ Function108157: ; 108157 call Function108b98 call Function108af4 ret -; 1081ad -MobileTradeAnim_ClearTiles: ; 1081ad +MobileTradeAnim_ClearTiles: ld a, $1 ld [rVBK], a ld hl, vTiles0 @@ -269,9 +260,8 @@ MobileTradeAnim_ClearTiles: ; 1081ad xor a call ByteFill ret -; 1081ca -MobileTradeAnim_ClearBGMap: ; 1081ca +MobileTradeAnim_ClearBGMap: ld a, $1 ld [rVBK], a hlbgcoord 0, 0 @@ -285,9 +275,8 @@ MobileTradeAnim_ClearBGMap: ; 1081ca ld a, $7f call ByteFill ret -; 1081e9 -MobileTradeAnim_GetFrontpic: ; 1081e9 +MobileTradeAnim_GetFrontpic: push de push af predef GetUnownLetter @@ -298,9 +287,8 @@ MobileTradeAnim_GetFrontpic: ; 1081e9 pop de predef GetMonFrontpic ret -; 108201 -Function108201: ; 108201 +Function108201: push de push af predef GetUnownLetter @@ -311,27 +299,24 @@ Function108201: ; 108201 pop de predef GetAnimatedFrontpic ret -; 108219 -Function108219: ; 108219 +Function108219: ld [wCurPartySpecies], a hlcoord 7, 2 ld d, $0 ld e, ANIM_MON_TRADE predef AnimateFrontpic ret -; 108229 -Function108229: ; 108229 +Function108229: ld [wCurPartySpecies], a hlcoord 7, 2 ld d, $0 ld e, ANIM_MON_TRADE predef LoadMonAnimation ret -; 108239 -MobileTradeAnim_InitSpeciesName: ; 108239 +MobileTradeAnim_InitSpeciesName: push de ld [wd265], a call GetPokemonName @@ -340,9 +325,8 @@ MobileTradeAnim_InitSpeciesName: ; 108239 ld bc, MON_NAME_LENGTH call CopyBytes ret -; 10824b -MobileTradeAnim_JumptableLoop: ; 10824b +MobileTradeAnim_JumptableLoop: ld a, [wJumptableIndex] bit 7, a jr nz, .StopAnim @@ -365,9 +349,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b farcall Function106464 scf ret -; 10827b -.ExecuteMobileTradeAnimCommand: ; 10827b +.ExecuteMobileTradeAnimCommand: ld a, [wJumptableIndex] ld e, a ld d, 0 @@ -378,9 +361,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld h, [hl] ld l, a jp hl -; 10828a -.Jumptable: ; 10828a +.Jumptable: dw GetMobileTradeAnimByte ; 00 dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01 dw MobileTradeAnim_02 ; 02 @@ -401,15 +383,13 @@ MobileTradeAnim_JumptableLoop: ; 10824b dw MobileTradeAnim_11 ; 11 dw MobileTradeAnim_FadeToBlack ; 12 dw MobileTradeAnim_GetOddEgg ; 13 get odd egg -; 1082b2 -MobileTradeAnim_Next: ; 1082b2 +MobileTradeAnim_Next: ld hl, wJumptableIndex inc [hl] ret -; 1082b7 -GetMobileTradeAnimByte: ; 1082b7 +GetMobileTradeAnimByte: ld hl, wTradeAnimAddress ld e, [hl] inc hl @@ -421,15 +401,13 @@ GetMobileTradeAnimByte: ; 1082b7 dec hl ld [hl], e ret -; 1082c6 -EndMobileTradeAnim: ; 1082c6 +EndMobileTradeAnim: ld hl, wJumptableIndex set 7, [hl] ret -; 1082cc -WaitMobileTradeSpriteAnims: ; 1082cc +WaitMobileTradeSpriteAnims: .loop push bc farcall PlaySpriteAnimations @@ -438,27 +416,24 @@ WaitMobileTradeSpriteAnims: ; 1082cc dec c jr nz, .loop ret -; 1082db -Function1082db: ; 1082db +Function1082db: .loop farcall PlaySpriteAnimations farcall SetUpPokeAnim farcall HDMATransferTileMapToWRAMBank3 jr nc, .loop ret -; 1082f0 -Function1082f0: ; 1082f0 +Function1082f0: .loop call Function108b78 call DelayFrame dec c jr nz, .loop ret -; 1082fa -Function1082fa: ; 1082fa +Function1082fa: .loop call Function108b78 push hl @@ -470,9 +445,8 @@ Function1082fa: ; 1082fa dec c jr nz, .loop ret -; 10830e -MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e +MobileTradeAnim_ShowPlayerMonToBeSent: ld de, MUSIC_EVOLUTION call PlayMusic2 ld a, $80 @@ -537,9 +511,8 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e call WaitMobileTradeSpriteAnims call GetMobileTradeAnimByte ret -; 10839b -MobileTradeAnim_ShowOTMonFromTrade: ; 10839b +MobileTradeAnim_ShowOTMonFromTrade: call ClearBGPalettes call ClearSprites call ClearTileMap @@ -595,9 +568,8 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b call Function108c16 call GetMobileTradeAnimByte ret -; 10842c -MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c +MobileTradeAnim_ShowPlayerMonForGTS: ld de, MUSIC_EVOLUTION call PlayMusic2 ld a, $80 @@ -672,9 +644,8 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c call WaitMobileTradeSpriteAnims call GetMobileTradeAnimByte ret -; 1084d7 -MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7 +MobileTradeAnim_ShowOTMonFromGTS: call ClearBGPalettes call ClearSprites call ClearTileMap @@ -741,9 +712,8 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7 call Function108c40 call GetMobileTradeAnimByte ret -; 108589 -MobileTradeAnim_GetOddEgg: ; 108589 +MobileTradeAnim_GetOddEgg: call ClearBGPalettes call ClearSprites call ClearTileMap @@ -809,9 +779,8 @@ MobileTradeAnim_GetOddEgg: ; 108589 call Function1082db call GetMobileTradeAnimByte ret -; 108638 -MobileTradeAnim_02: ; 108638 +MobileTradeAnim_02: farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites @@ -845,9 +814,8 @@ MobileTradeAnim_02: ; 108638 call Function108af4 call GetMobileTradeAnimByte ret -; 108689 -MobileTradeAnim_10: ; 108689 +MobileTradeAnim_10: farcall DeinitializeAllSprites call ClearBGPalettes call ClearSprites @@ -891,9 +859,8 @@ MobileTradeAnim_10: ; 108689 call Function108af4 call GetMobileTradeAnimByte ret -; 1086f4 -MobileTradeAnim_11: ; 1086f4 +MobileTradeAnim_11: call ClearBGPalettes call ClearSprites call ClearTileMap @@ -940,9 +907,8 @@ MobileTradeAnim_11: ; 1086f4 call PlayMusic2 call GetMobileTradeAnimByte ret -; 108763 -MobileTradeAnim_GiveTrademon1: ; 108763 +MobileTradeAnim_GiveTrademon1: ld de, SFX_GIVE_TRADEMON call PlaySFX ld c, 40 @@ -1006,9 +972,8 @@ MobileTradeAnim_GiveTrademon1: ; 108763 .done call MobileTradeAnim_Next ret -; 1087cf -MobileTradeAnim_GiveTrademon2: ; 1087cf +MobileTradeAnim_GiveTrademon2: ld c, 40 ld hl, wBGPals2 + 1 palettes call Function1082f0 @@ -1039,9 +1004,8 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf .done call GetMobileTradeAnimByte ret -; 108811 -MobileTradeAnim_05: ; 108811 +MobileTradeAnim_05: ld c, 40 call WaitMobileTradeSpriteAnims ld a, $1 @@ -1057,9 +1021,8 @@ MobileTradeAnim_05: ; 108811 ld de, SFX_THROW_BALL call PlaySFX ret -; 108838 -MobileTradeAnim_06: ; 108838 +MobileTradeAnim_06: ld c, 40 call WaitMobileTradeSpriteAnims ld a, $1 @@ -1068,9 +1031,8 @@ MobileTradeAnim_06: ; 108838 call PlaySFX call GetMobileTradeAnimByte ret -; 10884c -MobileTradeAnim_07: ; 10884c +MobileTradeAnim_07: ld c, 80 call DelayFrames depixel 30, 10, 2, 0 @@ -1080,9 +1042,8 @@ MobileTradeAnim_07: ; 10884c ld de, SFX_THROW_BALL call PlaySFX ret -; 108863 -MobileTradeAnim_GetTrademon1: ; 108863 +MobileTradeAnim_GetTrademon1: ld c, 40 call WaitMobileTradeSpriteAnims .loop @@ -1105,9 +1066,8 @@ MobileTradeAnim_GetTrademon1: ; 108863 call Function108af4 call MobileTradeAnim_Next ret -; 108894 -MobileTradeAnim_GetTrademon2: ; 108894 +MobileTradeAnim_GetTrademon2: ld c, 20 ld hl, wBGPals2 + 1 palettes call Function1082fa @@ -1174,18 +1134,16 @@ MobileTradeAnim_GetTrademon2: ; 108894 .asm_108906 call MobileTradeAnim_Next ret -; 10890a -MobileTradeAnim_GetTrademon3: ; 10890a +MobileTradeAnim_GetTrademon3: ld c, 40 ld hl, wBGPals2 palette 6 call Function1082f0 call Function108af4 call GetMobileTradeAnimByte ret -; 108919 -MobileTradeAnim_0f: ; 108919 +MobileTradeAnim_0f: ld c, 40 call WaitMobileTradeSpriteAnims farcall DeinitializeAllSprites @@ -1198,9 +1156,8 @@ MobileTradeAnim_0f: ; 108919 call EnableLCD call GetMobileTradeAnimByte ret -; 10893d -MobileTradeAnim_FadeToBlack: ; 10893d +MobileTradeAnim_FadeToBlack: .loop ld a, [rBGP] and a @@ -1219,9 +1176,8 @@ MobileTradeAnim_FadeToBlack: ; 10893d call DmgToCgbObjPal0 call GetMobileTradeAnimByte ret -; 10895e -Function10895e: ; 10895e +Function10895e: ld de, vTiles0 tile $30 jr asm_108966 @@ -1241,9 +1197,8 @@ asm_108966 predef PlaceGraphic call WaitBGMap ret -; 10898a -Function10898a: ; 10898a +Function10898a: ld de, vTiles2 call MobileTradeAnim_GetFrontpic call WaitTop @@ -1255,9 +1210,8 @@ Function10898a: ; 10898a predef PlaceGraphic call WaitBGMap ret -; 1089a8 -MobileTradeAnim_DisplayMonToBeSent: ; 1089a8 +MobileTradeAnim_DisplayMonToBeSent: ld de, wPlayerTrademonSpecies ld a, [de] cp EGG @@ -1307,16 +1261,14 @@ MobileTradeAnim_DisplayEggData: call PlaceString call MobileTradeAnim_MonDisplay_UpdateBGMap ret -; 108a1d -.EggTemplate: ; 108a1d +.EggTemplate: db "タマゴ" next "おや/?????" next "<ID>№<DOT>?????" db "@" -; 108a33 -Function108a33: ; 108a33 +Function108a33: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1) @@ -1330,13 +1282,11 @@ Function108a33: ; 108a33 call PlaceString call MobileTradeAnim_MonDisplay_UpdateBGMap ret -; 108a54 -.OddEgg: ; 108a54 +.OddEgg: db "なぞのタマゴ@" -; 108a5b -MobileTradeAnim_LoadMonTemplate: ; 108a5b +MobileTradeAnim_LoadMonTemplate: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1) @@ -1349,38 +1299,33 @@ MobileTradeAnim_LoadMonTemplate: ; 108a5b ld de, .MonTemplate call PlaceString ret -; 108a79 -.MonTemplate: ; 108a79 +.MonTemplate: db "─ №<DOT>" next "" next "おや/" next "<ID>№<DOT>" db "@" -; 108a87 -MobileTradeAnim_MonDisplay_UpdateBGMap: ; 108a87 +MobileTradeAnim_MonDisplay_UpdateBGMap: call WaitBGMap call WaitTop ld a, HIGH(vBGMap0) ld [hBGMapAddress + 1], a ret -; 108a92 -MobileTradeAnim_MonDisplay_PrintSpeciesNumber: ; 108a92 +MobileTradeAnim_MonDisplay_PrintSpeciesNumber: hlcoord 9, 0 lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum ret -; 108a9c -MobileTradeAnim_MonDisplay_PrintSpeciesName: ; 108a9c +MobileTradeAnim_MonDisplay_PrintSpeciesName: hlcoord 5, 2 call PlaceString ret -; 108aa3 -MobileTradeAnim_MonDisplay_PrintOTNameAndGender: ; 108aa3 +MobileTradeAnim_MonDisplay_PrintOTNameAndGender: cp $3 jr c, .got_gender xor a @@ -1397,30 +1342,26 @@ MobileTradeAnim_MonDisplay_PrintOTNameAndGender: ; 108aa3 ld a, [hl] ld [bc], a ret -; 108abb -.GenderChars: ; 108abb +.GenderChars: db " " db "♂" db "♀" -; 108abe -MobileTradeAnim_MonDisplay_PrintIDNumber: ; 108abe +MobileTradeAnim_MonDisplay_PrintIDNumber: hlcoord 8, 6 lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum ret -; 108ac8 -MobileTradeAnim_ClearTilemap: ; 108ac8 +MobileTradeAnim_ClearTilemap: hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill ret -; 108ad4 -Function108ad4: ; 108ad4 +Function108ad4: and a jr z, .asm_108adc ld de, GFX_1092c7 @@ -1438,9 +1379,8 @@ Function108ad4: ; 108ad4 ld a, $0 ld [rVBK], a ret -; 108af4 -Function108af4: ; 108af4 +Function108af4: ld a, [rSVBK] push af ld a, $5 @@ -1477,9 +1417,8 @@ Function108af4: ; 108af4 call DmgToCgbBGPals call DelayFrame ret -; 108b45 -Function108b45: ; 108b45 +Function108b45: ld a, [rSVBK] push af ld a, $5 @@ -1493,9 +1432,8 @@ Function108b45: ; 108b45 pop af ld [rSVBK], a ret -; 108b5a -Function108b5a: ; 108b5a +Function108b5a: ld a, [rSVBK] push af ld a, $5 @@ -1515,9 +1453,8 @@ Function108b5a: ; 108b5a ld a, $1 ld [hCGBPalUpdate], a ret -; 108b78 -Function108b78: ; 108b78 +Function108b78: ld a, [rSVBK] push af ld a, $5 @@ -1540,12 +1477,11 @@ Function108b78: ; 108b78 ld a, $1 ld [hCGBPalUpdate], a ret -; 108b98 Palette_108b98: ; removed -Function108b98: ; 108b98 +Function108b98: ld d, a ld a, [rSVBK] push af @@ -1567,15 +1503,13 @@ Function108b98: ; 108b98 pop af ld [rSVBK], a ret -; 108bbd -MobileTradeAnim_DeleteSprites: ; 108bbd +MobileTradeAnim_DeleteSprites: farcall DeinitializeAllSprites call ClearSprites ret -; 108bc7 -Function108bc7: ; 108bc7 (42:4bc7) +Function108bc7: ld a, [wcf64] and a ret z @@ -1592,7 +1526,7 @@ Function108bc7: ; 108bc7 (42:4bc7) farcall DeinitializeSprite ret -Function108be0: ; 108be0 (42:4be0) +Function108be0: ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld a, [hl] @@ -1601,9 +1535,8 @@ Function108be0: ; 108be0 (42:4be0) add 1 * 8 ld [hl], a ret -; 108bec (42:4bec) -Function108bec: ; 108bec +Function108bec: ld a, $90 ld [hWY], a ld hl, .PlayerWillTradeMon @@ -1615,7 +1548,6 @@ Function108bec: ; 108bec ld c, 80 call DelayFrames ret -; 108c07 .PlayerWillTradeMon: ; 0x108c07 text_jump UnknownText_0x1bc787 @@ -1632,7 +1564,7 @@ Function108bec: ; 108bec db "@" ; 0x108c16 -Function108c16: ; 108c16 +Function108c16: ld a, $90 ld [hWY], a ld hl, .TakeGoodCareOfMon @@ -1640,14 +1572,13 @@ Function108c16: ; 108c16 ld c, 80 call DelayFrames ret -; 108c26 .TakeGoodCareOfMon: ; 0x108c26 text_jump UnknownText_0x1bc7c3 db "@" ; 0x108c2b -Function108c2b: ; 108c2b +Function108c2b: ld a, $90 ld [hWY], a ld hl, .PlayersMonTrade @@ -1655,14 +1586,13 @@ Function108c2b: ; 108c2b ld c, 80 call DelayFrames ret -; 108c3b .PlayersMonTrade: ; 0x108c3b text_jump UnknownText_0x1bc7dd db "@" ; 0x108c40 -Function108c40: ; 108c40 +Function108c40: ld a, $90 ld [hWY], a ld a, [wcf65] @@ -1680,7 +1610,6 @@ Function108c40: ; 108c40 ld c, 80 call DelayFrames ret -; 108c63 .TakeGoodCareOf: ; 0x108c63 text_jump UnknownText_0x1bc7f0 @@ -1692,7 +1621,7 @@ Function108c40: ; 108c40 db "@" ; 0x108c6d -Function108c6d: ; 108c6d +Function108c6d: ld hl, LZ_108fe7 debgcoord 0, 0 call Decompress @@ -1700,9 +1629,8 @@ Function108c6d: ; 108c6d debgcoord 0, 0, vBGMap1 call Decompress ret -; 108c80 -Function108c80: ; 108c80 +Function108c80: ld a, $1 ld [rVBK], a ld hl, LZ_1090a7 @@ -1714,9 +1642,8 @@ Function108c80: ; 108c80 ld a, $0 ld [rVBK], a ret -; 108c9b -DebugMobileTrade: ; 108c9b +DebugMobileTrade: ; localization error: NAME_LENGTH (11) should be NAME_LENGTH_JAPANESE (6) here ld hl, .DebugTradeData @@ -1781,7 +1708,6 @@ DebugMobileTrade: ; 108c9b jr nz, .their_ot_loop ret -; 108ce9 .DebugTradeData: db VENUSAUR @@ -1792,9 +1718,8 @@ DebugMobileTrade: ; 108c9b db "クりーチャ@" dw $0456 db "マツミヤ@@" -; 108d07 -Function108d07: ; 108d07 +Function108d07: ld a, [wc74e] and $7f cp $8 @@ -1810,7 +1735,6 @@ Function108d07: ; 108d07 ld bc, 1 palettes call FarCopyWRAM ret -; 108d27 LZ_108d27: INCBIN "gfx/unknown/108d27.2bpp.lz" diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 6bcced09e..12eab3aa2 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -7,7 +7,7 @@ String_114000: String_114004: db "CGB-AAAA-00", 0, 0 -Unknown_114011: ; 114011 +Unknown_114011: dw String_114033 dw String_11403a dw String_114043 @@ -26,41 +26,40 @@ Unknown_114011: ; 114011 dw String_114160 dw String_114163 -String_114033: ; 114033 +String_114033: db "From: ", 0 -String_11403a: ; 11403a +String_11403a: db "Sender: ", 0 -String_114043: ; 114043 +String_114043: db "Reply-To: ", 0 -String_11404e: ; 11404e +String_11404e: db "To: ", 0 -String_114053: ; 114053 +String_114053: db "Cc: ", 0 -String_114058: ; 114058 +String_114058: db "Subject: ", 0 -String_114062: ; 114062 +String_114062: db "MIME-Version: 1.0", 0 -String_114074: ; 114074 +String_114074: db "X-Game-title: XXXXXXXXXX", 0 -String_11408d: ; 11408d +String_11408d: db "X-Game-code: CGB-", 0 -String_11409f: ; 11409f +String_11409f: db "X-GBmail-type: exclusive", 0 -String_1140b8: ; 1140b8 +String_1140b8: db "Content-Type: text/plain; charset=iso-2022-jp", 0 -String_1140e6: ; 1140e6 +String_1140e6: db "Content-Type: multipart/mixed; boundary=\"", 0 -String_114110: ; 114110 +String_114110: db "Content-Type: Application/Octet-Stream; name=\"", 0 -String_11413f: ; 11413f +String_11413f: db "Content-Transfer-Encoding:Base64", 0 -String_114160: ; 114160 +String_114160: db "--", 0 -String_114163: ; 114163 +String_114163: db ".", 0 -; 114165 -Jumptable_114165: ; 114165 +Jumptable_114165: dw Stubbed_Function114268 dw Function114269 dw Function11433c @@ -74,9 +73,8 @@ Jumptable_114165: ; 114165 dw Function1154d4 dw Function1156cc dw Function1159fb -; 11417f -Unknown_11417f: ; 11417f +Unknown_11417f: dw .From dw .Sender dw .ReplyTo @@ -91,45 +89,43 @@ Unknown_11417f: ; 11417f dw .XGameCode dw .XGBMailType -.From: ; 114199 +.From: db "FROM:", 0 -.Sender: ; 11419f +.Sender: db "SENDER:", 0 -.ReplyTo: ; 1141a7 +.ReplyTo: db "REPLY-TO:", 0 -.To: ; 1141b1 +.To: db "TO:", 0 -.CC: ; 1141b5 +.CC: db "CC:", 0 -.Subject: ; 1141b9 +.Subject: db "SUBJECT:", 0 -.Date: ; 1141c2 +.Date: db "DATE:", 0 -.ContentType: ; 1141c8 +.ContentType: db "CONTENT-TYPE:", 0 -.MimeVersion: ; 1141d6 +.MimeVersion: db "MIME-VERSION:", 0 -.XMailer: ; 1141e4 +.XMailer: db "X-MAILER:", 0 -.XGameTitle: ; 1141ee +.XGameTitle: db "X-GAME-TITLE:", 0 -.XGameCode: ; 1141fc +.XGameCode: db "X-GAME-CODE:", 0 -.XGBMailType: ; 114209 +.XGBMailType: db "X-GBMAIL-TYPE:", 0 -; 114218 -String_114218: ; 114218 +String_114218: db "NAME=", 0 -String_11421e: ; 11421e +String_11421e: db "MULTIPART", 0 -String_114228: ; 114228 +String_114228: db "BOUNDARY=", 0 -String_114232: ; 114232 +String_114232: db "=?ISO-2022-JP?B?", 0 -; 114243 -Function114243:: ; 114243 +Function114243:: ld a, SRAM_ENABLE ld [MBC3SRamEnable], a ld a, [hFF8C] @@ -147,9 +143,8 @@ Function114243:: ; 114243 pop de jp hl -; 11425c -Function11425c: ; 11425c +Function11425c: ld [$dc02], a pop af ld [hFF8C], a @@ -157,14 +152,12 @@ Function11425c: ; 11425c ld [MBC3SRamBank], a ret -; 114268 Stubbed_Function114268: ret -; 114269 -Function114269: ; 114269 +Function114269: ld h, d ld l, e xor a @@ -303,18 +296,16 @@ Function114269: ; 114269 ld [$dc02], a jp .asm_11429b -; 114333 -Function114333: ; 114333 +Function114333: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 11433c -Function11433c: ; 11433c +Function11433c: push de ld h, d ld l, e @@ -406,9 +397,8 @@ Function11433c: ; 11433c ld b, $1 jp Function11425c -; 1143b7 -Function1143b7: ; 1143b7 +Function1143b7: ld a, [de] ld b, a inc de @@ -458,9 +448,8 @@ Function1143b7: ; 1143b7 pop hl jp Function11425c -; 1143f3 -Function1143f3: ; 1143f3 +Function1143f3: call Function114412 and a jr nz, .asm_11440d @@ -487,9 +476,8 @@ Function1143f3: ; 1143f3 ld b, $84 ret -; 114412 -Function114412: ; 114412 +Function114412: ld a, c ld [$dc00], a ld [hFF8C], a @@ -618,18 +606,16 @@ Function114412: ; 114412 ld a, $1 ret -; 1144c8 -Function1144c8: ; 1144c8 +Function1144c8: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 1144d1 -Function1144d1: ; 1144d1 +Function1144d1: call Function114561 dec de dec de @@ -726,9 +712,8 @@ Function1144d1: ; 1144d1 ld a, $1 jp Function11425c -; 114561 -Function114561: ; 114561 +Function114561: ld hl, $dc03 ld a, [de] ld [hli], a @@ -749,9 +734,8 @@ Function114561: ; 114561 ld [hl], a ret -; 114576 -Function114576: ; 114576 +Function114576: xor a ld [wDecoBed], a ld b, $7 @@ -805,9 +789,8 @@ Function114576: ; 114576 ld [wDecoBed], a ret -; 1145c5 -Function1145c5: ; 1145c5 +Function1145c5: ld hl, $dc24 ld de, String_11421e ld c, $0 @@ -899,9 +882,8 @@ Function1145c5: ; 1145c5 xor a ret -; 11463c -Function11463c: ; 11463c +Function11463c: ld a, [$dc00] push af push de @@ -963,18 +945,16 @@ Function11463c: ; 11463c ld a, $1 ret -; 11469b -Function11469b: ; 11469b +Function11469b: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 1146a4 -Function1146a4: ; 1146a4 +Function1146a4: call Function114867 and a jr nz, .asm_1146e4 @@ -1031,9 +1011,8 @@ Function1146a4: ; 1146a4 ld a, $1 ret -; 1146fa -Function1146fa: ; 1146fa +Function1146fa: call Function114867 and a jp nz, .asm_11478a @@ -1158,9 +1137,8 @@ Function1146fa: ; 1146fa xor a ret -; 1147cd -Function1147cd: ; 1147cd +Function1147cd: ld bc, NULL ld a, [wDecoRightOrnament] and a @@ -1236,18 +1214,16 @@ Function1147cd: ; 1147cd ld a, $1 ret -; 11483a -Function11483a: ; 11483a +Function11483a: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 114843 -Function114843: ; 114843 +Function114843: ld a, [$dc00] push af push de @@ -1270,9 +1246,8 @@ Function114843: ; 114843 ld a, $1 ret -; 114867 -Function114867: ; 114867 +Function114867: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a @@ -1330,18 +1305,16 @@ Function114867: ; 114867 ld a, $1 ret -; 1148b9 -Function1148b9: ; 1148b9 +Function1148b9: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 1148c2 -Function1148c2: ; 1148c2 +Function1148c2: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a @@ -1432,18 +1405,16 @@ Function1148c2: ; 1148c2 ld a, $1 ret -; 114944 -Function114944: ; 114944 +Function114944: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 11494d -Function11494d: ; 11494d +Function11494d: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a @@ -1526,18 +1497,16 @@ Function11494d: ; 11494d ld a, $1 ret -; 1149c3 -Function1149c3: ; 1149c3 +Function1149c3: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 1149cc -Function1149cc: ; 1149cc +Function1149cc: ld hl, $dc06 ld a, [hl] ld [wCurrMapBGEventCount], a @@ -1586,18 +1555,16 @@ Function1149cc: ; 1149cc ld a, $1 ret -; 114a0f -Function114a0f: ; 114a0f +Function114a0f: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 114a18 -Function114a18: ; 114a18 +Function114a18: ld bc, NULL ld h, b .asm_114a1c @@ -1663,18 +1630,16 @@ Function114a18: ; 114a18 ld a, $1 ret -; 114a71 -Function114a71: ; 114a71 +Function114a71: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 114a7a -Function114a7a: ; 114a7a +Function114a7a: ld bc, NULL .asm_114a7d inc bc @@ -1725,18 +1690,16 @@ Function114a7a: ; 114a7a ld a, $1 ret -; 114ac6 -Function114ac6: ; 114ac6 +Function114ac6: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 114acf -Function114acf: ; 114acf +Function114acf: .asm_114acf push hl push bc @@ -1838,18 +1801,16 @@ Function114acf: ; 114acf xor a ret -; 114b4c -Function114b4c: ; 114b4c +Function114b4c: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 114b55 -Function114b55: ; 114b55 +Function114b55: call Function114561 ld b, $0 ld hl, $dc03 @@ -1923,9 +1884,8 @@ endr ld b, $82 jp Function11425c -; 114bbc -Function114bbc: ; 114bbc +Function114bbc: ld h, d ld l, e ld a, [hli] @@ -1978,9 +1938,8 @@ Function114bbc: ; 114bbc pop hl jp Function11425c -; 114c0b -Function114c0b: ; 114c0b +Function114c0b: ld hl, $dc24 push bc call Function115d53 @@ -2038,18 +1997,16 @@ Function114c0b: ; 114c0b jr z, .asm_114c24 jr .asm_114c18 -; 114c55 -Function114c55: ; 114c55 +Function114c55: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 114c5e -Function114c5e: ; 114c5e +Function114c5e: ld de, wPartyMon5Defense push hl .asm_114c62 @@ -2148,9 +2105,8 @@ Function114c5e: ; 114c5e dec bc ret -; 114cd9 -Function114cd9: ; 114cd9 +Function114cd9: ld h, d ld l, e ld b, [hl] @@ -2215,9 +2171,8 @@ endr ld a, $1 jp Function11425c -; 114d39 -Function114d39: ; 114d39 +Function114d39: .asm_114d39 ld a, [$dc04] and a @@ -2284,9 +2239,8 @@ Function114d39: ; 114d39 ld [hli], a ret -; 114d99 -Function114d99: ; 114d99 +Function114d99: ld de, wPartyMon5Defense xor a ld [de], a @@ -2359,9 +2313,8 @@ Function114d99: ; 114d99 xor a ret -; 114df1 -Function114df1: ; 114df1 +Function114df1: cp $1b ret nz ld a, [hli] @@ -2410,9 +2363,8 @@ Function114df1: ; 114df1 xor a ret -; 114e2d -Function114e2d: ; 114e2d +Function114e2d: cp $30 jr c, .asm_114e45 cp $40 @@ -2447,9 +2399,8 @@ Function114e2d: ; 114e2d xor a ret -; 114e62 -Function114e62: ; 114e62 +Function114e62: ld a, c and a jr nz, .asm_114e6f @@ -2492,9 +2443,8 @@ Function114e62: ; 114e62 ld b, $83 jp Function11425c -; 114ea0 -Function114ea0: ; 114ea0 +Function114ea0: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a @@ -2540,18 +2490,16 @@ Function114ea0: ; 114ea0 ld b, $83 ret -; 114ee0 -Function114ee0: ; 114ee0 +Function114ee0: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 114ee9 -Function114ee9: ; 114ee9 +Function114ee9: ld hl, $dc03 ld a, b ld [hli], a @@ -2584,9 +2532,8 @@ Function114ee9: ; 114ee9 ld [hl], d ret -; 114f0a -Function114f0a: ; 114f0a +Function114f0a: call Function114f39 and a jr nz, .asm_114f26 @@ -2621,9 +2568,8 @@ Function114f0a: ; 114f0a ld a, $ff ret -; 114f39 -Function114f39: ; 114f39 +Function114f39: ld hl, $dc0d ld e, [hl] inc hl @@ -2653,9 +2599,8 @@ Function114f39: ; 114f39 .asm_114f58 ret -; 114f59 -Function114f59: ; 114f59 +Function114f59: ld a, [wTimerEventStartDay] and a jr nz, .asm_114f7c @@ -2781,9 +2726,8 @@ Function114f59: ; 114f59 xor a ret -; 115020 -Function115020: ; 115020 +Function115020: push hl ld hl, $dc06 ld a, [hli] @@ -2830,18 +2774,16 @@ Function115020: ; 115020 ld a, $1 ret -; 115059 -Function115059: ; 115059 +Function115059: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 115062 -Function115062: ; 115062 +Function115062: ld hl, wDecoBed ld a, [hli] and a @@ -2894,9 +2836,8 @@ Function115062: ; 115062 .asm_1150b2 ret -; 1150b3 -Function1150b3: ; 1150b3 +Function1150b3: ld hl, $dc24 ld de, wPartyMon5Defense ld b, $0 @@ -2998,9 +2939,8 @@ Function1150b3: ; 1150b3 ld [de], a ret -; 115136 -Function115136: ; 115136 +Function115136: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a @@ -3046,18 +2986,16 @@ Function115136: ; 115136 ld a, $1 ret -; 115170 -Function115170: ; 115170 +Function115170: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 115179 -Function115179: ; 115179 +Function115179: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a @@ -3167,18 +3105,16 @@ Function115179: ; 115179 xor a ret -; 11520e -Function11520e: ; 11520e +Function11520e: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 115217 -Function115217: ; 115217 +Function115217: push hl ld hl, $dc06 ld a, [hli] @@ -3263,18 +3199,16 @@ Function115217: ; 115217 call z, Function115286 jr .asm_115252 -; 115286 -Function115286: ; 115286 +Function115286: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 11528f -Function11528f: ; 11528f +Function11528f: ld hl, wDecoBed ld c, [hl] inc hl @@ -3297,18 +3231,16 @@ Function11528f: ; 11528f ld [hl], c ret -; 1152af -Function1152af: ; 1152af +Function1152af: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 1152b8 -Function1152b8: ; 1152b8 +Function1152b8: push bc call Function11537d push de @@ -3433,9 +3365,8 @@ Function1152b8: ; 1152b8 xor a jp Function11425c -; 11537d -Function11537d: ; 11537d +Function11537d: ld hl, $dc06 ld a, [de] ld [hli], a @@ -3483,9 +3414,8 @@ Function11537d: ; 11537d ld [wTimerEventStartDay], a ret -; 1153b5 -Function1153b5: ; 1153b5 +Function1153b5: ld hl, $dc0d ld e, [hl] inc hl @@ -3510,9 +3440,8 @@ Function1153b5: ; 1153b5 ld [hl], d ret -; 1153d2 -Function1153d2: ; 1153d2 +Function1153d2: ld a, [$dc03] ld d, a ld a, [$dc04] @@ -3698,9 +3627,8 @@ Function1153d2: ; 1153d2 xor a ret -; 1154d4 -Function1154d4: ; 1154d4 +Function1154d4: xor a ld [wTimerEventStartDay], a call Function1155af @@ -3830,9 +3758,8 @@ Function1154d4: ; 1154d4 call Function1155d1 jr .asm_115547 -; 1155af -Function1155af: ; 1155af +Function1155af: ld hl, $dc06 ld a, [de] ld [hli], a @@ -3862,9 +3789,8 @@ Function1155af: ; 1155af call Function1155d1 ret -; 1155d1 -Function1155d1: ; 1155d1 +Function1155d1: ld a, [$dc0d] ld l, a ld a, [$dc0e] @@ -3907,9 +3833,8 @@ Function1155d1: ; 1155d1 ld [$dc0e], a ret -; 11560a -Function11560a: ; 11560a +Function11560a: ld a, [$dc06] ld [wCurrMapBGEventCount], a ld a, [$dc17] @@ -4035,9 +3960,8 @@ Function11560a: ; 11560a ld bc, $03db jr .asm_115659 -; 1156cc -Function1156cc: ; 1156cc +Function1156cc: ld a, [wTimerEventStartDay] and a jp z, Function11425c @@ -4099,9 +4023,8 @@ Function1156cc: ; 1156cc ld b, $83 jp Function11425c -; 115732 -Function115732: ; 115732 +Function115732: ld hl, $dc02 ld a, [de] ld [hli], a @@ -4143,9 +4066,8 @@ Function115732: ; 115732 ld [hl], b ret -; 11575c -Function11575c: ; 11575c +Function11575c: ld hl, $dc05 ld a, [hli] ld h, [hl] @@ -4231,9 +4153,8 @@ Function11575c: ; 11575c ld [wTimerEventStartDay], a ret -; 1157d0 -Function1157d0: ; 1157d0 +Function1157d0: ld hl, $dc05 ld a, [hli] ld h, [hl] @@ -4290,9 +4211,8 @@ Function1157d0: ; 1157d0 ld [wTimerEventStartDay], a ret -; 11581e -Function11581e: ; 11581e +Function11581e: ld a, [wTimerEventStartDay] and a ret z @@ -4398,9 +4318,8 @@ Function11581e: ; 11581e ld [wTimerEventStartDay], a ret -; 1158c2 -Function1158c2: ; 1158c2 +Function1158c2: ld a, e ld [wSwarmFlags], a ld a, d @@ -4608,9 +4527,8 @@ endr ld [hl], a ret -; 1159dc -Function1159dc: ; 1159dc +Function1159dc: cp $1a jr c, .asm_1159ef cp $34 @@ -4638,9 +4556,8 @@ Function1159dc: ; 1159dc ld a, $2b ret -; 1159fb -Function1159fb: ; 1159fb +Function1159fb: ld a, [wTimerEventStartDay] and a jp z, Function11425c @@ -4701,9 +4618,8 @@ Function1159fb: ; 1159fb ld a, $1 jp Function11425c -; 115a5f -Function115a5f: ; 115a5f +Function115a5f: ld hl, $dc05 ld a, [hli] ld h, [hl] @@ -4762,9 +4678,8 @@ Function115a5f: ; 115a5f ld [wTimerEventStartDay], a ret -; 115ab0 -Function115ab0: ; 115ab0 +Function115ab0: ld hl, $dc05 ld a, [hli] ld h, [hl] @@ -4823,9 +4738,8 @@ Function115ab0: ; 115ab0 xor a ret -; 115b00 -Function115b00: ; 115b00 +Function115b00: ld a, [wTimerEventStartDay] and a ret z @@ -4957,9 +4871,8 @@ Function115b00: ; 115b00 xor a ret -; 115bc8 -Function115bc8: ; 115bc8 +Function115bc8: xor a ld [wDecoCarpet], a .asm_115bcc @@ -5058,9 +4971,8 @@ Function115bc8: ; 115bc8 ld a, $2 ret -; 115c49 -Function115c49: ; 115c49 +Function115c49: ld a, e ld [wWeeklyFlags], a ld a, d @@ -5197,9 +5109,8 @@ endr jp nz, .asm_115c64 ret -; 115cfd -Function115cfd: ; 115cfd +Function115cfd: cp $2b jr c, .asm_115d27 jr z, .asm_115d2f @@ -5268,9 +5179,8 @@ Function115cfd: ; 115cfd sub $47 ret -; 115d53 -Function115d53: ; 115d53 +Function115d53: .asm_115d53 ld a, [de] ld [hli], a @@ -5284,18 +5194,16 @@ Function115d53: ; 115d53 ld [hl], a ret -; 115d61 -Function115d61: ; 115d61 +Function115d61: push bc ld bc, $dc00 call Function115d80 pop bc ret -; 115d6a -Function115d6a: ; 115d6a +Function115d6a: .asm_115d6a ld a, [hli] ld [de], a @@ -5308,18 +5216,16 @@ Function115d6a: ; 115d6a xor a ret -; 115d77 -Function115d77: ; 115d77 +Function115d77: push bc ld bc, wCurrMapBGEventCount call Function115d80 pop bc ret -; 115d80 -Function115d80: ; 115d80 +Function115d80: ld e, a ld a, d cp $bf @@ -5340,13 +5246,11 @@ Function115d80: ; 115d80 ld e, $0 ret -; 115d99 INCLUDE "mobile/mobile_45_sprite_engine.asm" -; 116567 -Function116567: ; 116567 +Function116567: ld hl, wc3f7 dec [hl] ret nz @@ -5383,9 +5287,8 @@ Function116567: ; 116567 ld [wc3f7], a ret -; 11659d -Function11659d: ; 11659d +Function11659d: ld a, [wc314] cp $12 ret nc @@ -5399,9 +5302,8 @@ Function11659d: ; 11659d ld l, a jp hl -; 1165af -Jumptable_1165af: ; 1165af +Jumptable_1165af: dw Function11677e dw Function1165d5 dw Function1165d8 @@ -5421,9 +5323,8 @@ Jumptable_1165af: ; 1165af dw Function1166c4 dw Function1166d6 dw Function1166d6 -; 1165d5 -Function1165d5: ; 1165d5 +Function1165d5: call Function11678e Function1165d8: @@ -5444,9 +5345,8 @@ Function1165e3: ret c jp Function116797 -; 1165f5 -Function1165f5: ; 1165f5 +Function1165f5: ld a, $1 ld c, a ld a, $1 @@ -5466,9 +5366,8 @@ Function116600: ld [wc314], a ret -; 116615 -Function116615: ; 116615 +Function116615: call Function11678e Function116618: @@ -5489,9 +5388,8 @@ Function116623: ret c jp Function116797 -; 116635 -Function116635: ; 116635 +Function116635: ld a, $2 ld c, a ld a, $ff @@ -5511,9 +5409,8 @@ Function116640: ld [wc314], a ret -; 116655 -Function116655: ; 116655 +Function116655: xor a ld [wc314 + 3], a call Function11678e @@ -5558,9 +5455,8 @@ Function11668d: ld [wc314], a ret -; 11669f -Function11669f: ; 11669f +Function11669f: call Function11678e Function1166a2: @@ -5607,9 +5503,8 @@ Function1166d6: ld [wc314], a ret -; 1166f4 -Function1166f4: ; 1166f4 +Function1166f4: ld [wc30e], a ld a, b ld [wc314 + 2], a @@ -5635,9 +5530,8 @@ Function1166f4: ; 1166f4 call Function116797 ret -; 11671f -Function11671f: ; 11671f +Function11671f: ld [wc30f], a ld a, b ld [wc314 + 3], a @@ -5659,9 +5553,8 @@ Function11671f: ; 11671f call Function116797 ret -; 116747 -Function116747: ; 116747 +Function116747: ld hl, wc30e ld a, [wc314 + 2] add [hl] @@ -5672,9 +5565,8 @@ Function116747: ; 116747 ld [hl], a ret -; 116758 -Function116758: ; 116758 +Function116758: ld a, [wc30f] cp $30 jr c, .asm_116770 @@ -5703,9 +5595,8 @@ Function116758: ; 116758 ld [wc314 + 4], a ret -; 11677e -Function11677e: ; 11677e +Function11677e: ld a, $0 Function116780: @@ -5721,23 +5612,20 @@ Function116780: and a ret -; 11678e -Function11678e: ; 11678e +Function11678e: ld hl, wc314 ld a, [hl] ld [wc314 + 1], a inc [hl] ret -; 116797 -Function116797: ; 116797 +Function116797: ld hl, wc314 inc [hl] ret -; 11679c Function11679c: ld a, c @@ -5746,7 +5634,7 @@ Function11679c: ld [wc312], a jr asm_1167af -Function1167a6: ; 1167a6 +Function1167a6: ld hl, wc313 dec [hl] ret nz @@ -5794,7 +5682,6 @@ asm_1167af ld [wc313], a ret -; 1167eb Unknown_1167eb: dw Unknown_1167fb @@ -5806,7 +5693,7 @@ Unknown_1167eb: dw Unknown_116881 dw Unknown_1168ae -Unknown_1167fb: ; 1167fb +Unknown_1167fb: db $0, $6 db $1, $4 db $2, $4 @@ -5815,7 +5702,7 @@ Unknown_1167fb: ; 1167fb db $1, $4 db $fe -Unknown_116808: ; 116808 +Unknown_116808: db $4, $6 db $5, $4 db $6, $4 @@ -5824,7 +5711,7 @@ Unknown_116808: ; 116808 db $5, $4 db $fe -Unknown_116815: ; 116815 +Unknown_116815: db $fd, $20 db $8, $c db $9, $24 @@ -5847,7 +5734,7 @@ Unknown_116815: ; 116815 db $8, $4 db -1 ; end -Unknown_11683e: ; 11683e +Unknown_11683e: db $fd, $20 db $e, $c db $f, $24 @@ -5870,14 +5757,14 @@ Unknown_11683e: ; 11683e db $e, $4 db -1 ; end -Unknown_116867: ; 116867 +Unknown_116867: db $14, $8 db $15, $8 db $16, $8 db $15, $8 db $fe -Unknown_116870: ; 116870 +Unknown_116870: db $17, $5 db $18, $5 db $19, $5 @@ -5888,7 +5775,7 @@ Unknown_116870: ; 116870 db $18, $5 db $fe -Unknown_116881: ; 116881 +Unknown_116881: db $1c, $7 db $1d, $7 db $1e, $a @@ -5913,7 +5800,7 @@ Unknown_116881: ; 116881 db $fd, $40 db -1 ; end -Unknown_1168ae: ; 1168ae +Unknown_1168ae: db $24, $4 db $25, $4 db $26, $4 @@ -5926,7 +5813,6 @@ Unknown_1168ae: ; 1168ae db $2d, $4 db $2e, $4 db $fe -; 1168c5 Unknown_1168c5: dw Unknown_116923 @@ -5977,7 +5863,7 @@ Unknown_1168c5: dw Unknown_1172c4 dw Unknown_1172e9 -Unknown_116923: ; 116923 +Unknown_116923: db $f db $0, $0, $1, $a db $0, $8, $2, $d @@ -5995,7 +5881,7 @@ Unknown_116923: ; 116923 db $18, $8, $32, $a db $18, $10, $33, $a -Unknown_116960: ; 116960 +Unknown_116960: db $10 db $1, $0, $1, $a db $1, $8, $2, $d @@ -6014,7 +5900,7 @@ Unknown_116960: ; 116960 db $19, $10, $17, $a db $19, $18, $35, $a -Unknown_1169a1: ; 1169a1 +Unknown_1169a1: db $f db $1, $0, $1, $a db $1, $8, $2, $d @@ -6032,7 +5918,7 @@ Unknown_1169a1: ; 1169a1 db $19, $10, $37, $a db $19, $18, $35, $a -Unknown_1169de: ; 1169de +Unknown_1169de: db $f db $0, $0, $1, $a db $0, $8, $2, $d @@ -6050,7 +5936,7 @@ Unknown_1169de: ; 1169de db $18, $8, $32, $a db $18, $10, $33, $a -Unknown_116a1b: ; 116a1b +Unknown_116a1b: db $f db $0, $0, $4, $2d db $0, $8, $3, $2d @@ -6068,7 +5954,7 @@ Unknown_116a1b: ; 116a1b db $18, $10, $32, $2a db $18, $18, $31, $2a -Unknown_116a58: ; 116a58 +Unknown_116a58: db $10 db $1, $0, $4, $2d db $1, $8, $3, $2d @@ -6087,7 +5973,7 @@ Unknown_116a58: ; 116a58 db $19, $10, $16, $2a db $19, $18, $15, $2a -Unknown_116a99: ; 116a99 +Unknown_116a99: db $f db $1, $0, $4, $2d db $1, $8, $3, $2d @@ -6105,7 +5991,7 @@ Unknown_116a99: ; 116a99 db $19, $8, $37, $2a db $19, $10, $36, $2a -Unknown_116ad6: ; 116ad6 +Unknown_116ad6: db $f db $0, $0, $4, $2d db $0, $8, $3, $2d @@ -6123,7 +6009,7 @@ Unknown_116ad6: ; 116ad6 db $18, $10, $32, $2a db $18, $18, $31, $2a -Unknown_116b13: ; 116b13 +Unknown_116b13: db $10 db $18, $0, $0, $b db $18, $8, $8, $b @@ -6142,7 +6028,7 @@ Unknown_116b13: ; 116b13 db $0, $10, $44, $2b db $0, $18, $43, $2b -Unknown_116b54: ; 116b54 +Unknown_116b54: db $10 db $19, $0, $0, $b db $19, $8, $18, $b @@ -6161,7 +6047,7 @@ Unknown_116b54: ; 116b54 db $1, $10, $44, $2b db $1, $18, $d, $2b -Unknown_116b95: ; 116b95 +Unknown_116b95: db $10 db $18, $0, $0, $b db $18, $8, $5c, $2b @@ -6180,7 +6066,7 @@ Unknown_116b95: ; 116b95 db $0, $10, $44, $2b db $0, $18, $43, $2b -Unknown_116bd6: ; 116bd6 +Unknown_116bd6: db $10 db $18, $0, $0, $a db $18, $8, $56, $a @@ -6199,7 +6085,7 @@ Unknown_116bd6: ; 116bd6 db $0, $10, $49, $2a db $0, $18, $48, $2a -Unknown_116c17: ; 116c17 +Unknown_116c17: db $10 db $19, $0, $0, $a db $19, $8, $76, $a @@ -6218,7 +6104,7 @@ Unknown_116c17: ; 116c17 db $1, $10, $19, $2a db $1, $18, $63, $2a -Unknown_116c58: ; 116c58 +Unknown_116c58: db $10 db $1a, $0, $6c, $a db $1a, $8, $6d, $a @@ -6237,7 +6123,7 @@ Unknown_116c58: ; 116c58 db $2, $10, $47, $2a db $2, $18, $46, $2a -Unknown_116c99: ; 116c99 +Unknown_116c99: db $10 db $19, $0, $0, $2a db $19, $8, $77, $2a @@ -6256,7 +6142,7 @@ Unknown_116c99: ; 116c99 db $1, $10, $19, $2a db $1, $18, $63, $2a -Unknown_116cda: ; 116cda +Unknown_116cda: db $10 db $18, $0, $0, $a db $18, $8, $57, $2a @@ -6275,7 +6161,7 @@ Unknown_116cda: ; 116cda db $0, $10, $49, $2a db $0, $18, $48, $2a -Unknown_116d1b: ; 116d1b +Unknown_116d1b: db $c db $0, $0, $38, $4a db $0, $8, $39, $4a @@ -6290,7 +6176,7 @@ Unknown_116d1b: ; 116d1b db $10, $10, $19, $6a db $10, $18, $9, $6d -Unknown_116d4c: ; 116d4c +Unknown_116d4c: db $e db $0, $8, $3b, $4a db $0, $10, $3b, $6a @@ -6307,7 +6193,7 @@ Unknown_116d4c: ; 116d4c db $18, $10, $b, $6a db $18, $18, $a, $6a -Unknown_116d85: ; 116d85 +Unknown_116d85: db $e db $0, $0, $35, $2a db $0, $8, $3c, $4a @@ -6324,7 +6210,7 @@ Unknown_116d85: ; 116d85 db $18, $10, $e, $4d db $18, $18, $f, $4a -Unknown_116dbe: ; 116dbe +Unknown_116dbe: db $e db $0, $0, $65, $4a db $0, $8, $66, $4a @@ -6341,7 +6227,7 @@ Unknown_116dbe: ; 116dbe db $18, $8, $40, $4d db $18, $10, $41, $4d -Unknown_116df7: ; 116df7 +Unknown_116df7: db $e db $0, $0, $3e, $6a db $0, $8, $3d, $6a @@ -6358,7 +6244,7 @@ Unknown_116df7: ; 116df7 db $18, $0, $f, $6a db $18, $8, $e, $6d -Unknown_116e30: ; 116e30 +Unknown_116e30: db $e db $0, $0, $68, $6a db $0, $8, $67, $6a @@ -6375,7 +6261,7 @@ Unknown_116e30: ; 116e30 db $18, $10, $40, $6d db $18, $18, $3f, $6d -Unknown_116e69: ; 116e69 +Unknown_116e69: db $c db $8, $0, $9, $d db $8, $8, $19, $a @@ -6390,7 +6276,7 @@ Unknown_116e69: ; 116e69 db $18, $10, $39, $2a db $18, $18, $38, $2a -Unknown_116e9a: ; 116e9a +Unknown_116e9a: db $e db $0, $0, $a, $a db $0, $8, $b, $a @@ -6407,7 +6293,7 @@ Unknown_116e9a: ; 116e9a db $18, $8, $3b, $a db $18, $10, $3b, $2a -Unknown_116ed3: ; 116ed3 +Unknown_116ed3: db $e db $0, $10, $e, $d db $0, $18, $f, $a @@ -6424,7 +6310,7 @@ Unknown_116ed3: ; 116ed3 db $18, $10, $3d, $a db $18, $18, $3e, $a -Unknown_116f0c: ; 116f0c +Unknown_116f0c: db $e db $0, $0, $3f, $d db $0, $8, $40, $d @@ -6441,7 +6327,7 @@ Unknown_116f0c: ; 116f0c db $18, $10, $67, $a db $18, $18, $68, $a -Unknown_116f45: ; 116f45 +Unknown_116f45: db $e db $0, $0, $f, $2a db $0, $8, $e, $2d @@ -6458,7 +6344,7 @@ Unknown_116f45: ; 116f45 db $18, $10, $3c, $2a db $18, $18, $35, $4a -Unknown_116f7e: ; 116f7e +Unknown_116f7e: db $e db $0, $8, $41, $2d db $0, $10, $40, $2d @@ -6475,7 +6361,7 @@ Unknown_116f7e: ; 116f7e db $18, $10, $66, $2a db $18, $18, $65, $2a -Unknown_116fb7: ; 116fb7 +Unknown_116fb7: db $d db $fa, $0, $72, $a db $fa, $8, $73, $d @@ -6491,7 +6377,7 @@ Unknown_116fb7: ; 116fb7 db $a, $18, $94, $a db $12, $10, $a3, $a -Unknown_116fec: ; 116fec +Unknown_116fec: db $e db $fd, $0, $85, $d db $fd, $8, $86, $d @@ -6508,7 +6394,7 @@ Unknown_116fec: ; 116fec db $15, $10, $b5, $a db $15, $18, $b6, $a -Unknown_117025: ; 117025 +Unknown_117025: db $c db $8, $0, $79, $d db $8, $8, $7a, $d @@ -6523,7 +6409,7 @@ Unknown_117025: ; 117025 db $18, $10, $9b, $a db $18, $18, $9c, $a -Unknown_117056: ; 117056 +Unknown_117056: db $b db $8, $0, $7d, $a db $8, $8, $7e, $d @@ -6537,7 +6423,7 @@ Unknown_117056: ; 117056 db $18, $10, $9f, $a db $18, $18, $a0, $a -Unknown_117083: ; 117083 +Unknown_117083: db $f db $0, $0, $a1, $a db $0, $8, $a2, $a @@ -6555,7 +6441,7 @@ Unknown_117083: ; 117083 db $18, $10, $87, $a db $18, $18, $88, $a -Unknown_1170c0: ; 1170c0 +Unknown_1170c0: db $f db $0, $0, $a1, $a db $0, $8, $a2, $d @@ -6573,7 +6459,7 @@ Unknown_1170c0: ; 1170c0 db $18, $10, $87, $a db $18, $18, $88, $a -Unknown_1170fd: ; 1170fd +Unknown_1170fd: db $f db $0, $0, $a9, $a db $0, $8, $aa, $a @@ -6591,7 +6477,7 @@ Unknown_1170fd: ; 1170fd db $18, $10, $ba, $a db $18, $18, $bb, $a -Unknown_11713a: ; 11713a +Unknown_11713a: db $f db $0, $0, $ae, $c db $0, $8, $af, $c @@ -6609,7 +6495,7 @@ Unknown_11713a: ; 11713a db $18, $10, $c0, $c db $18, $18, $be, $c -Unknown_117177: ; 117177 +Unknown_117177: db $9 db $14, $0, $1f, $6 db $14, $8, $20, $6 @@ -6621,7 +6507,7 @@ Unknown_117177: ; 117177 db $4, $8, $2, $6 db $4, $10, $3, $6 -Unknown_11719c: ; 11719c +Unknown_11719c: db $9 db $14, $0, $22, $6 db $14, $8, $23, $6 @@ -6633,7 +6519,7 @@ Unknown_11719c: ; 11719c db $4, $8, $5, $6 db $4, $10, $6, $6 -Unknown_1171c1: ; 1171c1 +Unknown_1171c1: db $9 db $14, $0, $25, $6 db $14, $8, $26, $6 @@ -6645,7 +6531,7 @@ Unknown_1171c1: ; 1171c1 db $4, $8, $8, $6 db $4, $10, $9, $6 -Unknown_1171e6: ; 1171e6 +Unknown_1171e6: db $9 db $14, $0, $28, $6 db $14, $8, $29, $6 @@ -6657,7 +6543,7 @@ Unknown_1171e6: ; 1171e6 db $4, $8, $b, $6 db $4, $10, $c, $6 -Unknown_11720b: ; 11720b +Unknown_11720b: db $9 db $14, $0, $2b, $6 db $14, $8, $2c, $6 @@ -6669,7 +6555,7 @@ Unknown_11720b: ; 11720b db $4, $8, $e, $6 db $4, $10, $f, $6 -Unknown_117230: ; 117230 +Unknown_117230: db $9 db $14, $0, $47, $6 db $14, $8, $48, $6 @@ -6681,7 +6567,7 @@ Unknown_117230: ; 117230 db $4, $8, $2f, $6 db $4, $10, $30, $6 -Unknown_117255: ; 117255 +Unknown_117255: db $9 db $14, $0, $35, $6 db $14, $8, $4a, $6 @@ -6693,7 +6579,7 @@ Unknown_117255: ; 117255 db $4, $8, $32, $6 db $4, $10, $31, $26 -Unknown_11727a: ; 11727a +Unknown_11727a: db $9 db $14, $0, $4b, $6 db $14, $8, $4c, $6 @@ -6705,7 +6591,7 @@ Unknown_11727a: ; 11727a db $4, $8, $34, $6 db $4, $10, $35, $6 -Unknown_11729f: ; 11729f +Unknown_11729f: db $9 db $14, $0, $4e, $6 db $14, $8, $4f, $6 @@ -6717,7 +6603,7 @@ Unknown_11729f: ; 11729f db $4, $8, $36, $6 db $4, $10, $37, $6 -Unknown_1172c4: ; 1172c4 +Unknown_1172c4: db $9 db $14, $0, $51, $6 db $14, $8, $52, $6 @@ -6729,7 +6615,7 @@ Unknown_1172c4: ; 1172c4 db $4, $8, $39, $6 db $4, $10, $3a, $6 -Unknown_1172e9: ; 1172e9 +Unknown_1172e9: db $9 db $10, $0, $0, $2 db $10, $8, $0, $2 @@ -6740,7 +6626,6 @@ Unknown_1172e9: ; 1172e9 db $0, $0, $0, $2 db $0, $8, $0, $2 db $4, $10, $10, $6 -; 11730e Palette_11730e: RGB 31, 31, 31 @@ -6782,7 +6667,7 @@ Palette_11734e: RGB 10, 9, 9 RGB 15, 14, 14 -Unknown_117356: ; 117356 +Unknown_117356: db $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9, $c9 db $c9, $c9, $c9, $c9, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1, $c1 db $c5, $c6, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2, $c2 @@ -6832,18 +6717,16 @@ Unknown_117356: ; 117356 db $8f, $8f, $af, $af, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 db $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f, $8f db $8f, $8f, $8f, $8f, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 -; 117656 SECTION "Mobile Stadium", ROMX -GiveOddEgg: ; 117656 +GiveOddEgg: farcall _GiveOddEgg ret -; 11765d -Function11765d: ; 11765d (45:765d) +Function11765d: ld a, [hInMenu] push af ld a, $1 @@ -6853,7 +6736,7 @@ Function11765d: ; 11765d (45:765d) ld [hInMenu], a ret -Function11766b: ; 11766b (45:766b) +Function11766b: call Function117699 ld a, [rSVBK] push af @@ -6874,7 +6757,7 @@ Function11766b: ; 11766b (45:766b) ld [rSVBK], a ret -Function117699: ; 117699 (45:7699) +Function117699: ld a, $5 call GetSRAMBank ld hl, wcd49 @@ -6903,7 +6786,7 @@ Function117699: ; 117699 (45:7699) farcall ClearSpriteAnims ret -Function1176ee: ; 1176ee (45:76ee) +Function1176ee: .loop call JoyTextDelay ld a, [wcd49] @@ -6921,7 +6804,7 @@ Function1176ee: ; 1176ee (45:76ee) call ClearSprites ret -Function117719: ; 117719 (45:7719) +Function117719: ld a, [wcd49] ld e, a ld d, 0 @@ -6933,7 +6816,7 @@ Function117719: ; 117719 (45:7719) ld l, a jp hl -Jumptable_117728: ; 117728 (45:7728) +Jumptable_117728: dw Function117738 dw Function117764 dw Function1178aa @@ -6944,7 +6827,7 @@ Jumptable_117728: ; 117728 (45:7728) dw Function1179a7 -Function117738: ; 117738 (45:7738) +Function117738: farcall Function171ccd depixel 6, 3 ld a, $1d @@ -6964,7 +6847,7 @@ Function117738: ; 117738 (45:7738) ld [wcd23], a jp MobilePassword_IncrementJumptable -Function117764: ; 117764 (45:7764) +Function117764: ld a, [wcd4a] cp $10 jr nz, .asm_11776f @@ -7003,18 +6886,18 @@ Function117764: ; 117764 (45:7764) jp nz, Function117764_d_right ret -Function117764_select: ; 1177a5 (45:77a5) +Function117764_select: farcall Function171cf0 ret -Function117764_start: ; 1177ac (45:77ac) +Function117764_start: ld a, $2 ld [wcd4c], a ld a, $4 ld [wcd4d], a ret -Function1177b7: ; 1177b7 (45:77b7) +Function1177b7: ld a, $3 ld [wcd24], a ld a, [wcd4a] @@ -7027,13 +6910,13 @@ Function1177b7: ; 1177b7 (45:77b7) ld [wcd49], a ret -Function1177cb: ; 1177cb (45:77cb) +Function1177cb: ld a, $80 ld [wcd49], a ld [wScriptVar], a jp MobilePassword_IncrementJumptable -Function117764_b_button: ; 1177d6 (45:77d6) +Function117764_b_button: call PlayClickSFX ld a, [wcd4a] and a @@ -7051,7 +6934,7 @@ Function117764_b_button: ; 1177d6 (45:77d6) ld [hl], a ret -Function117764_d_up: ; 1177f1 (45:77f1) +Function117764_d_up: ld a, [wcd4d] and a ret z @@ -7064,11 +6947,11 @@ Function117764_d_up: ; 1177f1 (45:77f1) sla a sla a add e -Function117764_d_vertical_load: ; 117806 (45:7806) +Function117764_d_vertical_load: ld [wcd4c], a ret -Function117764_d_down: ; 11780a (45:780a) +Function117764_d_down: ld a, [wcd4d] cp $4 ret z @@ -7092,7 +6975,7 @@ Function117764_d_down: ; 11780a (45:780a) ld a, $1 jr Function117764_d_vertical_load -Function117764_d_left: ; 11782d (45:782d) +Function117764_d_left: ld a, [wcd4c] and a ret z @@ -7100,7 +6983,7 @@ Function117764_d_left: ; 11782d (45:782d) ld [wcd4c], a ret -Function117764_d_right: ; 117837 (45:7837) +Function117764_d_right: ld e, $d ld a, [wcd4d] cp $4 @@ -7114,7 +6997,7 @@ Function117764_d_right: ; 117837 (45:7837) ld [wcd4c], a ret -Function117764_a_button: ; 11784c (45:784c) +Function117764_a_button: call PlayClickSFX ld a, [wcd4d] cp $4 @@ -7167,7 +7050,7 @@ Function117764_a_button: ; 11784c (45:784c) ret nz jp Function117764_start -Function1178aa: ; 1178aa (45:78aa) +Function1178aa: ld hl, MenuHeader_1179b5 call LoadMenuHeader call MenuBox @@ -7190,7 +7073,7 @@ Function1178aa: ; 1178aa (45:78aa) ld [wcd4e], a jp MobilePassword_IncrementJumptable -Function1178e8: ; 1178e8 (45:78e8) +Function1178e8: ld a, [hJoyPressed] cp B_BUTTON jr z, .b_button @@ -7242,7 +7125,7 @@ Function1178e8: ; 1178e8 (45:78e8) call ExitMenu jp MobilePassword_IncrementJumptable -Function117942: ; 117942 (45:7942) +Function117942: call SpeechTextBox hlcoord 1, 14 ld de, SavedPasswordString @@ -7263,17 +7146,17 @@ Function117942: ; 117942 (45:7942) jr z, asm_11797e call MobilePassword_IncrementJumptable -Function117976: ; 117976 (45:7976) +Function117976: ld hl, wcd4e dec [hl] ret nz call ExitMenu -asm_11797e: ; 11797e (45:797e) +asm_11797e: ld a, $80 ld [wcd49], a ret -Function117984: ; 117984 (45:7984) +Function117984: ld hl, MenuHeader_1179b5 call LoadMenuHeader call MenuBox @@ -7286,7 +7169,7 @@ Function117984: ; 117984 (45:7984) ld [wcd4e], a call MobilePassword_IncrementJumptable -Function1179a7: ; 1179a7 (45:79a7) +Function1179a7: ld hl, wcd4e dec [hl] ret nz @@ -7295,56 +7178,47 @@ Function1179a7: ; 1179a7 (45:79a7) ld [wcd49], a ret -; 1179b5 (45:79b5) -MenuHeader_1179b5: ; 1179b5 +MenuHeader_1179b5: db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -; 1179bd -MenuHeader_1179bd: ; 1179bd +MenuHeader_1179bd: db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL db 0 ; default option -; 1179c5 -YessNoString_1179c5: ; 1179c5 +YessNoString_1179c5: db "はい" next "いいえ@" -; 1179cc -AskSavePasswordString: ; 1179cc +AskSavePasswordString: db "こ<NO>パスワード¯ほぞんして" line "おきますか?@" -; 1179e1 -NotAPokemonPasswordString: ; 1179e1 +NotAPokemonPasswordString: db "パスワード<PKMN>にゅうりょく" line "されていません!@" -; 1179f7 -SavedPasswordString: ; 1179f7 +SavedPasswordString: db "ログインパスワード¯ほぞん" line "しました@" -; 117a0a -MobilePassword_IncrementJumptable: ; 117a0a (45:7a0a) +MobilePassword_IncrementJumptable: ld hl, wcd49 inc [hl] ret -; 117a0f (45:7a0f) Unknown_117a0f: INCBIN "data/mobile/ascii-alpha.txt" Unknown_117a47: INCBIN "data/mobile/ascii-sym.txt" -; 117a7f ; everything from here to the end of the bank is related to the diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 1edafb47c..70e8ef9f8 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -1,4 +1,4 @@ -Function115d99: ; 115d99 +Function115d99: ld de, GFX_11601a ld hl, vTiles0 tile $60 lb bc, BANK(GFX_11601a), 20 @@ -16,9 +16,8 @@ Function115d99: ; 115d99 ld [wc308], a ret -; 115dc3 -Function115dc3: ; 115dc3 +Function115dc3: xor a ld [wc305], a ld a, $a0 @@ -27,9 +26,8 @@ Function115dc3: ; 115dc3 call ByteFill ret -; 115dd3 -Function115dd3: ; 115dd3 +Function115dd3: ld a, [wc305] and a ret z @@ -77,25 +75,23 @@ Function115dd3: ; 115dd3 jr nz, .asm_115e04 ret -; 115e18 -Function115e18: ; 115e18 +Function115e18: ld a, c ld [wc30a], a xor a ld [wc30b], a jr Function115e2b -; 115e22 -Function115e22: ; 115e22 +Function115e22: ld hl, wc30c dec [hl] ret nz ld hl, wc30b inc [hl] -Function115e2b: ; 115e2b +Function115e2b: ld a, [wc30a] sla a ld c, a @@ -126,7 +122,6 @@ Function115e2b: ; 115e2b ld [wc30c], a ret -; 115e59 Unknown_115e59: dw Unknown_115e61 @@ -135,7 +130,7 @@ Unknown_115e59: dw Unknown_115e79 ; OAM idx (see Unknown_115e86), flip flags/duration -Unknown_115e61: ; 115e61 +Unknown_115e61: db $04, $08 db $05, $08 db $06, $08 @@ -143,17 +138,17 @@ Unknown_115e61: ; 115e61 db $08, $08 db -1 -Unknown_115e6c: ; 115e6c +Unknown_115e6c: db $01, $08 db $02, $08 db $03, $08 db $09, $08 db $0a, $08 -Unknown_115e76: ; 115e76 +Unknown_115e76: db $00, $08 db -1 -Unknown_115e79: ; 115e79 +Unknown_115e79: db $0b, $08 db $0c, $08 db $0d, $08 @@ -161,7 +156,6 @@ Unknown_115e79: ; 115e79 db $0f, $08 db $00, $08 db -1 -; 115e86 Unknown_115e86: dw Unknown_115ea6 @@ -181,14 +175,14 @@ Unknown_115e86: dw Unknown_115ff0 dw Unknown_116005 -Unknown_115ea6: ; 115ea6 +Unknown_115ea6: db 4 dsprite 1, 0, 0, 0, $60, $01 dsprite 1, 0, 1, 0, $61, $01 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115eb7: ; 115eb7 +Unknown_115eb7: db 5 dsprite 0, 0, 1, 0, $64, $00 dsprite 1, 0, 0, 0, $60, $01 @@ -196,7 +190,7 @@ Unknown_115eb7: ; 115eb7 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115ecc: ; 115ecc +Unknown_115ecc: db 5 dsprite 0, 0, 1, 0, $65, $00 dsprite 1, 0, 0, 0, $60, $01 @@ -204,7 +198,7 @@ Unknown_115ecc: ; 115ecc dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115ee1: ; 115ee1 +Unknown_115ee1: db 5 dsprite 0, 0, 1, 0, $66, $00 dsprite 1, 0, 0, 0, $60, $01 @@ -212,7 +206,7 @@ Unknown_115ee1: ; 115ee1 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115ef6: ; 115ef6 +Unknown_115ef6: db 7 dsprite 0, 0, 0, 0, $67, $01 dsprite 1, 0, 0, 0, $68, $01 @@ -222,7 +216,7 @@ Unknown_115ef6: ; 115ef6 dsprite 3, 0, 1, 0, $6b, $00 dsprite 3, 0, 2, 0, $6c, $00 -Unknown_115f13: ; 115f13 +Unknown_115f13: db 7 dsprite 0, 0, 0, 0, $67, $01 dsprite 1, 0, 0, 0, $68, $01 @@ -232,7 +226,7 @@ Unknown_115f13: ; 115f13 dsprite 3, 0, 1, 0, $6b, $00 dsprite 3, 0, 2, 0, $6c, $00 -Unknown_115f30: ; 115f30 +Unknown_115f30: db 7 dsprite 0, 0, 0, 0, $67, $01 dsprite 1, 0, 0, 0, $68, $01 @@ -242,7 +236,7 @@ Unknown_115f30: ; 115f30 dsprite 3, 0, 1, 0, $6b, $00 dsprite 3, 0, 2, 0, $6c, $00 -Unknown_115f4d: ; 115f4d +Unknown_115f4d: db 7 dsprite 0, 0, 0, 0, $67, $01 dsprite 1, 0, 0, 0, $68, $01 @@ -252,7 +246,7 @@ Unknown_115f4d: ; 115f4d dsprite 3, 0, 1, 0, $6b, $00 dsprite 3, 0, 2, 0, $6c, $00 -Unknown_115f6a: ; 115f6a +Unknown_115f6a: db 7 dsprite 0, 0, 0, 0, $67, $01 dsprite 1, 0, 0, 0, $68, $01 @@ -262,7 +256,7 @@ Unknown_115f6a: ; 115f6a dsprite 3, 0, 1, 0, $6b, $00 dsprite 3, 0, 2, 0, $6c, $00 -Unknown_115f87: ; 115f87 +Unknown_115f87: db 5 dsprite 0, 0, 1, 0, $72, $00 dsprite 1, 0, 0, 0, $60, $01 @@ -270,7 +264,7 @@ Unknown_115f87: ; 115f87 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115f9c: ; 115f9c +Unknown_115f9c: db 5 dsprite 0, 0, 1, 0, $73, $00 dsprite 1, 0, 0, 0, $60, $01 @@ -278,7 +272,7 @@ Unknown_115f9c: ; 115f9c dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115fb1: ; 115fb1 +Unknown_115fb1: db 5 dsprite 0, 1, 1, 0, $64, $60 dsprite 1, 0, 0, 0, $60, $01 @@ -286,7 +280,7 @@ Unknown_115fb1: ; 115fb1 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115fc6: ; 115fc6 +Unknown_115fc6: db 5 dsprite 0, 1, 1, 0, $65, $60 dsprite 1, 0, 0, 0, $60, $01 @@ -294,7 +288,7 @@ Unknown_115fc6: ; 115fc6 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115fdb: ; 115fdb +Unknown_115fdb: db 5 dsprite 0, 1, 1, 0, $66, $60 dsprite 1, 0, 0, 0, $60, $01 @@ -302,7 +296,7 @@ Unknown_115fdb: ; 115fdb dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_115ff0: ; 115ff0 +Unknown_115ff0: db 5 dsprite 0, 1, 1, 0, $72, $60 dsprite 1, 0, 0, 0, $60, $01 @@ -310,20 +304,19 @@ Unknown_115ff0: ; 115ff0 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -Unknown_116005: ; 116005 +Unknown_116005: db 5 dsprite 0, 1, 1, 0, $73, $60 dsprite 1, 0, 0, 0, $60, $01 dsprite 1, 0, 1, 0, $61, $01 dsprite 2, 0, 0, 0, $62, $01 dsprite 2, 0, 1, 0, $63, $01 -; 11601a -GFX_11601a:: ; 11601a +GFX_11601a:: INCBIN "gfx/unknown/11601a.2bpp" -Function11615a: ; 11615a +Function11615a: xor a ld [wc30d], a ld [$c319], a @@ -350,9 +343,8 @@ Function11615a: ; 11615a ld [wc3f3], a ret -; 11619d -Function11619d: ; 11619d +Function11619d: ld a, [wc30d] and a ret z @@ -368,9 +360,8 @@ Function11619d: ; 11619d call Function1161b8 ret -; 1161b8 -Function1161b8: ; 1161b8 +Function1161b8: ld a, [$c319] ld e, a ld d, 0 @@ -382,9 +373,8 @@ Function1161b8: ; 1161b8 ld l, a jp hl -; 1161c7 -.Jumptable: ; 1161c7 +.Jumptable: dw Function1161d5 dw Function116294 dw Function1162cb @@ -392,9 +382,8 @@ Function1161b8: ; 1161b8 dw Function1163c0 dw Function11636e dw Function116441 -; 1161d5 -Function1161d5: ; 1161d5 +Function1161d5: ld a, [rSVBK] push af @@ -504,16 +493,14 @@ Function1161d5: ; 1161d5 ld [$c319], a ret -; 11628c -MenuHeader_11628c: ; 11628c +MenuHeader_11628c: db MENU_BACKUP_TILES ; flags menu_coords 0, 6, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -; 116294 -Function116294: ; 116294 +Function116294: farcall Function170d02 ld a, [$c319] inc a @@ -537,9 +524,8 @@ Function116294: ; 116294 ld [hWY], a ret -; 1162cb -Function1162cb: ; 1162cb +Function1162cb: farcall Function170cc6 ld a, [$c319] inc a @@ -557,9 +543,8 @@ Function1162cb: ; 1162cb ld [rSVBK], a ret -; 1162f2 -Function1162f2: ; 1162f2 +Function1162f2: call Function11659d call Function116758 call Function1167a6 @@ -648,9 +633,8 @@ Function1162f2: ; 1162f2 jr nz, .asm_11635a ret -; 11636e -Function11636e: ; 11636e +Function11636e: ld a, [rSVBK] push af ld a, $5 @@ -687,9 +671,8 @@ Function11636e: ; 11636e ld [wc30d], a ret -; 1163c0 -Function1163c0: ; 1163c0 +Function1163c0: ld a, [rSVBK] push af ld a, $1 @@ -746,9 +729,8 @@ Function1163c0: ; 1163c0 ld [wc30d], a ret -; 116441 -Function116441: ; 116441 +Function116441: farcall Function17d405 ld a, $90 ld [hWY], a @@ -764,9 +746,8 @@ Function116441: ; 116441 ld [wc30d], a ret -; 116468 -Function116468: ; 116468 +Function116468: call Function116567 ld a, [wc314] cp $d diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 5ee3ea1e8..50950204f 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1,11 +1,11 @@ SECTION "Mobile 46", ROMX -Function118000: ; 118000 +Function118000: ld a, $1 ld [wcd38], a jr asm_11800b -Function118007: ; 118007 +Function118007: xor a ld [wcd38], a @@ -44,11 +44,10 @@ asm_11800b ld [rSVBK], a call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu -BattleTowerRoomMenu_DoNothing: ; 11805e (46:405e) +BattleTowerRoomMenu_DoNothing: ret -; 11805f -Function11805f: ; 11805f +Function11805f: ld a, $1 ld [wcd38], a call BattleTowerRoomMenu_InitRAM @@ -86,9 +85,8 @@ Function11805f: ; 11805f call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret -; 1180b8 -Function1180b8: ; 1180b8 +Function1180b8: call BattleTowerRoomMenu_InitRAM ld a, $22 ld [wcd33], a @@ -132,17 +130,16 @@ Function1180b8: ; 1180b8 call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret -; 11811a -Function11811a: ; 11811a +Function11811a: ld a, 1 ld [wcd38], a jr Function118125 -_BattleTowerRoomMenu: ; 118121 +_BattleTowerRoomMenu: xor a ld [wcd38], a -Function118125: ; 118125 +Function118125: call BattleTowerRoomMenu_InitRAM ld a, $3 ld [wcd33], a @@ -180,9 +177,8 @@ Function118125: ; 118125 call Function118180 call ReturnToMapFromSubmenu ret -; 118180 -Function118180: ; 118180 +Function118180: ld a, [wScriptVar] and a ret nz @@ -226,9 +222,8 @@ Function118180: ; 118180 ld [wc300], a ld [wScriptVar], a jr .reset_banks -; 1181da -Function1181da: ; 1181da +Function1181da: call BattleTowerRoomMenu_InitRAM ld a, $2 ld [wcd38], a @@ -266,9 +261,8 @@ Function1181da: ; 1181da call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret -; 118233 -Function118233: ; 118233 +Function118233: call BattleTowerRoomMenu_InitRAM ld a, $1b ld [wcd33], a @@ -303,9 +297,8 @@ Function118233: ; 118233 ld [rSVBK], a call BattleTowerRoomMenu_Cleanup ret -; 118284 -Function118284: ; 118284 +Function118284: call BattleTowerRoomMenu_InitRAM ld a, $19 ld [wcd33], a @@ -339,10 +332,9 @@ Function118284: ; 118284 ld [rSVBK], a call BattleTowerRoomMenu_Cleanup ret -; 1182d5 (46:42d5) -Function1182d5: ; 1182d5 +Function1182d5: call BattleTowerRoomMenu_InitRAM ld a, $18 ld [wcd33], a @@ -378,9 +370,8 @@ Function1182d5: ; 1182d5 call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret -; 118329 -Function118329: ; 118329 +Function118329: call BattleTowerRoomMenu_InitRAM ld a, $15 ld [wcd33], a @@ -415,9 +406,8 @@ Function118329: ; 118329 ld [rSVBK], a call BattleTowerRoomMenu_Cleanup ret -; 11837a -Function11837a: ; 11837a +Function11837a: call BattleTowerRoomMenu_InitRAM ld a, $16 ld [wcd33], a @@ -452,9 +442,8 @@ Function11837a: ; 11837a ld [rSVBK], a call BattleTowerRoomMenu_Cleanup ret -; 1183cb -BattleTowerRoomMenu_InitRAM: ; 1183cb +BattleTowerRoomMenu_InitRAM: di ld a, [rIE] ld [wcd32], a @@ -497,9 +486,8 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb ld [$bfff], a call CloseSRAM ret -; 118440 -Function118440: ; 118440 +Function118440: push af ld a, $5 call GetSRAMBank @@ -509,9 +497,8 @@ Function118440: ; 118440 call CloseSRAM pop af ret -; 118452 -BattleTowerRoomMenu_Cleanup: ; 118452 +BattleTowerRoomMenu_Cleanup: di xor a ld [hMobileReceive], a @@ -528,9 +515,8 @@ BattleTowerRoomMenu_Cleanup: ; 118452 ld a, [wc300] ld [wScriptVar], a ret -; 118473 -Function118473: ; 118473 +Function118473: ld a, [wcd65] and a ret z @@ -559,13 +545,11 @@ Function118473: ; 118473 xor a ld [wcd65], a ret -; 1184a5 -Function1184a5: ; 1184a5 +Function1184a5: jumptable .Jumptable, wcf66 -; 1184b4 -.Jumptable: ; 1184b4 +.Jumptable: dw Function11886e dw Function118880 dw Function11878d @@ -594,13 +578,11 @@ Function1184a5: ; 1184a5 dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 1184ec -Function1184ec: ; 1184ec +Function1184ec: jumptable .Jumptable, wcf66 -; 1184fb -.Jumptable: ; 1184fb +.Jumptable: dw Function11886e dw Function118880 dw Function11878d @@ -642,13 +624,11 @@ Function1184ec: ; 1184ec dw Function11878d dw Function119ac9 dw Function118e76 -; 11854d -BattleTowerRoomMenu_Jumptable: ; 11854d +BattleTowerRoomMenu_Jumptable: jumptable .Jumptable, wcf66 -; 11855c -.Jumptable: ; 11855c +.Jumptable: dw BattleTowerRoomMenu_PickLevelMessage dw BattleTowerRoomMenu_PlacePickLevelMenu dw BattleTowerRoomMenu_UpdatePickLevelMenu @@ -665,13 +645,11 @@ BattleTowerRoomMenu_Jumptable: ; 11854d dw Function118e76 ; mobile dw BattleTowerRoomMenu_CallRoomMenu2 ; mobile dw Function118e76 ; mobile -; 11857c -Function11857c: ; 11857c +Function11857c: jumptable .Jumptable, wcf66 -; 11858b -.Jumptable: ; 11858b +.Jumptable: dw Function11886e dw Function118880 dw Function11878d @@ -700,13 +678,11 @@ Function11857c: ; 11857c dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 1185c3 -Function1185c3: ; 1185c3 +Function1185c3: jumptable .Jumptable, wcf66 -; 1185d2 -.Jumptable: ; 1185d2 +.Jumptable: dw Function11886e dw Function118880 dw Function11878d @@ -748,13 +724,11 @@ Function1185c3: ; 1185c3 dw BattleTowerRoomMenu_UpdateYesNoMenu dw Function11914e dw Function118e76 -; 118624 -Function118624: ; 118624 +Function118624: jumptable .Jumptable, wcf66 -; 118633 -.Jumptable: ; 118633 +.Jumptable: dw Function118866 dw Function118880 dw Function11878d @@ -786,13 +760,11 @@ Function118624: ; 118624 dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 118671 -Function118671: ; 118671 +Function118671: jumptable .Jumptable, wcf66 -; 118680 -.Jumptable: ; 118680 +.Jumptable: dw Function118866 dw Function118880 dw Function11878d @@ -818,13 +790,11 @@ Function118671: ; 118671 dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 1186b2 -Function1186b2: ; 1186b2 +Function1186b2: jumptable .Jumptable, wcf66 -; 1186c1 -.Jumptable: ; 1186c1 +.Jumptable: dw Function118866 dw Function118880 dw Function11878d @@ -851,13 +821,11 @@ Function1186b2: ; 1186b2 dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 1186f5 -Function1186f5: ; 1186f5 (46:46f5) +Function1186f5: jumptable .Jumptable, wcf66 -; 118704 (46:4704) -.Jumptable: ; 118704 (46:4704) +.Jumptable: dw Function11886a dw Function118880 dw Function11878d @@ -891,13 +859,11 @@ Function1186f5: ; 1186f5 (46:46f5) dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 118746 (46:4746) -Function118746: ; 118746 +Function118746: jumptable .Jumptable, wcf66 -; 118755 -.Jumptable: ; 118755 +.Jumptable: dw Function11886e dw Function118880 dw Function11878d @@ -926,9 +892,8 @@ Function118746: ; 118746 dw Function118e76 dw BattleTowerRoomMenu_CallRoomMenu2 dw Function118e76 -; 11878d -Function11878d: ; 11878d (46:478d) +Function11878d: ld a, [wc821] bit 1, a jr nz, .asm_1187af @@ -994,7 +959,7 @@ Function11878d: ; 11878d (46:478d) .asm_118803 ld a, $d3 -Function118805: ; 118805 (46:4805) +Function118805: ld [wc300], a xor a ld [wc301], a @@ -1007,7 +972,7 @@ Function118805: ; 118805 (46:4805) ld [wcf66], a ret -Function118821: ; 118821 (46:4821) +Function118821: ld a, [$c319] cp $3 jr c, .asm_11884a @@ -1029,9 +994,8 @@ Function118821: ; 118821 (46:4821) .asm_11884a and a ret -; 11884c (46:484c) -Function11884c: ; 11884c +Function11884c: ld a, [hJoyDown] cp $5 jr nz, .asm_118864 @@ -1047,16 +1011,14 @@ Function11884c: ; 11884c .asm_118864 and a ret -; 118866 Function118866: ld a, 2 jr asm_11886f -Function11886a: ; 11886a (46:486a) +Function11886a: ld a, 1 jr asm_11886f -; 11886e (46:486e) Function11886e: xor a @@ -1069,7 +1031,7 @@ asm_11886f ld a, [wcd33] ld [wMobileInactivityTimerSeconds], a -Function118880: ; 118880 (46:4880) +Function118880: call BattleTowerRoomMenu2 ret c xor a @@ -1079,9 +1041,8 @@ Function118880: ; 118880 (46:4880) ld hl, $46 ld a, $2 jp Function119e2b -; 118896 (46:4896) -Function118896: ; 118896 +Function118896: ld a, [wc821] bit 1, a jr nz, .asm_1188a5 @@ -1097,24 +1058,23 @@ Function118896: ; 118896 .asm_1188aa call BattleTowerRoomMenu_IncrementJumptable jp BattleTowerRoomMenu_IncrementJumptable -; 1188b0 -Function1188b0: ; 1188b0 (46:48b0) +Function1188b0: ld de, $c346 ld a, $c jp Function119e2b -Function1188b8: ; 1188b8 (46:48b8) +Function1188b8: ld de, wc3ac ld a, $e jp Function119e2b -Function1188c0: ; 1188c0 (46:48c0) +Function1188c0: ld de, wc3cd ld a, $10 jp Function119e2b -Function1188c8: ; 1188c8 (46:48c8) +Function1188c8: ld a, $1 ld [wcd65], a call Function1188e7 @@ -1131,7 +1091,7 @@ Function1188c8: ; 1188c8 (46:48c8) ld a, $6 jp Function119e2b -Function1188e7: ; 1188e7 (46:48e7) +Function1188e7: ld de, $c346 ld a, $5 call GetSRAMBank @@ -1150,7 +1110,7 @@ Function1188e7: ; 1188e7 (46:48e7) jr nz, .asm_1188fa ret -Function118903: ; 118903 (46:4903) +Function118903: ld a, [wc3f0] ld [$c319], a ld c, $1 @@ -1161,12 +1121,12 @@ Function118903: ; 118903 (46:4903) jp BattleTowerRoomMenu_IncrementJumptable -Function11891c: ; 11891c +Function11891c: call Function118b42 jp BattleTowerRoomMenu_IncrementJumptable -BattleTowerRoomMenu_PickLevelMessage: ; 118922 +BattleTowerRoomMenu_PickLevelMessage: ld a, [wcd38] and a jr nz, .asm_11892d @@ -1349,7 +1309,7 @@ BattleTowerRoomMenu_UpdatePickLevelMenu: -Function118a54: ; 118a54 +Function118a54: ld a, [wcd55] ld l, a ld a, [wcd56] @@ -1357,9 +1317,8 @@ Function118a54: ; 118a54 ld de, wc3ec ld bc, $0004 jp Function118ae4 -; 118a65 -Function118a65: ; 118a65 +Function118a65: ld hl, BattleDownloadURL ld de, wcc60 ld bc, $80 @@ -1367,9 +1326,8 @@ Function118a65: ; 118a65 ld de, w3_d000 ld bc, $1000 jp Function118b10 -; 118a7a -Function118a7a: ; 118a7a +Function118a7a: ld hl, BattleDownloadURL ld de, wcc60 ld bc, $80 @@ -1377,9 +1335,8 @@ Function118a7a: ; 118a7a ld de, w3_d000 ld bc, $1000 jp Function118b10 -; 118a8f -Function118a8f: ; 118a8f +Function118a8f: ld hl, ExchangeDownloadURL ld de, wcc60 ld bc, $80 @@ -1387,9 +1344,8 @@ Function118a8f: ; 118a8f ld de, w3_d000 ld bc, $1000 jp Function118b10 -; 118aa4 -Function118aa4: ; 118aa4 +Function118aa4: ld hl, NewsDownloadURL ld de, wcc60 ld bc, $80 @@ -1399,9 +1355,8 @@ Function118aa4: ; 118aa4 ld de, w3_d100 ld bc, $e00 jr Function118b10 -; 118abc -Function118abc: ; 118abc (46:4abc) +Function118abc: ld hl, MenuDownloadURL ld de, wcc60 ld bc, $80 @@ -1409,7 +1364,6 @@ Function118abc: ; 118abc (46:4abc) ld de, w3_d000 ld bc, $1000 jr Function118b10 -; 118ad0 (46:4ad0) Function118ad0: ld hl, IndexDownloadURL @@ -1449,7 +1403,6 @@ Function118ae4: pop bc ld a, $2a jp Function119e2b -; 118b10 Function118b10: push de @@ -1463,7 +1416,7 @@ Function118b10: ld a, $2a jp Function119e2b -Function118b24: ; 118b24 (46:4b24) +Function118b24: ld hl, $c346 ld a, $8 ld [hli], a @@ -1479,9 +1432,8 @@ Function118b24: ; 118b24 (46:4b24) ld [wcd89], a ld hl, $c346 ret -; 118b42 (46:4b42) -Function118b42: ; 118b42 +Function118b42: ld hl, wd002 ld a, l ld [wcd51], a @@ -1514,9 +1466,8 @@ Function118b42: ; 118b42 ld a, h ld [wcd60], a ret -; 118b8c -Function118b8c: ; 118b8c +Function118b8c: .asm_118b8c call Function118b9a ret nc @@ -1528,9 +1479,8 @@ Function118b8c: ; 118b8c ld [hli], a ld [hli], a ret -; 118b9a -Function118b9a: ; 118b9a +Function118b9a: ld a, h cp $e0 ret c @@ -1538,7 +1488,6 @@ Function118b9a: ; 118b9a call Function118805 and a ret -; 118ba5 charmap " ", $20 ; revert to ascii @@ -1559,7 +1508,7 @@ IndexDownloadURL: ; 0x118ce5 db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0 -Unreferenced_Function118d35: ; 118d35 +Unreferenced_Function118d35: ld hl, $d200 ld a, [wcd38] and a @@ -1600,9 +1549,8 @@ Unreferenced_Function118d35: ; 118d35 .asm_118d7b ld a, $d3 jp Function118805 -; 118d80 -Function118d80: ; 118d80 +Function118d80: call Function118e06 ld a, [wcd38] and a @@ -1662,9 +1610,8 @@ asm_118d9f ld bc, $0200 ld a, $2c jp Function119e2b -; 118ded -Function118ded: ; 118ded +Function118ded: ld a, [wcd38] and a jr z, .asm_118e03 @@ -1678,9 +1625,8 @@ Function118ded: ; 118ded .asm_118e03 jp BattleTowerRoomMenu_IncrementJumptable -; 118e06 -Function118e06: ; 118e06 +Function118e06: ld hl, wd002 ld a, [wcd38] and a @@ -1715,7 +1661,7 @@ Function118e06: ; 118e06 ld [hl], a jr asm_118e3e -Function118e39: ; 118e39 (46:4e39) +Function118e39: .asm_118e39 ld a, [hli] and a @@ -1755,33 +1701,32 @@ asm_118e3e inc de jr .asm_118e63 -Function118e6d: ; 118e6d (46:4e6d) +Function118e6d: xor a ld [wcd65], a ld a, $a jp Function119e2b -Function118e76: ; 118e76 (46:4e76) +Function118e76: ; Call $c in BattleTowerRoomMenu2 ld a, $c ld [wcd3c], a jp BattleTowerRoomMenu_IncrementJumptable -Function118e7e: ; 118e7e (46:4e7e) +Function118e7e: call BattleTowerRoomMenu2 ret c ld a, $36 jp Function119e2b -BattleTowerRoomMenu_CallRoomMenu2: ; 118e87 (46:4e87) +BattleTowerRoomMenu_CallRoomMenu2: call BattleTowerRoomMenu2 ret c ld a, [wcd33] ld [wcf66], a ret -; 118e92 (46:4e92) -Function118e92: ; 118e92 +Function118e92: call Function118440 call Function1191d3 ld a, [wcd53] @@ -1794,9 +1739,8 @@ Function118e92: ; 118e92 ld de, w3_d800 ld bc, $0800 jp Function118b10 -; 118eb0 -Function118eb0: ; 118eb0 +Function118eb0: call Function118440 ld hl, $d802 ld de, wBGMapBuffer @@ -1805,9 +1749,8 @@ Function118eb0: ; 118eb0 call Function1192cc ret c jp BattleTowerRoomMenu_IncrementJumptable -; 118ec6 -Function118ec6: ; 118ec6 +Function118ec6: call Function118440 call SpeechTextBox ld hl, $d80e @@ -1836,9 +1779,8 @@ Function118ec6: ; 118ec6 ld a, $1c ld [wcd47], a jp BattleTowerRoomMenu_IncrementJumptable -; 118f0d -Function118f0d: ; 118f0d +Function118f0d: call BattleTowerRoomMenu2 ret c call Function118440 @@ -1877,9 +1819,8 @@ Function118f14: ld a, $1c ld [wcd47], a jp BattleTowerRoomMenu_IncrementJumptable -; 118f5e -Function118f5e: ; 118f5e +Function118f5e: call BattleTowerRoomMenu2 ret c call Function118440 @@ -1929,9 +1870,8 @@ Function118f68: .asm_118fba call BattleTowerRoomMenu_IncrementJumptable jp BattleTowerRoomMenu_IncrementJumptable -; 118fc0 -Function118fc0: ; 118fc0 +Function118fc0: call Function118440 ld a, [wcd55] ld l, a @@ -2006,9 +1946,8 @@ Function119009: ld bc, $1000 ld a, $2c jp Function119e2b -; 119054 -Function119054: ; 119054 +Function119054: ld a, $6 call GetSRAMBank ld hl, wd002 @@ -2063,9 +2002,8 @@ Function119054: ; 119054 ld [rSVBK], a call CloseSRAM jp BattleTowerRoomMenu_IncrementJumptable -; 1190d0 -Function1190d0: ; 1190d0 +Function1190d0: ld a, $3 ld [rSVBK], a ld a, [wcd57] @@ -2078,9 +2016,8 @@ Function1190d0: ; 1190d0 ld de, w3_d000 ld bc, $1000 jp Function118b10 -; 1190ec -Function1190ec: ; 1190ec +Function1190ec: ld a, $5 call GetSRAMBank ld hl, wBGMapBuffer @@ -2123,9 +2060,8 @@ Function1190ec: ; 1190ec ld hl, Text_ReceivedNews call BattleTowerRoomMenu_SetMessage jp BattleTowerRoomMenu_IncrementJumptable -; 11914e -Function11914e: ; 11914e +Function11914e: call BattleTowerRoomMenu2 ret c ld a, $1c @@ -2133,9 +2069,8 @@ Function11914e: ; 11914e ld a, $a ld [wc300], a ret -; 11915d -Function11915d: ; 11915d +Function11915d: ld hl, $d802 ld de, wBGMapBuffer ld bc, $000c @@ -2165,9 +2100,8 @@ Function11915d: ; 11915d .asm_11918e call CloseSRAM ret -; 119192 -Function119192: ; 119192 +Function119192: inc b inc c jr .asm_11919e @@ -2193,9 +2127,8 @@ Function119192: ; 119192 call Function118805 scf ret -; 1191ad -Function1191ad: ; 1191ad +Function1191ad: push bc ld c, $0 ld a, $5 @@ -2224,9 +2157,8 @@ Function1191ad: ; 1191ad pop bc and a ret -; 1191d3 -Function1191d3: ; 1191d3 +Function1191d3: ld hl, w3_d100 + 2 ld a, l ld [wcd53], a @@ -2253,9 +2185,8 @@ Function1191d3: ; 1191d3 ld [wcd58], a call Function11920f ret -; 11920f -Function11920f: ; 11920f +Function11920f: .asm_11920f call Function118b9a ret nc @@ -2271,9 +2202,8 @@ Function11920f: ; 11920f ld [hli], a inc hl ret -; 119223 -Function119223: ; 119223 +Function119223: xor a ld [wcd4b], a ld [wcd4c], a @@ -2382,9 +2312,8 @@ Function119223: ; 119223 ld [wcd4e], a and a ret -; 1192cc -Function1192cc: ; 1192cc +Function1192cc: ld a, $5 call GetSRAMBank ld hl, $aa73 @@ -2414,9 +2343,8 @@ Function1192cc: ; 1192cc .asm_1192fe and a ret -; 119300 -Function119300: ; 119300 +Function119300: xor a ld [wcd4b], a ld [wcd4c], a @@ -2501,15 +2429,13 @@ Function119300: ; 119300 .asm_11937f ret -; 119380 -Function119380: ; 119380 +Function119380: ld a, $80 ld [wcd49], a jp BattleTowerRoomMenu_IncrementJumptable -; 119388 -Function119388: ; 119388 +Function119388: ld hl, wcd49 dec [hl] ret nz @@ -2554,9 +2480,8 @@ Function1193a0: ld bc, $0200 ld a, $2c jp Function119e2b -; 1193e3 -Function1193e3: ; 1193e3 +Function1193e3: ld hl, wcd49 dec [hl] ret nz @@ -2578,9 +2503,8 @@ Function1193fb: ld de, w3_d000 ld bc, $1000 jp Function118b10 -; 119413 -Function119413: ; 119413 +Function119413: ld a, $6 call GetSRAMBank ld a, [w3_d000] @@ -2614,9 +2538,8 @@ Function119413: ; 119413 ld [rSVBK], a call CloseSRAM jp BattleTowerRoomMenu_IncrementJumptable -; 119451 -Function119451: ; 119451 (46:5451) +Function119451: ld a, [wcd89] and $1 jr z, .asm_11945d @@ -2632,7 +2555,7 @@ Function119451: ; 119451 (46:5451) ld a, [wd002] ld hl, wd003 -Function119471: ; 119471 (46:5471) +Function119471: push af ld a, [hli] ld [$c608], a @@ -2813,7 +2736,7 @@ endr call Function1195c4 ret -Function119584: ; 119584 (46:5584) +Function119584: ld a, [$c608] ld b, a ld a, [$c608 + 3] @@ -2858,7 +2781,7 @@ Function119584: ; 119584 (46:5584) and a ret -Function1195c4: ; 1195c4 (46:55c4) +Function1195c4: ld a, [hli] ld c, a ld a, [hli] @@ -2891,7 +2814,7 @@ Function1195c4: ; 1195c4 (46:55c4) ld a, $d8 jp Function118805 -Function1195f8: ; 1195f8 (46:55f8) +Function1195f8: ld a, $11 ld [wcd3c], a ld a, $1c @@ -2903,7 +2826,7 @@ Function1195f8: ; 1195f8 (46:55f8) call BattleTowerRoomMenu_IncrementJumptable jp BattleTowerRoomMenu_IncrementJumptable -Function119612: ; 119612 (46:5612) +Function119612: ld a, $14 ld [wcd3c], a ld a, $1c @@ -2914,7 +2837,7 @@ Function119612: ; 119612 (46:5612) ld [wcd47], a jp BattleTowerRoomMenu_IncrementJumptable -Function119629: ; 119629 (46:5629) +Function119629: call BattleTowerRoomMenu2 ret c ld a, $60 @@ -2930,7 +2853,7 @@ Function119629: ; 119629 (46:5629) ld [wcd47], a call BattleTowerRoomMenu_IncrementJumptable -Function119648: ; 119648 (46:5648) +Function119648: call BattleTowerRoomMenu2 ret c call DelayFrame @@ -2943,12 +2866,12 @@ Function119648: ; 119648 (46:5648) ld a, $2a jp Function119e2b -Function119665: ; 119665 (46:5665) +Function119665: ld a, $1a ld [wcd3c], a call BattleTowerRoomMenu_IncrementJumptable -Function11966d: ; 11966d (46:566d) +Function11966d: call BattleTowerRoomMenu2 ret c ld a, [wcd47] @@ -2957,12 +2880,12 @@ Function11966d: ; 11966d (46:566d) ld [wc300], a ret -Function11967d: ; 11967d (46:567d) +Function11967d: ld a, $18 ld [wcd3c], a call BattleTowerRoomMenu_IncrementJumptable -Function119685: ; 119685 (46:5685) +Function119685: call BattleTowerRoomMenu2 ret c ld a, $14 @@ -2971,7 +2894,7 @@ Function119685: ; 119685 (46:5685) ld [wc300], a ret -Function119694: ; 119694 (46:5694) +Function119694: ld b, 0 ld hl, Unknown_1196b8 .asm_119699 @@ -3002,9 +2925,8 @@ Function119694: ; 119694 (46:5694) cp $7 jr nz, .asm_119699 ret -; 1196b8 (46:56b8) -Unknown_1196b8: ; 1196b8 +Unknown_1196b8: db "Mon" db "Tue" db "Wed" @@ -3012,13 +2934,12 @@ Unknown_1196b8: ; 1196b8 db "Fri" db "Sat" db "Sun" -; 1196cd SECTION "Mobile 46 ASCII", ROMX ; A hack to use ascii above. -Function1196cd: ; 1196cd (46:56cd) +Function1196cd: ld de, $c719 call Function1196de ld [wcd4a], a @@ -3027,7 +2948,7 @@ Function1196cd: ; 1196cd (46:56cd) ld [wcd4b], a ret -Function1196de: ; 1196de (46:56de) +Function1196de: ld a, [de] inc de ; b = ([de] - 48) * 2 @@ -3045,9 +2966,8 @@ Function1196de: ; 1196de (46:56de) sub $30 add c ret -; 1196f2 (46:56f2) -Function1196f2: ; 1196f2 +Function1196f2: ld hl, wd002 .asm_1196f5 call Function118b9a @@ -3169,9 +3089,8 @@ Function1196f2: ; 1196f2 call Function1197bf ld [hli], a jp BattleTowerRoomMenu_IncrementJumptable -; 119798 -Function119798: ; 119798 +Function119798: ld d, $0 ld e, d call Function1197b4 @@ -3189,9 +3108,8 @@ Function119798: ; 119798 or e ld e, a ret -; 1197b4 -Function1197b4: ; 1197b4 +Function1197b4: ld a, [hli] cp $61 jr nc, .asm_1197bc @@ -3201,9 +3119,8 @@ Function1197b4: ; 1197b4 .asm_1197bc sub $57 ret -; 1197bf -Function1197bf: ; 1197bf +Function1197bf: cp $a jr nc, .asm_1197c6 add $30 @@ -3212,9 +3129,8 @@ Function1197bf: ; 1197bf .asm_1197c6 add $57 ret -; 1197c9 -Function1197c9: ; 1197c9 +Function1197c9: ld hl, wd002 call Function118e39 ld a, $9 @@ -3239,9 +3155,8 @@ Function1197dc: ld bc, $1000 ld a, $2a jp Function119e2b -; 119800 -Function119800: ; 119800 +Function119800: ld a, $fd ld [$c6d0], a ld [wOTTrademonSpecies], a @@ -3273,9 +3188,8 @@ Function119800: ; 119800 ld [wJumptableIndex], a farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable -; 11984e -Function11984e: ; 11984e +Function11984e: ld a, [wcd80] and a jr nz, .asm_1198a0 @@ -3343,9 +3257,8 @@ Function11984e: ; 11984e ld [wJumptableIndex], a farcall Function115dc3 jp BattleTowerRoomMenu_IncrementJumptable -; 1198ee -Function1198ee: ; 1198ee +Function1198ee: ld hl, Text_RegisteringRecord call BattleTowerRoomMenu_SetMessage call BattleTowerRoomMenu_IncrementJumptable @@ -3382,14 +3295,12 @@ Function1198f7: ld bc, $0200 ld a, $2c jp Function119e2b -; 119937 -Function119937: ; 119937 +Function119937: farcall Function1707f4 jp BattleTowerRoomMenu_IncrementJumptable -; 119940 -Function119940: ; 119940 +Function119940: ld de, wc3cd ld c, $1e .asm_119945 @@ -3408,9 +3319,8 @@ Function119940: ; 119940 .asm_119953 ret -; 119954 -Function119954: ; 119954 +Function119954: ld a, $1c ld [wcd3c], a call BattleTowerRoomMenu2 @@ -3426,9 +3336,8 @@ Function119954: ; 119954 ld hl, $c608 ld a, $1e jp Function119e2b -; 119973 -Function119973: ; 119973 +Function119973: ld a, $1 ld [wcf64], a xor a @@ -3437,9 +3346,8 @@ Function119973: ; 119973 ld de, w3_d000 ld a, $20 jp Function119e2b -; 119987 -Function119987: ; 119987 +Function119987: ld hl, w3_d000 + 1 ld a, [w3_d000] or [hl] @@ -3464,9 +3372,8 @@ Function119987: ; 119987 ld a, $1b ld [wcf66], a ret -; 1199b4 -Function1199b4: ; 1199b4 +Function1199b4: ld a, [w3_d081+1] and a jr nz, .asm_1199c7 @@ -3478,9 +3385,8 @@ Function1199b4: ; 1199b4 .asm_1199c7 jp Function119ac9 -; 1199ca -Function1199ca: ; 1199ca +Function1199ca: ld a, $20 ld [wcd89], a ld a, [wcf64] @@ -3491,9 +3397,8 @@ Function1199ca: ; 1199ca ld bc, $0700 ld a, $28 jp Function119e2b -; 1199e2 -Function1199e2: ; 1199e2 +Function1199e2: ld c, $c ld de, XGameCodePrefix call Function119e4f @@ -3624,15 +3529,13 @@ Function119ac9: ld a, $10 ld [wcf66], a ret -; 119af1 XGameCode: INCBIN "data/mobile/x-game-code.txt" XGameResult: INCBIN "data/mobile/x-game-result.txt" -; 119b0d -Function119b0d: ; 119b0d +Function119b0d: ld a, $8 ld [wcd3c], a call BattleTowerRoomMenu2 @@ -3671,9 +3574,8 @@ Function119b45: asm_119b4d ld a, $26 jp Function119e2b -; 119b52 -Function119b52: ; 119b52 +Function119b52: ld a, [w3_d090] cp $1 jr nz, .asm_119b66 @@ -3686,9 +3588,8 @@ Function119b52: ; 119b52 .asm_119b66 ld a, $1c jp Function119e2b -; 119b6b -Function119b6b: ; 119b6b +Function119b6b: ld a, [w3_d090] cp $1 jr z, .asm_119b75 @@ -3816,9 +3717,8 @@ Function119b6b: ; 119b6b ld bc, $0069 call CopyBytes jp BattleTowerRoomMenu_IncrementJumptable -; 119c3e -Function119c3e: ; 119c3e +Function119c3e: cp $2b jr c, .asm_119c68 jr z, .asm_119c80 @@ -3883,9 +3783,8 @@ Function119c3e: ; 119c3e sub $47 and a ret -; 119c97 -BattleTowerRoomMenu_UberRestrictionMessage: ; 119c97 +BattleTowerRoomMenu_UberRestrictionMessage: ld hl, Text_UberRestriction call BattleTowerRoomMenu_SetMessage call BattleTowerRoomMenu_IncrementJumptable @@ -3914,9 +3813,8 @@ BattleTowerRoomMenu_DelayRestartMenu: ld a, $0 ld [wcf66], a ret -; 119cc3 -BattleTowerRoomMenu_QuitMessage: ; 119cc3 +BattleTowerRoomMenu_QuitMessage: ld a, [wcd38] and a jr z, .asm_119cd1 @@ -3951,26 +3849,23 @@ BattleTowerRoomMenu_UpdateYesNoMenu: ld a, [wMobileInactivityTimerFrames] ld [wcf66], a ret -; 119cf7 -MenuHeader_119cf7: ; 119cf7 +MenuHeader_119cf7: db MENU_BACKUP_TILES ; flags menu_coords 12, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL db 0 ; default option -; 119cff -MenuData_119cff: ; 119cff +MenuData_119cff: db MENU_BACKUP_TILES ; flags menu_coords 15, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL db 0 ; default option -; 119d07 String_119d07: db " ▼@" -Strings_L10ToL100: ; 119d0c +Strings_L10ToL100: db " L:10 @@" db " L:20 @@" db " L:30 @@" @@ -3983,7 +3878,7 @@ Strings_L10ToL100: ; 119d0c db " L:100@@" db "CANCEL@@" -Strings_Ll0ToL40: ; 119d64 +Strings_Ll0ToL40: db " L:10 @@" db " L:20 @@" db " L:30 @@" @@ -3992,9 +3887,8 @@ Strings_Ll0ToL40: ; 119d64 String_119d8c: db "CANCEL@" -; 119d93 -BattleTower_LevelCheck: ; 119d93 (46:5d93) +BattleTower_LevelCheck: ld a, [rSVBK] push af ld a, $1 @@ -4038,7 +3932,7 @@ BattleTower_LevelCheck: ; 119d93 (46:5d93) scf ret -BattleTower_UbersCheck: ; 119dd1 (46:5dd1) +BattleTower_UbersCheck: ld a, [rSVBK] push af ld a, [wcd4f] @@ -4092,26 +3986,22 @@ BattleTower_UbersCheck: ; 119dd1 (46:5dd1) ld [rSVBK], a scf ret -; 119e2b (46:5e2b) -Function119e2b: ; 119e2b (46:5e2b) +Function119e2b: call Function3e32 -BattleTowerRoomMenu_IncrementJumptable: ; 119e2e (46:5e2e) +BattleTowerRoomMenu_IncrementJumptable: ld hl, wcf66 inc [hl] ret -; 119e33 (46:5e33) -XGameCodePrefix: ; 119e33 +XGameCodePrefix: INCBIN "data/mobile/x-game-code-prefix.txt" -;119e40 -XGameResultPrefix: ; 119e40 +XGameResultPrefix: INCBIN "data/mobile/x-game-result-prefix.txt" -; 119e4f -Function119e4f: ; 119e4f +Function119e4f: push bc ld hl, w3_d100 ld a, [hli] @@ -4173,9 +4063,8 @@ Function119e4f: ; 119e4f .finish and a ret -; 119e8e -Function119e8e: ; 119e8e +Function119e8e: cp $60 jr c, .less_than_0x60 sub $57 @@ -4184,9 +4073,8 @@ Function119e8e: ; 119e8e .less_than_0x60 sub $30 ret -; 119e98 -Function119e98: ; 119e98 +Function119e98: ld a, $2 .loop push af @@ -4210,9 +4098,8 @@ Function119e98: ; 119e98 and a jr nz, .loop ret -; 119eb4 -Function119eb4: ; 119eb4 (46:5eb4) +Function119eb4: xor a ld [wc3cc], a ld de, wc3ac @@ -4224,7 +4111,7 @@ Function119eb4: ; 119eb4 (46:5eb4) jr nz, .loop ret -Function119ec2: ; 119ec2 (46:5ec2) +Function119ec2: ld a, BANK(sMobileLoginPassword) call GetSRAMBank xor a @@ -4239,7 +4126,7 @@ Function119ec2: ; 119ec2 (46:5ec2) call CloseSRAM ret -BattleTowerRoomMenu2: ; 119ed8 (46:5ed8) +BattleTowerRoomMenu2: ld a, [rSVBK] ld [wcd8c], a ld a, $1 @@ -4290,23 +4177,20 @@ BattleTowerRoomMenu2: ; 119ed8 (46:5ed8) dw Function11a4fe dw Function11a466 dw Function11a47a -; 119f3f -Function119f3f: ; 119f3f +Function119f3f: call Function11a5b9 jp BattleTowerRoomMenu2_IncrementJumptable -; 119f45 -Function119f45: ; 119f45 +Function119f45: hlcoord 4, 2 ld de, String_11a661 call PlaceString ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 119f56 -Function119f56: ; 119f56 +Function119f56: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_119f62 @@ -4323,9 +4207,8 @@ Function119f56: ; 119f56 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 119f76 -Function119f76: ; 119f76 +Function119f76: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_119f82 @@ -4343,9 +4226,8 @@ Function119f76: ; 119f76 xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 119f98 -Function119f98: ; 119f98 +Function119f98: call Function11a536 ret c call PlayClickSFX @@ -4393,9 +4275,8 @@ Function119f98: ; 119f98 ld [wc300], a scf ret -; 11a00e -Function11a00e: ; 11a00e +Function11a00e: ld a, BANK(sMobileLoginPassword) call GetSRAMBank ld a, [sMobileLoginPassword] @@ -4467,9 +4348,8 @@ Function11a00e: ; 11a00e ld a, $1 ld [wc305], a ret -; 11a0ca -Function11a0ca: ; 11a0ca +Function11a0ca: xor a ld [wMenuBorderLeftCoord], a ld [wMenuBorderTopCoord], a @@ -4490,9 +4370,8 @@ Function11a0ca: ; 11a0ca ld a, $1 ld [wc305], a ret -; 11a113 -Function11a113: ; 11a113 +Function11a113: call Function11a63c ld c, $1 farcall Function115e18 @@ -4501,15 +4380,13 @@ Function11a113: ; 11a113 call PlaceString and a ret -; 11a129 -Function11a129: ; 11a129 +Function11a129: ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a131 -Function11a131: ; 11a131 +Function11a131: ld hl, wMobileInactivityTimerMinutes dec [hl] ret nz @@ -4524,9 +4401,8 @@ Function11a13d: call PlaceString and a ret -; 11a14b -Function11a14b: ; 11a14b +Function11a14b: ld hl, wcd85 ld a, [hl] cp $f3 @@ -4544,9 +4420,8 @@ Function11a14b: ; 11a14b ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a16d -Function11a16d: ; 11a16d +Function11a16d: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a179 @@ -4565,9 +4440,8 @@ Function11a16d: ; 11a16d xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a192 -Function11a192: ; 11a192 +Function11a192: call Function11a536 ret c call PlayClickSFX @@ -4595,9 +4469,8 @@ Function11a192: ; 11a192 call PlaceString scf ret -; 11a1d6 -Function11a1d6: ; 11a1d6 +Function11a1d6: ld a, [wcd85] cp $50 jr nz, .asm_11a1e4 @@ -4609,9 +4482,8 @@ Function11a1d6: ; 11a1d6 .asm_11a1e4 and a ret -; 11a1e6 -Function11a1e6: ; 11a1e6 +Function11a1e6: ld hl, String_11a706 ld de, $c346 call Function11a1ff @@ -4622,9 +4494,8 @@ Function11a1e6: ; 11a1e6 ld a, $50 ld [de], a ret -; 11a1ff -Function11a1ff: ; 11a1ff +Function11a1ff: .asm_11a1ff ld a, [hli] cp $50 @@ -4632,9 +4503,8 @@ Function11a1ff: ; 11a1ff ld [de], a inc de jr .asm_11a1ff -; 11a207 -BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207 +BattleTowerRoomMenu2_PlaceYesNoMenu: ld hl, MenuHeader_11a2de call LoadMenuHeader call MenuBox @@ -4652,9 +4522,8 @@ BattleTowerRoomMenu2_PlaceYesNoMenu: ; 11a207 xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a235 -BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 +BattleTowerRoomMenu2_UpdateYesNoMenu: ld hl, hJoyPressed ld a, [hl] and A_BUTTON @@ -4741,31 +4610,26 @@ BattleTowerRoomMenu2_UpdateYesNoMenu: ; 11a235 farcall ReloadMapPart and a ret -; 11a2cf -String_11a2cf: ; 11a2cf +String_11a2cf: db "YES@" -; 11a2d3 -String_11a2d3: ; 11a2d3 +String_11a2d3: db "NO@" -; 11a2d6 -MenuHeader_11a2d6: ; 11a2d6 +MenuHeader_11a2d6: db MENU_BACKUP_TILES ; flags menu_coords 14, 6, SCREEN_WIDTH - 1, 10 dw NULL db 0 ; default option -; 11a2de -MenuHeader_11a2de: ; 11a2de +MenuHeader_11a2de: db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL db 0 ; default option -; 11a2e6 -Function11a2e6: ; 11a2e6 +Function11a2e6: call Function11a63c ld c, $2 farcall Function115e18 @@ -4775,9 +4639,8 @@ Function11a2e6: ; 11a2e6 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a302 -Function11a302: ; 11a302 +Function11a302: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a30e @@ -4802,9 +4665,8 @@ Function11a302: ; 11a302 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a33a -Function11a33a: ; 11a33a +Function11a33a: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a346 @@ -4819,9 +4681,8 @@ Function11a33a: ; 11a33a farcall Function115dc3 and a ret -; 11a357 -Function11a357: ; 11a357 +Function11a357: call Function11a63c hlcoord 4, 2 ld de, String_11a743 @@ -4829,9 +4690,8 @@ Function11a357: ; 11a357 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a36b -Function11a36b: ; 11a36b +Function11a36b: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a377 @@ -4849,9 +4709,8 @@ Function11a36b: ; 11a36b xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a38d -Function11a38d: ; 11a38d +Function11a38d: call Function11a536 ret c call PlayClickSFX @@ -4875,9 +4734,8 @@ Function11a38d: ; 11a38d ld [wcd80], a scf ret -; 11a3c5 -Function11a3c5: ; 11a3c5 +Function11a3c5: call Function11a63c hlcoord 4, 2 ld de, String_11a762 @@ -4885,9 +4743,8 @@ Function11a3c5: ; 11a3c5 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a3d9 -Function11a3d9: ; 11a3d9 +Function11a3d9: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a3e5 @@ -4904,9 +4761,8 @@ Function11a3d9: ; 11a3d9 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a3f9 -Function11a3f9: ; 11a3f9 +Function11a3f9: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a405 @@ -4924,9 +4780,8 @@ Function11a3f9: ; 11a3f9 xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a41b -Function11a41b: ; 11a41b +Function11a41b: call Function11a536 ret c call PlayClickSFX @@ -4950,9 +4805,8 @@ Function11a41b: ; 11a41b ld [wcd80], a scf ret -; 11a452 -Function11a452: ; 11a452 +Function11a452: call Function11a63c hlcoord 4, 2 ld de, String_11a791 @@ -4960,9 +4814,8 @@ Function11a452: ; 11a452 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a466 -Function11a466: ; 11a466 +Function11a466: call Function11a63c hlcoord 4, 2 ld de, String_11a7c1 @@ -4970,9 +4823,8 @@ Function11a466: ; 11a466 ld a, $80 ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a47a -Function11a47a: ; 11a47a +Function11a47a: ld a, [wMobileInactivityTimerMinutes] and a jr z, .asm_11a486 @@ -4984,9 +4836,8 @@ Function11a47a: ; 11a47a .asm_11a486 and a ret -; 11a488 -Function11a488: ; 11a488 +Function11a488: call Function11a63c hlcoord 4, 2 ld de, String_11a7ac @@ -4995,9 +4846,8 @@ Function11a488: ; 11a488 xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a49e -Function11a49e: ; 11a49e +Function11a49e: call Function11a536 ret c call PlayClickSFX @@ -5023,17 +4873,15 @@ Function11a49e: ; 11a49e ld [wcd80], a scf ret -; 11a4db -Function11a4db: ; 11a4db +Function11a4db: call Function11a63c ld de, String_11a6db hlcoord 4, 2 call PlaceString ret -; 11a4e8 -Function11a4e8: ; 11a4e8 +Function11a4e8: call Function11a63c hlcoord 4, 2 ld de, String_11a7d7 @@ -5042,9 +4890,8 @@ Function11a4e8: ; 11a4e8 xor a ld [wMobileInactivityTimerMinutes], a jp BattleTowerRoomMenu2_IncrementJumptable -; 11a4fe -Function11a4fe: ; 11a4fe +Function11a4fe: call Function11a536 ret c call PlayClickSFX @@ -5068,9 +4915,8 @@ Function11a4fe: ; 11a4fe ld [wcd80], a scf ret -; 11a536 -Function11a536: ; 11a536 +Function11a536: ld hl, hJoyPressed ld a, [hl] and $1 @@ -5141,17 +4987,15 @@ Function11a536: ; 11a536 ld [wcd8b], a and a ret -; 11a5b0 -BattleTowerRoomMenu2_IncrementJumptable: ; 11a5b0 +BattleTowerRoomMenu2_IncrementJumptable: ld a, [wcd3c] inc a ld [wcd3c], a scf ret -; 11a5b9 -Function11a5b9: ; 11a5b9 +Function11a5b9: xor a ld [wMenuBorderLeftCoord], a ld [wMenuBorderTopCoord], a @@ -5174,9 +5018,8 @@ Function11a5b9: ; 11a5b9 ld a, $1 ld [wc305], a ret -; 11a5f5 -Function11a5f5: ; 11a5f5 +Function11a5f5: ld a, $e ld [wMenuBorderLeftCoord], a ld a, $13 @@ -5204,9 +5047,8 @@ Function11a5f5: ; 11a5f5 ld [hl], a farcall ReloadMapPart ret -; 11a63c -Function11a63c: ; 11a63c +Function11a63c: hlcoord 4, 1 ld de, String_11a7f4 call PlaceString @@ -5220,115 +5062,92 @@ Function11a63c: ; 11a63c ld de, String_11a7f4 call PlaceString ret -; 11a661 -String_11a661: ; 11a661 +String_11a661: db "これから モバイルセンターに" next "でんわ<WO>かけます@" -; 11a679 -String_11a679: ; 11a679 +String_11a679: db "モバイルアダプタ<NO>じゅんびは" next "できて いますか?@" -; 11a692 -String_11a692: ; 11a692 +String_11a692: db "でんわ<WO>かけています" next "しばらく おまちください@" -; 11a6aa -String_11a6aa: ; 11a6aa +String_11a6aa: db "でんわをかけると つうわりょう" next "せつぞくりょう<GA>かかります@" -; 11a6c8 -String_11a6c8: ; 11a6c8 +String_11a6c8: db "せつぞく しました@" -; 11a6d2 -String_11a6d2: ; 11a6d2 +String_11a6d2: db "つうしん ちゅう@" -; 11a6db -String_11a6db: ; 11a6db +String_11a6db: db "つうしん ちゅう" next "セレクト エーでちゅうし@" -; 11a6f1 -String_11a6f1: ; 11a6f1 +String_11a6f1: db "この サービスには" next "つうわりょう<NO>ほかに@" -; 11a706 -String_11a706: ; 11a706 +String_11a706: db "おかね<GA>@" -; 11a70b -String_11a70b: ; 11a70b +String_11a70b: db "えん" next "かかります よろしい ですか?@" -; 11a71e -String_11a71e: ; 11a71e +String_11a71e: db "つうしん しゅうりょう@" -; 11a72a -String_11a72a: ; 11a72a +String_11a72a: db "つないだ じかん" next " やく ふん びょう@" -; 11a743 -String_11a743: ; 11a743 +String_11a743: db "もっていない データが" next "あります!@" -; 11a755 -String_11a755: ; 11a755 +String_11a755: db "データ<WO>よみこみますか?@" -; 11a762 -String_11a762: ; 11a762 +String_11a762: db "おなじ データ<WO>よみこんだ" next "こと<GA>ありますが@" -; 11a779 -String_11a779: ; 11a779 +String_11a779: db "そのデータ<WA>なくなっているか" next "こわれて います@" -; 11a791 -String_11a791: ; 11a791 +String_11a791: db "もっている データと" next "おなじデータしか ありません!@" -; 11a7ac -String_11a7ac: ; 11a7ac +String_11a7ac: db "データ<NO>よみこみを" next "ちゅうし しますか?@" -; 11a7c1 String_11a7c1: ; 11a7c1 ; new news? db "あたらしい ニュースは" next "ありません でした@" -; 11a7d7 -String_11a7d7: ; 11a7d7 +String_11a7d7: db "あたらしいニュース<GA>あります" next "ニュース<WO>よみこみますか?@" -; 11a7f4 -String_11a7f4: ; 11a7f4 +String_11a7f4: db " @" -; 11a804 -MenuHeader_11a804: ; 11a804 +MenuHeader_11a804: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, 5 dw NULL db 0 ; default option -; 11a80c -Function11a80c: ; 11a80c +Function11a80c: ld de, hDivisor ld bc, hDividend ld hl, Unknown_11a89a @@ -5386,18 +5205,16 @@ Function11a80c: ; 11a80c call Function11a884 ld [wcd64], a ret -; 11a884 -Function11a884: ; 11a884 +Function11a884: add e cp $a ret c sub $a inc b ret -; 11a88c -Function11a88c: ; 11a88c +Function11a88c: ld a, [bc] sla a ld c, a @@ -5411,41 +5228,37 @@ Function11a88c: ; 11a88c ld [de], a inc de ret -; 11a89a -Unknown_11a89a: ; 11a89a +Unknown_11a89a: x = 0 rept 16 bcd x % 100, x / 100 x = x + 1 endr -Unknown_11a8ba: ; 11a8ba +Unknown_11a8ba: x = 0 rept 16 bcd x % 100, x / 100 x = x + 16 endr -Unknown_11a8da: ; 11a8da +Unknown_11a8da: x = 0 rept 16 bcd x % 100, x / 100 x = x + 256 endr -; 11a8fa -BattleTowerRoomMenu_WriteMessage: ; 11a8fa +BattleTowerRoomMenu_WriteMessage: jumptable .Jumptable, $c31a -; 11a909 -.Jumptable: ; 11a909 +.Jumptable: dw BattleTowerRoomMenu_WriteMessage_DoNothing dw Function11a90f dw Function11a971 -; 11a90f -Function11a90f: ; 11a90f +Function11a90f: ld a, $1 ld [rSVBK], a call SpeechTextBox @@ -5505,9 +5318,8 @@ Function11a90f: ; 11a90f BattleTowerRoomMenu_WriteMessage_DoNothing: ret -; 11a971 -Function11a971: ; 11a971 +Function11a971: ld hl, $c31f ld a, [hJoyDown] and a @@ -5554,9 +5366,8 @@ Function11a971: ; 11a971 .asm_11a9bf ret -; 11a9c0 -BattleTowerRoomMenu_SetMessage: ; 11a9c0 +BattleTowerRoomMenu_SetMessage: ld a, l ld [$c31b], a ld a, h @@ -5564,9 +5375,8 @@ BattleTowerRoomMenu_SetMessage: ; 11a9c0 ld a, $1 ld [$c31a], a ret -; 11a9ce -Function11a9ce: ; 11a9ce +Function11a9ce: call ClearBGPalettes call ReloadTilesetAndPalettes call Call_ExitMenu @@ -5576,15 +5386,13 @@ Function11a9ce: ; 11a9ce farcall FinishExitMenu call UpdateSprites ret -; 11a9f0 -Function11a9f0: ; 11a9f0 +Function11a9f0: ld a, $1 and a ret -; 11a9f4 -Function11a9f4: ; 11a9f4 +Function11a9f4: ld a, [wcd8a] ld l, a ld a, [wcd8b] @@ -5602,7 +5410,6 @@ Function11a9f4: ; 11a9f4 call Function118805 and a ret -; 11aa13 Text_SaveFileWillBeSent: ; 0x11aa13 text "SAVE FILE will be" @@ -5722,16 +5529,15 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f done ; 0x11ac3e -Function11ac3e: ; 11ac3e +Function11ac3e: call SpeechTextBox call FadeToMenu callfar ClearSpriteAnims2 call Function11ac51 call CloseSubmenu ret -; 11ac51 -Function11ac51: ; 11ac51 +Function11ac51: xor a ld [hBGMapMode], a ld hl, wOptions @@ -5778,9 +5584,8 @@ Function11ac51: ; 11ac51 pop af ld [wOptions], a ret -; 11acb7 -Function11acb7: ; 11acb7 +Function11acb7: ld hl, TilemapPack_11ba44 ld a, [wcd49] ld c, a @@ -5831,9 +5636,8 @@ Function11acb7: ; 11acb7 xor a ld [wcd4a], a ret -; 11ad1b -Function11ad1b: ; 11ad1b +Function11ad1b: call ClearBGPalettes call ClearSprites call ClearTileMap @@ -5866,16 +5670,14 @@ Function11ad1b: ; 11ad1b ld [wc7d4], a farcall Pokedex_OrderMonsByMode ret -; 11ad6e -Function11ad6e: ; 11ad6e +Function11ad6e: ld a, [wJumptableIndex] ld hl, Jumptable_11ad78 call Function11b239 jp hl -; 11ad78 -Jumptable_11ad78: ; 11ad78 +Jumptable_11ad78: dw Function11b082 dw Function11b0ff dw Function11ad95 @@ -5885,21 +5687,18 @@ Jumptable_11ad78: ; 11ad78 dw Function11ad8f dw Function11af04 dw Function11af4e -; 11ad8a -Function11ad8a: ; 11ad8a +Function11ad8a: ld hl, wJumptableIndex inc [hl] ret -; 11ad8f -Function11ad8f: ; 11ad8f +Function11ad8f: ld hl, wJumptableIndex set 7, [hl] ret -; 11ad95 -Function11ad95: ; 11ad95 +Function11ad95: ld hl, MenuHeader_11ae38 call LoadMenuHeader call MenuBox @@ -5990,23 +5789,20 @@ Function11adc4: call ExitMenu farcall ReloadMapPart ret -; 11ae38 -MenuHeader_11ae38: ; 11ae38 +MenuHeader_11ae38: db MENU_BACKUP_TILES ; flags menu_coords 10, 10, 17, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -; 11ae40 -String_11ae40: ; 11ae40 +String_11ae40: db "どちらでも" next "♂オス" next "♀メス" db "@" -; 11ae4e -Function11ae4e: ; 11ae4e +Function11ae4e: ld hl, MenuHeader_11afe8 call LoadMenuHeader call MenuBox @@ -6095,9 +5891,8 @@ Function11ae98: call ExitMenu farcall ReloadMapPart ret -; 11af04 -Function11af04: ; 11af04 +Function11af04: ld hl, MenuHeader_11afe8 call LoadMenuHeader call MenuBox @@ -6186,9 +5981,8 @@ Function11af4e: call ExitMenu farcall ReloadMapPart ret -; 11afb7 -Function11afb7: ; 11afb7 +Function11afb7: ld e, $ed jr asm_11afbd @@ -6208,7 +6002,6 @@ asm_11afbd: ld d, [hl] ld [de], a ret -; 11afcc Unknown_11afcc: dwcoord 11, 12 @@ -6218,9 +6011,8 @@ Unknown_11afcc: Unknown_11afd2: dwcoord 15, 8 dwcoord 15, 10 -; 11afd6 -Function11afd6: ; 11afd6 +Function11afd6: ld de, SCREEN_WIDTH ld a, $3 .row @@ -6236,38 +6028,32 @@ Function11afd6: ; 11afd6 dec b jr nz, .row ret -; 11afe8 -MenuHeader_11afe8: ; 11afe8 +MenuHeader_11afe8: db MENU_BACKUP_TILES ; flags menu_coords 9, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -; 11aff0 -String_11aff0: ; 11aff0 +String_11aff0: db "この じょうけんで" next "よろしいですか?@" -; 11b003 -String_11b003: ; 11b003 +String_11b003: db "こうかんを" next "ちゅうししますか?@" -; 11b013 -MenuHeader_11b013: ; 11b013 +MenuHeader_11b013: db MENU_BACKUP_TILES ; flags menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw NULL db 1 ; default option -; 11b01b String_11b01b: db "はい" next "いいえ@" -; 11b022 -Function11b022: ; 11b022 +Function11b022: ld a, [wcd2e] and a jr z, .asm_11b02e @@ -6283,9 +6069,8 @@ Function11b022: ; 11b022 ld hl, wStringBuffer4 call Function11b03d ret -; 11b03d -Function11b03d: ; 11b03d +Function11b03d: push hl push af ld c, $1 @@ -6334,12 +6119,11 @@ Function11b03d: ; 11b03d ld bc, 4 ; string length call CopyBytes ret -; 11b07a .MaleString: db "オスの " .FemaleString: db "メスの " -Function11b082: ; 11b082 +Function11b082: call Function11b242 ld a, $7 ld [wc7d3], a @@ -6348,9 +6132,8 @@ Function11b082: ; 11b082 call Function11b275 call SetPalettes jp Function11ad8a -; 11b099 -Function11b099: ; 11b099 +Function11b099: ld c, $6 hlcoord 11, 1 ld a, [wc7d3] @@ -6383,9 +6166,8 @@ Function11b099: ; 11b099 dec a jr nz, .loop ret -; 11b0cf -.PlaceMonNameOrPlaceholderString: ; 11b0cf +.PlaceMonNameOrPlaceholderString: and a ret z @@ -6398,9 +6180,8 @@ Function11b099: ; 11b099 pop hl call PlaceString ret -; 11b0e1 -.SetCaughtFlag: ; 11b0e1 +.SetCaughtFlag: call CheckCaughtMemMon jr nz, .okay inc hl @@ -6410,9 +6191,8 @@ Function11b099: ; 11b099 ld a, $1 ld [hli], a ret -; 11b0ec -.CheckSeenFlag: ; 11b0ec +.CheckSeenFlag: call CheckSeenMemMon ret nz @@ -6421,13 +6201,11 @@ Function11b099: ; 11b099 call PlaceString scf ret -; 11b0f9 -.EmptySlot: ; 11b0f9 +.EmptySlot: db "ーーーーー@" -; 11b0ff -Function11b0ff: ; 11b0ff +Function11b0ff: ld hl, hJoyPressed ld a, [hl] and $2 @@ -6504,9 +6282,8 @@ Function11b0ff: ; 11b0ff ld a, $4 ld [wJumptableIndex], a ret -; 11b175 -Function11b175: ; 11b175 +Function11b175: ld a, [wc7d3] ld d, a ld a, [wc7d2] @@ -6610,17 +6387,15 @@ Function11b175: ; 11b175 call Function11b275 scf ret -; 11b1f7 -Function11b1f7: ; 11b1f7 +Function11b1f7: hlcoord 0, 0 ld a, $32 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ret -; 11b203 -Function11b203: ; 11b203 +Function11b203: .asm_11b203 ld a, [de] cp $ff @@ -6628,9 +6403,8 @@ Function11b203: ; 11b203 inc de ld [hli], a jr .asm_11b203 -; 11b20b -Function11b20b: ; 11b20b +Function11b20b: ld a, [wc7d1] ld hl, wc7d0 add [hl] @@ -6641,9 +6415,8 @@ Function11b20b: ; 11b20b ld a, [hl] ld [wd265], a ret -; 11b21e -CheckCaughtMemMon: ; 11b21e +CheckCaughtMemMon: push de push hl ld a, [wd265] @@ -6652,9 +6425,8 @@ CheckCaughtMemMon: ; 11b21e pop hl pop de ret -; 11b22a -CheckSeenMemMon: ; 11b22a +CheckSeenMemMon: push de push hl ld a, [wd265] @@ -6663,13 +6435,11 @@ CheckSeenMemMon: ; 11b22a pop hl pop de ret -; 11b236 -Function11b236: ; 11b236 +Function11b236: jp FillBoxWithByte -; 11b239 -Function11b239: ; 11b239 +Function11b239: ld e, a ld d, 0 add hl, de @@ -6678,9 +6448,8 @@ Function11b239: ; 11b239 ld h, [hl] ld l, a ret -; 11b242 -Function11b242: ; 11b242 +Function11b242: hlcoord 3, 4 ld de, wStringBuffer3 call PlaceString @@ -6714,14 +6483,12 @@ asm_11b26f Function11b272: ld [hl], $f5 ret -; 11b275 -Function11b275: ; 11b275 +Function11b275: call Function11b279 ret -; 11b279 -Function11b279: ; 11b279 +Function11b279: ld a, [wd265] ld [wCurSpecies], a call CheckSeenMemMon @@ -6737,9 +6504,8 @@ Function11b279: ; 11b279 .asm_11b294 ret -; 11b295 -Function11b295: ; 11b295 +Function11b295: hlcoord 4, 13 ld de, String_11b308 call PlaceString @@ -6796,31 +6562,25 @@ Function11b295: ; 11b295 ld de, wStringBuffer4 call PlaceString ret -; 11b2fe -String_11b2fe: ; 11b2fe +String_11b2fe: db "あげる#@" -; 11b303 -String_11b303: ; 11b303 +String_11b303: db "ほしい#@" -; 11b308 -String_11b308: ; 11b308 +String_11b308: db " @" -; 11b30e -String_11b30e: ; 11b30e +String_11b30e: db "みはっけん@" -; 11b314 -Function11b314: ; 11b314 +Function11b314: call Function11b31b call Function11b3d9 ret -; 11b31b -Function11b31b: ; 11b31b +Function11b31b: ld hl, .Coords ld a, [wJumptableIndex] cp 2 @@ -6851,7 +6611,6 @@ Function11b31b: ; 11b31b .load_sprites call Function11b397 ret -; 11b350 .Coords: dbpixel 3, 11, 2, 6 ; 0 @@ -6918,7 +6677,7 @@ Function11b31b: ; 11b31b db $39 ; 12 db $39 ; 13 -Function11b397: ; 11b397 +Function11b397: ld de, wVirtualOAMSprite00 .loop ld a, [hl] @@ -6944,9 +6703,8 @@ Function11b397: ; 11b397 ld [de], a ; attributes inc de jr .loop -; 11b3b6 -Unreferenced_Function11b3b6: ; 11b3b6 +Unreferenced_Function11b3b6: .loop ld a, [hl] cp -1 @@ -6974,9 +6732,8 @@ Unreferenced_Function11b3b6: ; 11b3b6 ld [de], a inc de jr .loop -; 11b3d9 -Function11b3d9: ; 11b3d9 +Function11b3d9: ld de, wVirtualOAMSprite28 push de ld a, [wc7d2] @@ -7048,16 +6805,14 @@ Function11b3d9: ; 11b3d9 xor a ld [hl], a ret -; 11b444 -Function11b444: ; 11b444 +Function11b444: ; special call Mobile46_InitJumptable call Mobile46_RunJumptable ret -; 11b44b -Mobile46_InitJumptable: ; 11b44b +Mobile46_InitJumptable: xor a ld [wJumptableIndex], a ld [wcf64], a @@ -7065,9 +6820,8 @@ Mobile46_InitJumptable: ; 11b44b ld [wcf66], a call UpdateTime ret -; 11b45c -Mobile46_RunJumptable: ; 11b45c +Mobile46_RunJumptable: .loop call .IterateJumptable call DelayFrame @@ -7075,9 +6829,8 @@ Mobile46_RunJumptable: ; 11b45c cp 4 jr nz, .loop ret -; 11b46a -.IterateJumptable: ; 11b46a +.IterateJumptable: jumptable .Jumptable, wJumptableIndex .Jumptable: @@ -7086,9 +6839,8 @@ Mobile46_RunJumptable: ; 11b45c dw Function11b5c0 dw Function11b5e0 dw Function11b5e7 ; unused -; 11b483 -Function11b483: ; 11b483 +Function11b483: call .InitRAM ld hl, wPlayerName ld a, NAME_LENGTH_JAPANESE - 1 @@ -7264,9 +7016,8 @@ Function11b483: ; 11b483 ld [bc], a inc bc ret -; 11b570 -Function11b570: ; 11b570 +Function11b570: call Function118007 ld a, [wScriptVar] and a @@ -7315,9 +7066,8 @@ Function11b570: ; 11b570 call CloseSRAM ret -; 11b5c0 -Function11b5c0: ; 11b5c0 +Function11b5c0: ld a, [wcd82] dec a ld [wCurPartyMon], a @@ -7327,19 +7077,16 @@ Function11b5c0: ; 11b5c0 farcall Function170807 farcall SaveAfterLinkTrade jp Function11ad8a -; 11b5e0 -Function11b5e0: ; 11b5e0 +Function11b5e0: xor a ld [wScriptVar], a jp Function11ad8a -; 11b5e7 -Function11b5e7: ; 11b5e7 +Function11b5e7: ret -; 11b5e8 -Function11b5e8: ; 11b5e8 +Function11b5e8: ld a, $0 call GetSRAMBank ld hl, wRTC @@ -7390,9 +7137,8 @@ Function11b5e8: ; 11b5e8 .Jumptable: dw Function11b66d dw Function11b6b3 -; 11b66d -Function11b66d: ; 11b66d +Function11b66d: call Function1180b8 ld a, [wScriptVar] and a @@ -7431,13 +7177,11 @@ Function11b66d: ; 11b66d .asm_11b6b0 jp Function11ad8a -; 11b6b3 -Function11b6b3: ; 11b6b3 +Function11b6b3: ret -; 11b6b4 -Function11b6b4: ; 11b6b4 +Function11b6b4: ld a, $5 call GetSRAMBank ld a, [wcd30] @@ -7573,9 +7317,8 @@ Function11b6b4: ; 11b6b4 ld [hl], a call AddMobileMonToParty ret -; 11b7e5 -Function11b7e5: ; 11b7e5 +Function11b7e5: ld a, [$c60d] ; species ld [wOTTrademonSpecies], a ld [wCurPartySpecies], a @@ -7632,9 +7375,8 @@ Function11b7e5: ; 11b7e5 call CloseSubmenu call RestartMapMusic ret -; 11b879 -Function11b879: ; 11b879 +Function11b879: farcall BattleTower_CheckSaveFileExistsAndIsYours ld a, [wScriptVar] and a @@ -7725,9 +7467,8 @@ Function11b879: ; 11b879 ld a, $2 ld [wScriptVar], a ret -; 11b920 -Function11b920: ; 11b920 +Function11b920: call Mobile46_InitJumptable ld a, $5 call GetSRAMBank @@ -7738,9 +7479,8 @@ Function11b920: ; 11b920 call CloseSRAM call Function118000 ret -; 11b93b -Function11b93b: ; 11b93b +Function11b93b: ld a, $5 call GetSRAMBank xor a @@ -7778,9 +7518,8 @@ Function11b93b: ; 11b93b call AddMobileMonToParty farcall SaveAfterLinkTrade ret -; 11b98f -AddMobileMonToParty: ; 11b98f +AddMobileMonToParty: ld hl, wPartyCount ld a, [hl] ld e, a @@ -7882,15 +7621,13 @@ AddMobileMonToParty: ; 11b98f call CloseSRAM ret -; 11ba38 -Function11ba38: ; 11ba38 +Function11ba38: farcall CheckCurPartyMonFainted ret c xor a ld [wScriptVar], a ret -; 11ba44 TilemapPack_11ba44: db $47, $30, $0a, $0a, $0a, $0a, $0a, $56 ; 00 diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 3ebe1736c..fe0869067 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -1,4 +1,4 @@ -Unreferenced_Function16c000: ; 16c000 +Unreferenced_Function16c000: ; Only for CGB ld a, [hCGB] and a @@ -26,9 +26,8 @@ Unreferenced_Function16c000: ; 16c000 pop af ld [wcfbe], a ret -; 16c031 -.RunJumptable: ; 16c031 +.RunJumptable: xor a ld [wJumptableIndex], a ld [wcf64], a @@ -46,9 +45,8 @@ Unreferenced_Function16c000: ; 16c000 cp $ff jr nz, .loop ret -; 16c05c -.Jumptable: ; 16c05c +.Jumptable: dw .init dw Function16c0ba dw Function16c089 @@ -61,9 +59,8 @@ Unreferenced_Function16c000: ; 16c000 dw Function16c0dc dw Function16c0ec dw .quit -; 16c074 -.init ; 16c074 +.init ld a, [wcf64] and a ret z @@ -71,17 +68,15 @@ Unreferenced_Function16c000: ; 16c000 xor a ld [wd003], a ret -; 16c081 -.quit ; 16c081 +.quit push af ld a, $ff ld [wd002], a pop af ret -; 16c089 -Function16c089: ; 16c089 +Function16c089: ld a, $1 ld [wBuffer2], a ld [wd1f1], a @@ -91,17 +86,15 @@ Function16c089: ; 16c089 ld a, [wd002] ld [wcf64], a ret -; 16c09e -Function16c09e: ; 16c09e +Function16c09e: ld a, [wcf64] cp $4 ret nz call Function16c0fa ret -; 16c0a8 -Function16c0a8: ; 16c0a8 +Function16c0a8: xor a ld [wBuffer2], a ld [wd1f1], a @@ -110,9 +103,8 @@ Function16c0a8: ; 16c0a8 ld [hWY], a call Function16c0fa ret -; 16c0ba -Function16c0ba: ; 16c0ba +Function16c0ba: call Function16c943 push af ld a, [wd003] @@ -121,9 +113,8 @@ Function16c0ba: ; 16c0ba pop af call c, Function16c0fa ret -; 16c0ca -Function16c0ca: ; 16c0ca +Function16c0ca: ld a, [wd003] cp $28 push af @@ -133,9 +124,8 @@ Function16c0ca: ; 16c0ca pop af call z, Function16c0fa ret -; 16c0dc -Function16c0dc: ; 16c0dc +Function16c0dc: call Function16ca11 push af ld a, [wd003] @@ -144,9 +134,8 @@ Function16c0dc: ; 16c0dc pop af call c, Function16c0fa ret -; 16c0ec -Function16c0ec: ; 16c0ec +Function16c0ec: call ClearBGPalettes call ClearScreen push af @@ -154,9 +143,8 @@ Function16c0ec: ; 16c0ec ld [wd002], a pop af ret -; 16c0fa -Function16c0fa: ; 16c0fa +Function16c0fa: push af ld a, [wd002] inc a @@ -165,9 +153,8 @@ Function16c0fa: ; 16c0fa ld [wd003], a pop af ret -; 16c108 -MobileSystemSplashScreen_InitGFX: ; 16c108 +MobileSystemSplashScreen_InitGFX: call DisableLCD ld hl, vTiles2 ld de, .Tiles @@ -183,9 +170,8 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ld [hBGMapMode], a call EnableLCD ret -; 16c130 -.LoadPals: ; 16c130 +.LoadPals: ld de, wBGPals1 ld hl, UnknownMobilePalettes_16c903 ld bc, 8 @@ -193,9 +179,8 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 call FarCopyWRAM farcall ApplyPals ret -; 16c145 -.LoadTileMap: ; 16c145 +.LoadTileMap: hlcoord 0, 0 ld bc, 20 xor a @@ -205,9 +190,8 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ld bc, $0154 call CopyBytes ret -; 16c15c -.LoadAttrMap: ; 16c15c +.LoadAttrMap: hlcoord 0, 0, wAttrMap ld bc, SCREEN_WIDTH xor a @@ -217,7 +201,6 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ld bc, 17 * SCREEN_WIDTH call CopyBytes ret -; 16c173 .Tiles: INCBIN "gfx/mobile/mobile_splash.2bpp" @@ -228,12 +211,11 @@ INCBIN "gfx/mobile/mobile_splash.tilemap" .AttrMap: INCBIN "gfx/mobile/mobile_splash.attrmap" -UnknownMobilePalettes_16c903: ; 16c903 +UnknownMobilePalettes_16c903: INCLUDE "gfx/unknown/16c903.pal" -; 16c943 -Function16c943: ; 16c943 +Function16c943: ld a, [wd003] and a jr nz, .asm_16c95e @@ -354,9 +336,8 @@ Function16c943: ; 16c943 ld [rSVBK], a scf ret -; 16ca11 -Function16ca11: ; 16ca11 +Function16ca11: ld a, [wd003] and a jr nz, .asm_16ca1d @@ -455,25 +436,22 @@ Function16ca11: ; 16ca11 ld [rSVBK], a scf ret -; 16cab6 -Function16cab6: ; 16cab6 +Function16cab6: ld b, $0 ld c, e add hl, bc ret -; 16cabb -Function16cabb: ; 16cabb +Function16cabb: inc hl ld a, [hl] srl a srl a and $1f ret -; 16cac4 -Function16cac4: ; 16cac4 +Function16cac4: inc hl ld a, [hld] and $3 @@ -487,15 +465,13 @@ Function16cac4: ; 16cac4 rl b ld a, b ret -; 16cad8 -Function16cad8: ; 16cad8 +Function16cad8: ld a, [hl] and $1f ret -; 16cadc -Function16cadc: ; 16cadc +Function16cadc: sla a sla a ld b, a @@ -505,9 +481,8 @@ Function16cadc: ; 16cadc or b ld [hl], a ret -; 16cae8 -Function16cae8: ; 16cae8 +Function16cae8: ld c, a srl a srl a @@ -530,18 +505,16 @@ Function16cae8: ; 16cae8 or b ld [hl], a ret -; 16cb08 -Function16cb08: ; 16cb08 +Function16cb08: ld b, a ld a, [hl] and $e0 or b ld [hl], a ret -; 16cb0f -Function16cb0f: ; 16cb0f +Function16cb0f: xor a ld [wBuffer1], a ld [wBuffer2], a @@ -556,9 +529,8 @@ Function16cb0f: ; 16cb0f xor a ld [wd1f0], a ret -; 16cb2e -Function16cb2e: ; 16cb2e +Function16cb2e: ld a, [wBuffer2] and a ret z @@ -567,9 +539,8 @@ Function16cb2e: ; 16cb2e ld de, wVirtualOAM call Function16cb5d ret -; 16cb40 -Function16cb40: ; 16cb40 +Function16cb40: ld hl, wd1ec inc [hl] ld a, [hl] @@ -588,9 +559,8 @@ Function16cb40: ; 16cb40 ld a, $a0 ld [wd1ef], a ret -; 16cb5d -Function16cb5d: ; 16cb5d +Function16cb5d: ld a, [hli] and a ret z @@ -622,7 +592,6 @@ Function16cb5d: ; 16cb5d dec a jr nz, .asm_16cb60 ret -; 16cb86 Unknown_16cb86: db 7 @@ -633,26 +602,23 @@ Unknown_16cb86: db 16, 0, 4, 1 db 16, 8, 5, 0 db 16, 16, 6, 0 -; 16cba3 -Function16cba3: ; 16cba3 +Function16cba3: xor a ld [wd1f1], a ld [wd1f2], a ld [wd1f3], a ret -; 16cbae -Function16cbae: ; 16cbae +Function16cbae: ld a, [wd1f1] and a ret z call Function16cbba call Function16cbd1 ret -; 16cbba -Function16cbba: ; 16cbba +Function16cbba: ld hl, wd1f2 inc [hl] ld a, [hl] @@ -669,9 +635,8 @@ Function16cbba: ; 16cbba .asm_16cbcd ld [wd1f3], a ret -; 16cbd1 -Function16cbd1: ; 16cbd1 +Function16cbd1: ld a, [wd1f3] ld c, a ld b, 0 @@ -689,13 +654,11 @@ Function16cbd1: ; 16cbd1 ld a, $1 ld [hCGBPalUpdate], a ret -; 16cbfb Unknown_16cbfb: db 0, 1, 2, 1, 0, 1, 2 -; 16cc02 -Function16cc02: ; 16cc02 +Function16cc02: call Function16cc18 call Function16cc49 call Function16cc62 @@ -704,17 +667,15 @@ Function16cc02: ; 16cc02 call Function16cb0f call Function16cba3 ret -; 16cc18 -Function16cc18: ; 16cc18 +Function16cc18: ld hl, vTiles1 ld de, GFX_16cca3 lb bc, BANK(GFX_16cca3), 46 call Get2bpp ret -; 16cc25 -Function16cc25: ; 16cc25 +Function16cc25: ld hl, Unknown_16cfa9 ld de, wBGPals1 + 1 palettes call .CopyPal @@ -725,15 +686,13 @@ Function16cc25: ; 16cc25 ld de, wOBPals1 + 1 palettes call .CopyPal ret -; 16cc41 -.CopyPal: ; 16cc41 +.CopyPal: ld bc, 1 palettes ld a, $5 jp FarCopyWRAM -; 16cc49 -Function16cc49: ; 16cc49 +Function16cc49: hlcoord 4, 15 ld a, $80 call Function16cc5a @@ -741,9 +700,8 @@ Function16cc49: ; 16cc49 ld a, $90 call Function16cc5a ret -; 16cc5a -Function16cc5a: ; 16cc5a +Function16cc5a: ld c, $10 .asm_16cc5c ld [hli], a @@ -751,17 +709,15 @@ Function16cc5a: ; 16cc5a dec c jr nz, .asm_16cc5c ret -; 16cc62 -Function16cc62: ; 16cc62 +Function16cc62: hlcoord 0, 15, wAttrMap ld bc, $0028 ld a, $1 call ByteFill ret -; 16cc6e -Function16cc6e: ; 16cc6e +Function16cc6e: hlbgcoord 0, 0, vBGMap1 jr Function16cc73 @@ -781,9 +737,8 @@ Function16cc73: pop af ld [rVBK], a ret -; 16cc90 -Function16cc90: ; 16cc90 +Function16cc90: ld bc, $1214 .asm_16cc93 push bc @@ -799,7 +754,6 @@ Function16cc90: ; 16cc90 dec b jr nz, .asm_16cc93 ret -; 16cca3 GFX_16cca3: INCBIN "gfx/unknown/16cca3.2bpp" @@ -829,4 +783,3 @@ Unknown_16cfb9: RGB 27, 11, 12 RGB 07, 07, 07 -; 16cfc1 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index e74321fc9..cbe858f6d 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -1,4 +1,4 @@ -Function170000: ; 170000 +Function170000: ld a, [$c62b] ld [wPlayerTrademonSpecies], a ld hl, $c62e @@ -35,9 +35,8 @@ Function170000: ; 170000 call CopyBytes ret -; 17005a -Function17005a: ; 17005a +Function17005a: ld a, $5 call GetSRAMBank ld a, [$a824] @@ -73,11 +72,10 @@ Function17005a: ; 17005a call CloseSRAM ret -; 1700b0 INCLUDE "engine/events/battle_tower/battle_tower.asm" -Function170be4: ; 170be4 +Function170be4: ld a, $5 call GetSRAMBank xor a @@ -87,9 +85,8 @@ Function170be4: ; 170be4 call CloseSRAM ret -; 170bf7 -Clears5_a89a: ; 170bf7 +Clears5_a89a: ld a, $5 call GetSRAMBank ld hl, $a89a @@ -99,9 +96,8 @@ Clears5_a89a: ; 170bf7 call CloseSRAM ret -; 170c06 -Function170c06: ; 170c06 +Function170c06: ld a, $5 call GetSRAMBank ld hl, $a894 @@ -203,9 +199,8 @@ Function170c06: ; 170c06 call CloseSRAM ret -; 170c8b -Function170c8b: ; 170c8b +Function170c8b: ld hl, wLastEnemyCounterMove ld b, $5 .asm_170c90 @@ -216,9 +211,8 @@ Function170c8b: ; 170c8b jr nz, .asm_170c90 ret -; 170c98 -CheckBTMonMovesForErrors: ; 170c98 +CheckBTMonMovesForErrors: ld c, BATTLETOWER_PARTY_LENGTH ld hl, wBT_OTTempMon1Moves .loop @@ -260,9 +254,8 @@ CheckBTMonMovesForErrors: ; 170c98 jr nz, .loop ret -; 170cc6 -Function170cc6: ; 170cc6 +Function170cc6: ld a, [rSVBK] push af ld a, BANK(wDecompressScratch) @@ -289,9 +282,8 @@ Function170cc6: ; 170cc6 ld [rSVBK], a ret -; 170d02 -Function170d02: ; 170d02 +Function170d02: ld a, $1 ld [rVBK], a ld de, GFX_171848 @@ -302,7 +294,6 @@ Function170d02: ; 170d02 ld [rVBK], a ret -; 170d16 PichuAnimatedMobileGFX: INCBIN "gfx/mobile/pichu_animated.2bpp.lz" @@ -313,7 +304,7 @@ INCBIN "gfx/mobile/electro_ball.2bpp.lz" GFX_171848: INCBIN "gfx/unknown/171848.2bpp" -Function1719c8: ; 1719c8 (5c:59c8) +Function1719c8: ld a, [hInMenu] push af ld a, $1 @@ -323,7 +314,7 @@ Function1719c8: ; 1719c8 (5c:59c8) ld [hInMenu], a ret -Function1719d6: ; 1719d6 (5c:59d6) +Function1719d6: farcall BattleTowerRoomMenu_InitRAM call Function1719ed ld a, [rSVBK] @@ -335,7 +326,7 @@ Function1719d6: ; 1719d6 (5c:59d6) ld [rSVBK], a ret -Function1719ed: ; 1719ed (5c:59ed) +Function1719ed: xor a ld [wcd49], a ld [wcd4a], a @@ -348,7 +339,7 @@ Function1719ed: ; 1719ed (5c:59ed) farcall ClearSpriteAnims ret -Function171a11: ; 171a11 (5c:5a11) +Function171a11: .loop call JoyTextDelay ld a, [wcd49] @@ -363,7 +354,7 @@ Function171a11: ; 171a11 (5c:5a11) call ClearSprites ret -Function171a36: ; 171a36 (5c:5a36) +Function171a36: ld a, [wcd49] ld e, a ld d, 0 @@ -375,7 +366,7 @@ Function171a36: ; 171a36 (5c:5a36) ld l, a jp hl -Jumptable_171a45: ; 171a45 (5c:5a45) +Jumptable_171a45: dw Function171a95 dw Function171ac9 dw Function171a5d @@ -390,7 +381,7 @@ Jumptable_171a45: ; 171a45 (5c:5a45) dw Function171c41 -Function171a5d: ; 171a5d (5c:5a5d) +Function171a5d: ld a, [wc821] bit 1, a jr nz, .asm_171a6a @@ -419,30 +410,28 @@ Function171a5d: ; 171a5d (5c:5a5d) ld [wcd49], a ret -Function171a95: ; 171a95 (5c:5a95) +Function171a95: farcall Function171ccd hlcoord 2, 8 ld de, String_171aa7 call PlaceString jp Function171c66 -; 171aa7 (5c:5aa7) -String_171aa7: ; 171aa7 +String_171aa7: db "モバイルアダプタに" next "せつぞく しています" next "しばらく おまちください" db "@" -; 171ac9 -Function171ac9: ; 171ac9 (5c:5ac9) +Function171ac9: ld de, wcd81 ld hl, $5c ld a, $2 call Function3e32 jp Function171c66 -Function171ad7: ; 171ad7 (5c:5ad7) +Function171ad7: xor a ld hl, $c608 ld bc, $66 @@ -452,7 +441,7 @@ Function171ad7: ; 171ad7 (5c:5ad7) call Function3e32 jp Function171c66 -Function171aec: ; 171aec (5c:5aec) +Function171aec: ld a, [rSVBK] push af ld a, $1 @@ -503,7 +492,7 @@ Function171aec: ; 171aec (5c:5aec) jr nz, .asm_171b1b jp Function171c66 -Function171b42: ; 171b42 (5c:5b42) +Function171b42: ld a, [de] inc de and a @@ -512,7 +501,7 @@ Function171b42: ; 171b42 (5c:5b42) ld [hli], a jr Function171b42 -Function171b4b: ; 171b4b (5c:5b4b) +Function171b4b: depixel 8, 2 ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct @@ -543,7 +532,7 @@ Function171b4b: ; 171b4b (5c:5b4b) ld [wcd24], a jp Function171c66 -Function171b85: ; 171b85 (5c:5b85) +Function171b85: ld hl, hJoyPressed ; $ffa7 ld a, [hl] and $2 @@ -559,12 +548,12 @@ Function171b85: ; 171b85 (5c:5b85) jr nz, asm_171baf ret -Function171b9f: ; 171b9f (5c:5b9f) +Function171b9f: ld a, $80 ld [wcd49], a ret -asm_171ba5: ; 171ba5 (5c:5ba5) +asm_171ba5: ld a, [wcd4a] and a ret z @@ -572,7 +561,7 @@ asm_171ba5: ; 171ba5 (5c:5ba5) ld [wcd4a], a ret -asm_171baf: ; 171baf (5c:5baf) +asm_171baf: ld a, [wcd4b] ld c, a ld a, [wcd4a] @@ -582,7 +571,7 @@ asm_171baf: ; 171baf (5c:5baf) ld [wcd4a], a ret -Function171bbd: ; 171bbd (5c:5bbd) +Function171bbd: call PlayClickSFX ld a, $8 ld [wcd23], a @@ -590,7 +579,7 @@ Function171bbd: ; 171bbd (5c:5bbd) ld [wcd24], a jp Function171c66 -Function171bcc: ; 171bcc (5c:5bcc) +Function171bcc: ld hl, hJoyPressed ; $ffa7 ld a, [hl] and $2 @@ -600,7 +589,7 @@ Function171bcc: ; 171bcc (5c:5bcc) jp nz, Function171beb ret -Function171bdc: ; 171bdc (5c:5bdc) +Function171bdc: ld a, $4 ld [wcd23], a ld a, $8 @@ -609,7 +598,7 @@ Function171bdc: ; 171bdc (5c:5bdc) dec [hl] ret -Function171beb: ; 171beb (5c:5beb) +Function171beb: ld a, $5 call GetSRAMBank ld a, [wcd4a] @@ -636,7 +625,7 @@ Function171beb: ; 171beb (5c:5beb) ld [wcd4c], a call Function171c66 -Function171c2c: ; 171c2c (5c:5c2c) +Function171c2c: ld hl, wcd4c dec [hl] ret nz @@ -644,12 +633,12 @@ Function171c2c: ; 171c2c (5c:5c2c) call ClearBGPalettes jr asm_171c60 -Function171c39: ; 171c39 (5c:5c39) +Function171c39: ld a, $28 ld [wcd4c], a call Function171c66 -Function171c41: ; 171c41 (5c:5c41) +Function171c41: ld hl, wcd4c dec [hl] ret nz @@ -659,31 +648,28 @@ Function171c41: ; 171c41 (5c:5c41) ld a, $2 ld [wc303], a farcall DisplayMobileError -asm_171c60: ; 171c60 (5c:5c60) +asm_171c60: ld a, $80 ld [wcd49], a ret -Function171c66: ; 171c66 (5c:5c66) +Function171c66: ld hl, wcd49 inc [hl] ret -; 171c6b (5c:5c6b) -MenuHeader_171c6b: ; 171c6b +MenuHeader_171c6b: db MENU_BACKUP_TILES ; flags menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw NULL db 0 ; default option -; 171c73 -String_171c73: ; 171c73 +String_171c73: db "モバイルセンターを けってい" next "しました@" -; 171c87 -Function171c87: ; 171c87 (5c:5c87) +Function171c87: call DisableLCD ld hl, GFX_171db1 ld de, vTiles2 tile $00 @@ -709,7 +695,7 @@ Function171c87: ; 171c87 (5c:5c87) call PlaceString ret -Function171ccd: ; 171ccd (5c:5ccd) +Function171ccd: ld a, [rSVBK] push af ld a, $5 @@ -728,7 +714,7 @@ Function171ccd: ; 171ccd (5c:5ccd) ld [rSVBK], a ret -Function171cf0: ; 171cf0 (5c:5cf0) +Function171cf0: xor a hlcoord 4, 15 ld [hli], a @@ -755,7 +741,7 @@ Function171cf0: ; 171cf0 (5c:5cf0) ld de, String_172e4e jp PlaceString -Function171d2b: ; 171d2b (5c:5d2b) +Function171d2b: call DisableLCD ld hl, GFX_171db1 ld de, vTiles2 tile $00 @@ -781,7 +767,6 @@ Function171d2b: ; 171d2b (5c:5d2b) call PlaceString ret -; 171d71 (5c:5d71) Palette_171d71: RGB 0, 0, 0 @@ -836,21 +821,20 @@ INCBIN "gfx/unknown/172955.attrmap" LZ_172abd: INCBIN "gfx/pokedex/slowpoke.2bpp.lz" -String_172e31: ; 172e31 +String_172e31: db "パスワード<WO>いれてください@" -String_172e3f: ; 172e3f +String_172e3f: db "きりかえ やめる けってい@" -String_172e4e: ; 172e4e +String_172e4e: db "きりかえ やめる " String_172e58: db "けってい@" -String_172e5d: ; 172e5d +String_172e5d: db "せつぞくする モバイルセンターを" next "えらんで ください@" -; 172e78 -Function172e78: ; 172e78 (5c:6e78) +Function172e78: ld a, $7f hlcoord 0, 0 ld bc, $168 @@ -875,7 +859,6 @@ Function172e78: ; 172e78 (5c:6e78) call CopyBytes ret -; 172eb9 (5c:6eb9) Function172eb9: ld a, [rSVBK] @@ -895,7 +878,6 @@ Function172eb9: ld [rSVBK], a ret -; 172edf (5c:6edf) Palette_172edf: RGB 5, 12, 17 diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 850096705..969baf34b 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -1,7 +1,7 @@ MobileAdapterGFX:: INCBIN "gfx/mobile/mobile_adapter.2bpp" -Function17a68f:: ; 17a68f (5e:668f) +Function17a68f:: call Function17a6a8 call Function17a751 ld hl, $d088 @@ -18,7 +18,7 @@ Function17a68f:: ; 17a68f (5e:668f) scf ret -Function17a6a8: ; 17a6a8 (5e:66a8) +Function17a6a8: push de push bc ld hl, wStringBuffer2 ; $d086 @@ -49,7 +49,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8) call DelayFrame ret -Function17a6f5: ; 17a6f5 (5e:66f5) +Function17a6f5: ld hl, wBuffer1 ld c, $0 ld b, $8 @@ -69,7 +69,7 @@ Function17a6f5: ; 17a6f5 (5e:66f5) ld [$d08c], a ret -Function17a713: ; 17a713 (5e:6713) +Function17a713: and $f cp $a jr nc, .asm_17a71d @@ -83,7 +83,7 @@ Function17a713: ; 17a713 (5e:6713) scf ret -Function17a721: ; 17a721 (5e:6721) +Function17a721: push de ld h, d ld l, e @@ -121,7 +121,7 @@ Function17a721: ; 17a721 (5e:6721) ld [de], a ret -Function17a751: ; 17a751 (5e:6751) +Function17a751: xor a ld [$d087], a .asm_17a755 @@ -137,7 +137,7 @@ Function17a751: ; 17a751 (5e:6751) jr z, .asm_17a755 ret -Function17a770: ; 17a770 (5e:6770) +Function17a770: ld a, [hOAMUpdate] push af ld a, $1 @@ -148,7 +148,7 @@ Function17a770: ; 17a770 (5e:6770) ld [hOAMUpdate], a ret -Function17a781: ; 17a781 (5e:6781) +Function17a781: ld a, [hInMenu] push af ld a, $1 @@ -158,7 +158,7 @@ Function17a781: ; 17a781 (5e:6781) ld [hInMenu], a ret -Function17a78f: ; 17a78f (5e:678f) +Function17a78f: ld hl, $d088 bit 7, [hl] res 7, [hl] @@ -169,21 +169,20 @@ Function17a78f: ; 17a78f (5e:678f) .asm_17a79f farcall ReloadMapPart ret -; 17a7a6 (5e:67a6) -Function17a7a6: ; 17a7a6 +Function17a7a6: ld a, [$d087] inc a ld [$d087], a ret -Function17a7ae: ; 17a7ae (5e:67ae) +Function17a7ae: ld a, [$d087] ld hl, Jumptable_17a7b6 rst JumpTable ret -Jumptable_17a7b6: ; 17a7b6 (5e:67b6) +Jumptable_17a7b6: dw Function17a7c2 dw Function17a7cd dw Function17a7d8 @@ -192,21 +191,21 @@ Jumptable_17a7b6: ; 17a7b6 (5e:67b6) dw Function17a7f4 -Function17a7c2: ; 17a7c2 (5e:67c2) +Function17a7c2: ld a, $4 call Function17aad3 ld a, $1 ld [$d087], a ret -Function17a7cd: ; 17a7cd (5e:67cd) +Function17a7cd: call Function17a83c call Function17a8ae ret c call Function17a848 ret -Function17a7d8: ; 17a7d8 (5e:67d8) +Function17a7d8: call Function17a83c call Function17a848 ld hl, $d08b @@ -220,7 +219,7 @@ Function17a7d8: ; 17a7d8 (5e:67d8) ld [$d087], a ret -Function17a7f4: ; 17a7f4 (5e:67f4) +Function17a7f4: ld hl, $d08b dec [hl] ret nz @@ -228,7 +227,7 @@ Function17a7f4: ; 17a7f4 (5e:67f4) set 7, [hl] ret -Function17a7ff: ; 17a7ff (5e:67ff) +Function17a7ff: ld hl, $d08b dec [hl] ret nz @@ -242,7 +241,7 @@ Function17a7ff: ; 17a7ff (5e:67ff) set 7, [hl] ret -Function17a81a: ; 17a81a (5e:681a) +Function17a81a: call IsSFXPlaying ret nc ld a, [hJoyPressed] @@ -259,7 +258,7 @@ Function17a81a: ; 17a81a (5e:681a) ld [$d087], a ret -Function17a83c: ; 17a83c (5e:683c) +Function17a83c: ld a, [hJoyLast] and $f0 ld c, a @@ -269,7 +268,7 @@ Function17a83c: ; 17a83c (5e:683c) ld c, a ret -Function17a848: ; 17a848 (5e:6848) +Function17a848: ld a, c and $60 cp $60 @@ -345,7 +344,7 @@ Function17a848: ; 17a848 (5e:6848) scf ret -Function17a8ae: ; 17a8ae (5e:68ae) +Function17a8ae: bit 1, c jr nz, .asm_17a8bc bit 0, c @@ -377,7 +376,7 @@ Function17a8ae: ; 17a8ae (5e:68ae) scf ret -Function17a8de: ; 17a8de (5e:68de) +Function17a8de: ld a, $2 call Function17aae0 ld a, [hl] @@ -414,7 +413,7 @@ Function17a8de: ; 17a8de (5e:68de) call Function17aa88 ret -Function17a91e: ; 17a91e (5e:691e) +Function17a91e: ld a, [$d08c] cp $7 jr c, .asm_17a92c @@ -435,7 +434,7 @@ Function17a91e: ; 17a91e (5e:691e) scf ret -Function17a943: ; 17a943 (5e:6943) +Function17a943: ld a, [$d08c] and a jr z, .asm_17a95d @@ -457,7 +456,7 @@ Function17a943: ; 17a943 (5e:6943) xor a ret -Function17a964: ; 17a964 (5e:6964) +Function17a964: ld a, [$d08c] cp $10 jr nc, .asm_17a979 @@ -475,7 +474,7 @@ Function17a964: ; 17a964 (5e:6964) scf ret -Function17a97b: ; 17a97b (5e:697b) +Function17a97b: hlcoord 1, 1 lb bc, 2, 18 call ClearBox @@ -499,7 +498,7 @@ Function17a97b: ; 17a97b (5e:697b) .asm_17a99d ret -Function17a99e: ; 17a99e (5e:699e) +Function17a99e: hlcoord 0, 12 ld b, $4 ld c, $12 @@ -508,15 +507,13 @@ Function17a99e: ; 17a99e (5e:699e) ld de, String_17a9b2 call PlaceString ret -; 17a9b2 (5e:69b2) -String_17a9b2: ; 17a9b2 +String_17a9b2: db "でんわばんごうが ただしく" next "はいって いません!" db "@" -; 17a9cb -Function17a9cb: ; 17a9cb (5e:69cb) +Function17a9cb: ld de, wVirtualOAM ; $c400 ld hl, $d088 bit 6, [hl] @@ -530,7 +527,7 @@ Function17a9cb: ; 17a9cb (5e:69cb) call Function17a9e3 ret -Function17a9e3: ; 17a9e3 (5e:69e3) +Function17a9e3: ld a, $3 ld [$d08e], a ld hl, Unknown_17aa77 @@ -540,7 +537,7 @@ Function17a9e3: ; 17a9e3 (5e:69e3) call Function17aa4a ret -Function17a9f5: ; 17a9f5 (5e:69f5) +Function17a9f5: ld a, [$d08c] cp $10 ret nc @@ -564,7 +561,7 @@ Function17a9f5: ; 17a9f5 (5e:69f5) call Function17aa4a ret -Function17aa22: ; 17aa22 (5e:6a22) +Function17aa22: ld a, $0 ld [$d08e], a push de @@ -590,7 +587,7 @@ Function17aa22: ; 17aa22 (5e:6a22) call Function17aa4a ret -Function17aa4a: ; 17aa4a (5e:6a4a) +Function17aa4a: ld [$d08d], a ld a, b add $8 @@ -623,33 +620,30 @@ Function17aa4a: ; 17aa4a (5e:6a4a) dec a jr nz, .loop ret -; 17aa72 (5e:6a72) -Unknown_17aa72: ; 17aa72 +Unknown_17aa72: db 1 db 0, 0, 0, 0 -; 17aa77 -Unknown_17aa77: ; 17aa77 +Unknown_17aa77: db 4 db 0, 0, 0, 0 db 0, 8, 1, 0 db 8, 0, 2, 0 db 8, 8, 3, 0 -; 17aa88 -Function17aa88: ; 17aa88 (5e:6a88) +Function17aa88: jr c, asm_17aa91 ld de, SFX_SWITCH_POKEMON call PlaySFX ret -asm_17aa91: ; 17aa91 (5e:6a91) +asm_17aa91: ld de, SFX_WRONG call PlaySFX ret -Function17aa98: ; 17aa98 (5e:6a98) +Function17aa98: ld a, $5 ld [$d08b], a call Function17aaa9 @@ -658,7 +652,7 @@ Function17aa98: ; 17aa98 (5e:6a98) set 7, [hl] ret -Function17aaa9: ; 17aaa9 (5e:6aa9) +Function17aaa9: ld a, $3 call Function17aae3 ld c, a @@ -673,7 +667,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9) call AddNTimes ret -Function17aac3: ; 17aac3 (5e:6ac3) +Function17aac3: ld a, $b push hl ld [hli], a @@ -685,24 +679,24 @@ Function17aac3: ; 17aac3 (5e:6ac3) ld [hli], a ret -Function17aad0: ; 17aad0 (5e:6ad0) +Function17aad0: call Function17aae0 -Function17aad3: ; 17aad3 (5e:6ad3) +Function17aad3: ld [$d089], a ret -Function17aad7: ; 17aad7 (5e:6ad7) +Function17aad7: push af ld a, [$d089] ld [$d08a], a pop af ret -Function17aae0: ; 17aae0 (5e:6ae0) +Function17aae0: call Function17aad7 -Function17aae3: ; 17aae3 (5e:6ae3) +Function17aae3: push af ld a, [$d08a] ld bc, $d @@ -714,9 +708,8 @@ Function17aae3: ; 17aae3 (5e:6ae3) add hl, bc ld a, [hl] ret -; 17aaf7 (5e:6af7) -Unknown_17aaf7: ; 17aaf7 +Unknown_17aaf7: db $0, $0, $1, $6, $5, $9, $3, $2, $1, $2, $1, $2, $4 db $0, $0, $2, $9, $5, $a, $4, $0, $2, $a, $a, $3, $5 db $0, $0, $3, $c, $5, $b, $5, $1, $0, $1, $0, $4, $0 @@ -730,9 +723,8 @@ Unknown_17aaf7: ; 17aaf7 db $0, $0, $0, $9, $e, $7, $1, $9, $b, $6, $8, $1, $1 db $0, $0,$f1, $c, $e, $8, $2, $a, $c, $7, $c, $2, $c db $0, $0,$f0,$10, $e, $c, $c, $b, $9, $b, $9, $b, $9 -; 17aba0 -Function17aba0: ; 17aba0 (5e:6ba0) +Function17aba0: ld a, [rVBK] push af ld a, $1 @@ -757,7 +749,7 @@ Function17aba0: ; 17aba0 (5e:6ba0) call Get2bpp ret -Function17abcf: ; 17abcf (5e:6bcf) +Function17abcf: ld a, [rSVBK] push af ld a, BANK(wBGPals1) @@ -788,7 +780,7 @@ Function17abcf: ; 17abcf (5e:6bcf) ld [rSVBK], a ret -Function17ac0c: ; 17ac0c (5e:6c0c) +Function17ac0c: call Function17ac1d call Function17ac2a hlcoord 0, 0 @@ -797,14 +789,14 @@ Function17ac0c: ; 17ac0c (5e:6c0c) call Function17ac46 ret -Function17ac1d: ; 17ac1d (5e:6c1d) +Function17ac1d: ld hl, Tilemap_17acd5 decoord 0, 4 ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH call CopyBytes ret -Function17ac2a: ; 17ac2a (5e:6c2a) +Function17ac2a: ld hl, Tilemap_17ae3d decoord 0, 4, wAttrMap ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH @@ -821,7 +813,7 @@ Function17ac2a: ; 17ac2a (5e:6c2a) jr nz, .loop ret -Function17ac46: ; 17ac46 (5e:6c46) +Function17ac46: ld a, [$d088] bit 4, a jr nz, .bit_4_set @@ -831,9 +823,8 @@ Function17ac46: ; 17ac46 (5e:6c46) .bit_4_set call Function3eea ret -; 17ac55 (5e:6c55) -Palette_17ac55: ; 17ac55 +Palette_17ac55: RGB 0, 0, 0 RGB 9, 10, 25 RGB 16, 19, 31 @@ -874,7 +865,7 @@ Palette_17ac55: ; 17ac55 RGB 0, 0, 0 RGB 0, 0, 0 -Palette_17ac95: ; 17ac95 +Palette_17ac95: RGB 31, 31, 31 RGB 4, 3, 3 RGB 31, 13, 0 @@ -915,11 +906,11 @@ Palette_17ac95: ; 17ac95 RGB 27, 31, 0 RGB 31, 31, 0 -Tilemap_17acd5: ; 17acd5 +Tilemap_17acd5: INCBIN "gfx/unknown/17acd5.tilemap" -Tilemap_17ae3d: ; 17ae3d +Tilemap_17ae3d: INCBIN "gfx/unknown/17ae3d.tilemap" -GFX_17afa5:: ; 17afa5 +GFX_17afa5:: INCBIN "gfx/unknown/17afa5.2bpp" diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 05a1fc34c..13cb091da 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -1,4 +1,4 @@ -Function17c000: ; 17c000 +Function17c000: call DisableLCD ld hl, vTiles2 @@ -79,19 +79,18 @@ Function17c000: ; 17c000 call EnableLCD farcall ReloadMapPart ret -; 17c083 -HaveWantGFX: ; 17c083 +HaveWantGFX: INCBIN "gfx/mobile/havewant.2bpp" -MobileSelectGFX: ; 17c983 +MobileSelectGFX: INCBIN "gfx/mobile/select.2bpp" -HaveWantMap: ; 17cb83 +HaveWantMap: ; Interleaved tile/palette map. INCBIN "gfx/mobile/havewant_map.bin" -HaveWantPals: ; 17cff3 +HaveWantPals: ; BG and OBJ palettes. RGB 0, 0, 0 RGB 21, 21, 21 @@ -174,7 +173,7 @@ HaveWantPals: ; 17cff3 RGB 0, 0, 0 -CheckStringForErrors: ; 17d073 +CheckStringForErrors: ; Valid character ranges: ; $0, $5 - $13, $19 - $1c, $26 - $34, $3a - $3e, $40 - $48, $60 - $ff .loop @@ -220,9 +219,8 @@ CheckStringForErrors: ; 17d073 .Done: and a ret -; 17d0b3 -CheckStringForErrors_IgnoreTerminator: ; 17d0b3 +CheckStringForErrors_IgnoreTerminator: ; Find control chars .loop ld a, [de] @@ -266,9 +264,8 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3 jr nz, .loop and a ret -; 17d0f3 -Function17d0f3: ; 17d0f3 +Function17d0f3: ld a, [$c608 + 5] ld [wOTTrademonSpecies], a ld [wCurPartySpecies], a @@ -325,32 +322,28 @@ Function17d0f3: ; 17d0f3 call CloseSubmenu call RestartMapMusic ret -; 17d187 -Mobile_CopyDefaultOTName: ; 17d187 +Mobile_CopyDefaultOTName: ld hl, Mobile5F_PlayersName ld de, $c63d ld bc, 5 call CopyBytes ret -; 17d194 Mobile5F_PlayersName: db "クりス@@" -; 17d198 -Mobile_CopyDefaultNickname: ; 17d199 +Mobile_CopyDefaultNickname: ld hl, .DefaultNickname ld de, $c642 ld bc, 5 call CopyBytes ret -; 17d1a6 .DefaultNickname: db "?????" -Mobile_CopyDefaultMail: ; 17d1ab +Mobile_CopyDefaultMail: ld a, "@" ld hl, $c647 ld bc, MAIL_MSG_LENGTH + 1 @@ -360,13 +353,11 @@ Mobile_CopyDefaultMail: ; 17d1ab ld bc, 6 call CopyBytes ret -; 17d1c3 .DefaultMessage: db "こんにちは@" -; 17d1c9 -Mobile_CopyDefaultMailAuthor: ; 17d1c9 +Mobile_CopyDefaultMailAuthor: ld a, "@" ld de, $c668 ld bc, 5 @@ -376,9 +367,8 @@ Mobile_CopyDefaultMailAuthor: ; 17d1c9 ld bc, 5 call CopyBytes ret -; 17d1e1 -CheckStringContainsLessThanBNextCharacters: ; 17d1e1 +CheckStringContainsLessThanBNextCharacters: .loop ld a, [de] inc de @@ -396,9 +386,8 @@ CheckStringContainsLessThanBNextCharacters: ; 17d1e1 .done scf ret -; 17d1f1 -Function17d1f1: ; 17d1f1 +Function17d1f1: ld a, [wCurPartySpecies] dec a call SetSeenAndCaughtMon @@ -423,7 +412,6 @@ Function17d1f1: ; 17d1f1 .asm_17d223 ret -; 17d224 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -435,7 +423,7 @@ Function17d1f1: ; 17d1f1 ; if [wScriptVar] == TRUE ; Show BattleTower-Menu with 3 options in english language ; - Challenge - Explanation - Cancel -Menu_ChallengeExplanationCancel: ; 17d224 +Menu_ChallengeExplanationCancel: ld a, [wScriptVar] and a jr nz, .English @@ -454,9 +442,8 @@ Menu_ChallengeExplanationCancel: ; 17d224 call Function17d246 call CloseWindow ret -; 17d246 -Function17d246: ; 17d246 +Function17d246: call VerticalMenu jr c, .Exit ld a, [wScriptVar] @@ -480,53 +467,48 @@ Function17d246: ; 17d246 ld a, $4 ld [wScriptVar], a ret -; 17d26a -MenuHeader_17d26a: ; 17d26a +MenuHeader_17d26a: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 14, 9 dw MenuData_17d272 db 1 ; default option -MenuData_17d272: ; 17d272 +MenuData_17d272: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 4 db "ニュース¯よみこむ@" db "ニュース¯みる@" db "せつめい@" db "やめる@" -; 17d28f -MenuHeader_ChallengeExplanationCancel: ; 17d28f +MenuHeader_ChallengeExplanationCancel: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 14, 7 dw MenuData_ChallengeExplanationCancel db 1 ; default option -MenuData_ChallengeExplanationCancel: ; 17d297 +MenuData_ChallengeExplanationCancel: db STATICMENU_CURSOR | STATICMENU_WRAP ; flags db 3 db "Challenge@" db "Explanation@" db "Cancel@" -; 17d2b6 -Function17d2b6: ; 17d2b6 +Function17d2b6: call Function17d2c0 farcall Function1181da ret -; 17d2c0 -Function17d2c0: ; 17d2c0 +Function17d2c0: xor a ld [wJumptableIndex], a ld [wcf64], a ld [wcf65], a ld [wcf66], a ret -; 17d2ce -Function17d2ce: ; 17d2ce +Function17d2ce: ld a, $5 call GetSRAMBank ld a, [$aa72] @@ -560,9 +542,8 @@ Function17d2ce: ; 17d2ce call ReturnToMapFromSubmenu call CloseSubmenu ret -; 17d314 -Function17d314: ; 17d314 +Function17d314: ld a, $5 call GetSRAMBank ld a, [$b1b1] @@ -613,9 +594,8 @@ Function17d314: ; 17d314 ld [wScriptVar], a scf ret -; 17d370 -Function17d370: ; 17d370 +Function17d370: xor a ld [wcd77], a ld [wMobileCrashCheckPointer], a @@ -665,9 +645,8 @@ Function17d370: ; 17d370 call CopyBytes call CloseSRAM ret -; 17d3f6 -Function17d3f6: ; 17d3f6 +Function17d3f6: call ClearBGPalettes call ClearSprites call ClearScreen @@ -708,9 +687,8 @@ Function17d405: pop af ld [rSVBK], a ret -; 17d45a -Function17d45a: ; 17d45a +Function17d45a: .asm_17d45a call JoyTextDelay ld a, [wcd77] @@ -724,21 +702,18 @@ Function17d45a: ; 17d45a xor a ld [wScriptVar], a ret -; 17d474 -Function17d474: ; 17d474 +Function17d474: jumptable Jumptable_17d483, wcd77 -; 17d483 -Jumptable_17d483: ; 17d483 +Jumptable_17d483: dw Function17d48d dw Function17d5be dw Function17d5c4 dw Function17d6fd dw Function17e427 -; 17d48d -Function17d48d: ; 17d48d +Function17d48d: ld hl, Palette_17eff6 ld de, $c608 ld bc, $40 @@ -921,9 +896,8 @@ Function17d48d: ; 17d48d call Function17e5af farcall ReloadMapPart jp Function17e438 -; 17d5be -Function17d5be: ; 17d5be +Function17d5be: call SetPalettes call Function17e438 @@ -962,9 +936,8 @@ Function17d5c4: ld a, $3 ld [wcd77], a ret -; 17d5f6 -Function17d5f6: ; 17d5f6 +Function17d5f6: ld a, $5 ld [rSVBK], a ld hl, $c608 @@ -974,9 +947,8 @@ Function17d5f6: ; 17d5f6 ld a, $4 ld [rSVBK], a ret -; 17d60b -Function17d60b: ; 17d60b +Function17d60b: ld a, $5 call GetSRAMBank ld hl, $b1d3 @@ -1063,10 +1035,9 @@ Function17d60b: ; 17d60b call CopyBytes call CloseSRAM ret -; 17d6a1 -Function17d6a1: ; 17d6a1 +Function17d6a1: push hl ld a, [wcd6e] ld c, a @@ -1114,9 +1085,8 @@ Function17d6a1: ; 17d6a1 call CloseSRAM pop hl ret -; 17d6fd -Function17d6fd: ; 17d6fd +Function17d6fd: ld a, [wcd77] bit 7, a jr nz, asm_17d721 @@ -1147,9 +1117,8 @@ asm_17d721 ld a, $2 ld [wcd77], a ret -; 17d72a -Jumptable17d72a: ; 17d72a +Jumptable17d72a: dw Function17d78c dw Function17d78d dw Function17d7b4 @@ -1199,13 +1168,11 @@ Jumptable17d72a: ; 17d72a dw Function17e3e0 dw Function17e3f0 dw Function17e409 -; 17d78c -Function17d78c: ; 17d78c +Function17d78c: ret -; 17d78d -Function17d78d: ; 17d78d +Function17d78d: call IncCrashCheckPointer ld a, [hli] ld c, a @@ -1224,9 +1191,8 @@ Function17d78d: ; 17d78d ld [wcd77], a call ClearBGPalettes ret -; 17d7b4 -Function17d7b4: ; 17d7b4 +Function17d7b4: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -1234,9 +1200,8 @@ Function17d7b4: ; 17d7b4 call PlayMusic2 call HlToCrashCheckPointer ret -; 17d7c2 -Function17d7c2: ; 17d7c2 +Function17d7c2: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -1245,9 +1210,8 @@ Function17d7c2: ; 17d7c2 call WaitSFX call HlToCrashCheckPointer ret -; 17d7d3 -Function17d7d3: ; 17d7d3 +Function17d7d3: call IncCrashCheckPointer ld a, [hli] dec a @@ -1257,9 +1221,8 @@ Function17d7d3: ; 17d7d3 call WaitSFX call HlToCrashCheckPointer ret -; 17d7e5 -Function17d7e5: ; 17d7e5 +Function17d7e5: call IncCrashCheckPointer ld a, [hli] ld [wcd4f], a @@ -1283,9 +1246,8 @@ Function17d7e5: ; 17d7e5 call Function17e691 call HlToCrashCheckPointer ret -; 17d818 -Function17d818: ; 17d818 +Function17d818: call IncCrashCheckPointer ld a, [hli] ld c, a @@ -1303,9 +1265,8 @@ Function17d818: ; 17d818 add hl, bc call PlaceString ret -; 17d833 -Function17d833: ; 17d833 +Function17d833: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -1331,9 +1292,8 @@ Function17d833: ; 17d833 farcall Function11c08f call Function17e349 ret -; 17d85d -Function17d85d: ; 17d85d +Function17d85d: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -1432,9 +1392,8 @@ Function17d85d: ; 17d85d .asm_17d8fe call Function17e349 ret -; 17d902 -Function17d902: ; 17d902 +Function17d902: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -1467,9 +1426,8 @@ Function17d902: ; 17d902 .asm_17d936 call Function17e349 ret -; 17d93a -Function17d93a: ; 17d93a +Function17d93a: call IncCrashCheckPointer ld de, $c708 ld bc, $5 @@ -1503,9 +1461,8 @@ Function17d93a: ; 17d93a ld [rSVBK], a call Function17e349 ret -; 17d98b -Function17d98b: ; 17d98b +Function17d98b: call IncCrashCheckPointer ld de, $c708 ld bc, $4 @@ -1540,9 +1497,8 @@ Function17d98b: ; 17d98b ld [rSVBK], a call Function17e349 ret -; 17d9e3 -Function17d9e3: ; 17d9e3 +Function17d9e3: call IncCrashCheckPointer ld de, $c708 ld bc, $7 @@ -1586,9 +1542,8 @@ Function17d9e3: ; 17d9e3 .asm_17da30 ret -; 17da31 -Function17da31: ; 17da31 +Function17da31: call IncCrashCheckPointer ld de, $c708 ld bc, $4 @@ -1647,7 +1602,6 @@ Function17da31: ; 17da31 .asm_17da8b ret -; 17da8c Unknown_17da8c: x = 0 @@ -1662,9 +1616,8 @@ rept 8 db (1 << x) ^ $ff x = x + 1 endr -; 17da9c -Function17da9c: ; 17da9c +Function17da9c: ld a, [wcd31] dec a jr z, .asm_17dabd @@ -1695,9 +1648,8 @@ Function17da9c: ; 17da9c call Function17e55b call Function17e5af jr .asm_17daba -; 17dadc -Function17dadc: ; 17dadc +Function17dadc: ld a, [wcd2e] ld hl, wcd24 add [hl] @@ -1735,9 +1687,8 @@ Function17dadc: ; 17dadc call Function17e55b call Function17e5af jr .asm_17db0e -; 17db2d -Function17db2d: ; 17db2d +Function17db2d: ld a, [wcd30] ld hl, wcd24 cp [hl] @@ -1757,9 +1708,8 @@ Function17db2d: ; 17db2d .asm_17db53 jp IncCrashCheckPointer -; 17db56 -Function17db56: ; 17db56 +Function17db56: ld a, [wcd30] cp $1 jr z, .asm_17db74 @@ -1775,9 +1725,8 @@ Function17db56: ; 17db56 .asm_17db74 jp IncCrashCheckPointer -; 17db77 -Function17db77: ; 17db77 +Function17db77: ld hl, wcd2d ld a, [wcd2f] add [hl] @@ -1807,9 +1756,8 @@ Function17db77: ; 17db77 .asm_17dbae jp IncCrashCheckPointer -; 17dbb1 -Function17dbb1: ; 17dbb1 +Function17dbb1: ld hl, wcd2f ld a, [wcd42] sub [hl] @@ -1843,9 +1791,8 @@ Function17dbb1: ; 17dbb1 pop af dec a jr .asm_17dbd4 -; 17dbe9 -Function17dbe9: ; 17dbe9 +Function17dbe9: ld hl, wcd2d ld a, [wcd2f] sub [hl] @@ -1877,9 +1824,8 @@ Function17dbe9: ; 17dbe9 call Function17e55b call Function17e5af jp IncCrashCheckPointer -; 17dc1f -Function17dc1f: ; 17dc1f +Function17dc1f: call IncCrashCheckPointer ld de, $c688 ld bc, $6 @@ -1938,23 +1884,20 @@ Function17dc1f: ; 17dc1f pop hl call Function17e40f ret -; 17dc96 MenuData_17dc96: db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags db 2 db "はい@" db "いいえ@" -; 17dc9f -Function17dc9f: ; 17dc9f +Function17dc9f: call IncCrashCheckPointer call HlToCrashCheckPointer call RotateFourPalettesLeft ret -; 17dca9 -Function17dca9: ; 17dca9 +Function17dca9: call IncCrashCheckPointer call HlToCrashCheckPointer @@ -1978,9 +1921,8 @@ Function17dcaf: ld a, $4 ld [rSVBK], a ret -; 17dccf -Function17dccf: ; 17dccf +Function17dccf: call IncCrashCheckPointer push hl ld a, [wcd4b] @@ -2024,9 +1966,8 @@ Function17dccf: ; 17dccf .asm_17dd11 pop hl ret -; 17dd13 -Function17dd13: ; 17dd13 +Function17dd13: call IncCrashCheckPointer ld a, [hli] ld c, a @@ -2046,9 +1987,8 @@ Function17dd13: ; 17dd13 pop hl call PlaceHLTextAtBC ret -; 17dd30 -Function17dd30: ; 17dd30 +Function17dd30: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -2065,9 +2005,8 @@ Function17dd30: ; 17dd30 add hl, de call Function17e600 ret -; 17dd49 -Function17dd49: ; 17dd49 +Function17dd49: call IncCrashCheckPointer ld de, $c708 ld bc, $a @@ -2146,9 +2085,8 @@ Function17dd49: ; 17dd49 .done call Function17e40f ret -; 17ddcd -Function17ddcd: ; 17ddcd +Function17ddcd: call IncCrashCheckPointer ld de, $c708 ld bc, $8 @@ -2208,9 +2146,8 @@ Function17ddcd: ; 17ddcd .asm_17de2e call Function17e40f ret -; 17de32 -Function17de32: ; 17de32 +Function17de32: call IncCrashCheckPointer ld de, $c708 ld bc, $9 @@ -2267,9 +2204,8 @@ Function17de32: ; 17de32 call CloseSRAM call Function17e40f ret -; 17de91 -Function17de91: ; 17de91 +Function17de91: call IncCrashCheckPointer ld de, $c708 ld bc, $7 @@ -2310,9 +2246,8 @@ Function17de91: ; 17de91 call CloseSRAM call Function17e40f ret -; 17ded9 -Function17ded9: ; 17ded9 +Function17ded9: call IncCrashCheckPointer ld de, $c708 ld bc, $1f @@ -2517,9 +2452,8 @@ Function17ded9: ; 17ded9 ld de, $4 add hl, de jp asm_17e0ee -; 17e026 -Function17e026: ; 17e026 +Function17e026: ld a, BANK(sBoxCount) call GetSRAMBank ld a, [sBoxCount] @@ -2651,9 +2585,8 @@ asm_17e0ee pop hl call Function17e40f ret -; 17e0fd -Function17e0fd: ; 17e0fd +Function17e0fd: call IncCrashCheckPointer ld de, $c708 ld bc, $6 @@ -2685,9 +2618,8 @@ Function17e0fd: ; 17e0fd ld [rSVBK], a call Function17e40f ret -; 17e133 -Function17e133: ; 17e133 +Function17e133: call IncCrashCheckPointer ld de, $c708 ld bc, $5 @@ -2716,9 +2648,8 @@ Function17e133: ; 17e133 ld [rSVBK], a call Function17e40f ret -; 17e165 -Function17e165: ; 17e165 +Function17e165: call IncCrashCheckPointer ld de, $c708 ld bc, $5 @@ -2753,9 +2684,8 @@ Function17e165: ; 17e165 ld [rSVBK], a call Function17e40f ret -; 17e1a1 -Function17e1a1: ; 17e1a1 +Function17e1a1: call IncCrashCheckPointer ld de, $c708 ld bc, $d @@ -2862,9 +2792,8 @@ Function17e1a1: ; 17e1a1 .asm_17e250 call Function17e40f ret -; 17e254 -Function17e254: ; 17e254 +Function17e254: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -2874,9 +2803,8 @@ Function17e254: ; 17e254 ld [de], a call HlToCrashCheckPointer ret -; 17e261 -Function17e261: ; 17e261 +Function17e261: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -2888,9 +2816,8 @@ Function17e261: ; 17e261 inc hl call HlToCrashCheckPointer ret -; 17e270 -Function17e270: ; 17e270 +Function17e270: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -2902,9 +2829,8 @@ Function17e270: ; 17e270 inc hl call HlToCrashCheckPointer ret -; 17e27f -Function17e27f: ; 17e27f +Function17e27f: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -2921,9 +2847,8 @@ Function17e27f: ; 17e27f add [hl] ld [de], a ret -; 17e293 -Function17e293: ; 17e293 +Function17e293: call IncCrashCheckPointer ld a, [hli] ld e, a @@ -2940,9 +2865,8 @@ Function17e293: ; 17e293 sub [hl] ld [de], a ret -; 17e2a7 -Function17e2a7: ; 17e2a7 +Function17e2a7: call IncCrashCheckPointer call HlToCrashCheckPointer call Function17e32b @@ -2988,9 +2912,8 @@ Function17e2a7: ; 17e2a7 ld a, $2 ld [wcd7a], a ret -; 17e309 -Function17e309: ; 17e309 +Function17e309: ld a, $2 ld [wc303], a call Function17dcaf @@ -3003,9 +2926,8 @@ Function17e309: ; 17e309 xor a ld [wcd77], a ret -; 17e32b -Function17e32b: ; 17e32b +Function17e32b: ld a, $5 call GetSRAMBank ld hl, $c608 @@ -3017,9 +2939,8 @@ Function17e32b: ; 17e32b call CopyBytes call CloseSRAM ret -; 17e349 -Function17e349: ; 17e349 +Function17e349: ld a, $5 call GetSRAMBank ld hl, $b0b1 @@ -3031,7 +2952,6 @@ Function17e349: ; 17e349 call CopyBytes call CloseSRAM ret -; 17e367 inc_crash_check_pointer_farcall: MACRO call IncCrashCheckPointer @@ -3049,26 +2969,22 @@ endr ret ENDM -IncCrashCheckPointer_SaveGameData: ; 17e367 +IncCrashCheckPointer_SaveGameData: inc_crash_check_pointer_farcall SaveGameData_ -; 17e37e -IncCrashCheckPointer_SaveAfterLinkTrade: ; 17e37e +IncCrashCheckPointer_SaveAfterLinkTrade: inc_crash_check_pointer_farcall SaveAfterLinkTrade -IncCrashCheckPointer_SaveBox: ; 17e395 +IncCrashCheckPointer_SaveBox: inc_crash_check_pointer_farcall SaveBox -; 17e3ac -IncCrashCheckPointer_SaveChecksum: ; 17e3ac +IncCrashCheckPointer_SaveChecksum: inc_crash_check_pointer_farcall SaveChecksum -; 17e3c3 -IncCrashCheckPointer_SaveTrainerRankingsChecksum: ; 17e3c3 +IncCrashCheckPointer_SaveTrainerRankingsChecksum: inc_crash_check_pointer_farcall UpdateTrainerRankingsChecksum2, BackupMobileEventIndex -; 17e3e0 -Function17e3e0: ; 17e3e0 +Function17e3e0: call IncCrashCheckPointer ld a, [hli] ld c, a @@ -3077,9 +2993,8 @@ Function17e3e0: ; 17e3e0 ld [hBGMapMode], a call DelayFrames ret -; 17e3f0 -Function17e3f0: ; 17e3f0 +Function17e3f0: call IncCrashCheckPointer call HlToCrashCheckPointer .asm_17e3f6 @@ -3093,15 +3008,13 @@ Function17e3f0: ; 17e3f0 ret nz call WaitBGMap jr .asm_17e3f6 -; 17e409 -Function17e409: ; 17e409 +Function17e409: ld hl, wcd77 set 7, [hl] ret -; 17e40f -Function17e40f: ; 17e40f +Function17e40f: ld de, wBGPals1 add hl, de jr HlToCrashCheckPointer @@ -3119,9 +3032,8 @@ HlToCrashCheckPointer: ld a, h ld [wMobileCrashCheckPointer + 1], a ret -; 17e427 -Function17e427: ; 17e427 +Function17e427: ld hl, hJoyPressed ld a, [hl] and $1 @@ -3133,33 +3045,29 @@ Function17e427: ; 17e427 ld a, $3 ld [wcd77], a ret -; 17e438 -Function17e438: ; 17e438 +Function17e438: ld hl, wcd77 inc [hl] ret -; 17e43d -Function17e43d: ; 17e43d +Function17e43d: ld a, [wBGMapBuffer] ld l, a ld a, [wcd21] ld h, a add hl, bc ret -; 17e447 -Function17e447: ; 17e447 +Function17e447: ld a, [wBGMapBuffer] ld l, a ld a, [wcd21] ld h, a add hl, de ret -; 17e451 -Function17e451: ; 17e451 +Function17e451: ld a, [wcd42] and a ret z @@ -3249,9 +3157,8 @@ Function17e451: ; 17e451 pop af ld [wcd2e], a ret -; 17e4dd -Function17e4dd: ; 17e4dd +Function17e4dd: ld a, [wcd2c] and $1 ret z @@ -3285,9 +3192,8 @@ Function17e4dd: ; 17e4dd ld a, $ee ld [hl], a ret -; 17e51b -Function17e51b: ; 17e51b +Function17e51b: ld a, [wcd28] ld hl, wCreditsTimer sub [hl] @@ -3321,27 +3227,24 @@ Function17e51b: ; 17e51b dec a jr nz, .asm_17e544 ret -; 17e55b -Function17e55b: ; 17e55b +Function17e55b: ld a, [wcd42] and a ret z ld a, $ed call Function17e571 ret -; 17e566 -Function17e566: ; 17e566 +Function17e566: ld a, [wcd42] and a ret z ld a, $7f call Function17e571 ret -; 17e571 -Function17e571: ; 17e571 +Function17e571: push af hlcoord 0, 0 ld bc, $14 @@ -3375,9 +3278,8 @@ Function17e571: ; 17e571 pop af ld [hl], a ret -; 17e5af -Function17e5af: ; 17e5af +Function17e5af: ld a, [wcd2c] and $2 ret z @@ -3422,9 +3324,8 @@ Function17e5af: ; 17e5af add hl, bc call PlaceString ret -; 17e600 -Function17e600: ; 17e600 +Function17e600: .asm_17e600 push af push hl @@ -3439,9 +3340,8 @@ Function17e600: ; 17e600 dec a jr nz, .asm_17e600 ret -; 17e613 -Function17e613: ; 17e613 +Function17e613: push hl hlcoord 0, 0 ld bc, $14 @@ -3541,9 +3441,8 @@ Function17e613: ; 17e613 ld [hl], a pop hl ret -; 17e691 -Function17e691: ; 17e691 +Function17e691: push hl ld hl, NULL ld bc, $14 @@ -3606,9 +3505,8 @@ Function17e691: ; 17e691 jr nz, .asm_17e6ac pop hl ret -; 17e6de -Function17e6de: ; 17e6de +Function17e6de: push af ld a, [$c708] ld l, a @@ -3631,10 +3529,9 @@ Function17e6de: ; 17e6de dec b jr nz, .asm_17e6ee ret -; 17e6fe -PokemonNewsGFX: ; 17e6fe +PokemonNewsGFX: INCBIN "gfx/mobile/pokemon_news.2bpp" GFX_17eb7e: @@ -3678,7 +3575,7 @@ Palette_17eff6: RGB 0, 0, 0 -Function17f036:: ; 17f036 +Function17f036:: ld a, $6 call GetSRAMBank inc de @@ -3690,9 +3587,8 @@ Function17f036:: ; 17f036 .asm_17f043 call CloseSRAM ret -; 17f047 -Function17f047: ; 17f047 +Function17f047: ld a, [de] inc de cp $50 @@ -3714,9 +3610,8 @@ Function17f047: ; 17f047 .finished scf ret -; 17f061 -.Jumptable: ; 17f061 +.Jumptable: dw Function17f081 ; 0 dw Function17f0f8 ; 1 dw Function17f154 ; 2 @@ -3733,9 +3628,8 @@ Function17f047: ; 17f047 dw Function17f41d ; d dw Function17f44f ; e dw Function17f44f ; f -; 17f081 -Function17f081: ; 17f081 +Function17f081: pop hl call Function17f524 jr c, .asm_17f09f @@ -3821,9 +3715,8 @@ Function17f081: ; 17f081 pop de and a ret -; 17f0f8 -Function17f0f8: ; 17f0f8 +Function17f0f8: pop hl call Function17f524 jr c, .asm_17f114 @@ -3880,9 +3773,8 @@ Function17f0f8: ; 17f0f8 pop de and a ret -; 17f154 -Function17f154: ; 17f154 +Function17f154: pop hl call Function17f524 jr c, .asm_17f167 @@ -3920,9 +3812,8 @@ Function17f154: ; 17f154 pop de and a ret -; 17f181 -Function17f181: ; 17f181 +Function17f181: pop hl call Function17f524 jr c, .asm_17f19d @@ -3975,9 +3866,8 @@ Function17f181: ; 17f181 pop de and a ret -; 17f1d0 -Function17f1d0: ; 17f1d0 +Function17f1d0: pop hl call Function17f524 jr c, .asm_17f1ec @@ -4032,9 +3922,8 @@ Function17f1d0: ; 17f1d0 pop de and a ret -; 17f220 -Function17f220: ; 17f220 +Function17f220: pop hl call Function17f524 jr c, .asm_17f23c @@ -4092,13 +3981,12 @@ Function17f220: ; 17f220 pop de and a ret -; 17f26e .Genders: dw .Boy, .Girl .Boy: db "Boy@" .Girl: db "Girl@" -Function17f27b: ; 17f27b +Function17f27b: pop hl call Function17f524 jr c, .asm_17f297 @@ -4153,9 +4041,8 @@ Function17f27b: ; 17f27b pop de and a ret -; 17f2cb -Function17f2cb: ; 17f2cb +Function17f2cb: pop hl push bc ld a, [hli] @@ -4185,9 +4072,8 @@ Function17f2cb: ; 17f2cb pop de and a ret -; 17f2ff -Function17f2ff: ; 17f2ff +Function17f2ff: pop hl push bc ld a, [hli] @@ -4215,9 +4101,8 @@ Function17f2ff: ; 17f2ff pop de and a ret -; 17f334 -Function17f334: ; 17f334 +Function17f334: pop hl push bc ld a, [hli] @@ -4259,9 +4144,8 @@ Function17f334: ; 17f334 pop de and a ret -; 17f382 -Function17f382: ; 17f382 +Function17f382: pop hl push bc ld a, [hli] @@ -4303,9 +4187,8 @@ Function17f382: ; 17f382 pop de and a ret -; 17f3c9 -Function17f3c9: ; 17f3c9 +Function17f3c9: push bc ld hl, wcd36 ld de, $c708 @@ -4323,9 +4206,8 @@ Function17f3c9: ; 17f3c9 pop de and a ret -; 17f3f0 -Function17f3f0: ; 17f3f0 +Function17f3f0: pop hl push hl ld a, [hli] @@ -4365,9 +4247,8 @@ Function17f3f0: ; 17f3f0 ld h, b scf ret -; 17f41d -Function17f41d: ; 17f41d +Function17f41d: pop hl ld a, [hli] push hl @@ -4410,9 +4291,8 @@ Function17f41d: ; 17f41d pop de and a ret -; 17f44f -Function17f44f: ; 17f44f +Function17f44f: pop hl call Function17f524 jr c, .asm_17f46d @@ -4523,9 +4403,8 @@ Function17f44f: ; 17f44f pop de and a ret -; 17f4f6 -Function17f4f6: ; 17f4f6 +Function17f4f6: ld a, [wcd6a] ld l, a ld a, [wcd6b] @@ -4541,9 +4420,8 @@ Function17f4f6: ; 17f4f6 dec a add hl, bc jr .asm_17f509 -; 17f50f -Function17f50f: ; 17f50f +Function17f50f: and a jr z, .asm_17f519 ld c, a @@ -4561,9 +4439,8 @@ Function17f50f: ; 17f50f ld b, a ld h, a ret -; 17f524 -Function17f524: ; 17f524 +Function17f524: push hl push bc push de @@ -4584,9 +4461,8 @@ Function17f524: ; 17f524 .asm_17f53a scf jr .asm_17f536 -; 17f53d -BattleTowerMobileError: ; 17f53d +BattleTowerMobileError: call FadeToMenu xor a ld [wc303], a @@ -4601,9 +4477,8 @@ BattleTowerMobileError: ; 17f53d ld [rSVBK], a call ExitAllMenus ret -; 17f555 -DisplayMobileError: ; 17f555 +DisplayMobileError: .loop call JoyTextDelay call .RunJumptable @@ -4657,36 +4532,31 @@ DisplayMobileError: ; 17f555 ld [sMobileLoginPassword], a call CloseSRAM ret -; 17f5ae -.RunJumptable: ; 17f5ae +.RunJumptable: jumptable .Jumptable, wc303 -; 17f5bd -.Jumptable: ; 17f5bd +.Jumptable: dw Function17f5c3 dw Function17ff23 dw Function17f5d2 -; 17f5c3 -Function17f5c3: ; 17f5c3 +Function17f5c3: call Function17f5e4 farcall FinishExitMenu ld a, $1 ld [wc303], a ret -; 17f5d2 -Function17f5d2: ; 17f5d2 +Function17f5d2: call Function17f5e4 farcall HDMATransferAttrMapAndTileMapToWRAMBank3 call SetPalettes ld a, $1 ld [wc303], a ret -; 17f5e4 -Function17f5e4: ; 17f5e4 +Function17f5e4: ld a, $8 ld [wMusicFade], a ld de, MUSIC_NONE @@ -4797,9 +4667,8 @@ Function17f5e4: ; 17f5e4 hlcoord 2, 6 call PlaceString ret -; 17f699 -Table_17f699: ; 17f699 +Table_17f699: dw String_17fedf dw String_17fdd9 dw String_17fdd9 @@ -4811,16 +4680,14 @@ Table_17f699: ; 17f699 dw String_17fe03 dw String_17fe03 dw String_17fe03 -; 17f6af -Palette_17f6af: ; 17f6af +Palette_17f6af: RGB 5, 5, 16 RGB 8, 19, 28 RGB 0, 0, 0 RGB 31, 31, 31 -; 17f6b7 -Function17f6b7: ; 17f6b7 +Function17f6b7: ld a, [wc300] call .bcd_two_digits inc hl @@ -4830,9 +4697,8 @@ Function17f6b7: ; 17f6b7 ld a, [wc301] call .bcd_two_digits ret -; 17f6cd -.bcd_two_digits ; 17f6cd +.bcd_two_digits ld c, a and $f0 swap a @@ -4840,22 +4706,19 @@ Function17f6b7: ; 17f6b7 ld a, c and $f -.bcd_digit ; 17f6d8 +.bcd_digit add "0" ld [hli], a ret -; 17f6dc -String_17f6dc: ; 17f6dc +String_17f6dc: db "つうしんエラー ー@" -; 17f6e8 -String_17f6e8: ; 17f6e8 +String_17f6e8: db "みていぎ<NO>エラーです" next "プログラム<WO>" next "かくにん してください" db "@" -; 17f706 Table_17f706: dw Unknown_17f74e @@ -5009,7 +4872,7 @@ Unknown_17f844: db 19 dbbw $4, $4, String_17fa49 dbbw $ff, $ff, String_17fa49 -String_17f891: ; 17f891 +String_17f891: db "モバイルアダプタが ただしく" next "さしこまれていません" next "とりあつかいせつめいしょを" @@ -5017,7 +4880,7 @@ String_17f891: ; 17f891 next "さしこんで ください" db "@" -String_17f8d1: ; 17f8d1 +String_17f8d1: db "でんわが うまく かけられないか" next "でんわかいせんが こんでいるので" next "つうしん できません" @@ -5025,14 +4888,14 @@ String_17f8d1: ; 17f8d1 next "かけなおして ください" db "@" -String_17f913: ; 17f913 +String_17f913: db "でんわかいせんが こんでいるため" next "でんわが かけられません" next "しばらく まって" next "かけなおして ください" db "@" -String_17f946: ; 17f946 +String_17f946: db "モバイルアダプタの エラーです" next "しばらく まって" next "かけなおして ください" @@ -5041,7 +4904,7 @@ String_17f946: ; 17f946 next "おといあわせください" db "@" -String_17f98e: ; 17f98e +String_17f98e: db "つうしんエラーです" next "しばらく まって" next "かけなおして ください" @@ -5050,7 +4913,7 @@ String_17f98e: ; 17f98e next "おといあわせください" db "@" -String_17f9d0: ; 17f9d0 +String_17f9d0: db "ログインパスワードか" next "ログイン アイディーに" next "まちがいがあります" @@ -5059,7 +4922,7 @@ String_17f9d0: ; 17f9d0 next "かけなおして ください" db "@" -String_17fa14: ; 17fa14 +String_17fa14: db "でんわが きれました" next "とりあつかいせつめいしょを" next "ごらんのうえ" @@ -5067,14 +4930,14 @@ String_17fa14: ; 17fa14 next "かけなおして ください" db "@" -String_17fa49: ; 17fa49 +String_17fa49: db "モバイルセンターの" next "つうしんエラーです" next "しばらくまって" next "かけなおして ください" db "@" -String_17fa71: ; 17fa71 +String_17fa71: db "モバイルアダプタに" next "とうろくされた じょうほうが" next "ただしく ありません" @@ -5082,7 +4945,7 @@ String_17fa71: ; 17fa71 next "しょきとうろくを してください" db "@" -String_17fab0: ; 17fab0 +String_17fab0: db "モバイルセンターが" next "こんでいて つながりません" next "しばらくまって" @@ -5091,14 +4954,14 @@ String_17fab0: ; 17fab0 next "せつめいしょを ごらんください" db "@" -String_17faf9: ; 17faf9 +String_17faf9: db "あてさき メールアドレスに" next "まちがいがあります" next "ただしい メールアドレスを" next "いれなおしてください" db "@" -String_17fb2a: ; 17fb2a +String_17fb2a: db "メールアドレスに" next "まちがいが あります" next "とりあつかいせつめいしょを" @@ -5107,7 +4970,7 @@ String_17fb2a: ; 17fb2a next "しょきとうろくを してください" db "@" -String_17fb6e: ; 17fb6e +String_17fb6e: db "ログインパスワードに" next "まちがいが あるか" next "モバイルセンターの エラーです" @@ -5116,7 +4979,7 @@ String_17fb6e: ; 17fb6e next "かけなおして ください" db "@" -String_17fbb6: ; 17fbb6 +String_17fbb6: db "データの よみこみが できません" next "しばらくまって" next "かけなおして ください" @@ -5125,7 +4988,7 @@ String_17fbb6: ; 17fbb6 next "おといあわせください" db "@" -String_17fbfe: ; 17fbfe +String_17fbfe: db "じかんぎれです" next "でんわが きれました" next "でんわを かけなおしてください" @@ -5133,7 +4996,7 @@ String_17fbfe: ; 17fbfe next "せつめいしょを ごらんください" db "@" -String_17fc3e: ; 17fc3e +String_17fc3e: db "ごりよう りょうきんの " next "おしはらいが おくれたばあいには" next "ごりようが できなくなります" @@ -5141,14 +5004,14 @@ String_17fc3e: ; 17fc3e next "せつめいしょを ごらんください" db "@" -String_17fc88: ; 17fc88 +String_17fc88: db "おきゃくさまの ごつごうにより" next "ごりようできません" next "くわしくは とりあつかい" next "せつめいしょを ごらんください" db "@" -String_17fcbf: ; 17fcbf +String_17fcbf: db "でんわかいせんが こんでいるか" next "モバイルセンターの エラーで" next "つうしんが できません" @@ -5156,7 +5019,7 @@ String_17fcbf: ; 17fcbf next "かけなおして ください" db "@" -String_17fcff: ; 17fcff +String_17fcff: db "ごりよう りょうきんが" next "じょうげんを こえているため" next "こんげつは ごりようできません" @@ -5164,7 +5027,7 @@ String_17fcff: ; 17fcff next "せつめいしょを ごらんください" db "@" -String_17fd47: ; 17fd47 +String_17fd47: db "げんざい モバイルセンターの" next "てんけんを しているので" next "つうしんが できません" @@ -5172,27 +5035,27 @@ String_17fd47: ; 17fd47 next "かけなおして ください" db "@" -String_17fd84: ; 17fd84 +String_17fd84: db "データの よみこみが できません" next "くわしくは とりあつかい" next "せつめいしょを ごらんください" db "@" -String_17fdb2: ; 17fdb2 +String_17fdb2: db "3ぷん いじょう なにも" next "にゅうりょく しなかったので" next "でんわが きれました" db "@" -String_17fdd9: ; 17fdd9 +String_17fdd9: db "つうしんが うまく" next "できませんでした" next "もういちど はじめから" next "やりなおしてください" db "@" -String_17fe03: ; 17fe03 +String_17fe03: db "データの よみこみが できません" next "しばらくまって" next "かけなおして ください" @@ -5201,12 +5064,12 @@ String_17fe03: ; 17fe03 next "おといあわせください" db "@" -String_17fe4b: ; 17fe4b +String_17fe4b: db "まちじかんが ながいので" next "でんわが きれました" db "@" -String_17fe63: ; 17fe63 +String_17fe63: db "あいての モバイルアダプタと" next "タイプが ちがいます" next "くわしくは とりあつかい" @@ -5221,16 +5084,15 @@ String_17fe9a: ; 17fe9a ; unused next "よみこみを さきに してください" db "@" -String_17fedf: ; 17fedf +String_17fedf: db "つうしんの じょうきょうが" next "よくないか かけるあいてが" next "まちがっています" next "もういちど かくにんをして" next "でんわを かけなおして ください" db "@" -; 17ff23 -Function17ff23: ; 17ff23 +Function17ff23: ld a, [hJoyPressed] and a ret z @@ -5243,9 +5105,8 @@ Function17ff23: ; 17ff23 ld hl, wc303 set 7, [hl] ret -; 17ff3c -Function17ff3c: ; 17ff3c +Function17ff3c: nop ld a, [wc300] cp $d0 @@ -5266,8 +5127,6 @@ Function17ff3c: ; 17ff3c ld [wc300], a and a ret -; 17ff68 -String_17ff68: ; 17ff68 +String_17ff68: db "101@" -; 17ff6c diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index a60091d4c..afd9cfba8 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -1,15 +1,15 @@ -MainMenu_Mobile: ; 49efc +MainMenu_Mobile: call ClearBGPalettes ld a, MUSIC_MOBILE_ADAPTER_MENU ld [wMapMusic], a ld de, MUSIC_MOBILE_ADAPTER_MENU call Function4a6c5 -Function49f0a: ; 49f0a +Function49f0a: call ClearBGPalettes call Function4a3a7 call Function4a492 call ClearBGPalettes -Function49f16: ; 49f16 +Function49f16: call MobileMenu_InitMenuBuffers ld c, 12 call DelayFrames @@ -98,47 +98,40 @@ Function49f16: ; 49f16 hlcoord 5, 1 call ClearBox jp .joy_loop -; 49fcc -MobileString1: ; 49fcc +MobileString1: db "めいしフォルダー" next "あいさつ" next "プロフィール" next "せ<TTE>い" next "もどる" db "@" -; 49fe9 MobileStrings2: -String_0x49fe9: ; 49fe9 +String_0x49fe9: db "めいし¯つくったり" next "ほぞんしておける フォルダーです@" -; 4a004 -String_0x4a004: ; 4a004 +String_0x4a004: db "モバイルたいせんや じぶんのめいしで" next "つかう あいさつ¯つくります@" -; 4a026 -String_0x4a026: ; 4a026 +String_0x4a026: db "あなた<NO>じゅうしょや ねんれいの" next "せ<TTE>い¯かえられます@" -; 4a042 -String_0x4a042: ; 4a042 +String_0x4a042: db "モバイルセンター<NI>せつぞくするとき" next "ひつような こと¯きめます@" -; 4a062 -String_0x4a062: ; 4a062 +String_0x4a062: db "まえ<NO>がめん <NI>もどります" next "@" -; 4a071 -MobileMenu_InitMenuBuffers: ; 4a071 (12:6071) +MobileMenu_InitMenuBuffers: ld hl, w2DMenuCursorInitY ld a, 2 ld [hli], a @@ -166,7 +159,7 @@ MobileMenu_InitMenuBuffers: ; 4a071 (12:6071) ld [hli], a ; wMenuCursorY, wMenuCursorX ret -Function4a098: ; 4a098 (12:6098) +Function4a098: ld a, 2 call MenuClickSound call PlaceHollowCursor @@ -179,13 +172,13 @@ Function4a098: ; 4a098 (12:6098) pop bc jp Function49f16 -Function4a0b9: ; 4a0b9 (12:60b9) +Function4a0b9: ld a, 2 call MenuClickSound pop bc jp Function4a4c4 -Function4a0c2: ; 4a0c2 (12:60c2) +Function4a0c2: ld a, 2 call MenuClickSound ld a, BANK(sPlayerData) @@ -211,7 +204,7 @@ Function4a0c2: ; 4a0c2 (12:60c2) call DelayFrames jr asm_4a111 -Function4a100: ; 4a100 (12:6100) +Function4a100: ld a, 2 call MenuClickSound call ClearBGPalettes @@ -219,12 +212,12 @@ Function4a100: ; 4a100 (12:6100) call ClearBGPalettes call ClearTileMap -asm_4a111: ; 4a111 (12:6111) +asm_4a111: pop bc call LoadFontsExtra jp Function49f0a -Function4a118: ; 4a118 (12:6118) +Function4a118: ld hl, w2DMenuCursorInitY ld a, $1 ld [hli], a @@ -249,14 +242,14 @@ Function4a118: ; 4a118 (12:6118) ld [hli], a ret -Function4a13b: ; 4a13b (12:613b) +Function4a13b: call Function4a3a7 call Function4a492 call Function4a373 ld c, 10 call DelayFrames -Function4a149: ; 4a149 (12:6149) +Function4a149: hlcoord 1, 2 ld b, $6 ld c, $10 @@ -288,13 +281,13 @@ Function4a149: ; 4a149 (12:6149) push bc jr asm_4a19d -Function4a195: ; 4a195 (12:6195) +Function4a195: call ScrollingMenuJoypad ld hl, wMenuCursorY ld b, [hl] push bc -asm_4a19d: ; 4a19d (12:619d) +asm_4a19d: bit 0, a jr nz, .asm_4a1a7 bit 1, a @@ -336,15 +329,13 @@ asm_4a19d: ; 4a19d (12:619d) hlcoord 2, 3 call ClearBox jp Function4a195 -; 4a1ef (12:61ef) -String_4a1ef: ; 4a1ef +String_4a1ef: db "モバイルセンター¯えらぶ" next "ログインパスワード¯いれる" next "もどる@" -; 4a20e -Function4a20e: ; 4a20e (12:620e) +Function4a20e: ld a, $1 call MenuClickSound farcall Function1719c8 @@ -352,7 +343,7 @@ Function4a20e: ; 4a20e (12:620e) call DelayFrame jr Function4a239 -Function4a221: ; 4a221 (12:6221) +Function4a221: ld a, $1 call MenuClickSound call Function4a28a @@ -365,12 +356,11 @@ Function4a221: ; 4a221 (12:6221) pop bc jp Function4a149 -Function4a239: ; 4a239 (12:6239) +Function4a239: pop bc jp Function4a13b -; 4a23d (12:623d) -Strings_4a23d: ; 4a23d +Strings_4a23d: db "いつも せつぞく¯する" next "モバイルセンター¯えらびます@" @@ -380,9 +370,8 @@ Strings_4a23d: ; 4a23d db "まえ<NO>がめん <NI>もどります@" db "@" -; 4a28a -Function4a28a: ; 4a28a (12:628a) +Function4a28a: hlcoord 2, 3 lb bc, 6, 1 ld a, " " @@ -458,17 +447,15 @@ Function4a28a: ; 4a28a (12:628a) farcall Mobile_OpenAndCloseMenu_HDMATransferTileMapAndAttrMap xor a ret -; 4a346 (12:6346) MenuHeader_0x4a346: ; 0x4a346 db MENU_BACKUP_TILES ; flags menu_coords 12, 0, SCREEN_WIDTH - 1, 6 -String_4a34b: ; 4a34b +String_4a34b: db "いれなおす" next "けす" next "もどる@" -; 4a358 UnknownText_0x4a358: ; 0x4a358 ; Delete the saved LOG-IN PASSWORD? @@ -496,7 +483,7 @@ MenuData_0x4a36a: ; 0x4a36a db "いいえ@" ; 0x4a373 -Function4a373: ; 4a373 (12:6373) +Function4a373: ld hl, w2DMenuCursorInitY ld a, $4 ld [hli], a @@ -522,19 +509,17 @@ Function4a373: ; 4a373 (12:6373) ld [hli], a ld [hli], a ret -; 4a39a (12:639a) -Function4a39a: ; 4a39a +Function4a39a: call Function4a485 call Function4a492 call Function4a3aa call SetPalettes ret -; 4a3a7 -Function4a3a7: ; 4a3a7 (12:63a7) +Function4a3a7: call Function4a485 -Function4a3aa: ; 4a3aa +Function4a3aa: hlcoord 0, 0 lb bc, 3, 1 xor a @@ -596,9 +581,8 @@ Function4a3aa: ; 4a3aa ld a, " " call Function4a6d8 ret -; 4a449 (12:6449) -Function4a449: ; 4a449 +Function4a449: ld bc, 3 * SCREEN_WIDTH ld a, $0 hlcoord 0, 0 @@ -622,21 +606,20 @@ Function4a449: ; 4a449 ld a, " " call ByteFill ret -; 4a485 -Function4a485: ; 4a485 (12:6485) +Function4a485: ld de, GFX_49c0c ld hl, vTiles2 tile $00 lb bc, BANK(GFX_49c0c), 13 call Get2bpp ret -Function4a492: ; 4a492 (12:6492) +Function4a492: call MG_Mobile_Layout00 ret -MainMenu_MobileStudium: ; 4a496 +MainMenu_MobileStudium: ld a, [wStartDay] ld b, a ld a, [wStartHour] @@ -660,10 +643,9 @@ MainMenu_MobileStudium: ; 4a496 ld a, e ld [wStartSecond], a ret -; 4a4c4 -Function4a4c4: ; 4a4c4 (12:64c4) +Function4a4c4: call ClearBGPalettes call Function4a3a7 call Function4a492 @@ -715,13 +697,13 @@ Function4a4c4: ; 4a4c4 (12:64c4) push bc jr asm_4a54d -Function4a545: ; 4a545 (12:6545) +Function4a545: call ScrollingMenuJoypad ld hl, wMenuCursorY ld b, [hl] push bc -asm_4a54d: ; 4a54d (12:654d) +asm_4a54d: bit 0, a jr nz, .asm_4a557 bit 1, a @@ -771,7 +753,7 @@ asm_4a54d: ; 4a54d (12:654d) call PlaceString jp Function4a5b0 -Function4a5b0: ; 4a5b0 (12:65b0) +Function4a5b0: call Function4a680 pop bc ld hl, wMenuCursorY @@ -781,21 +763,19 @@ Function4a5b0: ; 4a5b0 (12:65b0) hlcoord 3, 1 call ClearBox jp Function4a545 -; 4a5c5 (12:65c5) -String_4a5c5: ; 4a5c5 +String_4a5c5: db "じこしょうかい@" -String_4a5cd: ; 4a5cd +String_4a5cd: db "たいせん <GA>はじまるとき@" -String_4a5da: ; 4a5da +String_4a5da: db "たいせん <NI>かったとき@" -String_4a5e6: ; 4a5e6 +String_4a5e6: db "たいせん <NI>まけたとき@" -String_4a5f2: ; 4a5f2 +String_4a5f2: db "もどる@" -; 4a5f6 -Strings_4a5f6: ; 4a5f6 +Strings_4a5f6: db "めいし や ニュース <NI>のせる@" db "あなた<NO>あいさつです@" db "モバイル たいせん<GA>はじまるとき@" @@ -806,9 +786,8 @@ Strings_4a5f6: ; 4a5f6 db "あいて<NI>みえる あいさつです@" db "まえ<NO>がめん <NI>もどります@" db "@" -; 4a680 -Function4a680: ; 4a680 (12:6680) +Function4a680: ld hl, w2DMenuCursorInitY ld a, $2 ld [hli], a @@ -839,7 +818,7 @@ Function4a680: ; 4a680 (12:6680) ld [hli], a ret -Function4a6ab: ; 4a6ab (12:66ab) +Function4a6ab: ld a, $2 call MenuClickSound call ClearBGPalettes @@ -850,7 +829,7 @@ Function4a6ab: ; 4a6ab (12:66ab) call LoadFontsExtra jp Function4a4c4 -Function4a6c5: ; 4a6c5 (12:66c5) +Function4a6c5: ld a, $5 ld [wMusicFade], a ld a, e @@ -861,7 +840,7 @@ Function4a6c5: ; 4a6c5 (12:66c5) call DelayFrames ret -Function4a6d8: ; 4a6d8 (12:66d8) +Function4a6d8: push bc push hl .asm_4a6da diff --git a/mobile/news/news.asm b/mobile/news/news.asm index d9dcc3ce8..868556bdd 100644 --- a/mobile/news/news.asm +++ b/mobile/news/news.asm @@ -2,7 +2,7 @@ db $cc, $6b, $1e ; unused -Unreferenced_Function1f4003: ; 1f4003 +Unreferenced_Function1f4003: ld a, $6 call GetSRAMBank ld hl, .news_data @@ -15,7 +15,7 @@ Unreferenced_Function1f4003: ; 1f4003 .news_data INCBIN "mobile/news/news_1.bin" -Unreferenced_Function1f4dbe: ; 1f4dbe +Unreferenced_Function1f4dbe: ld a, $6 call GetSRAMBank ld hl, .news_data @@ -28,7 +28,7 @@ Unreferenced_Function1f4dbe: ; 1f4dbe .news_data INCBIN "mobile/news/news_2.bin" -Function1f5d9f: ; 1f5d9f +Function1f5d9f: ld a, $6 call GetSRAMBank ld hl, .news_data diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index 987ad4b9a..9c94297a8 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -1,4 +1,4 @@ -Mobile_PrintOpponentBattleMessage: ; 4ea0a +Mobile_PrintOpponentBattleMessage: ld a, c push af call SpeechTextBox |