summaryrefslogtreecommitdiff
path: root/misc/mobile_45.asm
diff options
context:
space:
mode:
Diffstat (limited to 'misc/mobile_45.asm')
-rw-r--r--misc/mobile_45.asm763
1 files changed, 392 insertions, 371 deletions
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index fe4729b9c..52a2a65e4 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -703,7 +703,7 @@ endr
ld a, d
or e
jr z, .asm_114559
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld e, [hl]
inc hl
ld d, [hl]
@@ -1537,7 +1537,7 @@ Function1149cc: ; 1149cc
ld [hl], d
dec hl
ld [hl], e
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld e, [hl]
inc hl
ld d, [hl]
@@ -2416,14 +2416,14 @@ Function114e62: ; 114e62
ld a, c
and a
jr nz, .asm_114e6f
- ld a, [wdc23]
+ ld a, [wStartDay]
and a
jp z, Function11425c
jr .asm_114e76
.asm_114e6f
xor a
- ld [wdc23], a
+ ld [wStartDay], a
call Function114ee9
.asm_114e76
@@ -2494,7 +2494,7 @@ Function114ea0: ; 114ea0
ld [hli], a
ld [hl], b
xor a
- ld [wdc23], a
+ ld [wStartDay], a
ret
.asm_114edb
@@ -2614,7 +2614,7 @@ Function114f39: ; 114f39
; 114f59
Function114f59: ; 114f59
- ld a, [wdc23]
+ ld a, [wStartDay]
and a
jr nz, .asm_114f7c
ld a, [wdc03]
@@ -2632,7 +2632,7 @@ Function114f59: ; 114f59
and a
jr nz, .asm_114fe7
ld a, $1
- ld [wdc23], a
+ ld [wStartDay], a
.asm_114f7c
ld a, [wdc03]
@@ -2811,7 +2811,7 @@ Function115062: ; 115062
ld d, [hl]
ld b, $0
ld hl, wdc24
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $1
jr z, .asm_11509b
cp $2
@@ -2836,14 +2836,14 @@ Function115062: ; 115062
call Function115d53
call Function1150b3
call Function115136
- ld a, [wdc23]
+ ld a, [wStartDay]
inc a
cp $4
jr nz, .asm_1150ae
ld a, $2
.asm_1150ae
- ld [wdc23], a
+ ld [wStartDay], a
xor a
.asm_1150b2
@@ -3329,7 +3329,7 @@ Function1152b8: ; 1152b8
call Function114ea0
and a
jr nz, .asm_1152f9
- ld [wdc23], a
+ ld [wStartDay], a
ld a, [wdc03]
cp $6
jr nz, .asm_1152ca
@@ -3337,7 +3337,7 @@ Function1152b8: ; 1152b8
.asm_115335
call Function1153b5
xor a
- ld [wdc23], a
+ ld [wStartDay], a
call Function114f59
and a
jr nz, .asm_1152f9
@@ -3355,7 +3355,7 @@ Function1152b8: ; 1152b8
jr z, .asm_11536b
call Function1153b5
xor a
- ld [wdc23], a
+ ld [wStartDay], a
call Function114f59
and a
jr nz, .asm_1152f9
@@ -3425,7 +3425,7 @@ Function11537d: ; 11537d
ld [hl], d
xor a
ld [wdc03], a
- ld [wdc23], a
+ ld [wStartDay], a
ret
; 1153b5
@@ -3645,7 +3645,7 @@ Function1153d2: ; 1153d2
Function1154d4: ; 1154d4
xor a
- ld [wdc23], a
+ ld [wStartDay], a
call Function1155af
call Function11560a
and a
@@ -3659,7 +3659,7 @@ Function1154d4: ; 1154d4
cp $1
jr nz, .asm_115531
xor a
- ld [wdc1c], a
+ ld [wDailyResetTimer], a
.asm_1154f7
ld a, [BigDoll]
cp $2
@@ -3699,7 +3699,7 @@ Function1154d4: ; 1154d4
.asm_115531
ld a, $1
- ld [wdc1c], a
+ ld [wDailyResetTimer], a
ld a, $b
ld [wdc03], a
call Function114f59
@@ -3726,7 +3726,7 @@ Function1154d4: ; 1154d4
call Function114ea0
and a
jr nz, .asm_11552c
- ld a, [wdc1c]
+ ld a, [wDailyResetTimer]
and a
jr z, .asm_11557d
ld a, $f
@@ -3860,7 +3860,7 @@ Function11560a: ; 11560a
ld c, [hl]
inc hl
ld b, [hl]
- ld a, [wdc0a]
+ ld a, [wCurrMapCallbackCount]
cp b
jp c, .asm_1156b1
jr nz, .asm_115631
@@ -3874,7 +3874,7 @@ Function11560a: ; 11560a
jr z, .asm_1156a9
ld a, [wdc09]
ld l, a
- ld a, [wdc0a]
+ ld a, [wCurrMapCallbackCount]
ld h, a
ld a, c
cpl
@@ -3887,7 +3887,7 @@ Function11560a: ; 11560a
ld a, l
ld [wdc09], a
ld a, h
- ld [wdc0a], a
+ ld [wCurrMapCallbackCount], a
.asm_11564d
ld a, $3
cp b
@@ -3929,13 +3929,13 @@ Function11560a: ; 11560a
ld a, [wCurrentMapSignpostCount]
ld [$ff8c], a
ld [$4000], a
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld e, [hl]
inc hl
ld d, [hl]
ld hl, wdc24
call Function115d6a
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld [hl], e
inc hl
ld [hl], d
@@ -3977,7 +3977,7 @@ Function11560a: ; 11560a
; 1156cc
Function1156cc: ; 1156cc
- ld a, [wdc23]
+ ld a, [wStartDay]
and a
jp z, Function11425c
cp $2
@@ -4006,7 +4006,7 @@ Function1156cc: ; 1156cc
call Function11581e
and a
jr nz, .asm_11572b
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $5
jr z, .asm_115716
ld a, [Poster]
@@ -4017,7 +4017,7 @@ Function1156cc: ; 1156cc
jp Function11425c
.asm_115716
- ld hl, wdc0a
+ ld hl, wCurrMapCallbackCount
ld a, [hli]
cpl
ld e, a
@@ -4030,7 +4030,7 @@ Function1156cc: ; 1156cc
ld l, a
add hl, de
xor a
- ld [wdc23], a
+ ld [wStartDay], a
jp Function11425c
.asm_11572b
@@ -4165,7 +4165,7 @@ Function11575c: ; 11575c
pop hl
add hl, bc
ld a, $2
- ld [wdc23], a
+ ld [wStartDay], a
ret
; 1157d0
@@ -4213,7 +4213,7 @@ Function1157d0: ; 1157d0
ld a, b
ld [Bed], a
ld a, $4
- ld [wdc23], a
+ ld [wStartDay], a
ret
.asm_11580f
@@ -4223,12 +4223,12 @@ Function1157d0: ; 1157d0
ld a, b
ld [Bed], a
ld a, $3
- ld [wdc23], a
+ ld [wStartDay], a
ret
; 11581e
Function11581e: ; 11581e
- ld a, [wdc23]
+ ld a, [wStartDay]
and a
ret z
ld a, [wdc0e]
@@ -4262,9 +4262,9 @@ Function11581e: ; 11581e
ld b, [hl]
inc hl
push hl
- ld a, [wdc0a]
+ ld a, [wCurrMapCallbackCount]
ld l, a
- ld a, [wdc0b]
+ ld a, [wCurrMapCallbackHeaderPointer]
ld h, a
cp b
jr c, .asm_1158bb
@@ -4284,12 +4284,12 @@ Function11581e: ; 11581e
inc bc
add hl, bc
ld a, l
- ld [wdc0a], a
+ ld [wCurrMapCallbackCount], a
ld a, h
- ld [wdc0b], a
+ ld [wCurrMapCallbackHeaderPointer], a
pop bc
pop hl
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
@@ -4299,13 +4299,13 @@ Function11581e: ; 11581e
ld d, [hl]
ld hl, PartyMon5Speed
call Function115d6a
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld a, [wCurrentMapSignpostCount]
ld [hli], a
ld a, e
ld [hli], a
ld [hl], d
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $3
jr z, .asm_1158b4
cp $4
@@ -4314,12 +4314,12 @@ Function11581e: ; 11581e
.asm_1158ad
ld a, $5
- ld [wdc23], a
+ ld [wStartDay], a
jr .asm_1158b9
.asm_1158b4
ld a, $2
- ld [wdc23], a
+ ld [wStartDay], a
.asm_1158b9
xor a
@@ -4330,7 +4330,7 @@ Function11581e: ; 11581e
.asm_1158bc
ld a, $ff
- ld [wdc23], a
+ ld [wStartDay], a
ret
; 1158c2
@@ -4575,7 +4575,7 @@ Function1159dc: ; 1159dc
; 1159fb
Function1159fb: ; 1159fb
- ld a, [wdc23]
+ ld a, [wStartDay]
and a
jp z, Function11425c
cp $2
@@ -4604,7 +4604,7 @@ Function1159fb: ; 1159fb
call Function115b00
and a
jr nz, .asm_115a5a
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $5
jr z, .asm_115a45
ld a, [Poster]
@@ -4615,7 +4615,7 @@ Function1159fb: ; 1159fb
jp Function11425c
.asm_115a45
- ld hl, wdc0a
+ ld hl, wCurrMapCallbackCount
ld a, [hli]
cpl
ld e, a
@@ -4628,7 +4628,7 @@ Function1159fb: ; 1159fb
ld l, a
add hl, de
xor a
- ld [wdc23], a
+ ld [wStartDay], a
jp Function11425c
.asm_115a5a
@@ -4692,7 +4692,7 @@ Function115a5f: ; 115a5f
rl b
add hl, bc
ld a, $2
- ld [wdc23], a
+ ld [wStartDay], a
ret
; 115ab0
@@ -4740,7 +4740,7 @@ Function115ab0: ; 115ab0
ld a, b
ld [Bed], a
ld a, $4
- ld [wdc23], a
+ ld [wStartDay], a
xor a
ret
@@ -4751,13 +4751,13 @@ Function115ab0: ; 115ab0
ld a, b
ld [Bed], a
ld a, $3
- ld [wdc23], a
+ ld [wStartDay], a
xor a
ret
; 115b00
Function115b00: ; 115b00
- ld a, [wdc23]
+ ld a, [wStartDay]
and a
ret z
ld a, [wdc0e]
@@ -4780,7 +4780,7 @@ Function115b00: ; 115b00
jr z, .asm_115b43
cp $2
jr z, .asm_115b3b
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $4
jr z, .asm_115b43
rept 2
@@ -4798,7 +4798,7 @@ endr
.asm_115b3d
ld a, $ff
- ld [wdc23], a
+ ld [wStartDay], a
ret
.asm_115b43
@@ -4826,9 +4826,9 @@ endr
ld b, [hl]
inc hl
push hl
- ld a, [wdc0a]
+ ld a, [wCurrMapCallbackCount]
ld l, a
- ld a, [wdc0b]
+ ld a, [wCurrMapCallbackHeaderPointer]
ld h, a
cp b
jr c, .asm_115b36
@@ -4848,12 +4848,12 @@ endr
inc bc
add hl, bc
ld a, l
- ld [wdc0a], a
+ ld [wCurrMapCallbackCount], a
ld a, h
- ld [wdc0b], a
+ ld [wCurrMapCallbackHeaderPointer], a
pop bc
pop hl
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld a, [hli]
ld [wCurrentMapSignpostCount], a
ld [$ff8c], a
@@ -4863,13 +4863,13 @@ endr
ld d, [hl]
ld hl, wdc26
call Function115d6a
- ld hl, wdc07
+ ld hl, wCurrMapTriggerCount
ld a, [wCurrentMapSignpostCount]
ld [hli], a
ld a, e
ld [hli], a
ld [hl], d
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $3
jr z, .asm_115bc1
cp $4
@@ -4878,12 +4878,12 @@ endr
.asm_115bba
ld a, $5
- ld [wdc23], a
+ ld [wStartDay], a
jr .asm_115bc6
.asm_115bc1
ld a, $2
- ld [wdc23], a
+ ld [wStartDay], a
.asm_115bc6
xor a
@@ -4949,7 +4949,7 @@ Function115bc8: ; 115bc8
jr nz, .asm_115bcc
.asm_115c1b
- ld a, [wdc23]
+ ld a, [wStartDay]
cp $4
jr z, .asm_115c33
ld a, [de]
@@ -5053,7 +5053,7 @@ endr
.asm_115c99
ld a, $ff
- ld [wdc23], a
+ ld [wStartDay], a
ret
.asm_115c9f
@@ -5156,7 +5156,7 @@ Function115cfd: ; 115cfd
pop hl
pop hl
ld a, $ff
- ld [wdc23], a
+ ld [wStartDay], a
ret
.asm_115d2f
@@ -5268,7 +5268,7 @@ Function115d80: ; 115d80
Function115d99: ; 115d99
ld de, GFX_11601a
- ld hl, $8600
+ ld hl, VTiles0 tile $60
lb bc, BANK(GFX_11601a), $14
call Get2bpp
xor a
@@ -5976,7 +5976,7 @@ Function1163c0: ; 1163c0
pop af
ld [rSVBK], a
callba Function104061
- ld a, [InLinkBattle]
+ ld a, [wLinkMode]
cp $4
jr z, .asm_11642a
ld a, $8
@@ -7656,13 +7656,13 @@ Function117656: ; 117656
; 11765d
Function11765d: ; 11765d (45:765d)
- ld a, [$ffaa]
+ ld a, [hInMenu]
push af
ld a, $1
- ld [$ffaa], a
+ ld [hInMenu], a
call Function11766b
pop af
- ld [$ffaa], a
+ ld [hInMenu], a
ret
Function11766b: ; 11766b (45:766b)
@@ -7716,7 +7716,7 @@ Function117699: ; 117699 (45:7699)
ret
Function1176ee: ; 1176ee (45:76ee)
- call Functiona57
+ call JoyTextDelay
ld a, [wcd49]
bit 7, a
jr nz, .asm_117709
@@ -7798,7 +7798,7 @@ Function117764: ; 117764 (45:7764)
ld a, [hl]
and $2
jr nz, asm_1177d6
- ld hl, $ffa9
+ ld hl, hJoyLast
ld a, [hl]
and $40
jr nz, asm_1177f1
@@ -7973,11 +7973,11 @@ Function1178aa: ; 1178aa (45:78aa)
ld hl, MenuDataHeader_1179b5
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
ld hl, MenuDataHeader_1179bd
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
callba Function104061
hlcoord 16, 8
ld de, String_1179c5
@@ -8076,7 +8076,7 @@ Function117984: ; 117984 (45:7984)
ld hl, MenuDataHeader_1179b5
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
callba Function104061
hlcoord 1, 14
ld de, String_1179e1
@@ -8150,13 +8150,13 @@ INCBIN "data/mobile/ascii-sym.txt"
; Mobile Stadium option from the continue/newgame menu.
; XXX better function names
MobileStudium: ; 0x117a7f
- ld a, [$ffaa]
+ ld a, [hInMenu]
push af
ld a, $1
- ld [$ffaa], a
+ ld [hInMenu], a
call Function117a8d
pop af
- ld [$ffaa], a
+ ld [hInMenu], a
ret
; 0x117a8d
@@ -8168,7 +8168,7 @@ Function117a8d: ; 0x117a8d
Function117a94: ; 0x117a94
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a
@@ -8189,8 +8189,8 @@ Function117ab4: ; 0x117ab4
; 0x117acd
Function117acd: ; 0x117acd
- call Functiona57
- ld a, [wcf63]
+ call JoyTextDelay
+ ld a, [wJumptableIndex]
bit 7, a
jr nz, .asm_117ae2 ; 0x117ad5 $b
call Function117ae9
@@ -8202,7 +8202,7 @@ Function117acd: ; 0x117acd
ret
Function117ae9: ; 0x117ae9
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld e, a
ld d, $0
ld hl, Pointers117af8
@@ -8236,7 +8236,7 @@ Function117b14:
ld hl, Data117cbc
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
jp Function117cdd
Function117b28:
@@ -8248,7 +8248,7 @@ Function117b31:
ld hl, Data117cc4
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
hlcoord 16, 8
ld de, YesNo117ccc
call PlaceString
@@ -8306,7 +8306,7 @@ Function117b4f:
call ExitMenu
callba Function104061
ld a, $80
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
Function117bb6:
@@ -8325,11 +8325,11 @@ Function117bb6:
ld [wc303], a
callba Function17f555
ld a, $80
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
.asm_117be1
ld a, $80
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
.asm_117be7
ld a, [rSVBK]
@@ -8345,7 +8345,7 @@ Function117bb6:
ld a, [wd001]
cp $f
jr nz, .asm_117c16 ; 0x117c01 $13
- ld hl, wdfec
+ ld hl, $e000 - 20
ld de, wcd69
ld c, $10
.asm_117c0b
@@ -8386,7 +8386,7 @@ Function117c4a:
ld hl, Data117cbc
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
callba Function104061
ld hl, MobileStadiumSuccessText
call PrintText
@@ -8411,7 +8411,7 @@ Function117c4a:
pop af
ld [rSVBK], a
ld a, $80
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
Function117c89:
@@ -8464,7 +8464,7 @@ MobileStadiumSuccessText: ; 0x117cd8
db "@"
Function117cdd: ; 0x117cdd
- ld hl, wcf63
+ ld hl, wJumptableIndex
inc [hl]
ret
@@ -8493,7 +8493,7 @@ asm_11800b
ld a, $3
ld [rSVBK], a
.asm_118024
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1b
@@ -8534,7 +8534,7 @@ Function11805f: ; 11805f
ld a, $3
ld [rSVBK], a
.asm_11807d
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1b
@@ -8572,7 +8572,7 @@ Function1180b8: ; 1180b8
ld a, $3
ld [rSVBK], a
.asm_1180d1
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $28
@@ -8627,7 +8627,7 @@ Function118125: ; 118125
ld a, $3
ld [rSVBK], a
.asm_11813e
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $f
@@ -8712,7 +8712,7 @@ Function1181da: ; 1181da
ld a, $3
ld [rSVBK], a
.asm_1181f8
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $28
@@ -8750,7 +8750,7 @@ Function118233: ; 118233
ld a, $3
ld [rSVBK], a
.asm_11824c
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1e
@@ -8787,7 +8787,7 @@ Function118284: ; 118284
ld a, $3
ld [rSVBK], a ; $ff00+$70
.asm_11829d
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $20
@@ -8824,7 +8824,7 @@ Function1182d5: ; 1182d5
ld a, $3
ld [rSVBK], a
.asm_1182ee
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1b
@@ -8862,7 +8862,7 @@ Function118329: ; 118329
ld a, $3
ld [rSVBK], a
.asm_118342
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $18
@@ -8899,7 +8899,7 @@ Function11837a: ; 11837a
ld a, $3
ld [rSVBK], a
.asm_118393
- call Functiona57
+ call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $19
@@ -8954,7 +8954,7 @@ Function1183cb: ; 1183cb
ld [rIE], a
ld a, $1
ld [$ffc9], a
- ld [$ffe9], a
+ ld [hMobile], a
ei
callba Function106462
callba Function106464
@@ -8984,7 +8984,7 @@ Function118452: ; 118452
di
xor a
ld [$ffc9], a
- ld [$ffe9], a
+ ld [hMobile], a
ld [hVBlank], a
call NormalSpeed
xor a
@@ -9728,22 +9728,22 @@ Function118903: ; 118903 (46:4903)
ld [wcd3c], a
call Function119ed8
jp Function119e2e
-; 11891c (46:491c)
+
Function11891c: ; 11891c
call Function118b42
jp Function119e2e
-; 118922
+
Function118922: ; 118922
ld a, [wcd38]
and a
jr nz, .asm_11892d
- ld hl, UnknownText_0x11aba5
+ ld hl, Text_WhatLevelDoYouWantToChallenge
jr .asm_118930
.asm_11892d
- ld hl, UnknownText_0x11abcb
+ ld hl, Text_CheckBattleRoomListByMaxLevel
.asm_118930
call Function11a9c0
@@ -9756,7 +9756,7 @@ Function118936:
ld hl, MenuDataHeader_119cf7
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
call Function321c
hlcoord 16, 8, AttrMap
ld a, $40
@@ -9770,13 +9770,13 @@ Function118936:
ld a, [StatusFlags]
bit 6, a
jr nz, .asm_11896b
- ld hl, Strings_119d64
- ld a, $5
+ ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels
+ ld a, 5 ; 4 levels to choose from, including 'Cancel'-option
jr .asm_118970
.asm_11896b
- ld hl, Strings_119d0c
- ld a, $b
+ ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels
+ ld a, 11 ; 10 levels to choose from, including 'Cancel'-option
.asm_118970
ld [wcd4a], a
@@ -9915,7 +9915,8 @@ Function118982:
ld a, $0
ld [wcd46], a
ret
-; 118a54
+
+
Function118a54: ; 118a54
ld a, [wcd55]
@@ -11816,7 +11817,7 @@ Function119800: ; 119800
ld [wc702], a
ld a, [wcd81]
ld [wc74e], a
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
push af
ld a, [wcf64]
push af
@@ -11839,7 +11840,7 @@ Function119800: ; 119800
pop af
ld [wcf64], a
pop af
- ld [wcf63], a
+ ld [wJumptableIndex], a
callba Function115dc3
jp Function119e2e
; 11984e
@@ -11852,7 +11853,7 @@ Function11984e: ; 11984e
and a
jr nz, .asm_1198a8
callba Function170000
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
push af
ld a, [wcf64]
push af
@@ -11875,7 +11876,7 @@ Function11984e: ; 11984e
pop af
ld [wcf64], a
pop af
- ld [wcf63], a
+ ld [wJumptableIndex], a
callba Function115dc3
jp Function119e2e
@@ -11886,7 +11887,7 @@ Function11984e: ; 11984e
.asm_1198a8
callba Function17005a
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
push af
ld a, [wcf64]
push af
@@ -11909,7 +11910,7 @@ Function11984e: ; 11984e
pop af
ld [wcf64], a
pop af
- ld [wcf63], a
+ ld [wJumptableIndex], a
callba Function115dc3
jp Function119e2e
; 1198ee
@@ -12537,7 +12538,7 @@ MenuData_119cff: ; 119cff
String_119d07:
db " ▼@"
-Strings_119d0c:
+Strings_L10ToL100: ; 119d0c
db " L:10 @@"
db " L:20 @@"
db " L:30 @@"
@@ -12550,7 +12551,7 @@ Strings_119d0c:
db " L:100@@"
db "CANCEL@@"
-Strings_119d64:
+Strings_Ll0ToL40: ; 119d64
db " L:10 @@"
db " L:20 @@"
db " L:30 @@"
@@ -13020,13 +13021,13 @@ Function11a00e: ; 11a00e
.asm_11a081
xor a
- ld [wcf83], a
- ld [wcf82], a
+ ld [wMenuBorderLeftCoord], a
+ ld [wMenuBorderTopCoord], a
ld a, $13
- ld [wcf85], a
+ ld [wMenuBorderRightCoord], a
ld a, $5
- ld [wcf84], a
- call Function1c00
+ ld [wMenuBorderBottomCoord], a
+ call BackUpTiles
callba Function11765d
callba Function117ab4
callba Function106462
@@ -13043,13 +13044,13 @@ Function11a00e: ; 11a00e
Function11a0ca: ; 11a0ca
xor a
- ld [wcf83], a
- ld [wcf82], a
+ ld [wMenuBorderLeftCoord], a
+ ld [wMenuBorderTopCoord], a
ld a, $13
- ld [wcf85], a
+ ld [wMenuBorderRightCoord], a
ld a, $11
- ld [wcf84], a
- call Function1c00
+ ld [wMenuBorderBottomCoord], a
+ call BackUpTiles
callba Function11765d
callba Function17d3f6
callba Function106462
@@ -13210,7 +13211,7 @@ Function11a207: ; 11a207
ld hl, MenuDataHeader_11a2de
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
call Function321c
hlcoord 16, 8
ld de, String_11a2cf
@@ -13367,11 +13368,11 @@ Function11a302: ; 11a302
call PlaceString
hlcoord 9, 4
ld de, wcd68
- ld bc, $8102
+ lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
hlcoord 14, 4
ld de, wcd67
- ld bc, $8102
+ lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ld a, $80
ld [wcd44], a
@@ -13727,13 +13728,13 @@ Function11a5b0: ; 11a5b0
Function11a5b9: ; 11a5b9
xor a
- ld [wcf83], a
- ld [wcf82], a
+ ld [wMenuBorderLeftCoord], a
+ ld [wMenuBorderTopCoord], a
ld a, $13
- ld [wcf85], a
+ ld [wMenuBorderRightCoord], a
ld a, $5
- ld [wcf84], a
- call Function1c00
+ ld [wMenuBorderBottomCoord], a
+ call BackUpTiles
hlcoord 0, 0, AttrMap
ld b, $6
ld c, $14
@@ -13752,14 +13753,14 @@ Function11a5b9: ; 11a5b9
Function11a5f5: ; 11a5f5
ld a, $e
- ld [wcf83], a
+ ld [wMenuBorderLeftCoord], a
ld a, $13
- ld [wcf85], a
+ ld [wMenuBorderRightCoord], a
ld a, $6
- ld [wcf82], a
+ ld [wMenuBorderTopCoord], a
ld a, $a
- ld [wcf84], a
- call Function1c00
+ ld [wMenuBorderBottomCoord], a
+ call BackUpTiles
hlcoord 14, 6, AttrMap
ld b, $5
ld c, $6
@@ -14274,13 +14275,13 @@ UnknownText_0x11ab8b: ; 0x11ab8b
done
; 0x11aba5
-UnknownText_0x11aba5: ; 0x11aba5
+Text_WhatLevelDoYouWantToChallenge: ; 0x11aba5
text "What level do you"
line "want to challenge?"
done
; 0x11abcb
-UnknownText_0x11abcb: ; 0x11abcb
+Text_CheckBattleRoomListByMaxLevel: ; 0x11abcb
text "Check BATTLE ROOM"
line "list by max level?"
done
@@ -14310,7 +14311,7 @@ UnknownText_0x11ac1f: ; 0x11ac1f
Function11ac3e: ; 11ac3e
call SpeechTextBox
call FadeToMenu
- callab Function8e814
+ callab InefficientlyClear121BytesAtwc300
call Function11ac51
call Function2b3c
ret
@@ -14327,10 +14328,10 @@ Function11ac51: ; 11ac51
push af
xor a
ld [VramState], a
- ld a, [$ffaa]
+ ld a, [hInMenu]
push af
ld a, $1
- ld [$ffaa], a
+ ld [hInMenu], a
xor a
ld [$ffde], a
ld [wcd49], a
@@ -14341,8 +14342,8 @@ Function11ac51: ; 11ac51
call Function11ad1b
call DelayFrame
.asm_11ac82
- call Functiona57
- ld a, [wcf63]
+ call JoyTextDelay
+ ld a, [wJumptableIndex]
bit 7, a
jr nz, .asm_11aca8
call Function11b314
@@ -14357,7 +14358,7 @@ Function11ac51: ; 11ac51
.asm_11aca8
call ClearSprites
pop af
- ld [$ffaa], a
+ ld [hInMenu], a
pop af
ld [VramState], a
pop af
@@ -14427,7 +14428,7 @@ Function11ad1b: ; 11ad1b
ld a, [wcfa9]
ld [wcd82], a
dec a
- ld [$ffb0], a
+ ld [hConnectedMapWidth], a
ld a, $10
ld [wc3b7], a
ld hl, Function8e83f
@@ -14443,7 +14444,7 @@ Function11ad1b: ; 11ad1b
xor a
call ByteFill
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a
@@ -14455,7 +14456,7 @@ Function11ad1b: ; 11ad1b
; 11ad6e
Function11ad6e: ; 11ad6e
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld hl, Jumptable_11ad78
call Function11b239
jp [hl]
@@ -14474,13 +14475,13 @@ Jumptable_11ad78: ; 11ad78
; 11ad8a
Function11ad8a: ; 11ad8a
- ld hl, wcf63
+ ld hl, wJumptableIndex
inc [hl]
ret
; 11ad8f
Function11ad8f: ; 11ad8f
- ld hl, wcf63
+ ld hl, wJumptableIndex
set 7, [hl]
ret
; 11ad95
@@ -14521,7 +14522,7 @@ Function11adc4:
ret z
call PlayClickSFX
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
jr .asm_11ae2e
.asm_11ade6
@@ -14642,7 +14643,7 @@ Function11ae98:
ld a, $7f
ld [hl], a
ld a, $1
- ld [wcf63], a
+ ld [wJumptableIndex], a
jr .asm_11aef7
.asm_11aec1
@@ -14733,7 +14734,7 @@ Function11af4e:
ld a, $7f
ld [hl], a
ld a, $1
- ld [wcf63], a
+ ld [wJumptableIndex], a
jr .asm_11afaa
.asm_11af77
@@ -14764,7 +14765,7 @@ Function11af4e:
cp $2
jr z, .asm_11af6a
ld a, $6
- ld [wcf63], a
+ ld [wJumptableIndex], a
xor a
ld [ScriptVar], a
@@ -15056,7 +15057,7 @@ Function11b0ff: ; 11b0ff
jr .asm_11b148
.asm_11b141
- ld hl, wcf63
+ ld hl, wJumptableIndex
ld a, $7
ld [hl], a
ret
@@ -15089,7 +15090,7 @@ Function11b0ff: ; 11b0ff
.asm_11b16c
ld [wcd30], a
ld a, $4
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
; 11b175
@@ -15098,7 +15099,7 @@ Function11b175: ; 11b175
ld d, a
ld a, [wc7d2]
ld e, a
- ld hl, $ffa9
+ ld hl, hJoyLast
ld a, [hl]
and $40
jr nz, .asm_11b19a
@@ -15253,7 +15254,7 @@ Function11b22a: ; 11b22a
; 11b236
Function11b236: ; 11b236
- jp Functionfb8
+ jp FillBoxWithByte
; 11b239
Function11b239: ; 11b239
@@ -15410,7 +15411,7 @@ Function11b314: ; 11b314
Function11b31b: ; 11b31b
ld hl, Unknown_11b350
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
cp $2
jr c, .asm_11b349
ld a, [wc7d1]
@@ -15418,7 +15419,7 @@ Function11b31b: ; 11b31b
jr nc, .asm_11b344
cp $3
jr c, .asm_11b349
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
cp $2
jr z, .asm_11b349
cp $3
@@ -15552,7 +15553,7 @@ Function11b3d9: ; 11b3d9
ld [hli], a
cp $41
jr c, .asm_11b42b
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
cp $4
jr z, .asm_11b43b
cp $5
@@ -15591,7 +15592,7 @@ Function11b444: ; 11b444
Function11b44b: ; 11b44b
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a
@@ -15603,14 +15604,14 @@ Function11b45c: ; 11b45c
.asm_11b45c
call Function11b46a
call DelayFrame
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
cp $4
jr nz, .asm_11b45c
ret
; 11b46a
Function11b46a: ; 11b46a
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, Jumptable_11b479
@@ -15779,11 +15780,11 @@ Function11b538: ; 11b538
ld [wcd2b], a
ld [bc], a
inc bc
- ld a, [wd84a]
+ ld a, [wSecretID]
ld [wcd2c], a
ld [bc], a
inc bc
- ld a, [wd84b]
+ ld a, [wSecretID + 1]
ld [wcd2d], a
ld [bc], a
inc bc
@@ -15812,7 +15813,7 @@ Function11b570: ; 11b570
.asm_11b57f
ld a, $4
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
; 11b585
@@ -15912,14 +15913,14 @@ Function11b64c: ; 11b64c
.asm_11b64c
call Function11b65a
call DelayFrame
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
cp $1
jr nz, .asm_11b64c
ret
; 11b65a
Function11b65a: ; 11b65a
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, Jumptable_11b669
@@ -16145,10 +16146,10 @@ Function11b7e5: ; 11b7e5
ld a, $1
ld [wd1e9], a
ld a, $2
- ld [InLinkBattle], a
+ ld [wLinkMode], a
callba Function421d8
xor a
- ld [InLinkBattle], a
+ ld [wLinkMode], a
callba Function14a58
ld a, $5
call GetSRAMBank
@@ -16529,7 +16530,7 @@ ENDC
sub $19
.asm_11c021
- ld hl, Unknown_11f332
+ ld hl, BTTrainerTexts
jr .asm_11c033
.asm_11c026
@@ -16676,7 +16677,7 @@ Function11c08f: ; 11c08f
Function11c0c6: ; 11c0c6
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld l, a
ld a, [wcf64]
ld h, a
@@ -16686,7 +16687,7 @@ Function11c0c6: ; 11c0c6
ld [hli], a
push de
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld a, $12
ld [wcf64], a
ld a, $6
@@ -16719,9 +16720,9 @@ Function11c0c6: ; 11c0c6
.asm_11c102
cp e
jr nc, .asm_11c11c
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
inc a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [hl], $4e
rra
jr c, .asm_11c113
@@ -16762,7 +16763,7 @@ Function11c0c6: ; 11c0c6
call PlaceWholeStringInBoxAtOnce
pop hl
ld a, l
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld a, h
ld [wcf64], a
ret
@@ -16831,13 +16832,13 @@ Function11c156: ; 11c156
; 11c1ab
Function11c1ab: ; 11c1ab
- ld a, [$ffaa]
+ ld a, [hInMenu]
push af
ld a, $1
- ld [$ffaa], a
+ ld [hInMenu], a
call Function11c1b9
pop af
- ld [$ffaa], a
+ ld [hInMenu], a
ret
; 11c1b9
@@ -16855,7 +16856,7 @@ Function11c1b9: ; 11c1b9
Function11c1ca: ; 11c1ca
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a
@@ -16934,10 +16935,10 @@ Function11c277: ; 11c277 (47:4277)
Function11c283: ; 11c283
.asm_11c283
- call Functiona57
+ call JoyTextDelay
ld a, [hJoyPressed]
ld [hJoypadPressed], a
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
bit 7, a
jr nz, .asm_11c2a2
call Function11c2ac
@@ -16952,7 +16953,7 @@ Function11c283: ; 11c283
; 11c2ac
Function11c2ac: ; 11c2ac
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, Jumptable_11c2bb
@@ -17153,7 +17154,7 @@ Function11c3ed: ; 11c3ed (47:43ed)
ld a, [de]
and $1
jr nz, .asm_11c42c
- ld de, $ffa9
+ ld de, hJoyLast
ld a, [de]
and $40
jr nz, .asm_11c47c
@@ -17218,7 +17219,7 @@ Function11c3ed: ; 11c3ed (47:43ed)
.asm_11c472
call Function11c4a5
.asm_11c475
- ld [wcf63], a
+ ld [wJumptableIndex], a
call PlayClickSFX
ret
.asm_11c47c
@@ -17325,7 +17326,7 @@ Function11c53d: ; 11c53d (47:453d)
and A_BUTTON
jr nz, .a
- ld de, $ffa9
+ ld de, hJoyLast
ld a, [de]
and D_UP
@@ -17382,7 +17383,7 @@ Function11c53d: ; 11c53d (47:453d)
.asm_11c59f
ld hl, wcd24
set 1, [hl]
- ld [wcf63], a
+ ld [wJumptableIndex], a
call PlayClickSFX
ret
@@ -17569,7 +17570,7 @@ Function11c675: ; 11c675 (47:4675)
ret
.select
- ld de, $ffa9
+ ld de, hJoyLast
ld a, [de]
and D_UP
jr nz, .asm_11c708
@@ -17598,7 +17599,7 @@ Function11c675: ; 11c675 (47:4675)
.asm_11c6fa
ld a, $15
.asm_11c6fc
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld hl, wcd24
set 3, [hl]
call PlayClickSFX
@@ -18118,7 +18119,7 @@ Function11c9c3: ; 11c9c3 (47:49c3)
ld hl, wcd24
set 4, [hl]
ld a, $4
- ld [wcf63], a
+ ld [wJumptableIndex], a
call PlayClickSFX
ret
.asm_11c9f7
@@ -18270,7 +18271,7 @@ Function11cab3: ; 11cab3 (47:4ab3)
ld [wcd2a], a
ret
.asm_11caf3
- ld hl, wcf63
+ ld hl, wJumptableIndex
set 7, [hl]
ret
.asm_11caf9
@@ -18279,7 +18280,7 @@ Function11cab3: ; 11cab3 (47:4ab3)
ld hl, wcd24
set 4, [hl]
ld a, $4
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld a, [wcd35]
cp $ff
ret nz
@@ -18388,7 +18389,7 @@ endr
ld d, a
hlcoord 1, 14
call PlaceString
- ld hl, wcf63
+ ld hl, wJumptableIndex
inc [hl]
inc hl
ld a, $10
@@ -18403,7 +18404,7 @@ endr
ld hl, wcd24
set 4, [hl]
ld a, $4
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
.asm_11cbeb
ld a, [hl]
@@ -18489,7 +18490,7 @@ Function11cd04: ; 11cd04 (47:4d04)
and a
ret z
ld a, $4
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
; 11cd10 (47:4d10)
@@ -18550,7 +18551,7 @@ Function11cd54: ; 11cd54 (47:4d54)
.asm_11cd7d
ld a, $15
.asm_11cd7f
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld hl, wcd24
set 5, [hl]
call PlayClickSFX
@@ -18643,7 +18644,7 @@ Function11ce2b: ; 11ce2b (47:4e2b)
and B_BUTTON
jr nz, .b
- ld de, $ffa9
+ ld de, hJoyLast
ld a, [de]
and D_UP
jr nz, .up
@@ -18691,7 +18692,7 @@ Function11ce2b: ; 11ce2b (47:4e2b)
.asm_11ce96
ld a, $13
.asm_11ce98
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld hl, wcd24
set 2, [hl]
call PlayClickSFX
@@ -18777,7 +18778,7 @@ String_11cf79: ; 11cf79
; 11cfb5
Function11cfb5: ; 11cfb5 (47:4fb5)
- ld hl, wcf63
+ ld hl, wJumptableIndex
inc [hl]
ret
; 11cfba (47:4fba)
@@ -20671,14 +20672,14 @@ Unknown_11f2f0:
db $01, $01, $00, $00, $00, $01
-Unknown_11f332:
- dw Unknown_11f338
- dw Unknown_11f36a
- dw Unknown_11f39c
+BTTrainerTexts: ; 11f332
+ dw BTTrainerGreetings
+ dw BTTrainerPlayerLostTexts
+ dw BTTrainerPlayerWonTexts
-Unknown_11f338: ; 11f338
- dw UnknownText_0x11f42e
- dw UnknownText_0x11f43d
+BTTrainerGreetings: ; 11f338
+ dw BattleTowerTextJump_0x11f42e
+ dw BattleTowerTextJump_0x11f43d
dw UnknownText_0x11f44c
dw UnknownText_0x11f45b
dw UnknownText_0x11f46a
@@ -20703,8 +20704,8 @@ Unknown_11f338: ; 11f338
dw UnknownText_0x11f587
dw UnknownText_0x11f596
-Unknown_11f36a: ; 11f36a
- dw UnknownText_0x11f433
+BTTrainerPlayerLostTexts: ; 11f36a
+ dw BattleTowerTextJump_0x11f433
dw UnknownText_0x11f442
dw UnknownText_0x11f451
dw UnknownText_0x11f460
@@ -20730,7 +20731,7 @@ Unknown_11f36a: ; 11f36a
dw UnknownText_0x11f58c
dw UnknownText_0x11f59b
-Unknown_11f39c: ; 11f39c
+BTTrainerPlayerWonTexts: ; 11f39c
dw UnknownText_0x11f438
dw UnknownText_0x11f447
dw UnknownText_0x11f456
@@ -20815,20 +20816,20 @@ Unknown_11f410: ; 11f410
dw UnknownText_0x11f681
-UnknownText_0x11f42e: ; 0x11f42e
- text_jump UnknownText_0x1ec000
+BattleTowerTextJump_0x11f42e: ; 0x11f42e
+ text_jump BattleTowerText_0x1ec000
db "@"
-UnknownText_0x11f433: ; 0x11f433
- text_jump UnknownText_0x1ec03b
+BattleTowerTextJump_0x11f433: ; 0x11f433
+ text_jump BattleTowerText_0x1ec03b
db "@"
UnknownText_0x11f438: ; 0x11f438
text_jump UnknownText_0x1ec060
db "@"
-UnknownText_0x11f43d: ; 0x11f43d
- text_jump UnknownText_0x1ec080
+BattleTowerTextJump_0x11f43d: ; 0x11f43d
+ text_jump BattleTowerText_0x1ec080
db "@"
UnknownText_0x11f442: ; 0x11f442
@@ -21326,7 +21327,7 @@ Function16c000: ; 16c000
Function16c031: ; 16c031
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [wcf64], a
ld [DefaultFlypoint], a
ld [wd003], a
@@ -22186,7 +22187,7 @@ Function16d43b: ; 16d43b
call GetSGBLayout
call Function32f9
call WaitBGMap
- call Functiona36
+ call JoyWaitAorB
call Function1d7d
ret
; 16d465
@@ -22296,7 +22297,7 @@ Function16d696: ; 16d696
Function16d69a: ; 16d69a
ld de, GFX_16cfc1 + $300
- ld hl, $9760
+ ld hl, VTiles2 tile $76
lb bc, BANK(GFX_16cfc1), 8
call Get2bpp
ret
@@ -22361,7 +22362,7 @@ Function16d70c: ; 16d70c
Function16d713: ; 16d713
push bc
push af
- ld a, [$ffa9]
+ ld a, [hJoyLast]
and $f0
ld b, a
ld a, [hJoyPressed]
@@ -22517,7 +22518,7 @@ Function16d7e7: ; 16d7e7
callba Function8cf62
.asm_16d7f4
- call Functiona57
+ call JoyTextDelay
call Function16d713
and a
ret z
@@ -22700,9 +22701,9 @@ Function170139: ; 170139
ld [hli], a
ld a, [PlayerID + 1]
ld [hli], a
- ld a, [wd84a]
+ ld a, [wSecretID]
ld [hli], a
- ld a, [wd84b]
+ ld a, [wSecretID + 1]
ld [hli], a
ld e, l
ld d, h
@@ -22783,7 +22784,7 @@ Function17020c: ; 17020c
Function170215: ; 170215
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
call Function17022c
ret
; 17021d
@@ -22794,7 +22795,7 @@ Function17021d: ; 17021d
Function17021e: ; 17021e
xor a
- ld [wcf63], a
+ ld [wJumptableIndex], a
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a
@@ -22803,19 +22804,19 @@ Function17021e: ; 17021e
Function17022c: ; 17022c
.asm_17022c
- call Function17023a
+ call Jumpto_BattleTowerBattleFunction
call DelayFrame
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
cp $1
jr nz, .asm_17022c
ret
; 17023a
-Function17023a: ; 17023a
- ld a, [wcf63]
+Jumpto_BattleTowerBattleFunction: ; 17023a
+ ld a, [wJumptableIndex]
ld e, a
ld d, 0
- ld hl, Jumptable_170249
+ ld hl, Jumptable_BattleTowerBattleFunctions
rept 2
add hl, de
endr
@@ -22825,22 +22826,22 @@ endr
jp [hl]
; 170249
-Jumptable_170249: ; 170249
- dw Function17024d
- dw Function1704c9
+Jumptable_BattleTowerBattleFunctions: ; 170249
+ dw RunBattleTowerBattle
+ dw SkipBattleTowerBattle
; 17024d
-Function17024d: ; 17024d
+RunBattleTowerBattle: ; 17024d
ld a, [Options]
push af
ld hl, Options
set 6, [hl]
- ld a, [wcfc0]
+ ld a, [InBattleTowerBattle]
push af
or $1
- ld [wcfc0], a
+ ld [InBattleTowerBattle], a
xor a
- ld [InLinkBattle], a
+ ld [wLinkMode], a
callba Mobile_HealParty
callba HealParty
call Function1702b7
@@ -22848,17 +22849,17 @@ Function17024d: ; 17024d
predef StartBattle
callba LoadPokemonData
callba HealParty
- ld a, [wd0ee]
+ ld a, [wBattleResult]
ld [ScriptVar], a
and a
jr nz, .asm_1702a9
- ld a, $1
+ ld a, BANK(sNrOfBeatenBattleTowerTrainers)
call GetSRAMBank
- ld a, [$be46]
- ld [wcf64], a
+ ld a, [sNrOfBeatenBattleTowerTrainers]
+ ld [wNrOfBeatenBattleTowerTrainers], a ; wcf64
call CloseSRAM
ld hl, StringBuffer3
- ld a, [wcf64]
+ ld a, [wNrOfBeatenBattleTowerTrainers] ; wcf64
add $f7
ld [hli], a
ld a, $50
@@ -22866,64 +22867,66 @@ Function17024d: ; 17024d
.asm_1702a9
pop af
- ld [wcfc0], a
+ ld [InBattleTowerBattle], a
pop af
ld [Options], a
ld a, $1
- ld [wcf63], a
+ ld [wJumptableIndex], a
ret
-; 1702b7
+
Function1702b7: ; 1702b7
- call Function1704a2
- ld de, $c643
- ld c, $b
+; Initialise the BattleTower-Trainer and his Pkmn
+ call CopyBTTrainer_FromBT_OTrainer_TowBT_OTTempCopy
+ ld de, wBT_OTTempCopy + wBT_OTTempCopy_Pkmn1Name ; $c643
+ ld c, PKMN_NAME_LENGTH
callba Function17d073
jr nc, .asm_1702db
- ld a, [$c608 + 11]
+
+ ld a, [wBT_OTTempCopy + wBT_OTTempCopy_Pkmn1]
ld [wd265], a
call GetPokemonName
ld l, e
ld h, d
- ld de, $c643
- ld bc, $000b
+ ld de, wBT_OTTempCopy + wBT_OTTempCopy_Pkmn1Name ; $c643
+ ld bc, PKMN_NAME_LENGTH
call CopyBytes
.asm_1702db
- ld de, $c67e
- ld c, $b
+ ld de, wBT_OTTempCopy + wBT_OTTempCopy_Pkmn2Name ; $c67e
+ ld c, PKMN_NAME_LENGTH
callba Function17d073
jr nc, .asm_1702fc
- ld a, [$c64e]
+ ld a, [wBT_OTTempCopy + wBT_OTTempCopy_Pkmn2] ; [$c64e]
ld [wd265], a
call GetPokemonName
ld l, e
ld h, d
- ld de, $c67e
- ld bc, $000b
+ ld de, wBT_OTTempCopy + wBT_OTTempCopy_Pkmn2Name ; $c67e
+ ld bc, PKMN_NAME_LENGTH
call CopyBytes
.asm_1702fc
- ld de, $c686 + 51
- ld c, $b
+ ld de, wBT_OTTempCopy + wBT_OTTempCopy_Pkmn3Name ; $c686 + 51 = $c6b9
+ ld c, PKMN_NAME_LENGTH
callba Function17d073
jr nc, .asm_17031d
- ld a, [$c689]
+ ld a, [wBT_OTTempCopy + wBT_OTTempCopy_Pkmn3] ; [$c689]
ld [wd265], a
call GetPokemonName
ld l, e
ld h, d
- ld de, $c686 + 51
- ld bc, $000b
+ ld de, wBT_OTTempCopy + wBT_OTTempCopy_Pkmn3Name ; $c686 + 51 = $c6b9
+ ld bc, PKMN_NAME_LENGTH
call CopyBytes
.asm_17031d
ld a, $50
- ld [$c64d], a
- ld [$c688], a
- ld [$c68a + 57], a
+ ld [wBT_OTTempCopy + wBT_OTTempCopy_45], a ; $c64d
+ ld [wBT_OTTempCopy + wBT_OTTempCopy_80], a ; $c688
+ ld [wBT_OTTempCopy + wBT_OTTempCopy_BB], a ; $c68a + 57 = $c6c3
call Function170c98
- ld de, $c608
+ ld de, wBT_OTTempCopy
ld c, $a
callba Function17d073
jr nc, .asm_17033d
@@ -22931,7 +22934,7 @@ Function1702b7: ; 1702b7
jr .asm_170340
.asm_17033d
- ld hl, $c608
+ ld hl, wBT_OTTempCopy ; 0xc608
.asm_170340
ld de, wd26b
@@ -22939,16 +22942,18 @@ Function1702b7: ; 1702b7
call CopyBytes
ld a, $50
ld [de], a
- ld hl, $c608 + 10
+ ld hl, wBT_OTTempCopy + wBT_OTTempCopy_TrainerClass
ld a, [hli]
ld [OtherTrainerClass], a
ld a, $ea
ld [BGMapBuffer], a
ld a, $d3
ld [wcd21], a
+
+ ; Copy Pkmn into Memory from the address in hl
ld de, OTPartyMon1Species
ld bc, OTPartyCount
- ld a, $3
+ ld a, BATTLETOWER_NROFPKMNS ; Number of Pkmn the BattleTower-Trainer has
ld [bc], a
inc bc
.asm_170367
@@ -22957,7 +22962,7 @@ Function1702b7: ; 1702b7
ld [bc], a
inc bc
push bc
- ld bc, $0030
+ ld bc, BATTLETOWER_PKMNSTRUCTLENGTH
call CopyBytes
push de
ld a, [BGMapBuffer]
@@ -23163,27 +23168,29 @@ Unknown_17047e:
db $0f, $05, $14, $07
db $05, $05, $11, $0c
db $0c, $06, $06, $04
-; 1704a2
-Function1704a2: ; 1704a2
+
+CopyBTTrainer_FromBT_OTrainer_TowBT_OTTempCopy: ; 1704a2
+; copy the BattleTower-Trainer data that lies at 'BT_OTrainer' to 'wBT_OTTempCopy'
ld a, [rSVBK]
push af
ld a, $3
ld [rSVBK], a
- ld hl, LYOverrides
- ld de, $c608
- ld bc, $00e0
+ ld hl, BT_OTrainer ; $d100
+ ld de, wBT_OTTempCopy ; $c608
+ ld bc, BT_OTrainerEnd - BT_OTrainer ; $e0 = $a + $1 + 3*$3b + $24
+ ; = $a + $1 + BATTLETOWER_NROFPKMNS * (BATTLETOWER_PKMNSTRUCTLENGTH + PKMN_NAME_LENGTH) + BATTLETOWER_TRAINERDATALENGTH
call CopyBytes
pop af
ld [rSVBK], a
- ld a, $1
+ ld a, BANK(s1_be45)
call GetSRAMBank
ld a, $2
- ld [$be45], a
- ld hl, $be46
+ ld [s1_be45], a
+ ld hl, sNrOfBeatenBattleTowerTrainers
inc [hl]
call CloseSRAM
-Function1704c9:
+SkipBattleTowerBattle: ; 1704c9
ret
; 1704ca
@@ -23221,8 +23228,8 @@ Function1704f1: ; 1704f1
call ClearSprites
call ClearScreen
.asm_1704fa
- call Functiona57
- ld a, [wcf63]
+ call JoyTextDelay
+ ld a, [wJumptableIndex]
bit 7, a
jr nz, .asm_17050f
call Function170510
@@ -23234,7 +23241,7 @@ Function1704f1: ; 1704f1
; 170510
Function170510: ; 170510
- ld a, [wcf63]
+ ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, Jumptable_17051f
@@ -23256,14 +23263,17 @@ Jumptable_17051f: ; 17051f
Function170525: ; 170525
ld a, $5
call GetSRAMBank
+
ld hl, $a89c
ld de, StringBuffer3
ld bc, $0016
call CopyBytes
+
ld hl, $a8b2
ld de, $c608
ld bc, $0096
call CopyBytes
+
call CloseSRAM
hlcoord 1, 1
ld de, StringBuffer3
@@ -23281,10 +23291,12 @@ Function170525: ; 170525
call Function1705f0
jr Function1705b2
+
Function170571:
call Function32f9
call Function1705b2
+
Function170577:
ld hl, hJoyPressed
ld a, [hl]
@@ -23320,12 +23332,12 @@ Function170577:
ret
.asm_1705ac
- ld hl, wcf63
+ ld hl, wJumptableIndex
set 7, [hl]
ret
Function1705b2:
- ld hl, wcf63
+ ld hl, wJumptableIndex
inc [hl]
ret
; 1705b7
@@ -23500,56 +23512,62 @@ endr
Jumptable_170696: ; 170696 (5c:4696)
- dw Function17075f
- dw Function170788
- dw Function170778
- dw Function170799
- dw Function17079d
- dw Function1707ac
- dw Function1707f4
- dw Function170868
- dw Function170881
- dw Function17089a
- dw Function1708b1
- dw Function1708b9
- dw Function1708c8
- dw Function1708f0
- dw Function17093c
- dw Function1709aa
- dw Function1709bb
- dw Function170a9c
- dw Function170aa0
- dw Function170aaf
- dw Function170abe
- dw Function170ad7
- dw Function170807
- dw Function17081d
- dw Function170ae8
- dw Function170b16
- dw Function1706d6
- dw Function1706ee
- dw Function17071b
- dw Function170729
- dw Function17073e
- dw Function170737
-
-
-Function1706d6: ; 1706d6 (5c:46d6)
- ld a, $1
+ dw Function17075f ; 0x00
+ dw Function170788 ; 0x01
+ dw Function170778 ; 0x02
+ dw Function170799 ; 0x03
+ dw Function17079d ; 0x04
+ dw Function1707ac ; 0x05
+ dw Function1707f4 ; 0x06
+ dw Function170868 ; 0x07
+ dw Function170881 ; 0x08
+ dw Function17089a ; 0x09
+ dw Function1708b1 ; 0x0a
+ dw Function1708b9 ; 0x0b
+ dw Function1708c8 ; 0x0c
+ dw Function1708f0 ; 0x0d
+ dw Function17093c ; 0x0e
+ dw Function1709aa ; 0x0f
+ dw Function1709bb ; 0x10
+ dw Function170a9c ; 0x11
+ dw Function170aa0 ; 0x12
+ dw Function170aaf ; 0x13
+ dw Function170abe ; 0x14
+ dw Function170ad7 ; 0x15
+ dw Function170807 ; 0x16
+ dw Function17081d ; 0x17
+ dw Function170ae8 ; 0x18
+ dw Function170b16 ; 0x19
+ dw ResetBattleTowerTrainersSRAM ; 0x1a
+ dw Function1706ee ; 0x1b
+ dw Function17071b ; 0x1c
+ dw Function170729 ; 0x1d
+ dw Function17073e ; 0x1e
+ dw Function170737 ; 0x1f
+
+
+; Reset the save memory for BattleTower-Trainers (Counter and all 7 TrainerBytes)
+ResetBattleTowerTrainersSRAM: ; 1706d6 (5c:46d6)
+ ld a, BANK(sBTTrainers)
call GetSRAMBank
+
ld a, $ff
- ld hl, $be48
- ld bc, $7
+ ld hl, sBTTrainers
+ ld bc, BATTLETOWER_NROFTRAINERS
call ByteFill
+
xor a
- ld [$be46], a
+ ld [sNrOfBeatenBattleTowerTrainers], a
+
call CloseSRAM
+
ret
Function1706ee: ; 1706ee (5c:46ee)
- ld a, $1
+ ld a, BANK(sbe50)
call GetSRAMBank
- ld a, [$be50]
+
+ ld a, [sbe50]
call CloseSRAM
ld [ScriptVar], a
ld hl, NumItems
@@ -23575,18 +23593,18 @@ Function1706ee: ; 1706ee (5c:46ee)
ret
Function17071b: ; 17071b (5c:471b)
- ld a, $1
+ ld a, BANK(s1_be45)
call GetSRAMBank
ld a, $3
- ld [$be45], a
+ ld [s1_be45], a
call CloseSRAM
ret
Function170729: ; 170729 (5c:4729)
- ld a, $1
+ ld a, BANK(s1_be45)
call GetSRAMBank
ld a, $4
- ld [$be45], a
+ ld [s1_be45], a
call CloseSRAM
ret
@@ -23606,10 +23624,10 @@ Function17073e: ; 17073e (5c:473e)
cp $1e
jr z, Function17073e
push af
- ld a, $1
+ ld a, BANK(sbe50)
call GetSRAMBank
pop af
- ld [$be50], a
+ ld [sbe50], a
call CloseSRAM
ret
@@ -23618,17 +23636,17 @@ Function17075f: ; 17075f (5c:475f)
ld a, [ScriptVar]
and a
ret z
- ld a, $1
+ ld a, BANK(sbe4f)
call GetSRAMBank
- ld a, [$be4f]
+ ld a, [sbe4f]
and $2
ld [ScriptVar], a
call CloseSRAM
ret
Function170778: ; 170778 (5c:4778)
- ld hl, $be45
- ld a, $1
+ ld hl, s1_be45
+ ld a, BANK(s1_be45)
call GetSRAMBank
ld a, [hl]
ld [ScriptVar], a
@@ -23636,11 +23654,11 @@ Function170778: ; 170778 (5c:4778)
ret
Function170788: ; 170788 (5c:4788)
- ld a, $1
+ ld a, BANK(sbe4f)
call GetSRAMBank
- ld a, [$be4f]
+ ld a, [sbe4f]
or $2
- ld [$be4f], a
+ ld [sbe4f], a
call CloseSRAM
ret
@@ -23651,10 +23669,10 @@ Function170799: ; 170799 (5c:4799)
Function17079d: ; 17079d (5c:479d)
ld c, $0
asm_17079f: ; 17079f (5c:479f)
- ld a, $1
+ ld a, BANK(s1_be45)
call GetSRAMBank
ld a, c
- ld [$be45], a
+ ld [s1_be45], a
call CloseSRAM
ret
@@ -23763,27 +23781,27 @@ Function17081d: ; 17081d (5c:481d)
ret
Function170868: ; 170868 (5c:4868)
- ld a, $1
+ ld a, BANK(sbe47)
call GetSRAMBank
ld a, [rSVBK] ; $ff00+$70
push af
ld a, $3
ld [rSVBK], a ; $ff00+$70
ld a, [wd000 + $800]
- ld [$be47], a
+ ld [sbe47], a
pop af
ld [rSVBK], a ; $ff00+$70
call CloseSRAM
ret
Function170881: ; 170881 (5c:4881)
- ld a, $1
+ ld a, BANK(sbe47)
call GetSRAMBank
ld a, [rSVBK] ; $ff00+$70
push af
ld a, $3
ld [rSVBK], a ; $ff00+$70
- ld a, [$be47]
+ ld a, [sbe47]
ld [wd000 + $800], a
pop af
ld [rSVBK], a ; $ff00+$70
@@ -23815,9 +23833,9 @@ Function1708b1: ; 1708b1 (5c:48b1)
ret
Function1708b9: ; 1708b9 (5c:48b9)
- ld a, $1
+ ld a, BANK(s1_be3c)
call GetSRAMBank
- ld a, [$be3c]
+ ld a, [s1_be3c]
ld [ScriptVar], a
call CloseSRAM
ret
@@ -24121,20 +24139,20 @@ Function170abe: ; 170abe (5c:4abe)
ld a, [ScriptVar]
and a
ret z
- ld a, $1
+ ld a, BANK(sbe4f)
call GetSRAMBank
- ld a, [$be4f]
+ ld a, [sbe4f]
and $1
ld [ScriptVar], a
call CloseSRAM
ret
Function170ad7: ; 170ad7 (5c:4ad7)
- ld a, $1
+ ld a, BANK(sbe4f)
call GetSRAMBank
- ld a, [$be4f]
+ ld a, [sbe4f]
or $1
- ld [$be4f], a
+ ld [sbe4f], a
call CloseSRAM
ret
@@ -24178,8 +24196,8 @@ Function170b16: ; 170b16 (5c:4b16)
ld [ScriptVar], a
ret
-Function170b44: ; 170b44
- callba Function1f8000
+Function_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
+ callba Function_LoadOpponentTrainerAndPokemons
ld a, [rSVBK]
push af
ld a, $3
@@ -24195,6 +24213,9 @@ Function170b44: ; 170b44
add hl, bc
ld a, [hl]
ld [wcd49], a
+
+; Load sprite of the opponent trainer
+; because s/he is chosen randomly and appears out of nowhere
ld a, [ScriptVar]
dec a
sla a
@@ -24237,8 +24258,8 @@ Function170bd2: ; 170bd2
ret
; 170bd3
-Function170bd3: ; 170bd3
- callba Function8b201
+SpecialCheckForBattleTowerRules: ; 170bd3
+ callba CheckForBattleTowerRules
jr c, .asm_170bde
xor a
jr .asm_170be0
@@ -24277,7 +24298,7 @@ Function170c06: ; 170c06
ld a, $5
call GetSRAMBank
ld hl, $a894
- ld a, [wd0ee]
+ ld a, [wBattleResult]
and a
jr nz, .asm_170c15
inc [hl]
@@ -24465,7 +24486,7 @@ Function170d02: ; 170d02
ld a, $1
ld [rVBK], a
ld de, GFX_171848
- ld hl, $8c10
+ ld hl, VTiles1 tile $41
lb bc, BANK(GFX_171848), $18
call Get2bpp
xor a
@@ -24483,13 +24504,13 @@ GFX_171848:
INCBIN "gfx/unknown/171848.2bpp"
Function1719c8: ; 1719c8 (5c:59c8)
- ld a, [$ffaa]
+ ld a, [hInMenu]
push af
ld a, $1
- ld [$ffaa], a
+ ld [hInMenu], a
call Function1719d6
pop af
- ld [$ffaa], a
+ ld [hInMenu], a
ret
Function1719d6: ; 1719d6 (5c:59d6)
@@ -24518,7 +24539,7 @@ Function1719ed: ; 1719ed (5c:59ed)
ret
Function171a11: ; 171a11 (5c:5a11)
- call Functiona57
+ call JoyTextDelay
ld a, [wcd49]
bit 7, a
jr nz, .asm_171a2c
@@ -24780,7 +24801,7 @@ Function171beb: ; 171beb (5c:5beb)
ld hl, MenuDataHeader_171c6b
call LoadMenuDataHeader
call Function1cbb
- call Function1cfd
+ call GetMemTileCoord
callba Function104061
hlcoord 1, 14
ld de, String_171c73
@@ -24848,11 +24869,11 @@ String_171c73: ; 171c73
Function171c87: ; 171c87 (5c:5c87)
call DisableLCD
ld hl, GFX_171db1
- ld de, $9000
+ ld de, VTiles2 tile $00
ld bc, $6e0
call CopyBytes
ld hl, LZ_172abd
- ld de, $8000
+ ld de, VTiles0 tile $00
call Decompress
call EnableLCD
ld hl, Tilemap_172491
@@ -24920,11 +24941,11 @@ endr
Function171d2b: ; 171d2b (5c:5d2b)
call DisableLCD
ld hl, GFX_171db1
- ld de, $9000
+ ld de, VTiles2 tile $00
ld bc, $6e0
call CopyBytes
ld hl, LZ_172abd
- ld de, $8000
+ ld de, VTiles0 tile $00
call Decompress
call EnableLCD
ld hl, Tilemap_172685
@@ -25019,7 +25040,7 @@ Function172e78: ; 172e78 (5c:6e78)
call ByteFill
call DisableLCD
ld hl, GFX_172f1f
- ld de, $9000
+ ld de, VTiles2 tile $00
ld bc, $610
call CopyBytes
call EnableLCD
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 11:14:54 +0000