mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Color fns, some more address decoding in link/mobile
This commit is contained in:
PikalaxALT
parent
630d789c70
commit
d08199c79d
@ -8,7 +8,7 @@
|
||||
const SCGB_06
|
||||
const SCGB_07
|
||||
const SCGB_08
|
||||
const SCGB_09
|
||||
const SCGB_MAPPALS
|
||||
const SCGB_0A
|
||||
const SCGB_0B
|
||||
const SCGB_0C
|
||||
@ -19,7 +19,7 @@
|
||||
const SCGB_11
|
||||
const SCGB_12
|
||||
const SCGB_13
|
||||
const SCGB_14
|
||||
const SCGB_PACKPALS
|
||||
const SCGB_15
|
||||
const SCGB_16
|
||||
const SCGB_17
|
||||
@ -27,7 +27,7 @@
|
||||
const SCGB_19
|
||||
const SCGB_1A
|
||||
const SCGB_1B
|
||||
const SCGB_1C
|
||||
const SCGB_FRONTPICPALS
|
||||
const SCGB_1D
|
||||
const SCGB_1E
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
; trainer groups
|
||||
enum_start
|
||||
CHRIS EQU __enum__
|
||||
trainerclass TRAINER_NONE ; 0
|
||||
const PHONECONTACT_MOM
|
||||
const PHONECONTACT_BIKESHOP
|
||||
@ -7,6 +8,7 @@
|
||||
const PHONECONTACT_ELM
|
||||
const PHONECONTACT_BUENA
|
||||
|
||||
KRIS EQU __enum__
|
||||
trainerclass FALKNER ; 1
|
||||
|
||||
trainerclass WHITNEY ; 2
|
||||
|
||||
105
engine/color.asm
105
engine/color.asm
@ -88,20 +88,20 @@ Function8aa4: ; 8aa4
|
||||
push de
|
||||
push bc
|
||||
ld hl, PalPacket_9ce6
|
||||
ld de, wcda9
|
||||
ld de, wSGBPals
|
||||
ld bc, PALPACKET_LENGTH
|
||||
call CopyBytes
|
||||
pop bc
|
||||
pop de
|
||||
ld a, c
|
||||
ld [wcda9 + 3], a
|
||||
ld [wSGBPals + 3], a
|
||||
ld a, b
|
||||
ld [wcda9 + 4], a
|
||||
ld [wSGBPals + 4], a
|
||||
ld a, e
|
||||
ld [wcda9 + 5], a
|
||||
ld [wSGBPals + 5], a
|
||||
ld a, d
|
||||
ld [wcda9 + 6], a
|
||||
ld hl, wcda9
|
||||
ld [wSGBPals + 6], a
|
||||
ld hl, wSGBPals
|
||||
call Function9809
|
||||
ld hl, BlkPacket_9a86
|
||||
call Function9809
|
||||
@ -119,7 +119,7 @@ Function8ad1: ; 8ad1
|
||||
|
||||
Function8ade: ; 8ade SGB layout $fc
|
||||
ld hl, wcd9b
|
||||
ld a, [wcda9]
|
||||
ld a, [wSGBPals]
|
||||
ld e, a
|
||||
ld d, $0
|
||||
add hl, de
|
||||
@ -128,17 +128,16 @@ Function8ade: ; 8ade SGB layout $fc
|
||||
ld a, [de]
|
||||
and a
|
||||
ld e, $5
|
||||
jr z, .asm_8af7
|
||||
jr z, .okay
|
||||
dec a
|
||||
ld e, $a
|
||||
jr z, .asm_8af7
|
||||
jr z, .okay
|
||||
ld e, $f
|
||||
|
||||
.asm_8af7
|
||||
.okay
|
||||
push de
|
||||
ld hl, wcda9 + 10
|
||||
ld hl, wSGBPals + 10
|
||||
ld bc, $6
|
||||
ld a, [wcda9]
|
||||
ld a, [wSGBPals]
|
||||
call AddNTimes
|
||||
pop de
|
||||
ld [hl], e
|
||||
@ -204,7 +203,7 @@ Function8b4d: ; 8b4d
|
||||
.asm_8b5c
|
||||
ld de, UnknOBPals
|
||||
ld a, $3b
|
||||
call GetAthPalletFromPalettes9df6
|
||||
call GetPredefPal
|
||||
jp LoadHLPaletteIntoDE
|
||||
; 8b67
|
||||
|
||||
@ -220,7 +219,7 @@ Function8b67: ; 8b67
|
||||
.asm_8b76
|
||||
ld de, UnknOBPals
|
||||
ld a, $3c
|
||||
call GetAthPalletFromPalettes9df6
|
||||
call GetPredefPal
|
||||
jp LoadHLPaletteIntoDE
|
||||
; 8b81
|
||||
|
||||
@ -233,20 +232,20 @@ Function8b81: ; 8b81
|
||||
ld a, c
|
||||
push af
|
||||
ld hl, PalPacket_9ce6
|
||||
ld de, wcda9
|
||||
ld de, wSGBPals
|
||||
ld bc, PALPACKET_LENGTH
|
||||
call CopyBytes
|
||||
pop af
|
||||
call GetMonPalettePointer_
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 3], a
|
||||
ld [wSGBPals + 3], a
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 4], a
|
||||
ld [wSGBPals + 4], a
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 5], a
|
||||
ld [wSGBPals + 5], a
|
||||
ld a, [hl]
|
||||
ld [wcda9 + 6], a
|
||||
ld hl, wcda9
|
||||
ld [wSGBPals + 6], a
|
||||
ld hl, wSGBPals
|
||||
jp Function9809
|
||||
|
||||
.asm_8bb2
|
||||
@ -438,7 +437,7 @@ endr
|
||||
jr nz, .asm_8cf0
|
||||
push hl
|
||||
ld hl, PalPacket_9ce6
|
||||
ld de, wcda9
|
||||
ld de, wSGBPals
|
||||
ld bc, PALPACKET_LENGTH
|
||||
call CopyBytes
|
||||
pop hl
|
||||
@ -446,14 +445,14 @@ rept 2
|
||||
inc hl
|
||||
endr
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 3], a
|
||||
ld [wSGBPals + 3], a
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 4], a
|
||||
ld [wSGBPals + 4], a
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 5], a
|
||||
ld [wSGBPals + 5], a
|
||||
ld a, [hli]
|
||||
ld [wcda9 + 6], a
|
||||
ld hl, wcda9
|
||||
ld [wSGBPals + 6], a
|
||||
ld hl, wSGBPals
|
||||
call Function9809
|
||||
ld hl, BlkPacket_9a86
|
||||
call Function9809
|
||||
@ -556,7 +555,7 @@ CopyPalettes: ; 9615
|
||||
push bc
|
||||
ld a, [hli]
|
||||
push hl
|
||||
call GetAthPalletFromPalettes9df6
|
||||
call GetPredefPal
|
||||
call LoadHLPaletteIntoDE
|
||||
pop hl
|
||||
inc hl
|
||||
@ -566,7 +565,7 @@ CopyPalettes: ; 9615
|
||||
ret
|
||||
; 9625
|
||||
|
||||
GetAthPalletFromPalettes9df6: ; 9625
|
||||
GetPredefPal: ; 9625
|
||||
ld l, a
|
||||
ld h, $0
|
||||
rept 3 ; multiply by 8
|
||||
@ -737,7 +736,7 @@ ApplyAttrMap: ; 96b3
|
||||
|
||||
Function96f3: ; 96f3 CGB layout $fc
|
||||
ld hl, wcd9b
|
||||
ld a, [wcda9]
|
||||
ld a, [wSGBPals]
|
||||
ld e, a
|
||||
ld d, $0
|
||||
add hl, de
|
||||
@ -748,7 +747,7 @@ Function96f3: ; 96f3 CGB layout $fc
|
||||
ld e, a
|
||||
hlcoord 11, 2, AttrMap
|
||||
ld bc, $28
|
||||
ld a, [wcda9]
|
||||
ld a, [wSGBPals]
|
||||
.asm_970b
|
||||
and a
|
||||
jr z, .asm_9712
|
||||
@ -892,10 +891,10 @@ Function97cc: ; 97cc
|
||||
ld a, $90
|
||||
ld [rOBPI], a
|
||||
ld a, $1c
|
||||
call GetAthPalletFromPalettes9df6
|
||||
call GetPredefPal
|
||||
call Function97e5
|
||||
ld a, $21
|
||||
call GetAthPalletFromPalettes9df6
|
||||
call GetPredefPal
|
||||
call Function97e5
|
||||
ret
|
||||
; 97e5
|
||||
@ -1956,15 +1955,15 @@ INCLUDE "gfx/pics/palette_pointers.asm"
|
||||
INCLUDE "gfx/trainers/palette_pointers.asm"
|
||||
; b1de
|
||||
|
||||
Functionb1de: ; b1de
|
||||
LoadMapPals: ; b1de
|
||||
callba LoadSpecialMapPalette
|
||||
jr c, .asm_b230
|
||||
jr c, .got_pals
|
||||
|
||||
ld a, [wPermission]
|
||||
and 7
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, Unknown_b279
|
||||
ld hl, .TilesetColorsPointers
|
||||
rept 2
|
||||
add hl, de
|
||||
endr
|
||||
@ -1986,8 +1985,8 @@ endr
|
||||
ld a, $5
|
||||
ld [rSVBK], a
|
||||
ld hl, UnknBGPals
|
||||
ld b, $8
|
||||
.asm_b210
|
||||
ld b, 8
|
||||
.outer_loop
|
||||
ld a, [de]
|
||||
push de
|
||||
push hl
|
||||
@ -2001,37 +2000,37 @@ endr
|
||||
ld e, l
|
||||
ld d, h
|
||||
pop hl
|
||||
ld c, 8
|
||||
.asm_b222
|
||||
ld c, 1 palettes
|
||||
.inner_loop
|
||||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
dec c
|
||||
jr nz, .asm_b222
|
||||
jr nz, .inner_loop
|
||||
pop de
|
||||
inc de
|
||||
dec b
|
||||
jr nz, .asm_b210
|
||||
jr nz, .outer_loop
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
|
||||
.asm_b230
|
||||
.got_pals
|
||||
ld a, [TimeOfDayPal]
|
||||
and 3
|
||||
ld bc, $40
|
||||
ld bc, 8 palettes
|
||||
ld hl, MapObjectPals
|
||||
call AddNTimes
|
||||
ld de, UnknOBPals
|
||||
ld bc, $40
|
||||
ld bc, 8 palettes
|
||||
ld a, $5 ; BANK(UnknOBPals)
|
||||
call FarCopyWRAM
|
||||
|
||||
ld a, [wPermission]
|
||||
cp 1
|
||||
jr z, .asm_b253
|
||||
cp 2
|
||||
cp TOWN
|
||||
jr z, .outside
|
||||
cp ROUTE
|
||||
ret nz
|
||||
.asm_b253
|
||||
.outside
|
||||
ld a, [MapGroup]
|
||||
ld l, a
|
||||
ld h, 0
|
||||
@ -2043,19 +2042,19 @@ endr
|
||||
ld a, [TimeOfDayPal]
|
||||
and 3
|
||||
cp NITE
|
||||
jr c, .asm_b26d
|
||||
jr c, .morn_day
|
||||
rept 4
|
||||
inc hl
|
||||
endr
|
||||
.asm_b26d
|
||||
ld de, UnknBGPals + 8 * 6 + 2
|
||||
.morn_day
|
||||
ld de, UnknBGPals + 6 palettes + 2
|
||||
ld bc, 4
|
||||
ld a, $5
|
||||
call FarCopyWRAM
|
||||
ret
|
||||
; b279
|
||||
|
||||
Unknown_b279: ; b279
|
||||
.TilesetColorsPointers: ; b279
|
||||
dw TilesetColors1
|
||||
dw TilesetColors1
|
||||
dw TilesetColors1
|
||||
|
||||
@ -542,7 +542,7 @@ Function81c33: ; 81c33
|
||||
ret
|
||||
|
||||
.asm_81c69
|
||||
ld hl, wcda9
|
||||
ld hl, wSGBPals
|
||||
ld a, $1
|
||||
ld [hli], a
|
||||
ld a, $ff
|
||||
@ -562,7 +562,7 @@ rept 2
|
||||
ld [hli], a
|
||||
endr
|
||||
ld [hl], a
|
||||
ld hl, wcda9
|
||||
ld hl, wSGBPals
|
||||
call Function81f0c
|
||||
hlcoord 10, 2
|
||||
ld de, wc608
|
||||
|
||||
@ -685,7 +685,7 @@ OakSpeech: ; 0x5f99
|
||||
ld [TrainerClass], a
|
||||
call Intro_PrepTrainerPic
|
||||
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call Intro_RotatePalettesLeftFrontpic
|
||||
|
||||
@ -706,7 +706,7 @@ OakSpeech: ; 0x5f99
|
||||
ld [TempMonDVs], a
|
||||
ld [TempMonDVs + 1], a
|
||||
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call Intro_WipeInFrontpic
|
||||
|
||||
@ -723,7 +723,7 @@ OakSpeech: ; 0x5f99
|
||||
ld [TrainerClass], a
|
||||
call Intro_PrepTrainerPic
|
||||
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call Intro_RotatePalettesLeftFrontpic
|
||||
|
||||
@ -736,7 +736,7 @@ OakSpeech: ; 0x5f99
|
||||
ld [CurPartySpecies], a
|
||||
callba DrawIntroPlayerPic
|
||||
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call Intro_RotatePalettesLeftFrontpic
|
||||
|
||||
@ -806,7 +806,7 @@ NamePlayer: ; 0x6074
|
||||
ld [CurPartySpecies], a
|
||||
callba DrawIntroPlayerPic
|
||||
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call RotateThreePalettesLeft
|
||||
|
||||
|
||||
161
engine/link.asm
161
engine/link.asm
@ -14,14 +14,14 @@ LinkCommunications: ; 28000
|
||||
call UpdateSprites
|
||||
call LoadStandardFont
|
||||
call LoadFontsBattleExtra
|
||||
callba Function16d69a
|
||||
callba LinkComms_LoadPleaseWaitTextboxBorderGFX
|
||||
call WaitBGMap2
|
||||
hlcoord 3, 8
|
||||
ld b, 2
|
||||
ld c, 12
|
||||
ld d, h
|
||||
ld e, l
|
||||
callba Function4d35b
|
||||
callba LinkTextbox2
|
||||
hlcoord 4, 10
|
||||
ld de, String_PleaseWait
|
||||
call PlaceString
|
||||
@ -38,14 +38,14 @@ LinkCommunications: ; 28000
|
||||
TimeCapsule: ; 2805d
|
||||
call ClearLinkData
|
||||
call Link_PrepPartyData_Gen1
|
||||
call Function28434
|
||||
call FixDataForLinkTransfer
|
||||
xor a
|
||||
ld [wPlayerLinkAction], a
|
||||
call Function87d
|
||||
ld a, [hLinkPlayerNumber]
|
||||
cp $2
|
||||
jr nz, .player_1
|
||||
ld c, $3
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
xor a
|
||||
ld [hSerialSend], a
|
||||
@ -90,7 +90,7 @@ TimeCapsule: ; 2805d
|
||||
ld [rIF], a
|
||||
ld a, $1d
|
||||
ld [rIE], a
|
||||
call Function287ab
|
||||
call Link_CopyRandomNumbers
|
||||
ld hl, OTPlayerName
|
||||
call Link_FindFirstNonControlCharacter_SkipZero
|
||||
push hl
|
||||
@ -180,14 +180,14 @@ TimeCapsule: ; 2805d
|
||||
Gen2ToGen2LinkComms: ; 28177
|
||||
call ClearLinkData
|
||||
call Link_PrepPartyData_Gen2
|
||||
call Function28434
|
||||
call FixDataForLinkTransfer
|
||||
call Function29dba
|
||||
ld a, [ScriptVar]
|
||||
and a
|
||||
jp z, Function283b2
|
||||
ld a, [hLinkPlayerNumber]
|
||||
cp $2
|
||||
jr nz, .Player2
|
||||
jr nz, .Player1
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
xor a
|
||||
@ -204,7 +204,7 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
ld a, $81
|
||||
ld [rSC], a
|
||||
|
||||
.Player2
|
||||
.Player1
|
||||
ld de, MUSIC_NONE
|
||||
call PlayMusic
|
||||
ld c, 3
|
||||
@ -231,20 +231,20 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
call Function75f
|
||||
ld a, [wLinkMode]
|
||||
cp LINK_TRADECENTER
|
||||
jr nz, .asm_281fd
|
||||
jr nz, .not_trading
|
||||
ld hl, wc9f4
|
||||
ld de, wcb84
|
||||
ld bc, $186
|
||||
call Function283f2
|
||||
|
||||
.asm_281fd
|
||||
.not_trading
|
||||
xor a
|
||||
ld [rIF], a
|
||||
ld a, $1d
|
||||
ld [rIE], a
|
||||
ld de, MUSIC_NONE
|
||||
call PlayMusic
|
||||
call Function287ab
|
||||
call Link_CopyRandomNumbers
|
||||
ld hl, OTPlayerName
|
||||
call Link_FindFirstNonControlCharacter_SkipZero
|
||||
ld de, wLinkData
|
||||
@ -253,17 +253,17 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
ld de, wPlayerTrademonSpecies
|
||||
ld hl, wLinkPlayerPartyMon1Species
|
||||
ld c, $2
|
||||
.asm_28224
|
||||
.loop1
|
||||
ld a, [de]
|
||||
inc de
|
||||
and a
|
||||
jr z, .asm_28224
|
||||
jr z, .loop1
|
||||
cp $fd
|
||||
jr z, .asm_28224
|
||||
jr z, .loop1
|
||||
cp $fe
|
||||
jr z, .asm_28224
|
||||
jr z, .loop1
|
||||
cp $ff
|
||||
jr z, .asm_28243
|
||||
jr z, .next1
|
||||
push hl
|
||||
push bc
|
||||
ld b, $0
|
||||
@ -274,93 +274,92 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
ld [hl], a
|
||||
pop bc
|
||||
pop hl
|
||||
jr .asm_28224
|
||||
jr .loop1
|
||||
|
||||
.asm_28243
|
||||
.next1
|
||||
ld hl, wc90f
|
||||
dec c
|
||||
jr nz, .asm_28224
|
||||
jr nz, .loop1
|
||||
ld a, [wLinkMode]
|
||||
cp LINK_TRADECENTER
|
||||
jp nz, .asm_282fe
|
||||
jp nz, .skip_mail
|
||||
ld hl, wcb84
|
||||
.asm_28254
|
||||
.loop2
|
||||
ld a, [hli]
|
||||
cp $20
|
||||
jr nz, .asm_28254
|
||||
.asm_28259
|
||||
jr nz, .loop2
|
||||
.loop3
|
||||
ld a, [hli]
|
||||
cp $fe
|
||||
jr z, .asm_28259
|
||||
jr z, .loop3
|
||||
cp $20
|
||||
jr z, .asm_28259
|
||||
jr z, .loop3
|
||||
dec hl
|
||||
ld de, wcb84
|
||||
ld bc, $190
|
||||
ld bc, $190 ; 400
|
||||
call CopyBytes
|
||||
ld hl, wcb84
|
||||
ld bc, $c6
|
||||
.asm_28272
|
||||
ld bc, $c6 ; 198
|
||||
.loop4
|
||||
ld a, [hl]
|
||||
cp $21
|
||||
jr nz, .asm_28279
|
||||
jr nz, .okay1
|
||||
ld [hl], $fe
|
||||
|
||||
.asm_28279
|
||||
.okay1
|
||||
inc hl
|
||||
dec bc
|
||||
ld a, b
|
||||
or c
|
||||
jr nz, .asm_28272
|
||||
jr nz, .loop4
|
||||
ld de, wcc9e
|
||||
.asm_28282
|
||||
.loop5
|
||||
ld a, [de]
|
||||
inc de
|
||||
cp $ff
|
||||
jr z, .asm_28294
|
||||
jr z, .start_copying_mail
|
||||
ld hl, wcc4a
|
||||
dec a
|
||||
ld b, $0
|
||||
ld c, a
|
||||
add hl, bc
|
||||
ld [hl], $fe
|
||||
jr .asm_28282
|
||||
jr .loop5
|
||||
|
||||
.asm_28294
|
||||
.start_copying_mail
|
||||
ld hl, wcb84
|
||||
ld de, wc9f4
|
||||
ld b, $6
|
||||
.asm_2829c
|
||||
ld b, PARTY_LENGTH
|
||||
.copy_mail_loop
|
||||
push bc
|
||||
ld bc, $21
|
||||
ld bc, MAIL_MSG_LENGTH + 1
|
||||
call CopyBytes
|
||||
ld a, $e
|
||||
ld a, (MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1)) % $100
|
||||
add e
|
||||
ld e, a
|
||||
ld a, $0
|
||||
ld a, (MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1)) / $100
|
||||
adc d
|
||||
ld d, a
|
||||
pop bc
|
||||
dec b
|
||||
jr nz, .asm_2829c
|
||||
jr nz, .copy_mail_loop
|
||||
ld de, wc9f4
|
||||
ld b, $6
|
||||
.asm_282b4
|
||||
ld b, PARTY_LENGTH
|
||||
.copy_author_loop
|
||||
push bc
|
||||
ld a, $21
|
||||
ld a, (MAIL_MSG_LENGTH + 1) % $100
|
||||
add e
|
||||
ld e, a
|
||||
ld a, $0
|
||||
ld a, (MAIL_MSG_LENGTH + 1) / $100
|
||||
adc d
|
||||
ld d, a
|
||||
ld bc, $e
|
||||
ld bc, MAIL_STRUCT_LENGTH - (MAIL_MSG_LENGTH + 1)
|
||||
call CopyBytes
|
||||
pop bc
|
||||
dec b
|
||||
jr nz, .asm_282b4
|
||||
ld b, $6
|
||||
jr nz, .copy_author_loop
|
||||
ld b, PARTY_LENGTH
|
||||
ld de, wc9f4
|
||||
.asm_282cc
|
||||
.fix_mail_loop
|
||||
push bc
|
||||
push de
|
||||
callba IsMailEuropean
|
||||
@ -385,12 +384,12 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
ld e, l
|
||||
pop bc
|
||||
dec b
|
||||
jr nz, .asm_282cc
|
||||
jr nz, .fix_mail_loop
|
||||
ld de, wcb0e
|
||||
xor a
|
||||
ld [de], a
|
||||
|
||||
.asm_282fe
|
||||
.skip_mail
|
||||
ld hl, wLinkData
|
||||
ld de, OTPlayerName
|
||||
ld bc, NAME_LENGTH
|
||||
@ -416,7 +415,7 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
call z, DelayFrames
|
||||
ld a, [wLinkMode]
|
||||
cp LINK_COLOSSEUM
|
||||
jr nz, .asm_283a9
|
||||
jr nz, .ready_to_trade
|
||||
ld a, CAL
|
||||
ld [OtherTrainerClass], a
|
||||
call ClearScreen
|
||||
@ -463,7 +462,7 @@ Gen2ToGen2LinkComms: ; 28177
|
||||
callba LoadPokemonData
|
||||
jp Function28b22
|
||||
|
||||
.asm_283a9
|
||||
.ready_to_trade
|
||||
ld de, MUSIC_ROUTE_30
|
||||
call PlayMusic
|
||||
jp InitTradeMenuDisplay
|
||||
@ -488,7 +487,7 @@ Function283b2: ; 283b2
|
||||
push de
|
||||
ld d, h
|
||||
ld e, l
|
||||
callba Function4d35b
|
||||
callba LinkTextbox2
|
||||
pop de
|
||||
pop hl
|
||||
bccoord 1, 14
|
||||
@ -510,7 +509,7 @@ Function283b2: ; 283b2
|
||||
Function283f2: ; 283f2
|
||||
ld a, $1
|
||||
ld [hFFCC], a
|
||||
.asm_283f6
|
||||
.loop
|
||||
ld a, [hl]
|
||||
ld [hSerialSend], a
|
||||
call Function78a
|
||||
@ -518,26 +517,26 @@ Function283f2: ; 283f2
|
||||
ld b, a
|
||||
inc hl
|
||||
ld a, $30
|
||||
.asm_28401
|
||||
.delay_cycles
|
||||
dec a
|
||||
jr nz, .asm_28401
|
||||
jr nz, .delay_cycles
|
||||
ld a, [hFFCC]
|
||||
and a
|
||||
ld a, b
|
||||
pop bc
|
||||
jr z, .asm_28411
|
||||
jr z, .load
|
||||
dec hl
|
||||
xor a
|
||||
ld [hFFCC], a
|
||||
jr .asm_283f6
|
||||
jr .loop
|
||||
|
||||
.asm_28411
|
||||
.load
|
||||
ld [de], a
|
||||
inc de
|
||||
dec bc
|
||||
ld a, b
|
||||
or c
|
||||
jr nz, .asm_283f6
|
||||
jr nz, .loop
|
||||
ret
|
||||
; 28419
|
||||
|
||||
@ -558,15 +557,15 @@ ClearLinkData: ; 28426
|
||||
ret
|
||||
; 28434
|
||||
|
||||
Function28434: ; 28434
|
||||
FixDataForLinkTransfer: ; 28434
|
||||
ld hl, wd1f3
|
||||
ld a, $fd
|
||||
ld b, 7
|
||||
ld b, LinkBattleRNs - wd1f3
|
||||
.loop1
|
||||
ld [hli], a
|
||||
dec b
|
||||
jr nz, .loop1
|
||||
ld b, 10
|
||||
ld b, TempEnemyMonSpecies - LinkBattleRNs
|
||||
.loop2
|
||||
call Random
|
||||
cp $fd
|
||||
@ -579,14 +578,14 @@ Function28434: ; 28434
|
||||
rept 3
|
||||
ld [hli], a
|
||||
endr
|
||||
ld b, $c8
|
||||
ld b, wc6d3 - (wMisc + 3)
|
||||
xor a
|
||||
.loop3
|
||||
ld [hli], a
|
||||
dec b
|
||||
jr nz, .loop3
|
||||
ld hl, wc818
|
||||
ld de, wMisc + 10
|
||||
ld hl, wTimeCapsulePartyMon1 - 1 + 6
|
||||
ld de, wc612
|
||||
lb bc, 0, 0
|
||||
.loop4
|
||||
inc c
|
||||
@ -602,13 +601,11 @@ endr
|
||||
ld b, $d
|
||||
jr z, .got_value
|
||||
ld b, $27
|
||||
|
||||
.got_value
|
||||
ld a, c
|
||||
cp b
|
||||
pop bc
|
||||
jr z, .done
|
||||
|
||||
.next2
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
@ -1163,7 +1160,7 @@ Link_CopyOTData: ; 2879e
|
||||
ret
|
||||
; 287ab
|
||||
|
||||
Function287ab: ; 287ab
|
||||
Link_CopyRandomNumbers: ; 287ab
|
||||
ld a, [hLinkPlayerNumber]
|
||||
cp $2
|
||||
ret z
|
||||
@ -2161,8 +2158,8 @@ Special_EnterTimeCapsule: ; 29c7b
|
||||
ret
|
||||
; 29c92
|
||||
|
||||
Special_AbortLink: ; 29c92
|
||||
ld c, $3
|
||||
WaitForOtherPlayerToExit: ; 29c92
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
ld a, -1
|
||||
ld [hLinkPlayerNumber], a
|
||||
@ -2173,7 +2170,7 @@ Special_AbortLink: ; 29c92
|
||||
ld [rSC], a
|
||||
ld a, $81
|
||||
ld [rSC], a
|
||||
ld c, $3
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
xor a
|
||||
ld [rSB], a
|
||||
@ -2188,7 +2185,7 @@ Special_AbortLink: ; 29c92
|
||||
ld [rSB], a
|
||||
ld [hSerialReceive], a
|
||||
ld [rSC], a
|
||||
ld c, $3
|
||||
ld c, 3
|
||||
call DelayFrames
|
||||
ld a, -1
|
||||
ld [hLinkPlayerNumber], a
|
||||
@ -2348,16 +2345,16 @@ Function29dba: ; 29dba
|
||||
call Function29e0c
|
||||
ld a, [ScriptVar]
|
||||
and a
|
||||
jr z, .asm_29e08
|
||||
jr z, .vblank
|
||||
ld bc, -1
|
||||
.asm_29de0
|
||||
.wait
|
||||
dec bc
|
||||
ld a, b
|
||||
or c
|
||||
jr nz, .asm_29de0
|
||||
jr nz, .wait
|
||||
ld a, [wOtherPlayerLinkMode]
|
||||
cp $5
|
||||
jr nz, .asm_29e03
|
||||
jr nz, .script_var
|
||||
ld a, $6
|
||||
ld [wPlayerLinkAction], a
|
||||
ld hl, wcf5b
|
||||
@ -2367,14 +2364,14 @@ Function29dba: ; 29dba
|
||||
call Function29e0c
|
||||
ld a, [wOtherPlayerLinkMode]
|
||||
cp $6
|
||||
jr z, .asm_29e08
|
||||
jr z, .vblank
|
||||
|
||||
.asm_29e03
|
||||
.script_var
|
||||
xor a
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
|
||||
.asm_29e08
|
||||
.vblank
|
||||
xor a
|
||||
ld [hVBlank], a
|
||||
ret
|
||||
|
||||
@ -1,7 +1,11 @@
|
||||
LinkCommsBorderGFX:
|
||||
INCBIN "gfx/unknown/16cfc1.2bpp"
|
||||
; 16d421
|
||||
|
||||
__LoadTradeScreenBorder: ; 16d421
|
||||
ld de, GFX_16cfc1
|
||||
ld de, LinkCommsBorderGFX
|
||||
ld hl, VTiles2
|
||||
lb bc, BANK(GFX_16cfc1), 70
|
||||
lb bc, BANK(LinkCommsBorderGFX), 70
|
||||
call Get2bpp
|
||||
ret
|
||||
; 16d42e
|
||||
@ -55,19 +59,19 @@ _LinkTextbox: ; 16d61d
|
||||
inc c
|
||||
inc c
|
||||
ld a, $7
|
||||
.loop
|
||||
.row
|
||||
push bc
|
||||
push hl
|
||||
.loop2
|
||||
.col
|
||||
ld [hli], a
|
||||
dec c
|
||||
jr nz, .loop2
|
||||
jr nz, .col
|
||||
pop hl
|
||||
ld de, SCREEN_WIDTH
|
||||
add hl, de
|
||||
pop bc
|
||||
dec b
|
||||
jr nz, .loop
|
||||
jr nz, .row
|
||||
ret
|
||||
; 16d640
|
||||
|
||||
@ -82,7 +86,7 @@ _LinkTextbox: ; 16d61d
|
||||
pop hl
|
||||
ld de, SCREEN_WIDTH
|
||||
add hl, de
|
||||
.loop3
|
||||
.loop
|
||||
push hl
|
||||
ld a, $33
|
||||
ld [hli], a
|
||||
@ -93,7 +97,7 @@ _LinkTextbox: ; 16d61d
|
||||
ld de, SCREEN_WIDTH
|
||||
add hl, de
|
||||
dec b
|
||||
jr nz, .loop3
|
||||
jr nz, .loop
|
||||
|
||||
ld a, $35
|
||||
ld [hli], a
|
||||
@ -133,10 +137,10 @@ _LoadTradeScreenBorder: ; 16d696
|
||||
; 16d69a
|
||||
|
||||
|
||||
Function16d69a: ; 16d69a
|
||||
ld de, GFX_16cfc1 + $300
|
||||
LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
|
||||
ld de, LinkCommsBorderGFX + $30 tiles
|
||||
ld hl, VTiles2 tile $76
|
||||
lb bc, BANK(GFX_16cfc1), 8
|
||||
lb bc, BANK(LinkCommsBorderGFX), 8
|
||||
call Get2bpp
|
||||
ret
|
||||
; 16d6a7
|
||||
|
||||
@ -1537,7 +1537,7 @@ ClearPocketList: ; 10a36 (4:4a36)
|
||||
|
||||
Pack_InitColors: ; 10a40
|
||||
call WaitBGMap
|
||||
ld b, SCGB_14
|
||||
ld b, SCGB_PACKPALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
call DelayFrame
|
||||
|
||||
@ -125,7 +125,7 @@ endr
|
||||
|
||||
PlacePartyHPBar: ; 500cf
|
||||
xor a
|
||||
ld [wcda9], a
|
||||
ld [wSGBPals], a
|
||||
ld a, [PartyCount]
|
||||
and a
|
||||
ret z
|
||||
@ -144,7 +144,7 @@ PlacePartyHPBar: ; 500cf
|
||||
ld b, $0
|
||||
call DrawBattleHPBar
|
||||
ld hl, wcd9b
|
||||
ld a, [wcda9]
|
||||
ld a, [wSGBPals]
|
||||
ld c, a
|
||||
ld b, $0
|
||||
add hl, bc
|
||||
@ -153,7 +153,7 @@ PlacePartyHPBar: ; 500cf
|
||||
call GetSGBLayout
|
||||
|
||||
.skip
|
||||
ld hl, wcda9
|
||||
ld hl, wSGBPals
|
||||
inc [hl]
|
||||
pop hl
|
||||
ld de, 2 * SCREEN_WIDTH
|
||||
|
||||
@ -26,7 +26,7 @@ SpecialsPointers:: ; c029
|
||||
add_special Special_CheckBothSelectedSameRoom
|
||||
add_special Special_FailedLinkToPast
|
||||
add_special Special_CloseLink
|
||||
add_special Special_AbortLink
|
||||
add_special WaitForOtherPlayerToExit
|
||||
add_special Special_SetBitsForBattleRequest
|
||||
add_special Special_SetBitsForTimeCapsuleRequest
|
||||
add_special Special_CheckTimeCapsuleCompatibility
|
||||
|
||||
@ -384,7 +384,7 @@ Functionfb8c8: ; fb8c8
|
||||
ld [TempMonDVs], a
|
||||
ld a, [hl]
|
||||
ld [TempMonDVs + 1], a
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
ret
|
||||
|
||||
@ -65,7 +65,7 @@ _TimeOfDayPals:: ; 8c011
|
||||
|
||||
|
||||
; update sgb pals
|
||||
ld b, SCGB_09
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
|
||||
|
||||
|
||||
@ -289,7 +289,7 @@ Function1047a3: ; 1047a3 (41:47a3)
|
||||
ld [hli], a
|
||||
dec c
|
||||
jr nz, .column
|
||||
ld bc, $20 - SCREEN_WIDTH
|
||||
ld bc, BG_MAP_WIDTH - SCREEN_WIDTH
|
||||
add hl, bc
|
||||
pop bc
|
||||
dec b
|
||||
@ -307,11 +307,11 @@ LoadGraphics: ; 1047cf
|
||||
ld [hTileAnimFrame], a
|
||||
callba RefreshSprites
|
||||
call LoadFontsExtra
|
||||
callba Function106594
|
||||
callba LoadOverworldFont
|
||||
ret
|
||||
|
||||
LoadMapPalettes: ; 1047eb
|
||||
ld b, SCGB_09
|
||||
ld b, SCGB_MAPPALS
|
||||
jp GetSGBLayout
|
||||
; 1047f0
|
||||
|
||||
@ -329,7 +329,7 @@ RefreshMapSprites: ; 1047f0
|
||||
call Function2e31
|
||||
.skip
|
||||
ld a, [wPlayerSpriteSetupFlags]
|
||||
and $1c
|
||||
and %00011100
|
||||
ld [wPlayerSpriteSetupFlags], a
|
||||
ret
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ BlindingFlash: ; 8c7e1
|
||||
set 2, [hl] ; Flash
|
||||
callba ReplaceTimeOfDayPals
|
||||
callba UpdateTimeOfDayPal
|
||||
ld b, SCGB_09
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
callba LoadOW_BGPal7
|
||||
callba FadeInPalettes
|
||||
|
||||
@ -446,7 +446,7 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
|
||||
ld [TimeOfDayPal], a
|
||||
ld a, $1
|
||||
ld [wPermission], a
|
||||
ld b, SCGB_09
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
call UpdateTimePals
|
||||
ld a, [rBGP]
|
||||
|
||||
@ -59,7 +59,7 @@ UnownPrinter: ; 16be4
|
||||
ld [TempMonDVs], a
|
||||
ld [TempMonDVs + 1], a
|
||||
|
||||
ld b, SCGB_1C
|
||||
ld b, SCGB_FRONTPICPALS
|
||||
call GetSGBLayout
|
||||
call SetPalettes
|
||||
|
||||
|
||||
@ -2002,7 +2002,7 @@ ExitAllMenus:: ; 2b4d
|
||||
call UpdateSprites
|
||||
call ret_d90
|
||||
Function2b5c:: ; 2b5c
|
||||
ld b, SCGB_09
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
callba LoadOW_BGPal7
|
||||
call WaitBGMap2
|
||||
@ -2025,7 +2025,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
|
||||
set 0, [hl]
|
||||
call UpdateSprites
|
||||
call WaitBGMap2
|
||||
ld b, SCGB_09
|
||||
ld b, SCGB_MAPPALS
|
||||
call GetSGBLayout
|
||||
callba LoadOW_BGPal7
|
||||
call UpdateTimePals
|
||||
|
||||
@ -44,7 +44,7 @@ CloseText:: ; 2dcf
|
||||
ld [hWY], a
|
||||
call ReplaceKrisSprite
|
||||
callba ReturnFromMapSetupScript
|
||||
callba Function106594
|
||||
callba LoadOverworldFont
|
||||
ret
|
||||
; 2e08
|
||||
|
||||
|
||||
22
main.asm
22
main.asm
@ -2868,7 +2868,7 @@ FlyFunction: ; ca3b
|
||||
callba Function561d
|
||||
call DelayFrame
|
||||
call ReplaceKrisSprite
|
||||
callba Function106594
|
||||
callba LoadOverworldFont
|
||||
ret
|
||||
; cade
|
||||
|
||||
@ -9674,10 +9674,10 @@ endr
|
||||
; 48e93
|
||||
|
||||
PackFGFXPointers: ; 48e93
|
||||
dw PackFGFX + $f0 * 1
|
||||
dw PackFGFX + $f0 * 3
|
||||
dw PackFGFX + $f0 * 0
|
||||
dw PackFGFX + $f0 * 2
|
||||
dw PackFGFX + (15 tiles) * 1
|
||||
dw PackFGFX + (15 tiles) * 3
|
||||
dw PackFGFX + (15 tiles) * 0
|
||||
dw PackFGFX + (15 tiles) * 2
|
||||
; 48e9b
|
||||
|
||||
PackFGFX: ; 48e9b
|
||||
@ -9689,7 +9689,7 @@ Special_MoveTutor: ; 4925b
|
||||
call ClearBGPalettes
|
||||
call ClearScreen
|
||||
call DelayFrame
|
||||
ld b, SCGB_14
|
||||
ld b, SCGB_PACKPALS
|
||||
call GetSGBLayout
|
||||
xor a
|
||||
ld [wItemAttributeParamBuffer], a
|
||||
@ -10289,7 +10289,7 @@ Function4d354: ; 4d354
|
||||
ret
|
||||
; 4d35b
|
||||
|
||||
Function4d35b: ; 4d35b
|
||||
LinkTextbox2: ; 4d35b
|
||||
ld h, d
|
||||
ld l, e
|
||||
push bc
|
||||
@ -14720,11 +14720,11 @@ DrawIntroPlayerPic: ; 88874
|
||||
; Draw the player pic at (6,4).
|
||||
|
||||
; Get class
|
||||
ld e, 0
|
||||
ld e, CHRIS
|
||||
ld a, [PlayerGender]
|
||||
bit 0, a
|
||||
jr z, .GotClass
|
||||
ld e, 1
|
||||
ld e, KRIS
|
||||
.GotClass
|
||||
ld a, e
|
||||
ld [TrainerClass], a
|
||||
@ -15310,6 +15310,8 @@ INCLUDE "engine/npctrade.asm"
|
||||
|
||||
INCLUDE "event/mom_phone.asm"
|
||||
|
||||
SECTION "bank40", ROMX, BANK[$40]
|
||||
|
||||
INCLUDE "misc/mobile_40.asm"
|
||||
|
||||
SECTION "bank41", ROMX, BANK[$41]
|
||||
@ -15324,6 +15326,8 @@ INCLUDE "battle/used_move_text.asm"
|
||||
|
||||
INCLUDE "misc/mobile_41.asm"
|
||||
|
||||
SECTION "bank42", ROMX, BANK[$42]
|
||||
|
||||
INCLUDE "misc/mobile_42.asm"
|
||||
|
||||
SECTION "Intro Logo", ROMX, BANK[$42]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user