summaryrefslogtreecommitdiff
path: root/misc/mobile_46.asm
diff options
context:
space:
mode:
Diffstat (limited to 'misc/mobile_46.asm')
-rwxr-xr-xmisc/mobile_46.asm657
1 files changed, 364 insertions, 293 deletions
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 836da4fa0..0689d4653 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -486,10 +486,10 @@ Function1183cb: ; 1183cb
ld a, $f
ld [rIE], a
ld a, $1
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
ei
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
callba Function115d99
callba Function11615a
@@ -516,7 +516,7 @@ Function118440: ; 118440
Function118452: ; 118452
di
xor a
- ld [hFFC9], a
+ ld [hMobileReceive], a
ld [hMobile], a
ld [hVBlank], a
call NormalSpeed
@@ -1071,7 +1071,7 @@ Function11878d: ; 11878d (46:478d)
set 0, [hl]
ld a, $6
ld [rSVBK], a
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
ld a, [hl]
sla a
@@ -1295,7 +1295,7 @@ Function118936:
ld a, $40
or [hl]
ld [hl], a
- call Function3200
+ call WaitBGMap2
ld a, $1
ld [wcd4f], a
ld a, $1
@@ -1466,7 +1466,7 @@ Function118a65: ; 118a65
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jp Function118b10
; 118a7a
@@ -1476,7 +1476,7 @@ Function118a7a: ; 118a7a
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jp Function118b10
; 118a8f
@@ -1486,7 +1486,7 @@ Function118a8f: ; 118a8f
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jp Function118b10
; 118aa4
@@ -1498,7 +1498,7 @@ Function118aa4: ; 118aa4
call CopyBytes
ld a, $5
ld [rSVBK], a
- ld de, LYOverrides
+ ld de, w3_d100
ld bc, $e00
jr Function118b10
; 118abc
@@ -1508,7 +1508,7 @@ Function118abc: ; 118abc (46:4abc)
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jr Function118b10
; 118ad0 (46:4ad0)
@@ -1518,7 +1518,7 @@ Function118ad0:
ld de, wcc60
ld bc, $80
call CopyBytes
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jr Function118b10
@@ -1663,7 +1663,8 @@ IndexDownloadURL: ; 0x118ce5
Function118d35: ; 118d35
- ld hl, LYOverridesBackup
+; unreferenced
+ ld hl, $d200
ld a, [wcd38]
and a
jr nz, .asm_118d6e
@@ -1739,7 +1740,7 @@ asm_118d9f
ld [wcd3b], a
.asm_118db7
- ld hl, $d800
+ ld hl, w3_d800
ld a, $8
ld [hli], a
ld a, $c6
@@ -1760,7 +1761,7 @@ asm_118d9f
call Function119ec2
ld a, $40
ld [wcd89], a
- ld hl, $d800
+ ld hl, w3_d800
ld de, $de00
ld bc, $0200
ld a, $2c
@@ -1894,7 +1895,7 @@ Function118e92: ; 118e92
ld de, wcc60
call Function1191ad
ret c
- ld de, $d800
+ ld de, w3_d800
ld bc, $0800
jp Function118b10
; 118eb0
@@ -2105,7 +2106,7 @@ Function119009:
ld a, $40
ld [wcd89], a
ld hl, wc314 + 48 + 2
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
ld a, $2c
jp Function119e2b
@@ -2119,9 +2120,9 @@ Function119054: ; 119054
ld e, a
ld a, [wcd50]
ld d, a
- ld a, [UnknBGPals]
+ ld a, [w3_d000]
ld c, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld b, a
call Function119192
ret c
@@ -2131,9 +2132,9 @@ Function119054: ; 119054
ld a, $6
ld [rSVBK], a
ld hl, wd002
- ld a, [UnknBGPals]
+ ld a, [w3_d000]
ld c, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld b, a
call Function119192
ret c
@@ -2178,7 +2179,7 @@ Function1190d0: ; 1190d0
ld de, wcc60
call Function1191ad
ret c
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jp Function118b10
; 1190ec
@@ -2198,9 +2199,9 @@ Function1190ec: ; 1190ec
call CloseSRAM
ld a, $6
call GetSRAMBank
- ld a, [UnknBGPals]
+ ld a, [w3_d000]
ld c, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld b, a
ld hl, wd002
ld de, $a000
@@ -2211,9 +2212,9 @@ Function1190ec: ; 1190ec
jr z, .asm_11913e
ld a, $6
ld [rSVBK], a
- ld a, [UnknBGPals]
+ ld a, [w3_d000]
ld c, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld b, a
ld hl, wd002
call Function119192
@@ -2330,7 +2331,7 @@ Function1191ad: ; 1191ad
; 1191d3
Function1191d3: ; 1191d3
- ld hl, wd102
+ ld hl, w3_d100 + 2
ld a, l
ld [wcd53], a
ld a, h
@@ -2678,7 +2679,7 @@ Function1193fb:
ld a, $8
ld [wcd3c], a
call Function119ed8
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
jp Function118b10
; 119413
@@ -2686,9 +2687,9 @@ Function1193fb:
Function119413: ; 119413
ld a, $6
call GetSRAMBank
- ld a, [UnknBGPals]
+ ld a, [w3_d000]
ld c, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld b, a
rept 2
dec bc
@@ -2707,7 +2708,7 @@ endr
ld [rSVBK], a
ld a, [wd000]
ld c, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld b, a
ld hl, wd002
call Function119192
@@ -3043,7 +3044,7 @@ Function119648: ; 119648 (46:5648)
ld [wcd3c], a
call Function119ed8
call Function118b24
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
ld a, $2a
jp Function119e2b
@@ -3338,7 +3339,7 @@ Function1197dc:
xor a
ld [de], a
call Function118b24
- ld de, UnknBGPals
+ ld de, w3_d000
ld bc, $1000
ld a, $2a
jp Function119e2b
@@ -3459,7 +3460,7 @@ Function1198f7:
ret nz
ld hl, $c608 + 2
call Function119940
- ld hl, $d800
+ ld hl, w3_d800
ld a, $c608 % $100
ld [hli], a
ld a, $c608 / $100
@@ -3480,7 +3481,7 @@ Function1198f7:
call Function119ec2
ld a, $40
ld [wcd89], a
- ld hl, $d800
+ ld hl, w3_d800
ld de, $de00
ld bc, $0200
ld a, $2c
@@ -3536,15 +3537,15 @@ Function119973: ; 119973
ld [wcf64], a
xor a
ld [wcf65], a
- ld [StringBuffer2 + 10], a
- ld de, UnknBGPals
+ ld [w3_d090], a
+ ld de, w3_d000
ld a, $20
jp Function119e2b
; 119987
Function119987: ; 119987
- ld hl, wd001
- ld a, [UnknBGPals]
+ ld hl, w3_d000 + 1
+ ld a, [w3_d000]
or [hl]
jr z, .asm_1199a0
ld a, [wcf64]
@@ -3556,7 +3557,7 @@ Function119987: ; 119987
jp Function119e2b
.asm_1199a0
- ld a, [StringBuffer2 + 10]
+ ld a, [w3_d090]
and a
jr z, .asm_1199ae
ld a, $16
@@ -3590,7 +3591,7 @@ Function1199ca: ; 1199ca
ld l, a
ld a, [wcf65]
ld h, a
- ld de, LYOverrides
+ ld de, w3_d100
ld bc, $0700
ld a, $28
jp Function119e2b
@@ -3694,27 +3695,27 @@ Function1199e2: ; 1199e2
jp Function119b45
.asm_119aaf
- ld a, [StringBuffer2 + 10]
+ ld a, [w3_d090]
and a
jr nz, .asm_119aa7
- ld a, [wd000 + $895]
+ ld a, [w3_d895]
sub $30
- ld [StringBuffer2 + 10], a
+ ld [w3_d090], a
ld a, [wcf64]
- ld [StringBuffer2 + 11], a
+ ld [w3_d090 + 1], a
ld a, [wcf65]
- ld [StringBuffer2 + 12], a
+ ld [w3_d090 + 2], a
Function119ac9:
- ld a, [UnknBGPals]
+ ld a, [w3_d000]
ld l, a
- ld a, [wd001]
+ ld a, [w3_d000 + 1]
ld h, a
dec hl
ld a, l
- ld [UnknBGPals], a
+ ld [w3_d000], a
ld a, h
- ld [wd001], a
+ ld [w3_d000 + 1], a
ld a, [wcf64]
ld l, a
ld a, [wcf65]
@@ -3738,7 +3739,7 @@ Function119b0d: ; 119b0d
ld a, $8
ld [wcd3c], a
call Function119ed8
- ld a, [StringBuffer2 + 10]
+ ld a, [w3_d090]
cp $1
jr z, .asm_119b23
ld a, $19
@@ -3748,19 +3749,19 @@ Function119b0d: ; 119b0d
.asm_119b23
ld a, $10
ld [wcd89], a
- ld a, [StringBuffer2 + 11]
+ ld a, [w3_d090 + 1]
ld l, a
- ld a, [StringBuffer2 + 12]
+ ld a, [w3_d090 + 2]
ld h, a
- ld de, LYOverrides
+ ld de, w3_d100
ld bc, $0700
ld a, $24
jp Function119e2b
Function119b3b:
- ld a, [StringBuffer2 + 11]
+ ld a, [w3_d090 + 1]
ld l, a
- ld a, [StringBuffer2 + 12]
+ ld a, [w3_d090 + 2]
ld h, a
jr asm_119b4d
@@ -3776,7 +3777,7 @@ asm_119b4d
; 119b52
Function119b52: ; 119b52
- ld a, [StringBuffer2 + 10]
+ ld a, [w3_d090]
cp $1
jr nz, .asm_119b66
ld a, $5
@@ -3791,19 +3792,19 @@ Function119b52: ; 119b52
; 119b6b
Function119b6b: ; 119b6b
- ld a, [StringBuffer2 + 10]
+ ld a, [w3_d090]
cp $1
jr z, .asm_119b75
jp Function119e2e
.asm_119b75
- ld a, [LYOverrides]
+ ld a, [w3_d100]
ld b, a
- ld a, [wd101]
+ ld a, [w3_d100 + 1]
or b
jr z, .asm_119be3
- ld hl, $d800
- ld de, wd102
+ ld hl, w3_d800
+ ld de, w3_d100 + 2
.asm_119b85
ld a, [de]
inc de
@@ -3887,7 +3888,7 @@ endr
ld [$a800], a
call CloseSRAM
xor a
- ld [StringBuffer2 + 10], a
+ ld [w3_d090], a
ret
.asm_119bfa
@@ -3896,10 +3897,10 @@ endr
cp $d
jr nz, .asm_119b93
ld a, l
- cp (wd000 + $800 + $69) % $100
+ cp (w3_d869) % $100
jr nz, .asm_119be3
ld a, h
- cp (wd000 + $800 + $69) / $100
+ cp (w3_d869) / $100
jr nz, .asm_119be3
ld a, $5
call GetSRAMBank
@@ -3907,14 +3908,14 @@ endr
ld [$b090], a
ld a, [wcf65]
ld [$b091], a
- ld hl, $d800
+ ld hl, w3_d800
ld de, $b023
ld bc, $0069
call CopyBytes
ld a, $3
ld [$a800], a
call CloseSRAM
- ld hl, $d800
+ ld hl, w3_d800
ld de, $c608
ld bc, $0069
call CopyBytes
@@ -3953,7 +3954,7 @@ Function119c3e: ; 119c3e
ld [$a800], a
call CloseSRAM
xor a
- ld [StringBuffer2 + 10], a
+ ld [w3_d090], a
scf
ret
@@ -4108,7 +4109,7 @@ Function119d93: ; 119d93 (46:5d93)
ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartyMon1Level
ld a, [PartyCount]
-.asm_119daf
+.party_loop
push af
ld a, [de]
push hl
@@ -4119,17 +4120,18 @@ Function119d93: ; 119d93 (46:5d93)
pop de
pop hl
cp [hl]
- jr z, .asm_119dbd
- jr nc, .asm_119dc6
-.asm_119dbd
+ jr z, .equal
+ jr nc, .exceeds
+.equal
pop af
dec a
- jr nz, .asm_119daf
+ jr nz, .party_loop
pop af
ld [rSVBK], a
and a
ret
-.asm_119dc6
+
+.exceeds
pop af
ld a, $4
ld [wcf66], a
@@ -4143,40 +4145,41 @@ Function119dd1: ; 119dd1 (46:5dd1)
push af
ld a, [wcd4f]
cp 70 / 10
- jr nc, .asm_119e08
+ jr nc, .level_70_or_more
ld a, $1
ld [rSVBK], a
ld hl, PartyMon1Level
ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartySpecies
ld a, [PartyCount]
-.asm_119deb
+.loop
push af
ld a, [de]
cp MEWTWO
- jr z, .asm_119dfd
+ jr z, .uber
cp MEW
- jr z, .asm_119dfd
+ jr z, .uber
cp LUGIA
- jr c, .asm_119e02
+ jr c, .next
cp NUM_POKEMON + 1
- jr nc, .asm_119e02
-.asm_119dfd
+ jr nc, .next
+.uber
ld a, [hl]
cp 70
- jr c, .asm_119e0d
-.asm_119e02
+ jr c, .uber_under_70
+.next
add hl, bc
inc de
pop af
dec a
- jr nz, .asm_119deb
-.asm_119e08
+ jr nz, .loop
+.level_70_or_more
pop af
ld [rSVBK], a
and a
ret
-.asm_119e0d
+
+.uber_under_70
pop af
ld a, [de]
ld [wd265], a
@@ -4210,7 +4213,7 @@ Unknown_119e40:
Function119e4f: ; 119e4f
push bc
- ld hl, LYOverrides
+ ld hl, w3_d100
ld a, [hli]
ld c, a
ld a, [hli]
@@ -4529,7 +4532,7 @@ Function11a00e: ; 11a00e
ld a, $3
ld [rSVBK], a
ld hl, $c608
- ld de, $d800
+ ld de, w3_d800
ld bc, $00f6
call CopyBytes
ld a, $1
@@ -4539,7 +4542,7 @@ Function11a00e: ; 11a00e
call Function11a9ce
ld a, $3
ld [rSVBK], a
- ld hl, $d800
+ ld hl, w3_d800
ld de, $c608
ld bc, $00f6
call CopyBytes
@@ -4563,7 +4566,7 @@ Function11a00e: ; 11a00e
call BackUpTiles
callba Function11765d
callba Function117ab4
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
call ExitMenu
callba ReloadMapPart
@@ -4586,7 +4589,7 @@ Function11a0ca: ; 11a0ca
call BackUpTiles
callba Function11765d
callba Function17d3f6
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
call ExitMenu
callba ReloadMapPart
@@ -5689,9 +5692,9 @@ Function11a9ce: ; 11a9ce
call ClearBGPalettes
call Function2bae
call Call_ExitMenu
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
- call Functiond90
+ call ret_d90
callba Function2b5c
call UpdateSprites
ret
@@ -5844,9 +5847,9 @@ UnknownText_0x11ac1f: ; 0x11ac1f
Function11ac3e: ; 11ac3e
call SpeechTextBox
call FadeToMenu
- callab ClearSpriteAnims
+ callab ClearSpriteAnims2
call Function11ac51
- call ReturnToCallingMenu
+ call CloseSubmenu
ret
; 11ac51
@@ -5882,9 +5885,9 @@ Function11ac51: ; 11ac51
call Function11b314
call Function11acb7
call Function11ad6e
- ld a, $78
- ld [wc3b5], a
- callba Function8cf7a
+ ld a, 30 * 4
+ ld [wCurrSpriteOAMAddr], a
+ callba DoNextFrameForAllSprites
callba ReloadMapPart
jr .asm_11ac82
@@ -5958,12 +5961,12 @@ Function11ad1b: ; 11ad1b
call ClearSprites
call ClearTileMap
callba Function17c000
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld [wcd82], a
dec a
ld [hObjectStructIndexBuffer], a
ld a, $10
- ld [wc3b7], a
+ ld [wCurIconTile], a
ld hl, Function8e83f
ld a, BANK(Function8e83f)
ld e, $4
@@ -5984,7 +5987,7 @@ Function11ad1b: ; 11ad1b
ld [wcd30], a
ld a, $2
ld [wc7d4], a
- callba Function40bdc
+ callba Pokedex_ChangeMode
ret
; 11ad6e
@@ -6027,12 +6030,12 @@ Function11ad95: ; 11ad95
ld de, String_11ae40
call PlaceString
hlcoord 10, 10, AttrMap
- ld bc, $0808
+ lb bc, 8, 8
call Function11afd6
callba ReloadMapPart
call Function11ad8a
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afcc
call Function11afb7
@@ -6059,13 +6062,13 @@ Function11adc4:
jr .asm_11ae2e
.asm_11ade6
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret z
jr .asm_11adf4
.asm_11aded
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
inc a
cp $4
ret z
@@ -6075,21 +6078,21 @@ Function11adc4:
ld hl, Unknown_11afcc
call Function11afbb
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afcc
call Function11afb7
ret
.asm_11ae06
call PlayClickSFX
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld hl, wcd30
ld [hl], a
and a
jr z, .asm_11ae28
hlcoord 2, 14
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .asm_11ae23
call Function11b272
@@ -6149,7 +6152,7 @@ Function11ae4e: ; 11ae4e
callba ReloadMapPart
call Function11ad8a
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
@@ -6180,13 +6183,13 @@ Function11ae98:
jr .asm_11aef7
.asm_11aec1
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret z
jr .asm_11aecf
.asm_11aec8
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
inc a
cp $3
ret z
@@ -6196,14 +6199,14 @@ Function11ae98:
ld hl, Unknown_11afd2
call Function11afbb
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
ret
.asm_11aee1
call PlayClickSFX
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .asm_11aeb4
ld a, [wcd4b]
@@ -6240,7 +6243,7 @@ Function11af04: ; 11af04
callba ReloadMapPart
call Function11ad8a
ld a, $2
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
@@ -6271,13 +6274,13 @@ Function11af4e:
jr .asm_11afaa
.asm_11af77
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ret z
jr .asm_11af85
.asm_11af7e
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
inc a
cp $3
ret z
@@ -6287,14 +6290,14 @@ Function11af4e:
ld hl, Unknown_11afd2
call Function11afbb
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld hl, Unknown_11afd2
call Function11afb7
ret
.asm_11af97
call PlayClickSFX
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $2
jr z, .asm_11af6a
ld a, $6
@@ -6317,7 +6320,7 @@ Function11afbb:
ld e, $7f
asm_11afbd:
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
ld c, a
ld b, 0
@@ -6343,20 +6346,20 @@ Unknown_11afd2:
; 11afd6
Function11afd6: ; 11afd6
- ld de, $0014
+ ld de, SCREEN_WIDTH
ld a, $3
-.asm_11afdb
+.row
push bc
push hl
-.asm_11afdd
+.col
ld [hli], a
dec c
- jr nz, .asm_11afdd
+ jr nz, .col
pop hl
add hl, de
pop bc
dec b
- jr nz, .asm_11afdb
+ jr nz, .row
ret
; 11afe8
@@ -6413,55 +6416,55 @@ Function11b03d: ; 11b03d
push hl
push af
ld c, $1
-.asm_11b041
+.loop
ld a, [hli]
- cp $ef
- jr z, .asm_11b051
- cp $f5
- jr z, .asm_11b051
- cp $50
- jr z, .asm_11b055
+ cp "♂"
+ jr z, .gender
+ cp "♀"
+ jr z, .gender
+ cp "@"
+ jr z, .done
inc c
- jr .asm_11b041
+ jr .loop
-.asm_11b051
+.gender
dec hl
- ld a, $50
+ ld a, "@"
ld [hli], a
-.asm_11b055
+.done
dec hl
push hl
- ld e, $4
- ld d, $0
+ ld e, 4
+ ld d, 0
add hl, de
ld e, l
ld d, h
pop hl
-.asm_11b05f
+.loop2
ld a, [hld]
ld [de], a
dec de
dec c
- jr nz, .asm_11b05f
+ jr nz, .loop2
pop af
pop de
cp $1
- jr nz, .asm_11b070
- ld hl, String_11b07a
- jr .asm_11b073
+ jr nz, .female
+ ld hl, .MaleString
+ jr .got_string
-.asm_11b070
- ld hl, String_11b07e
+.female
+ ld hl, .FemaleString
-.asm_11b073
- ld bc, 4
+.got_string
+ ld bc, 4 ; string length
call CopyBytes
ret
; 11b07a
-String_11b07a: db "ォスの "
-String_11b07e: db "メスの "
+.MaleString: db "ォスの "
+.FemaleString: db "メスの "
Function11b082: ; 11b082
call Function11b242
@@ -6485,36 +6488,38 @@ Function11b099: ; 11b099
ld a, [wc7d0]
ld e, a
ld d, $0
- ld hl, $c6d0
+ ld hl, wc6d0
add hl, de
ld e, l
ld d, h
hlcoord 11, 2
ld a, [wc7d3]
-.asm_11b0b9
+.loop
push af
ld a, [de]
ld [wd265], a
push de
push hl
- call Function11b0cf
+ call .PlaceMonNameOrPlaceholderString
pop hl
- ld de, $0028
+ ld de, 2 * SCREEN_WIDTH
add hl, de
pop de
inc de
pop af
dec a
- jr nz, .asm_11b0b9
+ jr nz, .loop
ret
; 11b0cf
-Function11b0cf: ; 11b0cf
+.PlaceMonNameOrPlaceholderString: ; 11b0cf
and a
ret z
- call Function11b0ec
+
+ call .CheckSeenFlag
ret c
- call Function11b0e1
+
+ call .SetCaughtFlag
push hl
call GetPokemonName
pop hl
@@ -6522,29 +6527,30 @@ Function11b0cf: ; 11b0cf
ret
; 11b0e1
-Function11b0e1: ; 11b0e1
- call Function11b21e
- jr nz, .asm_11b0e8
+.SetCaughtFlag: ; 11b0e1
+ call CheckCaughtMemMon
+ jr nz, .okay
inc hl
ret
-.asm_11b0e8
+.okay
ld a, $1
ld [hli], a
ret
; 11b0ec
-Function11b0ec: ; 11b0ec
- call Function11b22a
+.CheckSeenFlag: ; 11b0ec
+ call CheckSeenMemMon
ret nz
+
inc hl
- ld de, String_11b0f9
+ ld de, .EmptySlot
call PlaceString
scf
ret
; 11b0f9
-String_11b0f9: ; 11b0f9
+.EmptySlot: ; 11b0f9
db "ーーーーー@"
; 11b0ff
@@ -6580,7 +6586,7 @@ Function11b0ff: ; 11b0ff
.asm_11b131
call Function11b20b
- call Function11b22a
+ call CheckSeenMemMon
jr z, .asm_11b13d
ld a, $1
jr .asm_11b148
@@ -6764,7 +6770,7 @@ Function11b20b: ; 11b20b
ret
; 11b21e
-Function11b21e: ; 11b21e
+CheckCaughtMemMon: ; 11b21e
push de
push hl
ld a, [wd265]
@@ -6775,7 +6781,7 @@ Function11b21e: ; 11b21e
ret
; 11b22a
-Function11b22a: ; 11b22a
+CheckSeenMemMon: ; 11b22a
push de
push hl
ld a, [wd265]
@@ -6846,7 +6852,7 @@ Function11b275: ; 11b275
Function11b279: ; 11b279
ld a, [wd265]
ld [CurSpecies], a
- call Function11b22a
+ call CheckSeenMemMon
jr z, .asm_11b28f
call GetBaseData
ld a, [BaseGender]
@@ -6869,7 +6875,7 @@ Function11b295: ; 11b295
ld de, String_11b308
call PlaceString
call Function11b20b
- call Function11b22a
+ call CheckSeenMemMon
jr z, .asm_11b2d1
ld a, [$c608]
ld c, a
@@ -6882,7 +6888,7 @@ Function11b295: ; 11b295
ld hl, $0003
add hl, bc
ld e, [hl]
- callba Function8e9bc
+ callba FlyFunction_GetMonIcon
hlcoord 4, 14
push hl
call GetPokemonName
@@ -6943,53 +6949,106 @@ Function11b314: ; 11b314
; 11b31b
Function11b31b: ; 11b31b
- ld hl, Unknown_11b350
+ ld hl, .Coords
ld a, [wJumptableIndex]
- cp $2
- jr c, .asm_11b349
+ cp 2
+ jr c, .tilemap_1
ld a, [wc7d1]
- cp $4
- jr nc, .asm_11b344
- cp $3
- jr c, .asm_11b349
+ cp 4
+ jr nc, .tilemap_3
+ cp 3
+ jr c, .tilemap_1
ld a, [wJumptableIndex]
- cp $2
- jr z, .asm_11b349
- cp $3
- jr z, .asm_11b349
- cp $6
- jr z, .asm_11b349
+ cp 2
+ jr z, .tilemap_1
+ cp 3
+ jr z, .tilemap_1
+ cp 6
+ jr z, .tilemap_1
- ld bc, Unknown_11b37b
- jr .asm_11b34c
+ ld bc, .Tilemap2
+ jr .load_sprites
-.asm_11b344
- ld bc, Unknown_11b389
- jr .asm_11b34c
+.tilemap_3
+ ld bc, .Tilemap3
+ jr .load_sprites
-.asm_11b349
- ld bc, Unknown_11b36d
+.tilemap_1
+ ld bc, .Tilemap1
-.asm_11b34c
+.load_sprites
call Function11b397
ret
; 11b350
-Unknown_11b350:
- db $1a, $5e, $1a, $66, $1a, $6e, $1a, $76, $1a, $7e, $1a, $86, $1a, $8e
- db $22, $5e, $22, $66, $22, $6e, $22, $76, $22, $7e, $22, $86, $22, $8e
- db $ff
-
-Unknown_11b36d:
- db $30, $31, $31, $31, $31, $31, $32, $40, $41, $41, $41, $41, $41, $42
-Unknown_11b37b:
- db $30, $31, $31, $39, $39, $39, $39, $40, $41, $41, $39, $39, $39, $39
-Unknown_11b389:
- db $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39, $39
+.Coords:
+ dbpixel 3, 11, 2, 6 ; 0
+ dbpixel 3, 12, 2, 6 ; 1
+ dbpixel 3, 13, 2, 6 ; 2
+ dbpixel 3, 14, 2, 6 ; 3
+ dbpixel 3, 15, 2, 6 ; 4
+ dbpixel 3, 16, 2, 6 ; 5
+ dbpixel 3, 17, 2, 6 ; 6
+ dbpixel 4, 11, 2, 6 ; 7
+ dbpixel 4, 12, 2, 6 ; 8
+ dbpixel 4, 13, 2, 6 ; 9
+ dbpixel 4, 14, 2, 6 ; 10
+ dbpixel 4, 15, 2, 6 ; 11
+ dbpixel 4, 16, 2, 6 ; 12
+ dbpixel 4, 17, 2, 6 ; 13
+ db -1
+
+.Tilemap1: ; vtiles
+ db $30 ; 0
+ db $31 ; 1
+ db $31 ; 2
+ db $31 ; 3
+ db $31 ; 4
+ db $31 ; 5
+ db $32 ; 6
+ db $40 ; 7
+ db $41 ; 8
+ db $41 ; 9
+ db $41 ; 10
+ db $41 ; 11
+ db $41 ; 12
+ db $42 ; 13
+
+.Tilemap2: ; vtiles
+ db $30 ; 0
+ db $31 ; 1
+ db $31 ; 2
+ db $39 ; 3
+ db $39 ; 4
+ db $39 ; 5
+ db $39 ; 6
+ db $40 ; 7
+ db $41 ; 8
+ db $41 ; 9
+ db $39 ; 10
+ db $39 ; 11
+ db $39 ; 12
+ db $39 ; 13
+
+.Tilemap3: ; vtiles
+ db $39 ; 0
+ db $39 ; 1
+ db $39 ; 2
+ db $39 ; 3
+ db $39 ; 4
+ db $39 ; 5
+ db $39 ; 6
+ db $39 ; 7
+ db $39 ; 8
+ db $39 ; 9
+ db $39 ; 10
+ db $39 ; 11
+ db $39 ; 12
+ db $39 ; 13
Function11b397: ; 11b397
ld de, Sprites
-.asm_11b39a
+.loop
ld a, [hl]
cp $ff
ret z
@@ -6997,26 +7056,29 @@ Function11b397: ; 11b397
and $7
swap a
add [hl]
- inc hl
+ inc hl ; 1
ld [de], a
inc de
- ld a, [hli]
+
+ ld a, [hli] ; 2
ld [de], a
inc de
+
ld a, [bc]
inc bc
ld [de], a
inc de
- ld a, $5
+ ld a, $5 ; OBPal 5
ld [de], a
inc de
- jr .asm_11b39a
+ jr .loop
; 11b3b6
Function11b3b6: ; 11b3b6
-.asm_11b3b6
+; unreferenced
+.loop
ld a, [hl]
- cp $ff
+ cp -1
ret z
ld a, [wcd4d]
and $7
@@ -7040,11 +7102,11 @@ Function11b3b6: ; 11b3b6
ld a, $5
ld [de], a
inc de
- jr .asm_11b3b6
+ jr .loop
; 11b3d9
Function11b3d9: ; 11b3d9
- ld de, Sprites + $70
+ ld de, Sprites + 28 * 4
push de
ld a, [wc7d2]
dec a
@@ -7053,51 +7115,51 @@ Function11b3d9: ; 11b3d9
ld hl, wc7d0
add [hl]
cp e
- jr z, .asm_11b40d
+ jr z, .skip
ld hl, 0
- ld bc, $0070
+ ld bc, $70
call AddNTimes
ld e, l
ld d, h
- ld b, $0
+ ld b, 0
ld a, d
or e
- jr z, .asm_11b40f
+ jr z, .load_sprites
ld a, [wc7d2]
ld c, a
-.asm_11b401
+.loop1
ld a, e
sub c
ld e, a
ld a, d
sbc $0
ld d, a
- jr c, .asm_11b40f
+ jr c, .load_sprites
inc b
- jr .asm_11b401
+ jr .loop1
-.asm_11b40d
- ld b, $70
+.skip
+ ld b, 14 * 8
-.asm_11b40f
- ld a, $15
+.load_sprites
+ ld a, 2 * 8 + 5
add b
pop hl
ld [hli], a
cp $41
- jr c, .asm_11b42b
+ jr c, .version1
ld a, [wJumptableIndex]
- cp $4
- jr z, .asm_11b43b
- cp $5
- jr z, .asm_11b43b
- cp $7
- jr z, .asm_11b43b
- cp $8
- jr z, .asm_11b43b
-
-.asm_11b42b
- ld a, $9b
+ cp 4
+ jr z, .version2
+ cp 5
+ jr z, .version2
+ cp 7
+ jr z, .version2
+ cp 8
+ jr z, .version2
+
+.version1
+ ld a, 19 * 8 + 3
ld [hli], a
ld a, [wcd4c]
add $3c
@@ -7107,8 +7169,8 @@ Function11b3d9: ; 11b3d9
ld [hl], a
ret
-.asm_11b43b
- ld a, $9b
+.version2
+ ld a, 19 * 8 + 3
ld [hli], a
ld a, $39
ld [hli], a
@@ -7134,12 +7196,12 @@ Function11b44b: ; 11b44b
; 11b45c
Function11b45c: ; 11b45c
-.asm_11b45c
+.loop
call Function11b46a
call DelayFrame
ld a, [wJumptableIndex]
- cp $4
- jr nz, .asm_11b45c
+ cp 4
+ jr nz, .loop
ret
; 11b46a
@@ -7162,14 +7224,14 @@ Jumptable_11b479: ; 11b479
dw Function11b570
dw Function11b5c0
dw Function11b5e0
- dw Function11b5e7
+ dw Function11b5e7 ; unused
; 11b483
Function11b483: ; 11b483
call Function11b538
ld hl, PlayerName
- ld a, $5
-.asm_11b48b
+ ld a, $5 ; Japanese Name Length
+.loop1
push af
ld a, [hli]
ld [bc], a
@@ -7177,23 +7239,24 @@ Function11b483: ; 11b483
pop af
dec a
and a
- jr nz, .asm_11b48b
- ld de, $0030
+ jr nz, .loop1
+
+ ld de, PARTYMON_STRUCT_LENGTH
ld hl, PartyMon1Species
ld a, [wcd82]
dec a
push af
-.asm_11b49f
+.loop2
and a
- jr z, .asm_11b4a6
+ jr z, .okay
add hl, de
dec a
- jr .asm_11b49f
+ jr .loop2
-.asm_11b4a6
+.okay
push bc
- ld a, $30
-.asm_11b4a9
+ ld a, PARTYMON_STRUCT_LENGTH
+.loop3
push af
ld a, [hli]
ld [bc], a
@@ -7201,24 +7264,25 @@ Function11b483: ; 11b483
pop af
dec a
and a
- jr nz, .asm_11b4a9
+ jr nz, .loop3
+
pop de
push bc
ld a, [de]
ld [CurSpecies], a
call GetBaseData
- ld hl, $001f
+ ld hl, MON_LEVEL
add hl, de
ld a, [hl]
ld [CurPartyLevel], a
- ld hl, $0024
+ ld hl, MON_MAXHP
add hl, de
push hl
- ld hl, $000a
+ ld hl, MON_EXP + 2
add hl, de
pop de
push de
- ld b, $1
+ ld b, OTPARTYMON
predef CalcPkmnStats
pop de
ld h, d
@@ -7232,20 +7296,20 @@ endr
ld a, [de]
ld [hl], a
pop bc
- ld de, $000b
+ ld de, NAME_LENGTH
ld hl, PartyMonOT
pop af
push af
-.asm_11b4e8
+.loop4
and a
- jr z, .asm_11b4ef
+ jr z, .okay2
add hl, de
dec a
- jr .asm_11b4e8
+ jr .loop4
-.asm_11b4ef
- ld a, $a
-.asm_11b4f1
+.okay2
+ ld a, NAME_LENGTH - 1
+.loop5
push af
ld a, [hli]
ld [bc], a
@@ -7253,21 +7317,21 @@ endr
pop af
dec a
and a
- jr nz, .asm_11b4f1
- ld de, $000b
+ jr nz, .loop5
+ ld de, NAME_LENGTH
ld hl, PartyMonNicknames
pop af
push af
-.asm_11b502
+.loop6
and a
- jr z, .asm_11b509
+ jr z, .okay3
add hl, de
dec a
- jr .asm_11b502
+ jr .loop6
-.asm_11b509
- ld a, $a
-.asm_11b50b
+.okay3
+ ld a, NAME_LENGTH - 1
+.loop7
push af
ld a, [hli]
ld [bc], a
@@ -7275,22 +7339,22 @@ endr
pop af
dec a
and a
- jr nz, .asm_11b50b
- ld de, $002f
- ld hl, $a600
+ jr nz, .loop7
+ ld de, MAIL_STRUCT_LENGTH
+ ld hl, sPartyMail
pop af
-.asm_11b51b
+.loop8
and a
- jr z, .asm_11b522
+ jr z, .okay4
add hl, de
dec a
- jr .asm_11b51b
+ jr .loop8
-.asm_11b522
- ld a, $0
+.okay4
+ ld a, $0 ; BANK(sPartyMail)
call GetSRAMBank
- ld a, $2f
-.asm_11b529
+ ld a, MAIL_STRUCT_LENGTH
+.loop9
push af
ld a, [hli]
ld [bc], a
@@ -7298,38 +7362,45 @@ endr
pop af
dec a
and a
- jr nz, .asm_11b529
+ jr nz, .loop9
call CloseSRAM
jp Function11ad8a
; 11b538
Function11b538: ; 11b538
- ld bc, BattleMonNick + 5
+ ld bc, wc626
ld a, [PlayerID]
ld [wcd2a], a
ld [bc], a
inc bc
+
ld a, [PlayerID + 1]
ld [wcd2b], a
ld [bc], a
inc bc
+
ld a, [wSecretID]
ld [wcd2c], a
ld [bc], a
inc bc
+
ld a, [wSecretID + 1]
ld [wcd2d], a
ld [bc], a
inc bc
+
ld a, [wcd2e]
ld [bc], a
inc bc
+
ld a, [wcd2f]
ld [bc], a
inc bc
+
ld a, [wcd30]
ld [bc], a
inc bc
+
ld a, [wd265]
ld [bc], a
inc bc
@@ -7340,11 +7411,11 @@ Function11b570: ; 11b570
call Function118007
ld a, [ScriptVar]
and a
- jr nz, .asm_11b57f
+ jr nz, .exit
call Function11b585
jp Function11ad8a
-.asm_11b57f
+.exit
ld a, $4
ld [wJumptableIndex], a
ret
@@ -7353,9 +7424,9 @@ Function11b570: ; 11b570
Function11b585: ; 11b585
ld a, $3
ld [rSVBK], a
- ld hl, $d800
+ ld hl, w3_d800
ld de, $c608
- ld bc, $008f
+ ld bc, w3_d88f - w3_d800
call CopyBytes
ld a, $1
ld [rSVBK], a
@@ -7366,7 +7437,7 @@ Function11b585: ; 11b585
ld [de], a
inc de
ld hl, $c608
- ld bc, $008f
+ ld bc, w3_d88f - w3_d800
call CopyBytes
push de
pop hl
@@ -7387,8 +7458,8 @@ Function11b5c0: ; 11b5c0
dec a
ld [CurPartyMon], a
xor a
- ld [wd10b], a
- callba Functione039
+ ld [wPokemonWithdrawDepositParameter], a
+ callba RemoveMonFromPartyOrBox
callba Function170807
callba Function14a58
jp Function11ad8a
@@ -7480,7 +7551,7 @@ Function11b66d: ; 11b66d
push af
ld a, $3
ld [rSVBK], a
- ld a, [StringBuffer2 + 10]
+ ld a, [w3_d090]
ld b, a
pop af
ld [rSVBK], a
@@ -7504,7 +7575,7 @@ Function11b66d: ; 11b66d
ld a, $3
ld [rSVBK], a
ld a, $2
- ld [StringBuffer2 + 10], a
+ ld [w3_d090], a
pop af
ld [rSVBK], a
@@ -7677,7 +7748,7 @@ Function11b7e5: ; 11b7e5
callba Function108016
callba Function17d1f1
ld a, $1
- ld [wd1e9], a
+ ld [wForceEvolution], a
ld a, $2
ld [wLinkMode], a
callba EvolvePokemon
@@ -7701,13 +7772,13 @@ Function11b7e5: ; 11b7e5
ld [de], a
.asm_11b872
- call ReturnToCallingMenu
+ call CloseSubmenu
call RestartMapMusic
ret
; 11b879
Function11b879: ; 11b879
- callba Function17089a
+ callba BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar]
and a
ret z
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 20:47:05 +0000