pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Update mail struct labels

Browse Source
This commit is contained in:
PikalaxALT 2015-11-18 13:29:30 -05:00
parent 3f4044cd46
commit 1ff37608b6
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/compose_mail.asm
View File

@ -1,4 +1,4 @@
ComposeMailMessage: ; 11e75 (mail?) _ComposeMailMessage: ; 11e75 (mail?)
ld hl, wc6d0 ld hl, wc6d0
ld [hl], e ld [hl], e
inc hl inc hl

18
engine/startmenu.asm
View File

@ -937,10 +937,10 @@ GivePartyItem: ; 12c4c
ld [hl], a ld [hl], a
ld d, a ld d, a
callba ItemIsMail callba ItemIsMail
jr nc, .asm_12c5f jr nc, .done
call Function12cfe call ComposeMailMessage
.asm_12c5f .done
ret ret
; 12c60 ; 12c60
@ -1067,15 +1067,15 @@ StartMenuYesNo: ; 12cf5
; 12cfe ; 12cfe
Function12cfe: ; 12cfe (4:6cfe) ComposeMailMessage: ; 12cfe (4:6cfe)
ld de, wd002 ld de, wTempMailMessage
callba ComposeMailMessage callba _ComposeMailMessage
ld hl, PlayerName ld hl, PlayerName
ld de, wd023 ld de, wTempMailAuthor
ld bc, NAME_LENGTH - 1 ld bc, NAME_LENGTH - 1
call CopyBytes call CopyBytes
ld hl, PlayerID ld hl, PlayerID
ld bc, $2 ld bc, 2
call CopyBytes call CopyBytes
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld [de], a ld [de], a
@ -1088,7 +1088,7 @@ Function12cfe: ; 12cfe (4:6cfe)
call AddNTimes call AddNTimes
ld d, h ld d, h
ld e, l ld e, l
ld hl, wd002 ld hl, wTempMail
ld bc, MAIL_STRUCT_LENGTH ld bc, MAIL_STRUCT_LENGTH
ld a, BANK(sPartyMail) ld a, BANK(sPartyMail)
call GetSRAMBank call GetSRAMBank

7
sram.asm
View File

@ -9,13 +9,6 @@ sScratch::
SECTION "SRAM Bank 0", SRAM [$a600], BANK [0] SECTION "SRAM Bank 0", SRAM [$a600], BANK [0]
mailmsg: MACRO
\1Message:: ds MAIL_MSG_LENGTH
\1MessageEnd:: ds 1
\1Author:: ds NAME_LENGTH
\1AuthorID:: ds 2
\1MailType:: ds 1
endm
; a600 ; a600
sPartyMail:: sPartyMail::
sPartyMon1Mail:: mailmsg sPartyMon1Mail sPartyMon1Mail:: mailmsg sPartyMon1Mail

13
wram.asm
View File

@ -145,6 +145,15 @@ battle_tower_struct: MACRO
\1TrainerEnd:: \1TrainerEnd::
endm endm
mailmsg: MACRO
\1Message:: ds MAIL_MSG_LENGTH
\1MessageEnd:: ds 1
\1Author:: ds NAME_LENGTH +- 1
\1AuthorID:: ds 2
\1Species:: ds 1
\1MailType:: ds 1
endm
INCLUDE "vram.asm" INCLUDE "vram.asm"
SECTION "Stack", WRAM0 SECTION "Stack", WRAM0
@ -1462,6 +1471,10 @@ SECTION "WRAM 1", WRAMX, BANK [1]
wd000:: ds 1 wd000:: ds 1
DefaultSpawnpoint:: DefaultSpawnpoint::
wd001:: ds 1 wd001:: ds 1
wTempMail:: mailmsg wTempMail
ds wTempMail - @
wd002:: wd002::
PhoneScriptBank:: PhoneScriptBank::
LuckyNumberDigit1Buffer:: LuckyNumberDigit1Buffer::