Define InitDefaultEZChatMsgs and sEZChatMessages (#1022)

This commit is contained in:
vulcandth 2022-12-26 12:55:01 -06:00 committed by GitHub
parent 25e12c9391
commit cb8505e022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 45 additions and 33 deletions

View File

@ -68,3 +68,6 @@ DEF MOBILE_BATTLE_ALLOWED_MINUTES EQU 10
; + JP Mail struct $2a ; + JP Mail struct $2a
DEF MOBILE_EMAIL_LENGTH EQU $1e DEF MOBILE_EMAIL_LENGTH EQU $1e
DEF TRADE_CORNER_REQUEST_LENGTH EQU $8f DEF TRADE_CORNER_REQUEST_LENGTH EQU $8f
DEF EASY_CHAT_MESSAGE_WORD_COUNT EQU 6
DEF EASY_CHAT_MESSAGE_LENGTH EQU EASY_CHAT_MESSAGE_WORD_COUNT * 2 ; every word uses 2 bytes

View File

@ -147,10 +147,10 @@ Function170139: ; unreferenced
dec a dec a
jr nz, .CopyLoop jr nz, .CopyLoop
ld a, BANK(s4_a013) ld a, BANK(sEZChatBeginBattleMessage)
call OpenSRAM call OpenSRAM
ld hl, s4_a013 ld hl, sEZChatBattleMessages
ld bc, 36 ld bc, EASY_CHAT_MESSAGE_LENGTH * 3
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM

View File

@ -1748,13 +1748,13 @@ StageDataForNameCard:
ld a, [sCrystalData + 0] ld a, [sCrystalData + 0]
ld [de], a ld [de], a
inc de inc de
ld a, BANK(s4_a603) ; aka BANK(s4_a007) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 ld a, BANK(s4_a603) ; aka BANK(sEZChatMessages) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM call OpenSRAM
ld hl, s4_a603 ; address of MBC30 bank ld hl, s4_a603 ; address of MBC30 bank
ld bc, 8 ld bc, 8
call CopyBytes call CopyBytes
ld hl, s4_a007 ; address of MBC30 bank ld hl, sEZChatIntroductionMessage ; address of MBC30 bank
ld bc, 12 ld bc, EASY_CHAT_MESSAGE_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
ret ret

View File

@ -401,20 +401,28 @@ EraseHallOfFame:
call ByteFill call ByteFill
jp CloseSRAM jp CloseSRAM
Function14d18: ; unreferenced InitDefaultEZChatMsgs: ; unreferenced
ld a, BANK(s4_a007) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 ld a, BANK(sEZChatMessages) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM call OpenSRAM
ld hl, .Data ld hl, .Data
ld de, s4_a007 ld de, sEZChatMessages
ld bc, 4 * 12 ld bc, EASY_CHAT_MESSAGE_LENGTH * 4
call CopyBytes call CopyBytes
jp CloseSRAM jp CloseSRAM
.Data: .Data:
db $0d, $02, $00, $05, $00, $00, $22, $02, $01, $05, $00, $00 ; introduction
db $03, $04, $05, $08, $03, $05, $0e, $06, $03, $02, $00, $00 db $0d, EZCHAT_GREETINGS, $00, EZCHAT_EXCLAMATIONS, $00, EZCHAT_POKEMON
db $39, $07, $07, $04, $00, $05, $04, $07, $01, $05, $00, $00 db $22, EZCHAT_GREETINGS, $01, EZCHAT_EXCLAMATIONS, $00, EZCHAT_POKEMON
db $0f, $05, $14, $07, $05, $05, $11, $0c, $0c, $06, $06, $04 ; begin battle
db $03, EZCHAT_BATTLE, $05, EZCHAT_CONDITIONS, $03, EZCHAT_EXCLAMATIONS
db $0e, EZCHAT_CONVERSATION, $03, EZCHAT_GREETINGS, $00, EZCHAT_POKEMON
; win battle
db $39, EZCHAT_FEELINGS, $07, EZCHAT_BATTLE, $00, EZCHAT_EXCLAMATIONS
db $04, EZCHAT_FEELINGS, $01, EZCHAT_EXCLAMATIONS, $00, EZCHAT_POKEMON
; lose battle
db $0f, EZCHAT_EXCLAMATIONS, $14, EZCHAT_FEELINGS, $05, EZCHAT_EXCLAMATIONS
db $11, EZCHAT_TIME, $0c, EZCHAT_CONVERSATION, $06, EZCHAT_BATTLE
EraseBattleTowerStatus: EraseBattleTowerStatus:
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)

