mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
More mobile-related labels; remove unneeded map object constants
This commit is contained in:
PikalaxALT
parent
7683b78fb4
commit
f485a45cda
@ -4,6 +4,7 @@ INCLUDE "gbhw.asm"
|
||||
INCLUDE "hram.asm"
|
||||
|
||||
INCLUDE "constants/wram_constants.asm"
|
||||
INCLUDE "constants/sram_constants.asm"
|
||||
INCLUDE "constants/pokemon_constants.asm"
|
||||
INCLUDE "constants/type_constants.asm"
|
||||
INCLUDE "constants/move_constants.asm"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
const ENGINE_CREDITS_SKIP
|
||||
const ENGINE_BUG_CONTEST_ON ; 10
|
||||
const ENGINE_BUG_CONTEST_TIMER
|
||||
const ENGINE_12
|
||||
const ENGINE_SAFARI_ZONE
|
||||
const ENGINE_ROCKETS_IN_RADIO_TOWER
|
||||
const ENGINE_BIKE_SHOP_CALL_ENABLED
|
||||
const ENGINE_GIVE_POKERUS
|
||||
|
||||
3
constants/sram_constants.asm
Executable file
3
constants/sram_constants.asm
Executable file
@ -0,0 +1,3 @@
|
||||
; Mobile bank 5
|
||||
sMobileLoginPassword EQU $aa4b
|
||||
LOGIN_PASSWORD_LENGTH EQU 17
|
||||
@ -118,7 +118,7 @@ ENDM
|
||||
engine_flag StatusFlags, 6 ; credits skip
|
||||
engine_flag StatusFlags, 7 ; bug contest on ; $10
|
||||
engine_flag StatusFlags2, 2 ; bug contest timer
|
||||
engine_flag StatusFlags2, 1 ; ???
|
||||
engine_flag StatusFlags2, 1 ; safari zone?
|
||||
engine_flag StatusFlags2, 0 ; rockets in radio tower
|
||||
engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
|
||||
engine_flag StatusFlags2, 5 ; give pokerus
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
WarpToSpawnPoint:: ; 97c28
|
||||
ld hl, StatusFlags2
|
||||
res 1, [hl] ; ??
|
||||
res 1, [hl] ; safari zone?
|
||||
res 2, [hl] ; bug contest
|
||||
ret
|
||||
; 97c30
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
CeladonDeptStoreElevator_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
CeladonMansion2F_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
CeladonPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
CeruleanPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
CinnabarPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
DragonsDen1F_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
FuchsiaPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
GoldenrodDeptStoreElevator_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -146,10 +146,10 @@ GoldenrodGameCornerTMVendorMenuData:
|
||||
db $40 ; flags
|
||||
db 02, 00 ; start coords
|
||||
db 11, 15 ; end coords
|
||||
dw MenuData2_0x56cd1
|
||||
dw .MenuData2
|
||||
db 1 ; default option
|
||||
|
||||
MenuData2_0x56cd1:
|
||||
.MenuData2
|
||||
db $80 ; flags
|
||||
db 4 ; items
|
||||
db "TM25 5500@"
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
LavenderPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
MobileBattleRoom_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
MobileTradeRoomMobile_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
PewterPokeCEnter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RedsHouse2F_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route10North_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route10PokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route16_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route22_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route23_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route28_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route6UndergroundEntrance_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Route7_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphAerodactylChamber_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphAerodactylWordRoom_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphHoOhChamber_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphHoOhWordRoom_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphKabutoWordRoom_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphOmanyteChamber_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
RuinsofAlphOmanyteWordRoom_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
SafariZoneBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
SafariZoneFuchsiaGateBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
SafariZoneMainOffice_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
SaffronPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
SilverCaveOutside_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
TinTower2F_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
Underground_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
VermilionPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
ViridianPokeCenter2FBeta_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
WhirlIslandCave_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
WhirlIslandNW_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
const_value set 2
|
||||
|
||||
WhirlIslandSE_MapScriptHeader:
|
||||
.MapTriggers:
|
||||
|
||||
@ -66,20 +66,20 @@ InitMobileProfile: ; 4802f (12:402f)
|
||||
ld c, $12
|
||||
call Function48cdc
|
||||
hlcoord 2, 4
|
||||
ld de, String_48482
|
||||
ld de, MobileString_Gender
|
||||
call PlaceString
|
||||
.asm_480d7
|
||||
hlcoord 2, 6
|
||||
ld de, String_48489
|
||||
ld de, MobileString_Age
|
||||
call PlaceString
|
||||
hlcoord 2, 8
|
||||
ld de, String_4848d
|
||||
ld de, MobileString_Address
|
||||
call PlaceString
|
||||
hlcoord 2, 10
|
||||
ld de, String_48495
|
||||
ld de, MobileString_ZipCode
|
||||
call PlaceString
|
||||
hlcoord 2, 12
|
||||
ld de, String_4849e
|
||||
ld de, MobileString_OK
|
||||
call PlaceString
|
||||
ld a, [wd002]
|
||||
bit 6, a
|
||||
@ -109,7 +109,7 @@ InitMobileProfile: ; 4802f (12:402f)
|
||||
ld c, $12
|
||||
call TextBox
|
||||
hlcoord 1, 16
|
||||
ld de, String_48275
|
||||
ld de, MobileString_PersonalInfo
|
||||
call PlaceString
|
||||
call Function48187
|
||||
call WaitBGMap2
|
||||
@ -163,7 +163,7 @@ Function48187: ; 48187 (12:4187)
|
||||
.asm_481a2
|
||||
push de
|
||||
hlcoord 2, 12
|
||||
ld de, String_4849e
|
||||
ld de, MobileString_OK
|
||||
call PlaceString
|
||||
pop de
|
||||
.asm_481ad
|
||||
@ -203,13 +203,13 @@ Function48187: ; 48187 (12:4187)
|
||||
jr nz, .asm_48201
|
||||
.asm_481f8
|
||||
hlcoord 11, 10
|
||||
ld de, String_48202
|
||||
ld de, .String_TellLater
|
||||
call PlaceString
|
||||
.asm_48201
|
||||
ret
|
||||
; 48202 (12:4202)
|
||||
|
||||
String_48202: ; 48202
|
||||
.String_TellLater: ; 48202
|
||||
db "Tell Later@"
|
||||
; 4820d
|
||||
|
||||
@ -246,7 +246,7 @@ Function4820d: ; 4820d (12:420d)
|
||||
ld b, $2
|
||||
ld c, $12
|
||||
call ClearBox
|
||||
ld de, String_484a1
|
||||
ld de, MobileString_ProfileChanged
|
||||
hlcoord 1, 16
|
||||
call PlaceString
|
||||
call WaitBGMap
|
||||
@ -269,7 +269,7 @@ Function48272: ; 48272 (12:4272)
|
||||
jp Function4840c
|
||||
; 48275 (12:4275)
|
||||
|
||||
String_48275: ; 48275
|
||||
MobileString_PersonalInfo: ; 48275
|
||||
db "Personal Info@"
|
||||
; 48283
|
||||
|
||||
@ -282,7 +282,7 @@ Function48283: ; 48283 (12:4283)
|
||||
asm_4828d: ; 4828d (12:428d)
|
||||
call Function48283
|
||||
hlcoord 1, 16
|
||||
ld de, String_484b1
|
||||
ld de, MobileDesc_Gender
|
||||
call PlaceString
|
||||
ld hl, MenuDataHeader_0x484f1
|
||||
call LoadMenuDataHeader
|
||||
@ -334,7 +334,7 @@ asm_4828d: ; 4828d (12:428d)
|
||||
Function48304: ; 48304 (12:4304)
|
||||
call Function48283
|
||||
hlcoord 1, 16
|
||||
ld de, String_484cf
|
||||
ld de, MobileDesc_Address
|
||||
call PlaceString
|
||||
ld hl, MenuDataHeader_0x48504
|
||||
call LoadMenuDataHeader
|
||||
@ -489,7 +489,7 @@ Function4840c: ; 4840c (12:440c)
|
||||
call Function48187
|
||||
call Function48283
|
||||
hlcoord 1, 16
|
||||
ld de, String_48275
|
||||
ld de, MobileString_PersonalInfo
|
||||
call PlaceString
|
||||
call Function486bf
|
||||
pop bc
|
||||
@ -498,33 +498,33 @@ Function4840c: ; 4840c (12:440c)
|
||||
ld a, [wd002]
|
||||
bit 6, a
|
||||
jr nz, .asm_48437
|
||||
ld b, $9
|
||||
ld c, $1
|
||||
ld b, 9
|
||||
ld c, 1
|
||||
hlcoord 1, 4
|
||||
call ClearBox
|
||||
jp Function48157
|
||||
.asm_48437
|
||||
ld b, $7
|
||||
ld c, $1
|
||||
ld b, 7
|
||||
ld c, 1
|
||||
hlcoord 1, 6
|
||||
call ClearBox
|
||||
jp Function48157
|
||||
|
||||
Function48444: ; 48444 (12:4444)
|
||||
Mobile12_Bin2Dec: ; 48444 (12:4444)
|
||||
push bc
|
||||
push af
|
||||
push de
|
||||
push hl
|
||||
ld hl, Unknown_4845d
|
||||
.asm_4844b
|
||||
ld hl, .DigitStrings
|
||||
.loop
|
||||
and a
|
||||
jr z, .asm_48453
|
||||
jr z, .got_string
|
||||
rept 2
|
||||
inc hl
|
||||
endr
|
||||
dec a
|
||||
jr .asm_4844b
|
||||
.asm_48453
|
||||
jr .loop
|
||||
.got_string
|
||||
ld d, h
|
||||
ld e, l
|
||||
pop hl
|
||||
@ -535,7 +535,7 @@ endr
|
||||
ret
|
||||
; 4845d (12:445d)
|
||||
|
||||
Unknown_4845d: ; 4845d
|
||||
.DigitStrings: ; 4845d
|
||||
; 4845d
|
||||
db "0@"
|
||||
db "1@"
|
||||
@ -549,17 +549,17 @@ Unknown_4845d: ; 4845d
|
||||
db "9@"
|
||||
; 48471
|
||||
|
||||
MobileProfileString: db " Mobile Profile@"
|
||||
String_48482: db "Gender@"
|
||||
String_48489: db "Age@"
|
||||
String_4848d: db "Address@"
|
||||
String_48495: db "Zip Code@"
|
||||
String_4849e: db "OK@"
|
||||
String_484a1: db "Profile Changed@"
|
||||
String_484b1: db "Boy or girl?@"
|
||||
String_484be: db "How old are you?@"
|
||||
String_484cf: db "Where do you live?@"
|
||||
String_484e2: db "Your zip code?@"
|
||||
MobileProfileString: db " Mobile Profile@"
|
||||
MobileString_Gender: db "Gender@"
|
||||
MobileString_Age: db "Age@"
|
||||
MobileString_Address: db "Address@"
|
||||
MobileString_ZipCode: db "Zip Code@"
|
||||
MobileString_OK: db "OK@"
|
||||
MobileString_ProfileChanged: db "Profile Changed@"
|
||||
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
|
||||
|
||||
MenuDataHeader_0x484f1: ; 0x484f1
|
||||
@ -811,7 +811,7 @@ endr
|
||||
Function4876f: ; 4876f (12:476f)
|
||||
call Function48283
|
||||
hlcoord 1, 16
|
||||
ld de, String_484be
|
||||
ld de, MobileDesc_Age
|
||||
call PlaceString
|
||||
ld hl, MenuDataHeader_0x48509
|
||||
call LoadMenuDataHeader
|
||||
@ -1012,7 +1012,7 @@ INCBIN "gfx/unknown/0488cb.2bpp"
|
||||
Function488d3: ; 488d3 (12:48d3)
|
||||
call Function48283
|
||||
hlcoord 1, 16
|
||||
ld de, String_484e2
|
||||
ld de, MobileDesc_ZipCode
|
||||
call PlaceString
|
||||
call Function48a3a
|
||||
jp c, Function4840c
|
||||
@ -1173,16 +1173,16 @@ Function489ea: ; 489ea (12:49ea)
|
||||
push de
|
||||
ld a, [wd475]
|
||||
and $f
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
ld a, [wd476]
|
||||
and $f0
|
||||
swap a
|
||||
inc hl
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
ld a, [wd476]
|
||||
and $f
|
||||
inc hl
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
inc hl
|
||||
ld de, String_48a38
|
||||
call PlaceString
|
||||
@ -1190,20 +1190,20 @@ Function489ea: ; 489ea (12:49ea)
|
||||
and $f0
|
||||
swap a
|
||||
inc hl
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
ld a, [wd477]
|
||||
and $f
|
||||
inc hl
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
ld a, [wd478]
|
||||
and $f0
|
||||
swap a
|
||||
inc hl
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
ld a, [wd478]
|
||||
and $f
|
||||
inc hl
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
pop de
|
||||
ret
|
||||
; 48a38 (12:4a38)
|
||||
@ -1647,13 +1647,13 @@ Function48ca3: ; 48ca3
|
||||
|
||||
.asm_48cc7
|
||||
ld a, b
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
inc hl
|
||||
ld a, c
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
inc hl
|
||||
ld a, d
|
||||
call Function48444
|
||||
call Mobile12_Bin2Dec
|
||||
pop hl
|
||||
pop de
|
||||
pop bc
|
||||
|
||||
@ -5588,7 +5588,7 @@ INCBIN "gfx/unknown/11601a.2bpp"
|
||||
Function11615a: ; 11615a
|
||||
xor a
|
||||
ld [wc30d], a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ld [wc310], a
|
||||
ld [wc311], a
|
||||
ld [wc312], a
|
||||
@ -5617,7 +5617,7 @@ Function11619d: ; 11619d
|
||||
ld a, [wc30d]
|
||||
and a
|
||||
ret z
|
||||
ld a, [wc314 + 5]
|
||||
ld a, [$c319]
|
||||
cp $2
|
||||
jr c, .asm_1161b4
|
||||
ld a, $a0
|
||||
@ -5631,10 +5631,10 @@ Function11619d: ; 11619d
|
||||
; 1161b8
|
||||
|
||||
Function1161b8: ; 1161b8
|
||||
ld a, [wc314 + 5]
|
||||
ld a, [$c319]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, Jumptable_1161c7
|
||||
ld hl, .Jumptable
|
||||
rept 2
|
||||
add hl, de
|
||||
endr
|
||||
@ -5644,7 +5644,7 @@ endr
|
||||
jp [hl]
|
||||
; 1161c7
|
||||
|
||||
Jumptable_1161c7: ; 1161c7
|
||||
.Jumptable: ; 1161c7
|
||||
dw Function1161d5
|
||||
dw Function116294
|
||||
dw Function1162cb
|
||||
@ -5668,10 +5668,11 @@ Function1161d5: ; 1161d5
|
||||
|
||||
di
|
||||
|
||||
.asm_1161e9
|
||||
.wait_for_vblank
|
||||
; Wait until a vblank would occur had interrupts not just been disabled.
|
||||
ld a, [rLY]
|
||||
cp $91
|
||||
jr nz, .asm_1161e9
|
||||
jr nz, .wait_for_vblank
|
||||
|
||||
ld a, $d0
|
||||
ld [rHDMA1], a
|
||||
@ -5758,9 +5759,9 @@ Function1161d5: ; 1161d5
|
||||
ld [MusicFadeIDLo], a
|
||||
ld a, d
|
||||
ld [MusicFadeIDHi], a
|
||||
ld a, [wc314 + 5]
|
||||
ld a, [$c319]
|
||||
inc a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ret
|
||||
; 11628c
|
||||
|
||||
@ -5774,15 +5775,15 @@ MenuDataHeader_11628c: ; 11628c
|
||||
|
||||
Function116294: ; 116294
|
||||
callba Function170d02
|
||||
ld a, [wc314 + 5]
|
||||
ld a, [$c319]
|
||||
inc a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a
|
||||
ld hl, UnknBGPals + 8 * 6
|
||||
ld de, wc314 + 12
|
||||
ld de, $c320
|
||||
ld bc, 2 palettes
|
||||
call CopyBytes
|
||||
ld hl, Palette_11734e
|
||||
@ -5799,9 +5800,9 @@ Function116294: ; 116294
|
||||
|
||||
Function1162cb: ; 1162cb
|
||||
callba Function170cc6
|
||||
ld a, [wc314 + 5]
|
||||
ld a, [$c319]
|
||||
inc a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $5
|
||||
@ -5924,7 +5925,7 @@ Function11636e: ; 11636e
|
||||
ld [rSVBK], a
|
||||
ld a, $a0
|
||||
ld hl, Sprites
|
||||
ld bc, $0040
|
||||
ld bc, 16 * 4
|
||||
call ByteFill
|
||||
ld a, $90
|
||||
ld [hWY], a
|
||||
@ -5939,7 +5940,7 @@ Function11636e: ; 11636e
|
||||
xor a
|
||||
ld [MusicFadeIDHi], a
|
||||
xor a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ld [wc30d], a
|
||||
ret
|
||||
; 1163c0
|
||||
@ -5951,7 +5952,7 @@ Function1163c0: ; 1163c0
|
||||
ld [rSVBK], a
|
||||
ld a, $a0
|
||||
ld hl, Sprites
|
||||
ld bc, $0040
|
||||
ld bc, 16 * 4
|
||||
call ByteFill
|
||||
call DelayFrame
|
||||
callba Function14146
|
||||
@ -5961,7 +5962,7 @@ Function1163c0: ; 1163c0
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a
|
||||
ld hl, wc314 + 12
|
||||
ld hl, $c320
|
||||
ld de, wd030
|
||||
ld bc, $0010
|
||||
call CopyBytes
|
||||
@ -5997,7 +5998,7 @@ Function1163c0: ; 1163c0
|
||||
|
||||
.asm_116439
|
||||
xor a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ld [wc30d], a
|
||||
ret
|
||||
; 116441
|
||||
@ -6014,7 +6015,7 @@ Function116441: ; 116441
|
||||
xor a
|
||||
ld [MusicFadeIDHi], a
|
||||
xor a
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
ld [wc30d], a
|
||||
ret
|
||||
; 116468
|
||||
@ -6424,7 +6425,7 @@ Function1166d6:
|
||||
cp $ff
|
||||
ret nz
|
||||
ld a, $4
|
||||
ld [wc314 + 5], a
|
||||
ld [$c319], a
|
||||
xor a
|
||||
ld [wc314], a
|
||||
ret
|
||||
@ -7595,7 +7596,7 @@ Palette_11734e:
|
||||
RGB 10, 9, 9
|
||||
RGB 15, 14, 14
|
||||
|
||||
Unknown_117356:
|
||||
Unknown_117356: ; 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
|
||||
@ -7716,15 +7717,17 @@ Function117699: ; 117699 (45:7699)
|
||||
ret
|
||||
|
||||
Function1176ee: ; 1176ee (45:76ee)
|
||||
.loop
|
||||
call JoyTextDelay
|
||||
ld a, [wcd49]
|
||||
bit 7, a
|
||||
jr nz, .asm_117709
|
||||
jr nz, .quit
|
||||
call Function117719
|
||||
callba PlaySpriteAnimations
|
||||
callba ReloadMapPart
|
||||
jr Function1176ee
|
||||
.asm_117709
|
||||
jr .loop
|
||||
|
||||
.quit
|
||||
callba ClearSpriteAnims
|
||||
call ClearBGPalettes
|
||||
call ClearScreen
|
||||
@ -7773,7 +7776,7 @@ Function117738: ; 117738 (45:7738)
|
||||
ld [hl], a
|
||||
ld a, $3
|
||||
ld [wcd23], a
|
||||
jp Function117a0a
|
||||
jp MobilePassword_IncrementJumptable
|
||||
|
||||
Function117764: ; 117764 (45:7764)
|
||||
ld a, [wcd4a]
|
||||
@ -7787,37 +7790,37 @@ Function117764: ; 117764 (45:7764)
|
||||
ld [wcd24], a
|
||||
ld hl, hJoyPressed ; $ffa7
|
||||
ld a, [hl]
|
||||
and $4
|
||||
jr nz, Function1177a5
|
||||
and SELECT
|
||||
jr nz, Function117764_select
|
||||
ld a, [hl]
|
||||
and $8
|
||||
jr nz, Function1177ac
|
||||
and START
|
||||
jr nz, Function117764_start
|
||||
ld a, [hl]
|
||||
and $1
|
||||
jp nz, Function11784c
|
||||
and A_BUTTON
|
||||
jp nz, Function117764_a_button
|
||||
ld a, [hl]
|
||||
and $2
|
||||
jr nz, asm_1177d6
|
||||
and B_BUTTON
|
||||
jr nz, Function117764_b_button
|
||||
ld hl, hJoyLast
|
||||
ld a, [hl]
|
||||
and $40
|
||||
jr nz, asm_1177f1
|
||||
and D_UP
|
||||
jr nz, Function117764_d_up
|
||||
ld a, [hl]
|
||||
and $80
|
||||
jr nz, asm_11780a
|
||||
and D_DOWN
|
||||
jr nz, Function117764_d_down
|
||||
ld a, [hl]
|
||||
and $20
|
||||
jp nz, Function11782d
|
||||
and D_LEFT
|
||||
jp nz, Function117764_d_left
|
||||
ld a, [hl]
|
||||
and $10
|
||||
jp nz, Function117837
|
||||
and D_RIGHT
|
||||
jp nz, Function117764_d_right
|
||||
ret
|
||||
|
||||
Function1177a5: ; 1177a5 (45:77a5)
|
||||
Function117764_select: ; 1177a5 (45:77a5)
|
||||
callba Function171cf0
|
||||
ret
|
||||
|
||||
Function1177ac: ; 1177ac (45:77ac)
|
||||
Function117764_start: ; 1177ac (45:77ac)
|
||||
ld a, $2
|
||||
ld [wcd4c], a
|
||||
ld a, $4
|
||||
@ -7830,7 +7833,8 @@ Function1177b7: ; 1177b7 (45:77b7)
|
||||
ld a, [wcd4a]
|
||||
and a
|
||||
jr z, .asm_1177c5
|
||||
jp Function117a0a
|
||||
jp MobilePassword_IncrementJumptable
|
||||
|
||||
.asm_1177c5
|
||||
ld a, $6
|
||||
ld [wcd49], a
|
||||
@ -7840,8 +7844,9 @@ Function1177cb: ; 1177cb (45:77cb)
|
||||
ld a, $80
|
||||
ld [wcd49], a
|
||||
ld [ScriptVar], a
|
||||
jp Function117a0a
|
||||
asm_1177d6: ; 1177d6 (45:77d6)
|
||||
jp MobilePassword_IncrementJumptable
|
||||
|
||||
Function117764_b_button: ; 1177d6 (45:77d6)
|
||||
call PlayClickSFX
|
||||
ld a, [wcd4a]
|
||||
and a
|
||||
@ -7858,7 +7863,8 @@ asm_1177d6: ; 1177d6 (45:77d6)
|
||||
add hl, de
|
||||
ld [hl], a
|
||||
ret
|
||||
asm_1177f1: ; 1177f1 (45:77f1)
|
||||
|
||||
Function117764_d_up: ; 1177f1 (45:77f1)
|
||||
ld a, [wcd4d]
|
||||
and a
|
||||
ret z
|
||||
@ -7871,10 +7877,10 @@ asm_1177f1: ; 1177f1 (45:77f1)
|
||||
sla a
|
||||
sla a
|
||||
add e
|
||||
asm_117806: ; 117806 (45:7806)
|
||||
Function117764_d_vertical_load: ; 117806 (45:7806)
|
||||
ld [wcd4c], a
|
||||
ret
|
||||
asm_11780a: ; 11780a (45:780a)
|
||||
Function117764_d_down: ; 11780a (45:780a)
|
||||
ld a, [wcd4d]
|
||||
cp $4
|
||||
ret z
|
||||
@ -7888,15 +7894,15 @@ asm_11780a: ; 11780a (45:780a)
|
||||
cp $5
|
||||
jr nc, .asm_117829
|
||||
xor a
|
||||
jr asm_117806
|
||||
jr Function117764_d_vertical_load
|
||||
.asm_117825
|
||||
ld a, $2
|
||||
jr asm_117806
|
||||
jr Function117764_d_vertical_load
|
||||
.asm_117829
|
||||
ld a, $1
|
||||
jr asm_117806
|
||||
jr Function117764_d_vertical_load
|
||||
|
||||
Function11782d: ; 11782d (45:782d)
|
||||
Function117764_d_left: ; 11782d (45:782d)
|
||||
ld a, [wcd4c]
|
||||
and a
|
||||
ret z
|
||||
@ -7904,13 +7910,13 @@ Function11782d: ; 11782d (45:782d)
|
||||
ld [wcd4c], a
|
||||
ret
|
||||
|
||||
Function117837: ; 117837 (45:7837)
|
||||
Function117764_d_right: ; 117837 (45:7837)
|
||||
ld e, $d
|
||||
ld a, [wcd4d]
|
||||
cp $4
|
||||
jr nz, .asm_117842
|
||||
jr nz, .wrap
|
||||
ld e, $2
|
||||
.asm_117842
|
||||
.wrap
|
||||
ld a, [wcd4c]
|
||||
cp e
|
||||
ret z
|
||||
@ -7918,33 +7924,34 @@ Function117837: ; 117837 (45:7837)
|
||||
ld [wcd4c], a
|
||||
ret
|
||||
|
||||
Function11784c: ; 11784c (45:784c)
|
||||
Function117764_a_button: ; 11784c (45:784c)
|
||||
call PlayClickSFX
|
||||
ld a, [wcd4d]
|
||||
cp $4
|
||||
jr nz, .asm_117866
|
||||
jr nz, .not_4
|
||||
ld a, [wcd4c]
|
||||
cp $2
|
||||
jp z, Function1177b7
|
||||
cp $1
|
||||
jp z, Function1177cb
|
||||
jp Function1177a5
|
||||
.asm_117866
|
||||
jp Function117764_select
|
||||
|
||||
.not_4
|
||||
ld a, [wcd4a]
|
||||
ld e, a
|
||||
cp $10
|
||||
jp z, Function1177ac
|
||||
jp z, Function117764_start
|
||||
inc a
|
||||
ld [wcd4a], a
|
||||
ld d, $0
|
||||
ld a, [wcd4b]
|
||||
and a
|
||||
jr nz, .asm_117880
|
||||
jr nz, .ascii_symbols
|
||||
ld hl, Unknown_117a0f
|
||||
jr .asm_117883
|
||||
.asm_117880
|
||||
jr .got_ascii
|
||||
.ascii_symbols
|
||||
ld hl, Unknown_117a47
|
||||
.asm_117883
|
||||
.got_ascii
|
||||
push de
|
||||
ld a, [wcd4c]
|
||||
ld b, a
|
||||
@ -7967,7 +7974,7 @@ Function11784c: ; 11784c (45:784c)
|
||||
ld a, e
|
||||
cp $f
|
||||
ret nz
|
||||
jp Function1177ac
|
||||
jp Function117764_start
|
||||
|
||||
Function1178aa: ; 1178aa (45:78aa)
|
||||
ld hl, MenuDataHeader_1179b5
|
||||
@ -7980,27 +7987,27 @@ Function1178aa: ; 1178aa (45:78aa)
|
||||
call MenuBoxCoord2Tile
|
||||
callba ReloadMapPart
|
||||
hlcoord 16, 8
|
||||
ld de, String_1179c5
|
||||
ld de, YessNoString_1179c5
|
||||
call PlaceString
|
||||
hlcoord 15, 10
|
||||
ld a, $ed
|
||||
ld a, "▶"
|
||||
ld [hl], a
|
||||
hlcoord 1, 14
|
||||
ld de, String_1179cc
|
||||
ld de, AskSavePasswordString
|
||||
call PlaceString
|
||||
ld a, $1
|
||||
ld [wcd4e], a
|
||||
jp Function117a0a
|
||||
jp MobilePassword_IncrementJumptable
|
||||
|
||||
Function1178e8: ; 1178e8 (45:78e8)
|
||||
ld a, [hJoyPressed]
|
||||
cp $2
|
||||
jr z, .asm_117939
|
||||
cp $1
|
||||
jr z, .asm_117925
|
||||
cp $80
|
||||
jr z, .asm_11790f
|
||||
cp $40
|
||||
cp B_BUTTON
|
||||
jr z, .b_button
|
||||
cp A_BUTTON
|
||||
jr z, .a_button
|
||||
cp D_DOWN
|
||||
jr z, .d_down
|
||||
cp D_UP
|
||||
ret nz
|
||||
ld a, [wcd4e]
|
||||
and a
|
||||
@ -8008,59 +8015,62 @@ Function1178e8: ; 1178e8 (45:78e8)
|
||||
dec a
|
||||
ld [wcd4e], a
|
||||
hlcoord 15, 8
|
||||
ld a, $ed
|
||||
ld a, "▶"
|
||||
ld [hl], a
|
||||
hlcoord 15, 10
|
||||
ld a, $7f
|
||||
ld a, " "
|
||||
ld [hl], a
|
||||
ret
|
||||
.asm_11790f
|
||||
|
||||
.d_down
|
||||
ld a, [wcd4e]
|
||||
and a
|
||||
ret nz
|
||||
inc a
|
||||
ld [wcd4e], a
|
||||
hlcoord 15, 8
|
||||
ld a, $7f
|
||||
ld a, " "
|
||||
ld [hl], a
|
||||
hlcoord 15, 10
|
||||
ld a, $ed
|
||||
ld a, "▶"
|
||||
ld [hl], a
|
||||
ret
|
||||
.asm_117925
|
||||
|
||||
.a_button
|
||||
call PlayClickSFX
|
||||
ld a, [wcd4e]
|
||||
and a
|
||||
jr nz, .asm_117939
|
||||
jr nz, .b_button
|
||||
call ExitMenu
|
||||
ld a, $1
|
||||
ld [wcd4f], a
|
||||
jp Function117a0a
|
||||
.asm_117939
|
||||
jp MobilePassword_IncrementJumptable
|
||||
|
||||
.b_button
|
||||
call ExitMenu
|
||||
call ExitMenu
|
||||
jp Function117a0a
|
||||
jp MobilePassword_IncrementJumptable
|
||||
|
||||
Function117942: ; 117942 (45:7942)
|
||||
call SpeechTextBox
|
||||
hlcoord 1, 14
|
||||
ld de, String_1179f7
|
||||
ld de, SavedPasswordString
|
||||
call PlaceString
|
||||
ld a, $1e
|
||||
ld [wcd4e], a
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
ld a, [wcd4f]
|
||||
ld [$aa4b], a
|
||||
ld [sMobileLoginPassword], a
|
||||
ld hl, wc708
|
||||
ld de, $aa4c
|
||||
ld bc, $11
|
||||
ld de, sMobileLoginPassword + 1
|
||||
ld bc, LOGIN_PASSWORD_LENGTH
|
||||
call CopyBytes
|
||||
call CloseSRAM
|
||||
ld a, [wcd4f]
|
||||
and a
|
||||
jr z, asm_11797e
|
||||
call Function117a0a
|
||||
call MobilePassword_IncrementJumptable
|
||||
|
||||
Function117976: ; 117976 (45:7976)
|
||||
ld hl, wcd4e
|
||||
@ -8079,11 +8089,11 @@ Function117984: ; 117984 (45:7984)
|
||||
call MenuBoxCoord2Tile
|
||||
callba ReloadMapPart
|
||||
hlcoord 1, 14
|
||||
ld de, String_1179e1
|
||||
ld de, NotAPokemonPasswordString
|
||||
call PlaceString
|
||||
ld a, $1e
|
||||
ld [wcd4e], a
|
||||
call Function117a0a
|
||||
call MobilePassword_IncrementJumptable
|
||||
|
||||
Function1179a7: ; 1179a7 (45:79a7)
|
||||
ld hl, wcd4e
|
||||
@ -8112,27 +8122,27 @@ MenuDataHeader_1179bd: ; 1179bd
|
||||
; 1179c5
|
||||
|
||||
|
||||
String_1179c5: ; 1179c5
|
||||
YessNoString_1179c5: ; 1179c5
|
||||
db "はい"
|
||||
next "いいえ@"
|
||||
; 1179cc
|
||||
|
||||
String_1179cc: ; 1179cc
|
||||
db "こ", $25, "パスワード", $1f, "ほぞんして"
|
||||
AskSavePasswordString: ; 1179cc
|
||||
db "こ%パスワード¯ほぞんして"
|
||||
line "おきますか?@"
|
||||
; 1179e1
|
||||
|
||||
String_1179e1: ; 1179e1
|
||||
db "パスワード", $4a, "にゅうりょく"
|
||||
NotAPokemonPasswordString: ; 1179e1
|
||||
db "パスワード<PKMN>にゅうりょく"
|
||||
line "されていません!@"
|
||||
; 1179f7
|
||||
|
||||
String_1179f7: ; 1179f7
|
||||
db "ログインパスワード", $1f, "ほぞん"
|
||||
SavedPasswordString: ; 1179f7
|
||||
db "ログインパスワード¯ほぞん"
|
||||
line "しました@"
|
||||
; 117a0a
|
||||
|
||||
Function117a0a: ; 117a0a (45:7a0a)
|
||||
MobilePassword_IncrementJumptable: ; 117a0a (45:7a0a)
|
||||
ld hl, wcd49
|
||||
inc [hl]
|
||||
ret
|
||||
@ -8192,7 +8202,7 @@ Function117acd: ; 0x117acd
|
||||
call JoyTextDelay
|
||||
ld a, [wJumptableIndex]
|
||||
bit 7, a
|
||||
jr nz, .asm_117ae2 ; 0x117ad5 $b
|
||||
jr nz, .asm_117ae2
|
||||
call Function117ae9
|
||||
callba Function104000
|
||||
jr Function117acd
|
||||
@ -8205,7 +8215,7 @@ Function117ae9: ; 0x117ae9
|
||||
ld a, [wJumptableIndex]
|
||||
ld e, a
|
||||
ld d, $0
|
||||
ld hl, Pointers117af8
|
||||
ld hl, .Jumptable
|
||||
rept 2
|
||||
add hl, de
|
||||
endr
|
||||
@ -8214,7 +8224,7 @@ endr
|
||||
ld l, a
|
||||
jp [hl]
|
||||
|
||||
Pointers117af8: ; 0x117af8
|
||||
.Jumptable: ; 0x117af8
|
||||
dw Function117b06
|
||||
dw Function117b14
|
||||
dw Function117b28
|
||||
@ -8227,25 +8237,25 @@ Function117b06:
|
||||
callba Function172eb9
|
||||
ld a, $10
|
||||
ld [wcf64], a
|
||||
jp Function117cdd
|
||||
jp MobileStudium_JumptableIncrement
|
||||
|
||||
Function117b14:
|
||||
ld hl, wcf64
|
||||
dec [hl]
|
||||
ret nz
|
||||
ld hl, Data117cbc
|
||||
ld hl, MenuDataHeader_117cbc
|
||||
call LoadMenuDataHeader
|
||||
call MenuBox
|
||||
call MenuBoxCoord2Tile
|
||||
jp Function117cdd
|
||||
jp MobileStudium_JumptableIncrement
|
||||
|
||||
Function117b28:
|
||||
ld hl, MobileStadiumEntryText
|
||||
call PrintText
|
||||
jp Function117cdd
|
||||
jp MobileStudium_JumptableIncrement
|
||||
|
||||
Function117b31:
|
||||
ld hl, Data117cc4
|
||||
ld hl, MenuDataHeader_117cc4
|
||||
call LoadMenuDataHeader
|
||||
call MenuBox
|
||||
call MenuBoxCoord2Tile
|
||||
@ -8255,17 +8265,17 @@ Function117b31:
|
||||
hlcoord 15, 8
|
||||
ld a, "▶"
|
||||
ld [hl], a
|
||||
jp Function117cdd
|
||||
jp MobileStudium_JumptableIncrement
|
||||
|
||||
Function117b4f:
|
||||
ld a, [hJoyPressed]
|
||||
cp $2
|
||||
jr z, .asm_117ba4 ; 0x117b53 $4f
|
||||
cp $1
|
||||
jr z, .asm_117b8c ; 0x117b57 $33
|
||||
cp $80
|
||||
jr z, .asm_117b76 ; 0x117b5b $19
|
||||
cp $40
|
||||
cp B_BUTTON
|
||||
jr z, .b_button
|
||||
cp A_BUTTON
|
||||
jr z, .a_button
|
||||
cp D_DOWN
|
||||
jr z, .d_down
|
||||
cp D_UP
|
||||
ret nz
|
||||
ld a, [wcf64]
|
||||
and a
|
||||
@ -8279,7 +8289,8 @@ Function117b4f:
|
||||
ld a, " "
|
||||
ld [hl], a
|
||||
ret
|
||||
.asm_117b76
|
||||
|
||||
.d_down
|
||||
ld a, [wcf64]
|
||||
and a
|
||||
ret nz
|
||||
@ -8292,16 +8303,18 @@ Function117b4f:
|
||||
ld a, "▶"
|
||||
ld [hl], a
|
||||
ret
|
||||
.asm_117b8c
|
||||
|
||||
.a_button
|
||||
call PlayClickSFX
|
||||
ld a, [wcf64]
|
||||
and a
|
||||
jr nz, .asm_117ba4 ; 0x117b93 $f
|
||||
jr nz, .b_button
|
||||
call ExitMenu
|
||||
call ExitMenu
|
||||
callba ReloadMapPart
|
||||
jp Function117cdd
|
||||
.asm_117ba4
|
||||
jp MobileStudium_JumptableIncrement
|
||||
|
||||
.b_button
|
||||
call ExitMenu
|
||||
call ExitMenu
|
||||
callba ReloadMapPart
|
||||
@ -8317,9 +8330,9 @@ Function117bb6:
|
||||
call ClearSprites
|
||||
ld a, [wc300]
|
||||
and a
|
||||
jr z, .asm_117be7 ; 0x117bca $1b
|
||||
jr z, .asm_117be7
|
||||
cp $a
|
||||
jr z, .asm_117be1 ; 0x117bce $11
|
||||
jr z, .asm_117be1
|
||||
.asm_117bd0
|
||||
ld a, $2
|
||||
ld [wc303], a
|
||||
@ -8338,31 +8351,31 @@ Function117bb6:
|
||||
ld [rSVBK], a
|
||||
ld a, [wcd89]
|
||||
and $1
|
||||
jr nz, .asm_117c16 ; 0x117bf3 $21
|
||||
ld a, [wd000]
|
||||
jr nz, .asm_117c16
|
||||
ld a, [w3_d000]
|
||||
cp $fe
|
||||
jr nz, .asm_117c16 ; 0x117bfa $1a
|
||||
ld a, [wd001]
|
||||
jr nz, .asm_117c16
|
||||
ld a, [w3_d001]
|
||||
cp $f
|
||||
jr nz, .asm_117c16 ; 0x117c01 $13
|
||||
ld hl, $e000 - 20
|
||||
jr nz, .asm_117c16
|
||||
ld hl, w3_dfec
|
||||
ld de, wcd69
|
||||
ld c, $10
|
||||
.asm_117c0b
|
||||
ld a, [de]
|
||||
inc de
|
||||
cp [hl]
|
||||
jr nz, .asm_117c16 ; 0x117c0e $6
|
||||
jr nz, .asm_117c16
|
||||
inc hl
|
||||
dec c
|
||||
jr nz, .asm_117c0b ; 0x117c12 $f7
|
||||
jr .asm_117c20 ; 0x117c14 $a
|
||||
jr nz, .asm_117c0b
|
||||
jr .asm_117c20
|
||||
.asm_117c16
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
ld a, $d3
|
||||
ld [wc300], a
|
||||
jr .asm_117bd0 ; 0x117c1e $b0
|
||||
jr .asm_117bd0
|
||||
.asm_117c20
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
@ -8373,17 +8386,17 @@ Function117bb6:
|
||||
ld [rSVBK], a
|
||||
ld a, $7
|
||||
call GetSRAMBank
|
||||
ld hl, wd002
|
||||
ld hl, w3_d002
|
||||
ld de, $b000
|
||||
ld bc, $1000
|
||||
call CopyBytes
|
||||
call CloseSRAM
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
jp Function117cdd
|
||||
jp MobileStudium_JumptableIncrement
|
||||
|
||||
Function117c4a:
|
||||
ld hl, Data117cbc
|
||||
ld hl, MenuDataHeader_117cbc
|
||||
call LoadMenuDataHeader
|
||||
call MenuBox
|
||||
call MenuBoxCoord2Tile
|
||||
@ -8394,19 +8407,19 @@ Function117c4a:
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a
|
||||
ld hl, wd000
|
||||
ld de, $0008
|
||||
ld c, $8
|
||||
.asm_117c71
|
||||
ld hl, UnknBGPals
|
||||
ld de, 1 palettes
|
||||
ld c, 8
|
||||
.loop
|
||||
push hl
|
||||
ld a, $ff
|
||||
ld a, $7fff % $100
|
||||
ld [hli], a
|
||||
ld a, " "
|
||||
ld a, $7fff / $100
|
||||
ld [hl], a
|
||||
pop hl
|
||||
add hl, de
|
||||
dec c
|
||||
jr nz, .asm_117c71 ; 0x117c7b $f4
|
||||
jr nz, .loop
|
||||
call RotateThreePalettesRight
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
@ -8432,28 +8445,35 @@ Function117c89:
|
||||
dec bc
|
||||
ld a, b
|
||||
or c
|
||||
jr nz, .asm_117c97 ; 0x117ca2 $f3
|
||||
jr nz, .asm_117c97
|
||||
ld a, l
|
||||
ld [wcd83], a
|
||||
ld a, h
|
||||
ld [wcd84], a
|
||||
ld hl, $bfea
|
||||
ld de, wcd69
|
||||
ld bc, $0010
|
||||
ld bc, $10
|
||||
call CopyBytes
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Data117cbc: ; 0x117cbc
|
||||
db $40, $0c, $00, $11, $13, $00, $00, $00
|
||||
MenuDataHeader_117cbc: ; 0x117cbc
|
||||
db $40 ; flags
|
||||
db 12, 0 ; start coords
|
||||
db 17, 19 ; end coords
|
||||
dw NULL ; menu data 2
|
||||
db 0 ; default option
|
||||
|
||||
Data117cc4: ; 0x117cc4
|
||||
db $40, $07, $0e, $0b, $13, $00, $00, $00 ; XXX what is this
|
||||
MenuDataHeader_117cc4: ; 0x117cc4
|
||||
db $40 ; flags
|
||||
db 7, 14 ; start coords
|
||||
db 11, 19 ; end coords
|
||||
dw NULL ; menu data 2
|
||||
db 0 ; default item
|
||||
|
||||
YesNo117ccc: ; 0x117ccc
|
||||
db "はい"
|
||||
next "いいえ"
|
||||
db "@"
|
||||
next "いいえ@"
|
||||
|
||||
MobileStadiumEntryText: ; 0x117cd3
|
||||
text_jump _MobileStadiumEntryText
|
||||
@ -8463,9 +8483,7 @@ MobileStadiumSuccessText: ; 0x117cd8
|
||||
text_jump _MobileStadiumSuccessText
|
||||
db "@"
|
||||
|
||||
Function117cdd: ; 0x117cdd
|
||||
MobileStudium_JumptableIncrement: ; 0x117cdd
|
||||
ld hl, wJumptableIndex
|
||||
inc [hl]
|
||||
ret
|
||||
|
||||
|
||||
|
||||
@ -1301,7 +1301,7 @@ Function118936:
|
||||
ld a, $1
|
||||
ld [rSVBK], a
|
||||
ld a, [StatusFlags]
|
||||
bit 6, a
|
||||
bit 6, a ; Hall Of Fame
|
||||
jr nz, .asm_11896b
|
||||
ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels
|
||||
ld a, 5 ; 4 levels to choose from, including 'Cancel'-option
|
||||
@ -1429,7 +1429,7 @@ Function118982:
|
||||
|
||||
.asm_118a30
|
||||
ld a, [wcd4f]
|
||||
ld [wd000 + $800], a
|
||||
ld [w3_d800], a
|
||||
jp Function119e2e
|
||||
|
||||
.asm_118a39
|
||||
@ -1958,11 +1958,11 @@ Function118f14:
|
||||
ret c
|
||||
ld a, [wcc60]
|
||||
and a
|
||||
jr z, .asm_118f32
|
||||
ld hl, UnknownText_0x11aa13
|
||||
jr z, .DontSendSaveFile
|
||||
ld hl, Text_SaveFileWillBeSent
|
||||
call Function11a9c0
|
||||
|
||||
.asm_118f32
|
||||
.DontSendSaveFile
|
||||
ld a, [wcd57]
|
||||
ld l, a
|
||||
ld a, [wcd58]
|
||||
@ -2057,18 +2057,18 @@ Function118fc0: ; 118fc0
|
||||
ld a, [wcc60]
|
||||
and a
|
||||
jr z, .asm_118ff2
|
||||
ld hl, UnknownText_0x11aa2c
|
||||
ld hl, Text_SentSaveFileReadingNews
|
||||
jr .asm_118ff5
|
||||
|
||||
.asm_118ff2
|
||||
ld hl, UnknownText_0x11aa4b
|
||||
ld hl, Text_ReadingNews
|
||||
|
||||
.asm_118ff5
|
||||
call Function11a9c0
|
||||
jr Function119009
|
||||
|
||||
.asm_118ffa
|
||||
ld hl, UnknownText_0x11aa4b
|
||||
ld hl, Text_ReadingNews
|
||||
call Function11a9c0
|
||||
call Function119e2e
|
||||
call Function119e2e
|
||||
@ -2224,7 +2224,7 @@ Function1190ec: ; 1190ec
|
||||
ld a, $3
|
||||
ld [rSVBK], a
|
||||
call CloseSRAM
|
||||
ld hl, UnknownText_0x11aa5a
|
||||
ld hl, Text_ReceivedNews
|
||||
call Function11a9c0
|
||||
jp Function119e2e
|
||||
; 11914e
|
||||
@ -3450,7 +3450,7 @@ Function11984e: ; 11984e
|
||||
; 1198ee
|
||||
|
||||
Function1198ee: ; 1198ee
|
||||
ld hl, UnknownText_0x11aab2
|
||||
ld hl, Text_RegisteringRecord
|
||||
call Function11a9c0
|
||||
call Function119e2e
|
||||
|
||||
@ -3599,49 +3599,49 @@ Function1199ca: ; 1199ca
|
||||
|
||||
Function1199e2: ; 1199e2
|
||||
ld c, $c
|
||||
ld de, Unknown_119e33
|
||||
ld de, XGameCodePrefix
|
||||
call Function119e4f
|
||||
jp c, Function119ac9
|
||||
ld a, c
|
||||
cp $1
|
||||
jp nz, Function119ac9
|
||||
ld hl, $d880
|
||||
ld bc, Unknown_119af1
|
||||
.asm_1199f9
|
||||
ld hl, w3_d880
|
||||
ld bc, XGameCode
|
||||
.loop
|
||||
ld a, [bc]
|
||||
and a
|
||||
jr z, .asm_119a05
|
||||
jr z, .game_result_prefix
|
||||
cp [hl]
|
||||
jp nz, Function119ac9
|
||||
inc bc
|
||||
inc hl
|
||||
jr .asm_1199f9
|
||||
jr .loop
|
||||
|
||||
.asm_119a05
|
||||
.game_result_prefix
|
||||
ld c, $17
|
||||
ld de, Unknown_119e40
|
||||
ld de, XGameResultPrefix
|
||||
call Function119e4f
|
||||
jp c, .asm_119aa7
|
||||
ld a, c
|
||||
cp $1
|
||||
jp nz, .asm_119aa7
|
||||
ld a, [wd000 + $880]
|
||||
ld a, [w3_d880]
|
||||
cp $31
|
||||
jp nz, .asm_119aa7
|
||||
ld a, [wd000 + $881]
|
||||
ld a, [w3_d881]
|
||||
cp $20
|
||||
jp nz, .asm_119aa7
|
||||
ld a, [wd000 + $88a]
|
||||
ld a, [w3_d88a]
|
||||
cp $20
|
||||
jp nz, .asm_119aa7
|
||||
ld a, [wd000 + $894]
|
||||
ld a, [w3_d894]
|
||||
cp $20
|
||||
jp nz, .asm_119aa7
|
||||
xor a
|
||||
ld [wd000 + $8a0], a
|
||||
ld [wd000 + $8a1], a
|
||||
ld [wd000 + $8a2], a
|
||||
ld [wd000 + $8a3], a
|
||||
ld [w3_d8a0], a
|
||||
ld [w3_d8a1], a
|
||||
ld [w3_d8a2], a
|
||||
ld [w3_d8a3], a
|
||||
ld hl, $d8a0
|
||||
ld bc, $d889
|
||||
call Function119e98
|
||||
@ -3663,10 +3663,10 @@ Function1199e2: ; 1199e2
|
||||
cp [hl]
|
||||
jr nz, Function119ac9
|
||||
xor a
|
||||
ld [wd000 + $8a0], a
|
||||
ld [wd000 + $8a1], a
|
||||
ld [wd000 + $8a2], a
|
||||
ld [wd000 + $8a3], a
|
||||
ld [w3_d8a0], a
|
||||
ld [w3_d8a1], a
|
||||
ld [w3_d8a2], a
|
||||
ld [w3_d8a3], a
|
||||
ld hl, $d8a0
|
||||
ld bc, $d88e
|
||||
call Function119e98
|
||||
@ -3730,9 +3730,10 @@ Function119ac9:
|
||||
ret
|
||||
; 119af1
|
||||
|
||||
Unknown_119af1:
|
||||
INCBIN "data/mobile/x-game-code.txt"
|
||||
INCBIN "data/mobile/x-game-result.txt"
|
||||
XGameCode:
|
||||
INCBIN "data/mobile/x-game-code.txt"
|
||||
XGameResult:
|
||||
INCBIN "data/mobile/x-game-result.txt"
|
||||
; 119b0d
|
||||
|
||||
Function119b0d: ; 119b0d
|
||||
@ -3990,13 +3991,13 @@ Function119c3e: ; 119c3e
|
||||
; 119c97
|
||||
|
||||
Function119c97: ; 119c97
|
||||
ld hl, UnknownText_0x11ab0f
|
||||
ld hl, Text_UberRestriction
|
||||
call Function11a9c0
|
||||
call Function119e2e
|
||||
jr Function119cab
|
||||
|
||||
Function119ca2:
|
||||
ld hl, UnknownText_0x11aaf0
|
||||
ld hl, Text_PartyMonTopsThisLevel
|
||||
call Function11a9c0
|
||||
call Function119e2e
|
||||
|
||||
@ -4023,15 +4024,15 @@ Function119cc3: ; 119cc3
|
||||
jr z, .asm_119cd1
|
||||
dec a
|
||||
jr z, .asm_119cd6
|
||||
ld hl, UnknownText_0x11aa6a
|
||||
ld hl, Text_QuitReadingNews
|
||||
jr .asm_119cd9
|
||||
|
||||
.asm_119cd1
|
||||
ld hl, UnknownText_0x11ab4a
|
||||
ld hl, Text_CancelBattleRoomChallenge
|
||||
jr .asm_119cd9
|
||||
|
||||
.asm_119cd6
|
||||
ld hl, UnknownText_0x11ab6e
|
||||
ld hl, Text_ExitGymLeaderHonorRoll
|
||||
|
||||
.asm_119cd9
|
||||
call Function11a9c0
|
||||
@ -4205,10 +4206,14 @@ Function119e2e: ; 119e2e (46:5e2e)
|
||||
ret
|
||||
; 119e33 (46:5e33)
|
||||
|
||||
Unknown_119e33: ; 119e33
|
||||
INCBIN "data/mobile/x-game-code-prefix.txt"
|
||||
Unknown_119e40:
|
||||
INCBIN "data/mobile/x-game-result-prefix.txt"
|
||||
XGameCodePrefix: ; 119e33
|
||||
INCBIN "data/mobile/x-game-code-prefix.txt"
|
||||
XGameCodePrefixEnd:
|
||||
;119e40
|
||||
|
||||
XGameResultPrefix: ; 119e40
|
||||
INCBIN "data/mobile/x-game-result-prefix.txt"
|
||||
XGameResultPrefixEnd:
|
||||
; 119e4f
|
||||
|
||||
Function119e4f: ; 119e4f
|
||||
@ -4218,77 +4223,77 @@ Function119e4f: ; 119e4f
|
||||
ld c, a
|
||||
ld a, [hli]
|
||||
ld b, a
|
||||
.asm_119e57
|
||||
.loop
|
||||
ld a, [de]
|
||||
cp [hl]
|
||||
jr z, .asm_119e64
|
||||
.asm_119e5b
|
||||
jr z, .found_equality
|
||||
.next
|
||||
inc hl
|
||||
dec bc
|
||||
ld a, b
|
||||
or c
|
||||
jr nz, .asm_119e57
|
||||
.asm_119e61
|
||||
jr nz, .loop
|
||||
.return_carry
|
||||
pop bc
|
||||
scf
|
||||
ret
|
||||
|
||||
.asm_119e64
|
||||
.found_equality
|
||||
push de
|
||||
.asm_119e65
|
||||
.loop2
|
||||
ld a, [de]
|
||||
inc de
|
||||
cp "\n"
|
||||
jr z, .asm_119e7a
|
||||
jr z, .newline
|
||||
cp [hl]
|
||||
jr nz, .asm_119e77
|
||||
jr nz, .unequal
|
||||
inc hl
|
||||
dec bc
|
||||
ld a, b
|
||||
or c
|
||||
jr nz, .asm_119e65
|
||||
jr nz, .loop2
|
||||
pop de
|
||||
jr .asm_119e61
|
||||
jr .return_carry
|
||||
|
||||
.asm_119e77
|
||||
.unequal
|
||||
pop de
|
||||
jr .asm_119e5b
|
||||
jr .next
|
||||
|
||||
.asm_119e7a
|
||||
.newline
|
||||
pop de
|
||||
pop bc
|
||||
inc hl
|
||||
ld de, $d880
|
||||
.asm_119e80
|
||||
ld de, w3_d880
|
||||
.loop3
|
||||
ld a, [hli]
|
||||
ld [de], a
|
||||
inc de
|
||||
cp $d
|
||||
jr z, .asm_119e8c
|
||||
jr z, .finish
|
||||
dec c
|
||||
jr nz, .asm_119e80
|
||||
jr nz, .loop3
|
||||
scf
|
||||
ret
|
||||
|
||||
.asm_119e8c
|
||||
.finish
|
||||
and a
|
||||
ret
|
||||
; 119e8e
|
||||
|
||||
Function119e8e: ; 119e8e
|
||||
cp $60
|
||||
jr c, .asm_119e95
|
||||
jr c, .less_than_0x60
|
||||
sub $57
|
||||
ret
|
||||
|
||||
.asm_119e95
|
||||
.less_than_0x60
|
||||
sub $30
|
||||
ret
|
||||
; 119e98
|
||||
|
||||
Function119e98: ; 119e98
|
||||
ld a, $2
|
||||
.asm_119e9a
|
||||
.loop
|
||||
push af
|
||||
ld a, [bc]
|
||||
dec bc
|
||||
@ -4308,7 +4313,7 @@ Function119e98: ; 119e98
|
||||
pop af
|
||||
dec a
|
||||
and a
|
||||
jr nz, .asm_119e9a
|
||||
jr nz, .loop
|
||||
ret
|
||||
; 119eb4
|
||||
|
||||
@ -4316,26 +4321,26 @@ Function119eb4: ; 119eb4 (46:5eb4)
|
||||
xor a
|
||||
ld [wc3cc], a
|
||||
ld de, wc3ac
|
||||
.asm_119ebb
|
||||
.loop
|
||||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
and a
|
||||
jr nz, .asm_119ebb
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
Function119ec2: ; 119ec2 (46:5ec2)
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
xor a
|
||||
ld [$aa5c], a
|
||||
ld de, $aa4c
|
||||
.asm_119ece
|
||||
ld [sMobileLoginPassword + LOGIN_PASSWORD_LENGTH], a
|
||||
ld de, sMobileLoginPassword + 1
|
||||
.loop
|
||||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
and a
|
||||
jr nz, .asm_119ece
|
||||
jr nz, .loop
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
@ -4507,17 +4512,17 @@ Function119f98: ; 119f98
|
||||
Function11a00e: ; 11a00e
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
ld a, [$aa4b]
|
||||
ld a, [sMobileLoginPassword]
|
||||
and a
|
||||
jr z, .asm_11a02a
|
||||
ld a, [$aa4c]
|
||||
ld a, [sMobileLoginPassword + 1]
|
||||
call CloseSRAM
|
||||
and a
|
||||
ret nz
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
xor a
|
||||
ld [$aa4b], a
|
||||
ld [sMobileLoginPassword], a
|
||||
|
||||
.asm_11a02a
|
||||
call CloseSRAM
|
||||
@ -5726,64 +5731,64 @@ Function11a9f4: ; 11a9f4
|
||||
ret
|
||||
; 11aa13
|
||||
|
||||
UnknownText_0x11aa13: ; 0x11aa13
|
||||
Text_SaveFileWillBeSent: ; 0x11aa13
|
||||
text "SAVE FILE will be"
|
||||
line "sent."
|
||||
done
|
||||
; 0x11aa2c
|
||||
|
||||
UnknownText_0x11aa2c: ; 0x11aa2c
|
||||
Text_SentSaveFileReadingNews: ; 0x11aa2c
|
||||
text "Sent SAVE FILE."
|
||||
line "Reading NEWS…"
|
||||
done
|
||||
; 0x11aa4b
|
||||
|
||||
UnknownText_0x11aa4b: ; 0x11aa4b
|
||||
Text_ReadingNews: ; 0x11aa4b
|
||||
text "Reading NEWS…"
|
||||
done
|
||||
; 0x11aa5a
|
||||
|
||||
UnknownText_0x11aa5a: ; 0x11aa5a
|
||||
Text_ReceivedNews: ; 0x11aa5a
|
||||
text "Received NEWS!"
|
||||
done
|
||||
; 0x11aa6a
|
||||
|
||||
UnknownText_0x11aa6a: ; 0x11aa6a
|
||||
Text_QuitReadingNews: ; 0x11aa6a
|
||||
text "Quit reading NEWS?"
|
||||
done
|
||||
; 0x11aa7e
|
||||
|
||||
UnknownText_0x11aa7e: ; 0x11aa7e
|
||||
Text_CanceledSendingSaveFile: ; 0x11aa7e
|
||||
text "Canceled sending"
|
||||
line "SAVE FILE."
|
||||
done
|
||||
; 0x11aa9b
|
||||
|
||||
UnknownText_0x11aa9b: ; 0x11aa9b
|
||||
Text_ReceivedOddEgg: ; 0x11aa9b
|
||||
text "ODD EGG"
|
||||
line "was received!"
|
||||
done
|
||||
; 0x11aab2
|
||||
|
||||
UnknownText_0x11aab2: ; 0x11aab2
|
||||
Text_RegisteringRecord: ; 0x11aab2
|
||||
text "Registering your"
|
||||
line "record…"
|
||||
done
|
||||
; 0x11aacc
|
||||
|
||||
UnknownText_0x11aacc: ; 0x11aacc
|
||||
Text_BattleRoomVisitLimit: ; 0x11aacc
|
||||
text "One visit per day"
|
||||
line "per BATTLE ROOM!"
|
||||
done
|
||||
; 0x11aaf0
|
||||
|
||||
UnknownText_0x11aaf0: ; 0x11aaf0
|
||||
Text_PartyMonTopsThisLevel: ; 0x11aaf0
|
||||
text "A party #MON"
|
||||
line "tops this level."
|
||||
done
|
||||
; 0x11ab0f
|
||||
|
||||
UnknownText_0x11ab0f: ; 0x11ab0f
|
||||
Text_UberRestriction: ; 0x11ab0f
|
||||
text_from_ram wcd49
|
||||
text " may go"
|
||||
line "only to BATTLE"
|
||||
@ -5793,19 +5798,19 @@ UnknownText_0x11ab0f: ; 0x11ab0f
|
||||
done
|
||||
; 0x11ab4a
|
||||
|
||||
UnknownText_0x11ab4a: ; 0x11ab4a
|
||||
Text_CancelBattleRoomChallenge: ; 0x11ab4a
|
||||
text "Cancel your BATTLE"
|
||||
line "ROOM challenge?"
|
||||
done
|
||||
; 0x11ab6e
|
||||
|
||||
UnknownText_0x11ab6e: ; 0x11ab6e
|
||||
Text_ExitGymLeaderHonorRoll: ; 0x11ab6e
|
||||
text "Exit GYM LEADER"
|
||||
line "HONOR ROLL?"
|
||||
done
|
||||
; 0x11ab8b
|
||||
|
||||
UnknownText_0x11ab8b: ; 0x11ab8b
|
||||
Text_LinkingWithCenter: ; 0x11ab8b
|
||||
text "Linking with the"
|
||||
line "CENTER…"
|
||||
done
|
||||
@ -5823,18 +5828,18 @@ Text_CheckBattleRoomListByMaxLevel: ; 0x11abcb
|
||||
done
|
||||
; 0x11abf1
|
||||
|
||||
UnknownText_0x11abf1: ; 0x11abf1
|
||||
Text_EnterWhichBattleRoom: ; 0x11abf1
|
||||
text "Enter which"
|
||||
line "BATTLE ROOM?"
|
||||
done
|
||||
; 0x11ac0b
|
||||
|
||||
UnknownText_0x11ac0b: ; 0x11ac0b
|
||||
Text_WhichBattleRoom: ; 0x11ac0b
|
||||
text "Which BATTLE ROOM?"
|
||||
done
|
||||
; 0x11ac1f
|
||||
|
||||
UnknownText_0x11ac1f: ; 0x11ac1f
|
||||
Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
|
||||
text_from_ram StringBuffer3
|
||||
text "'s ROOM"
|
||||
line "@"
|
||||
|
||||
@ -708,7 +708,7 @@ Function17d405:
|
||||
ld [rSVBK], a
|
||||
ld hl, Palette_17eff6
|
||||
ld de, UnknBGPals
|
||||
ld bc, $0040
|
||||
ld bc, 8 palettes
|
||||
call CopyBytes
|
||||
call SetPalettes
|
||||
pop af
|
||||
@ -949,18 +949,18 @@ Function17d5c4:
|
||||
ld a, [hJoyPressed]
|
||||
and a
|
||||
ret z
|
||||
ld c, $0
|
||||
ld c, 0
|
||||
ld b, c
|
||||
ld hl, wcd32
|
||||
.asm_17d5ce
|
||||
.loop
|
||||
srl a
|
||||
jr c, .asm_17d5d6
|
||||
jr c, .got_button
|
||||
rept 2
|
||||
inc c
|
||||
endr
|
||||
jr .asm_17d5ce
|
||||
jr .loop
|
||||
|
||||
.asm_17d5d6
|
||||
.got_button
|
||||
add hl, bc
|
||||
ld a, [hli]
|
||||
ld c, a
|
||||
@ -969,7 +969,7 @@ endr
|
||||
and c
|
||||
cp $ff
|
||||
ret z
|
||||
ld a, [BGMapBuffer]
|
||||
ld a, [wcd20]
|
||||
ld l, a
|
||||
ld a, [wcd21]
|
||||
ld h, a
|
||||
@ -988,7 +988,7 @@ Function17d5f6: ; 17d5f6
|
||||
ld [rSVBK], a
|
||||
ld hl, $c608
|
||||
ld de, UnknBGPals
|
||||
ld bc, $0040
|
||||
ld bc, 8 palettes
|
||||
call CopyBytes
|
||||
ld a, $4
|
||||
ld [rSVBK], a
|
||||
@ -1153,12 +1153,12 @@ Function17d6fd: ; 17d6fd
|
||||
jr z, asm_17d721
|
||||
|
||||
Function17d711:
|
||||
.asm_17d711
|
||||
.crash_loop
|
||||
cp $31
|
||||
jr nc, .asm_17d711
|
||||
jr nc, .crash_loop
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, Jumptable_17d72a
|
||||
ld hl, Jumptable17d72a
|
||||
rept 2
|
||||
add hl, de
|
||||
endr
|
||||
@ -1174,7 +1174,7 @@ asm_17d721
|
||||
ret
|
||||
; 17d72a
|
||||
|
||||
Jumptable_17d72a: ; 17d72a
|
||||
Jumptable17d72a: ; 17d72a
|
||||
dw Function17d78c
|
||||
dw Function17d78d
|
||||
dw Function17d7b4
|
||||
@ -2032,9 +2032,9 @@ endr
|
||||
ld a, [hl]
|
||||
cp $ff
|
||||
jr z, .asm_17dd0d
|
||||
.asm_17dcfa
|
||||
.crash_loop
|
||||
cp $31
|
||||
jr nc, .asm_17dcfa
|
||||
jr nc, .crash_loop
|
||||
call Function17d711
|
||||
ld a, [wcd77]
|
||||
bit 7, a
|
||||
@ -4732,7 +4732,7 @@ Function17f56e: ; 17f56e
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
xor a
|
||||
ld [$aa4b], a
|
||||
ld [sMobileLoginPassword], a
|
||||
call CloseSRAM
|
||||
ret
|
||||
; 17f5ae
|
||||
|
||||
@ -411,13 +411,13 @@ Function4a28a: ; 4a28a (12:628a)
|
||||
push af
|
||||
call PlayClickSFX
|
||||
pop af
|
||||
bit 1, a
|
||||
jr nz, .asm_4a33b
|
||||
bit B_BUTTON_F, a
|
||||
jr nz, .quit
|
||||
ld a, [wMenuCursorY]
|
||||
cp $2
|
||||
jr z, .asm_4a2f0
|
||||
jr z, .DeleteLoginPassword
|
||||
cp $3
|
||||
jr z, .asm_4a33b
|
||||
jr z, .quit
|
||||
.asm_4a2df
|
||||
callba Function11765d
|
||||
call ClearBGPalettes
|
||||
@ -425,36 +425,37 @@ Function4a28a: ; 4a28a (12:628a)
|
||||
call LoadFontsExtra
|
||||
scf
|
||||
ret
|
||||
.asm_4a2f0
|
||||
|
||||
.DeleteLoginPassword
|
||||
call PlaceHollowCursor
|
||||
ld hl, UnknownText_0x4a358
|
||||
call PrintText
|
||||
hlcoord 14, 7
|
||||
ld b, $3
|
||||
ld c, $4
|
||||
ld b, 3
|
||||
ld c, 4
|
||||
call TextBox
|
||||
callba Function104148
|
||||
ld hl, MenuDataHeader_0x4a362
|
||||
ld hl, DeletePassword_YesNo_MenuDataHeader
|
||||
call LoadMenuDataHeader
|
||||
call VerticalMenu
|
||||
bit 1, a
|
||||
jr nz, .asm_4a338
|
||||
bit B_BUTTON_F, a
|
||||
jr nz, .dont_delete_password
|
||||
ld a, [wMenuCursorY]
|
||||
cp $2
|
||||
jr z, .asm_4a338
|
||||
jr z, .dont_delete_password
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
ld hl, $aa4b
|
||||
ld hl, sMobileLoginPassword
|
||||
xor a
|
||||
ld bc, $11
|
||||
ld bc, LOGIN_PASSWORD_LENGTH
|
||||
call ByteFill
|
||||
call CloseSRAM
|
||||
ld hl, UnknownText_0x4a35d
|
||||
call PrintText
|
||||
call JoyWaitAorB
|
||||
.asm_4a338
|
||||
.dont_delete_password
|
||||
call ExitMenu
|
||||
.asm_4a33b
|
||||
.quit
|
||||
call Call_ExitMenu
|
||||
callba Function104148
|
||||
xor a
|
||||
@ -484,7 +485,7 @@ UnknownText_0x4a35d: ; 0x4a35d
|
||||
db "@"
|
||||
; 0x4a362
|
||||
|
||||
MenuDataHeader_0x4a362: ; 0x4a362
|
||||
DeletePassword_YesNo_MenuDataHeader: ; 0x4a362
|
||||
db $40 ; flags
|
||||
db 07, 14 ; start coords
|
||||
db 11, 19 ; end coords
|
||||
|
||||
32
wram.asm
32
wram.asm
@ -245,7 +245,7 @@ Channel8:: channel_struct Channel8 ; c25f
|
||||
wCurTrackDuty:: ds 1
|
||||
wCurTrackIntensity:: ds 1
|
||||
wCurTrackFrequency:: dw
|
||||
wc296:: ds 1 ; used only in an unused function
|
||||
wc296:: ds 1 ; used only in an unused script
|
||||
wc297:: ds 1 ; used in MusicE0 and LoadNote
|
||||
|
||||
CurMusicByte:: ; c298
|
||||
@ -1375,7 +1375,7 @@ wMobileMonNicknamePointerBuffer:: dw
|
||||
wMobileMonMailPointerBuffer:: dw
|
||||
ds CreditsPos - @
|
||||
|
||||
wcd20:: ds 1 ; cd20
|
||||
wcd20:: ds 1
|
||||
wcd21:: ds 1
|
||||
wcd22::
|
||||
CreditsTimer:: ; cd22
|
||||
@ -3094,7 +3094,7 @@ PartyCount:: ; dcd7
|
||||
PartySpecies:: ; dcd8
|
||||
ds PARTY_LENGTH ; species of each Pokémon in party
|
||||
PartyEnd:: ; dcde
|
||||
ds 1 ; legacy functions don't check PartyCount
|
||||
ds 1 ; legacy scripts don't check PartyCount
|
||||
|
||||
PartyMons::
|
||||
PartyMon1:: party_struct PartyMon1 ; dcdf
|
||||
@ -3239,8 +3239,10 @@ wPokeAnimStructEnd::
|
||||
|
||||
SECTION "Battle Tower", WRAMX, BANK [3]
|
||||
|
||||
w3_d000:: ; d000
|
||||
ds $80
|
||||
w3_d000:: ds 1 ; d000
|
||||
w3_d001:: ds 1
|
||||
w3_d002::
|
||||
ds $7e
|
||||
w3_d080::
|
||||
ds $10
|
||||
w3_d090::
|
||||
@ -3264,11 +3266,23 @@ w3_d742:: battle_tower_struct w3_d742
|
||||
|
||||
wBTChoiceOfLvlGroup::
|
||||
w3_d800:: ds $69
|
||||
w3_d869:: ds $26
|
||||
w3_d88f:: ds 6
|
||||
w3_d895:: ds $36b
|
||||
w3_d869:: ds $17
|
||||
w3_d880:: ds 1
|
||||
w3_d881:: ds 1
|
||||
w3_d882:: ds 1
|
||||
w3_d883:: ds 7
|
||||
w3_d88a:: ds 5
|
||||
w3_d88f:: ds 5
|
||||
w3_d894:: ds 1
|
||||
w3_d895:: ds 11
|
||||
w3_d8a0:: ds 1
|
||||
w3_d8a1:: ds 1
|
||||
w3_d8a2:: ds 1
|
||||
w3_d8a3:: ds 1
|
||||
ds $35c
|
||||
w3_dc00:: ds $168
|
||||
w3_dd68:: ds $294
|
||||
w3_dd68:: ds $284
|
||||
w3_dfec:: ds $10
|
||||
w3_dffc:: ds 4
|
||||
|
||||
SECTION "GBC Video", WRAMX, BANK [5]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user