View File

@ -339,9 +339,9 @@ Function11c1b9:
Function11c254: Function11c254:
push af push af
ld a, BANK(s4_a007) ld a, BANK(sEZChatMessages)
call OpenSRAM call OpenSRAM
ld hl, s4_a007 ld hl, sEZChatMessages
pop af pop af
sla a sla a
sla a sla a
@ -352,7 +352,7 @@ Function11c254:
ld b, 0 ld b, 0
add hl, bc add hl, bc
ld de, wcd36 ld de, wcd36
ld bc, 12 ld bc, EASY_CHAT_MESSAGE_LENGTH
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
ret ret
@ -1762,9 +1762,9 @@ Function11cb66:
ld a, [hl] ld a, [hl]
and a and a
jr nz, .asm_11cbd4 jr nz, .asm_11cbd4
ld a, BANK(s4_a007) ld a, BANK(sEZChatMessages)
call OpenSRAM call OpenSRAM
ld hl, s4_a007 ld hl, sEZChatMessages
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
sla a sla a
@ -1776,7 +1776,7 @@ Function11cb66:
ld b, 0 ld b, 0
add hl, bc add hl, bc
ld de, wcd36 ld de, wcd36
ld c, 12 ld c, EASY_CHAT_MESSAGE_LENGTH
.asm_11cba2 .asm_11cba2
ld a, [de] ld a, [de]
ld [hli], a ld [hli], a

View File

@ -2423,14 +2423,14 @@ Unknown_100feb:
db -1 ; end db -1 ; end
Unknown_100ff3: Unknown_100ff3:
macro_100fc0 wdc41, 1 macro_100fc0 wdc41, 1
macro_100fc0 wPlayerName, NAME_LENGTH macro_100fc0 wPlayerName, NAME_LENGTH
macro_100fc0 wPlayerName, NAME_LENGTH macro_100fc0 wPlayerName, NAME_LENGTH
macro_100fc0 wPlayerID, 2 macro_100fc0 wPlayerID, 2
macro_100fc0 wSecretID, 2 macro_100fc0 wSecretID, 2
macro_100fc0 wPlayerGender, 1 macro_100fc0 wPlayerGender, 1
macro_100fc0 s4_a603, 8 macro_100fc0 s4_a603, 8
macro_100fc0 s4_a007, PARTYMON_STRUCT_LENGTH macro_100fc0 sEZChatMessages, EASY_CHAT_MESSAGE_LENGTH * 4
db -1 ; end db -1 ; end
Unknown_10102c: Unknown_10102c:

View File

@ -201,11 +201,12 @@ SECTION "SRAM Mobile 1", SRAM
ds $7 ds $7
s4_a007:: ; struct size $30 sEZChatMessages::
sEZChatIntroductionMessage:: ds EASY_CHAT_MESSAGE_LENGTH
ds $c sEZChatBattleMessages::
sEZChatBeginBattleMessage:: ds EASY_CHAT_MESSAGE_LENGTH
s4_a013:: ds 36 sEZChatWinBattleMessage:: ds EASY_CHAT_MESSAGE_LENGTH
sEZChatLoseBattleMessage:: ds EASY_CHAT_MESSAGE_LENGTH
s4_a037:: ds 4 s4_a037:: ds 4