mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-11-14 09:06:41 +13:00
named party menu/naming screen wram variables
This commit is contained in:
parent
f66a74b9fc
commit
0066e09828
|
|
@ -85,6 +85,30 @@ SLOTSFISH EQU $0E0C
|
||||||
SLOTSBIRD EQU $1210
|
SLOTSBIRD EQU $1210
|
||||||
SLOTSMOUSE EQU $1614
|
SLOTSMOUSE EQU $1614
|
||||||
|
|
||||||
|
; party menu types
|
||||||
|
NORMAL_PARTY_MENU EQU 0
|
||||||
|
USE_ITEM_PARTY_MENU EQU 1
|
||||||
|
BATTLE_PARTY_MENU EQU 2
|
||||||
|
TMHM_PARTY_MENU EQU 3
|
||||||
|
SWAP_MONS_PARTY_MENU EQU 4
|
||||||
|
EVO_STONE_PARTY_MENU EQU 5
|
||||||
|
|
||||||
|
; party memu message IDs
|
||||||
|
ANTIDOTE_MSG EQU $F0
|
||||||
|
BURN_HEAL_MSG EQU $F1
|
||||||
|
ICE_HEAL_MSG EQU $F2
|
||||||
|
AWAKENING_MSG EQU $F3
|
||||||
|
PARALYZ_HEAL_MSG EQU $F4
|
||||||
|
POTION_MSG EQU $F5
|
||||||
|
FULL_HEAL_MSG EQU $F6
|
||||||
|
REVIVE_MSG EQU $F7
|
||||||
|
RARE_CANDY_MSG EQU $F8
|
||||||
|
|
||||||
|
; naming screen types
|
||||||
|
NAME_PLAYER_SCREEN EQU 0
|
||||||
|
NAME_RIVAL_SCREEN EQU 1
|
||||||
|
NAME_MON_SCREEN EQU 2
|
||||||
|
|
||||||
; serial
|
; serial
|
||||||
|
|
||||||
ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01
|
ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01
|
||||||
|
|
|
||||||
|
|
@ -336,14 +336,14 @@ LoadAnimationTileset: ; 781d2 (1e:41d2)
|
||||||
ld d,0
|
ld d,0
|
||||||
add hl,de
|
add hl,de
|
||||||
ld a,[hli]
|
ld a,[hli]
|
||||||
ld [wd07d],a ; number of tiles
|
ld [wTempTilesetNumTiles],a ; number of tiles
|
||||||
ld a,[hli]
|
ld a,[hli]
|
||||||
ld e,a
|
ld e,a
|
||||||
ld a,[hl]
|
ld a,[hl]
|
||||||
ld d,a ; de = address of tileset
|
ld d,a ; de = address of tileset
|
||||||
ld hl,vSprites + $310
|
ld hl,vSprites + $310
|
||||||
ld b, BANK(AnimationTileset1) ; ROM bank
|
ld b, BANK(AnimationTileset1) ; ROM bank
|
||||||
ld a,[wd07d]
|
ld a,[wTempTilesetNumTiles]
|
||||||
ld c,a ; number of tiles
|
ld c,a ; number of tiles
|
||||||
jp CopyVideoData ; load tileset
|
jp CopyVideoData ; load tileset
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1162,8 +1162,8 @@ UseNextMonText: ; 3c7d3 (f:47d3)
|
||||||
; choose next player mon to send out
|
; choose next player mon to send out
|
||||||
; stores whether enemy mon has no HP left in Z flag
|
; stores whether enemy mon has no HP left in Z flag
|
||||||
ChooseNextMon: ; 3c7d8 (f:47d8)
|
ChooseNextMon: ; 3c7d8 (f:47d8)
|
||||||
ld a, $2
|
ld a, BATTLE_PARTY_MENU
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
.checkIfMonChosen
|
.checkIfMonChosen
|
||||||
jr nc, .monChosen
|
jr nc, .monChosen
|
||||||
|
|
@ -1462,8 +1462,8 @@ EnemySendOutFirstMon: ; 3c92a (f:492a)
|
||||||
ld a,[wCurrentMenuItem]
|
ld a,[wCurrentMenuItem]
|
||||||
and a
|
and a
|
||||||
jr nz,.next4
|
jr nz,.next4
|
||||||
ld a,2
|
ld a,BATTLE_PARTY_MENU
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
.next9
|
.next9
|
||||||
ld a,1
|
ld a,1
|
||||||
|
|
@ -2384,8 +2384,8 @@ PartyMenuOrRockOrRun:
|
||||||
jp UseBagItem
|
jp UseBagItem
|
||||||
.partyMenuWasSelected
|
.partyMenuWasSelected
|
||||||
call LoadScreenTilesFromBuffer1
|
call LoadScreenTilesFromBuffer1
|
||||||
xor a
|
xor a ; NORMAL_PARTY_MENU
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
ld [wMenuItemToSwap], a
|
ld [wMenuItemToSwap], a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
.checkIfPartyMonWasSelected
|
.checkIfPartyMonWasSelected
|
||||||
|
|
@ -2403,8 +2403,8 @@ PartyMenuOrRockOrRun:
|
||||||
ld bc, $81
|
ld bc, $81
|
||||||
ld a, $7f
|
ld a, $7f
|
||||||
call FillMemory
|
call FillMemory
|
||||||
xor a
|
xor a ; NORMAL_PARTY_MENU
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
call GoBackToPartyMenu
|
call GoBackToPartyMenu
|
||||||
jr .checkIfPartyMonWasSelected
|
jr .checkIfPartyMonWasSelected
|
||||||
.partyMonWasSelected
|
.partyMonWasSelected
|
||||||
|
|
|
||||||
|
|
@ -87,8 +87,8 @@ InGameTrade_GetMonName: ; 71b6a (1c:5b6a)
|
||||||
INCLUDE "data/trades.asm"
|
INCLUDE "data/trades.asm"
|
||||||
|
|
||||||
InGameTrade_DoTrade: ; 71c07 (1c:5c07)
|
InGameTrade_DoTrade: ; 71c07 (1c:5c07)
|
||||||
xor a
|
xor a ; NORMAL_PARTY_MENU
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
dec a
|
dec a
|
||||||
ld [wUpdateSpritesEnabled],a
|
ld [wUpdateSpritesEnabled],a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
|
|
|
||||||
|
|
@ -633,8 +633,8 @@ ItemUseEvoStone: ; da5b (3:5a5b)
|
||||||
ld a,[wcf91]
|
ld a,[wcf91]
|
||||||
ld [wd156],a
|
ld [wd156],a
|
||||||
push af
|
push af
|
||||||
ld a,$05 ; evolution stone party menu
|
ld a,EVO_STONE_PARTY_MENU
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
ld a,$ff
|
ld a,$ff
|
||||||
ld [wUpdateSpritesEnabled],a
|
ld [wUpdateSpritesEnabled],a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
|
|
@ -678,8 +678,8 @@ ItemUseMedicine: ; dabb (3:5abb)
|
||||||
push af
|
push af
|
||||||
ld a,[wcf91]
|
ld a,[wcf91]
|
||||||
push af
|
push af
|
||||||
ld a,$01
|
ld a,USE_ITEM_PARTY_MENU
|
||||||
ld [wd07d],a ; item use party menu
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
ld a,$ff
|
ld a,$ff
|
||||||
ld [wUpdateSpritesEnabled],a
|
ld [wUpdateSpritesEnabled],a
|
||||||
ld a,[wd152]
|
ld a,[wd152]
|
||||||
|
|
@ -737,22 +737,22 @@ ItemUseMedicine: ; dabb (3:5abb)
|
||||||
ld bc,4
|
ld bc,4
|
||||||
add hl,bc ; hl now points to status
|
add hl,bc ; hl now points to status
|
||||||
ld a,[wcf91]
|
ld a,[wcf91]
|
||||||
ld bc,$f008
|
ld bc, (ANTIDOTE_MSG << 8) | (1 << PSN)
|
||||||
cp a,ANTIDOTE
|
cp a,ANTIDOTE
|
||||||
jr z,.checkMonStatus
|
jr z,.checkMonStatus
|
||||||
ld bc,$f110
|
ld bc, (BURN_HEAL_MSG << 8) | (1 << BRN)
|
||||||
cp a,BURN_HEAL
|
cp a,BURN_HEAL
|
||||||
jr z,.checkMonStatus
|
jr z,.checkMonStatus
|
||||||
ld bc,$f220
|
ld bc, (ICE_HEAL_MSG << 8) | (1 << FRZ)
|
||||||
cp a,ICE_HEAL
|
cp a,ICE_HEAL
|
||||||
jr z,.checkMonStatus
|
jr z,.checkMonStatus
|
||||||
ld bc,$f307
|
ld bc, (AWAKENING_MSG << 8) | SLP
|
||||||
cp a,AWAKENING
|
cp a,AWAKENING
|
||||||
jr z,.checkMonStatus
|
jr z,.checkMonStatus
|
||||||
ld bc,$f440
|
ld bc, (PARALYZ_HEAL_MSG << 8) | (1 << PAR)
|
||||||
cp a,PARLYZ_HEAL
|
cp a,PARLYZ_HEAL
|
||||||
jr z,.checkMonStatus
|
jr z,.checkMonStatus
|
||||||
ld bc,$f6ff ; Full Heal
|
ld bc, (FULL_HEAL_MSG << 8) | $ff ; Full Heal
|
||||||
.checkMonStatus
|
.checkMonStatus
|
||||||
ld a,[hl] ; pokemon's status
|
ld a,[hl] ; pokemon's status
|
||||||
and c ; does the pokemon have a status ailment the item can cure?
|
and c ; does the pokemon have a status ailment the item can cure?
|
||||||
|
|
@ -761,7 +761,7 @@ ItemUseMedicine: ; dabb (3:5abb)
|
||||||
xor a
|
xor a
|
||||||
ld [hl],a ; remove the status ailment in the party data
|
ld [hl],a ; remove the status ailment in the party data
|
||||||
ld a,b
|
ld a,b
|
||||||
ld [wd07d],a ; the message to display for the item used
|
ld [wPartyMenuTypeOrMessageID],a ; the message to display for the item used
|
||||||
ld a,[wPlayerMonNumber]
|
ld a,[wPlayerMonNumber]
|
||||||
cp d ; is pokemon the item was used on active in battle?
|
cp d ; is pokemon the item was used on active in battle?
|
||||||
jp nz,.doneHealing
|
jp nz,.doneHealing
|
||||||
|
|
@ -1078,15 +1078,15 @@ ItemUseMedicine: ; dabb (3:5abb)
|
||||||
ld a,[hFlags_0xFFF6]
|
ld a,[hFlags_0xFFF6]
|
||||||
res 0,a
|
res 0,a
|
||||||
ld [hFlags_0xFFF6],a
|
ld [hFlags_0xFFF6],a
|
||||||
ld a,$f7 ; revived message
|
ld a,REVIVE_MSG
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
ld a,[wcf91]
|
ld a,[wcf91]
|
||||||
cp a,REVIVE
|
cp a,REVIVE
|
||||||
jr z,.showHealingItemMessage
|
jr z,.showHealingItemMessage
|
||||||
cp a,MAX_REVIVE
|
cp a,MAX_REVIVE
|
||||||
jr z,.showHealingItemMessage
|
jr z,.showHealingItemMessage
|
||||||
ld a,$f5 ; standard HP healed message
|
ld a,POTION_MSG
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
jr .showHealingItemMessage
|
jr .showHealingItemMessage
|
||||||
.playStatusAilmentCuringSound
|
.playStatusAilmentCuringSound
|
||||||
ld a,(SFX_02_3e - SFX_Headers_02) / 3 ; status ailment curing sound
|
ld a,(SFX_02_3e - SFX_Headers_02) / 3 ; status ailment curing sound
|
||||||
|
|
@ -1257,8 +1257,8 @@ ItemUseMedicine: ; dabb (3:5abb)
|
||||||
ld a,[hl]
|
ld a,[hl]
|
||||||
adc b
|
adc b
|
||||||
ld [hl],a
|
ld [hl],a
|
||||||
ld a,$f8 ; level up message
|
ld a,RARE_CANDY_MSG
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call RedrawPartyMenu
|
call RedrawPartyMenu
|
||||||
pop de
|
pop de
|
||||||
ld a,d
|
ld a,d
|
||||||
|
|
@ -1878,8 +1878,8 @@ ItemUsePPRestore: ; e31e (3:631e)
|
||||||
.chooseMon
|
.chooseMon
|
||||||
xor a
|
xor a
|
||||||
ld [wUpdateSpritesEnabled],a
|
ld [wUpdateSpritesEnabled],a
|
||||||
ld a,$01 ; item use party menu
|
ld a,USE_ITEM_PARTY_MENU
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
jr nc,.chooseMove
|
jr nc,.chooseMove
|
||||||
jp .itemNotUsed
|
jp .itemNotUsed
|
||||||
|
|
@ -2118,8 +2118,8 @@ ItemUseTMHM: ; e479 (3:6479)
|
||||||
call CopyData
|
call CopyData
|
||||||
ld a,$ff
|
ld a,$ff
|
||||||
ld [wUpdateSpritesEnabled],a
|
ld [wUpdateSpritesEnabled],a
|
||||||
ld a,$03 ; teach TM/HM party menu
|
ld a,TMHM_PARTY_MENU
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
push af
|
push af
|
||||||
ld hl,wd036
|
ld hl,wd036
|
||||||
|
|
@ -2650,8 +2650,8 @@ SendNewMonToBox: ; e7a4 (3:67a4)
|
||||||
jr nz, .asm_e817
|
jr nz, .asm_e817
|
||||||
.asm_e82a
|
.asm_e82a
|
||||||
ld hl, wBoxMonNicks
|
ld hl, wBoxMonNicks
|
||||||
ld a, $2
|
ld a, NAME_MON_SCREEN
|
||||||
ld [wd07d], a
|
ld [wNamingScreenType], a
|
||||||
predef AskName
|
predef AskName
|
||||||
ld a, [W_NUMINBOX]
|
ld a, [W_NUMINBOX]
|
||||||
dec a
|
dec a
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ AskName: ; 64eb (1:64eb)
|
||||||
xor a
|
xor a
|
||||||
ld [wUpdateSpritesEnabled], a
|
ld [wUpdateSpritesEnabled], a
|
||||||
push hl
|
push hl
|
||||||
ld a, $2
|
ld a, NAME_MON_SCREEN
|
||||||
ld [wd07d], a
|
ld [wNamingScreenType], a
|
||||||
call DisplayNamingScreen
|
call DisplayNamingScreen
|
||||||
ld a, [W_ISINBATTLE]
|
ld a, [W_ISINBATTLE]
|
||||||
and a
|
and a
|
||||||
|
|
@ -53,12 +53,12 @@ DoYouWantToNicknameText: ; 0x6557
|
||||||
TX_FAR _DoYouWantToNicknameText
|
TX_FAR _DoYouWantToNicknameText
|
||||||
db "@"
|
db "@"
|
||||||
|
|
||||||
Func_655c: ; 655c (1:655c)
|
DisplayNameRaterScreen: ; 655c (1:655c)
|
||||||
ld hl, wHPBarMaxHP
|
ld hl, wHPBarMaxHP
|
||||||
xor a
|
xor a
|
||||||
ld [wUpdateSpritesEnabled], a
|
ld [wUpdateSpritesEnabled], a
|
||||||
ld a, $2
|
ld a, NAME_MON_SCREEN
|
||||||
ld [wd07d], a
|
ld [wNamingScreenType], a
|
||||||
call DisplayNamingScreen
|
call DisplayNamingScreen
|
||||||
call GBPalWhiteOutWithDelay3
|
call GBPalWhiteOutWithDelay3
|
||||||
call RestoreScreenTilesAndReloadTilePatterns
|
call RestoreScreenTilesAndReloadTilePatterns
|
||||||
|
|
@ -236,8 +236,8 @@ DisplayNamingScreen: ; 6596 (1:6596)
|
||||||
cp $e4
|
cp $e4
|
||||||
ld de, Handakutens
|
ld de, Handakutens
|
||||||
jr z, .asm_66e3
|
jr z, .asm_66e3
|
||||||
ld a, [wd07d]
|
ld a, [wNamingScreenType]
|
||||||
cp $2
|
cp NAME_MON_SCREEN
|
||||||
jr nc, .checkMonNameLength
|
jr nc, .checkMonNameLength
|
||||||
ld a, [wHPBarMaxHP]
|
ld a, [wHPBarMaxHP]
|
||||||
cp $7 ; max length of player/rival names
|
cp $7 ; max length of player/rival names
|
||||||
|
|
@ -377,8 +377,8 @@ Func_680e: ; 680e (1:680e)
|
||||||
ld de, wcf4b
|
ld de, wcf4b
|
||||||
call PlaceString
|
call PlaceString
|
||||||
hlCoord 10, 3
|
hlCoord 10, 3
|
||||||
ld a, [wd07d]
|
ld a, [wNamingScreenType]
|
||||||
cp $2
|
cp NAME_MON_SCREEN
|
||||||
jr nc, .asm_6835
|
jr nc, .asm_6835
|
||||||
ld b, $7
|
ld b, $7
|
||||||
jr .asm_6837
|
jr .asm_6837
|
||||||
|
|
@ -390,8 +390,8 @@ Func_680e: ; 680e (1:680e)
|
||||||
ld [hli], a
|
ld [hli], a
|
||||||
dec b
|
dec b
|
||||||
jr nz, .asm_6839
|
jr nz, .asm_6839
|
||||||
ld a, [wd07d]
|
ld a, [wNamingScreenType]
|
||||||
cp $2
|
cp NAME_MON_SCREEN
|
||||||
ld a, [wHPBarMaxHP]
|
ld a, [wHPBarMaxHP]
|
||||||
jr nc, .asm_684b
|
jr nc, .asm_684b
|
||||||
cp $7
|
cp $7
|
||||||
|
|
@ -405,8 +405,8 @@ Func_680e: ; 680e (1:680e)
|
||||||
ld [wTopMenuItemX], a
|
ld [wTopMenuItemX], a
|
||||||
ld a, $5
|
ld a, $5
|
||||||
ld [wCurrentMenuItem], a
|
ld [wCurrentMenuItem], a
|
||||||
ld a, [wd07d]
|
ld a, [wNamingScreenType]
|
||||||
cp $2
|
cp NAME_MON_SCREEN
|
||||||
ld a, $9
|
ld a, $9
|
||||||
jr nc, .asm_6867
|
jr nc, .asm_6867
|
||||||
ld a, $6
|
ld a, $6
|
||||||
|
|
@ -462,7 +462,7 @@ CalcStringLength: ; 68eb (1:68eb)
|
||||||
|
|
||||||
PrintNamingText: ; 68f8 (1:68f8)
|
PrintNamingText: ; 68f8 (1:68f8)
|
||||||
hlCoord 0, 1
|
hlCoord 0, 1
|
||||||
ld a, [wd07d]
|
ld a, [wNamingScreenType]
|
||||||
ld de, YourTextString
|
ld de, YourTextString
|
||||||
and a
|
and a
|
||||||
jr z, .notNickname
|
jr z, .notNickname
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
; [wd07d] = menu type / message ID
|
; [wPartyMenuTypeOrMessageID] = menu type / message ID
|
||||||
; if less than $F0, it is a menu type
|
; if less than $F0, it is a menu type
|
||||||
; menu types:
|
; menu types:
|
||||||
; 00: normal pokemon menu (e.g. Start menu)
|
; 00: normal pokemon menu (e.g. Start menu)
|
||||||
|
|
@ -25,11 +25,11 @@ DrawPartyMenu_: ; 12cd2 (4:6cd2)
|
||||||
callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
|
callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
|
||||||
|
|
||||||
RedrawPartyMenu_: ; 12ce3 (4:6ce3)
|
RedrawPartyMenu_: ; 12ce3 (4:6ce3)
|
||||||
ld a,[wd07d]
|
ld a,[wPartyMenuTypeOrMessageID]
|
||||||
cp a,$04
|
cp a,SWAP_MONS_PARTY_MENU
|
||||||
jp z,.printMessage
|
jp z,.printMessage
|
||||||
call ErasePartyMenuCursors
|
call ErasePartyMenuCursors
|
||||||
callba SendBlkPacket_PartyMenu ; loads some data to wcf2e
|
callba SendBlkPacket_PartyMenu
|
||||||
hlCoord 3, 0
|
hlCoord 3, 0
|
||||||
ld de,wPartySpecies
|
ld de,wPartySpecies
|
||||||
xor a
|
xor a
|
||||||
|
|
@ -75,10 +75,10 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
|
||||||
inc hl
|
inc hl
|
||||||
inc hl
|
inc hl
|
||||||
.skipUnfilledRightArrow
|
.skipUnfilledRightArrow
|
||||||
ld a,[wd07d] ; menu type
|
ld a,[wPartyMenuTypeOrMessageID] ; menu type
|
||||||
cp a,$03
|
cp a,TMHM_PARTY_MENU
|
||||||
jr z,.teachMoveMenu
|
jr z,.teachMoveMenu
|
||||||
cp a,$05
|
cp a,EVO_STONE_PARTY_MENU
|
||||||
jr z,.evolutionStoneMenu
|
jr z,.evolutionStoneMenu
|
||||||
push hl
|
push hl
|
||||||
ld bc,14 ; 14 columns to the right
|
ld bc,14 ; 14 columns to the right
|
||||||
|
|
@ -196,7 +196,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
|
||||||
push af
|
push af
|
||||||
push hl
|
push hl
|
||||||
set 6,[hl] ; turn off letter printing delay
|
set 6,[hl] ; turn off letter printing delay
|
||||||
ld a,[wd07d] ; message ID
|
ld a,[wPartyMenuTypeOrMessageID] ; message ID
|
||||||
cp a,$F0
|
cp a,$F0
|
||||||
jr nc,.printItemUseMessage
|
jr nc,.printItemUseMessage
|
||||||
add a
|
add a
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,14 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
|
||||||
jp z,RedisplayStartMenu
|
jp z,RedisplayStartMenu
|
||||||
xor a
|
xor a
|
||||||
ld [wMenuItemToSwap],a
|
ld [wMenuItemToSwap],a
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
ld [wUpdateSpritesEnabled],a
|
ld [wUpdateSpritesEnabled],a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
jr .checkIfPokemonChosen
|
jr .checkIfPokemonChosen
|
||||||
.loop
|
.loop
|
||||||
xor a
|
xor a
|
||||||
ld [wMenuItemToSwap],a
|
ld [wMenuItemToSwap],a
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call GoBackToPartyMenu
|
call GoBackToPartyMenu
|
||||||
.checkIfPokemonChosen
|
.checkIfPokemonChosen
|
||||||
jr nc,.chosePokemon
|
jr nc,.chosePokemon
|
||||||
|
|
@ -89,8 +89,8 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
|
||||||
cp a,2 ; is there more than one pokemon in the party?
|
cp a,2 ; is there more than one pokemon in the party?
|
||||||
jp c,StartMenu_Pokemon ; if not, no switching
|
jp c,StartMenu_Pokemon ; if not, no switching
|
||||||
call SwitchPartyMon_Stats
|
call SwitchPartyMon_Stats
|
||||||
ld a,$04 ; swap pokemon positions menu
|
ld a,SWAP_MONS_PARTY_MENU
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call GoBackToPartyMenu
|
call GoBackToPartyMenu
|
||||||
jp .checkIfPokemonChosen
|
jp .checkIfPokemonChosen
|
||||||
.choseStats
|
.choseStats
|
||||||
|
|
@ -747,7 +747,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
|
||||||
ret
|
ret
|
||||||
.asm_13661
|
.asm_13661
|
||||||
xor a
|
xor a
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
ld a, [wMenuItemToSwap]
|
ld a, [wMenuItemToSwap]
|
||||||
dec a
|
dec a
|
||||||
ld b, a
|
ld b, a
|
||||||
|
|
@ -757,7 +757,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
|
||||||
jr nz, .asm_1367b
|
jr nz, .asm_1367b
|
||||||
xor a
|
xor a
|
||||||
ld [wMenuItemToSwap], a
|
ld [wMenuItemToSwap], a
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
ret
|
ret
|
||||||
.asm_1367b
|
.asm_1367b
|
||||||
ld a, b
|
ld a, b
|
||||||
|
|
@ -845,7 +845,7 @@ SwitchPartyMon_Stats: ; 13653 (4:7653)
|
||||||
ld [wWhichTrade], a
|
ld [wWhichTrade], a
|
||||||
xor a
|
xor a
|
||||||
ld [wMenuItemToSwap], a
|
ld [wMenuItemToSwap], a
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
pop de
|
pop de
|
||||||
pop hl
|
pop hl
|
||||||
ret
|
ret
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ LoadDefaultNamesPlayer: ; 695d (1:695d)
|
||||||
jr .asm_6999
|
jr .asm_6999
|
||||||
.asm_697a
|
.asm_697a
|
||||||
ld hl, wPlayerName
|
ld hl, wPlayerName
|
||||||
xor a
|
xor a ; NAME_PLAYER_SCREEN
|
||||||
ld [wd07d], a
|
ld [wNamingScreenType], a
|
||||||
call DisplayNamingScreen
|
call DisplayNamingScreen
|
||||||
ld a, [wcf4b]
|
ld a, [wcf4b]
|
||||||
cp $50
|
cp $50
|
||||||
|
|
@ -45,8 +45,8 @@ LoadDefaultNamesRival: ; 69a4 (1:69a4)
|
||||||
jr .asm_69e1
|
jr .asm_69e1
|
||||||
.asm_69c1
|
.asm_69c1
|
||||||
ld hl, W_RIVALNAME
|
ld hl, W_RIVALNAME
|
||||||
ld a, $1
|
ld a, NAME_RIVAL_SCREEN
|
||||||
ld [wd07d], a
|
ld [wNamingScreenType], a
|
||||||
call DisplayNamingScreen
|
call DisplayNamingScreen
|
||||||
ld a, [wcf4b]
|
ld a, [wcf4b]
|
||||||
cp $50
|
cp $50
|
||||||
|
|
|
||||||
2
home.asm
2
home.asm
|
|
@ -456,7 +456,7 @@ HandlePartyMenuInput:: ; 145a (0:145a)
|
||||||
callba ErasePartyMenuCursors
|
callba ErasePartyMenuCursors
|
||||||
xor a
|
xor a
|
||||||
ld [wMenuItemToSwap],a
|
ld [wMenuItemToSwap],a
|
||||||
ld [wd07d],a
|
ld [wPartyMenuTypeOrMessageID],a
|
||||||
call RedrawPartyMenu
|
call RedrawPartyMenu
|
||||||
jr HandlePartyMenuInput
|
jr HandlePartyMenuInput
|
||||||
.handleSwap
|
.handleSwap
|
||||||
|
|
|
||||||
4
main.asm
4
main.asm
|
|
@ -3582,8 +3582,8 @@ _AddPartyMon: ; f2e5 (3:72e5)
|
||||||
ld a, [$ffe4]
|
ld a, [$ffe4]
|
||||||
dec a
|
dec a
|
||||||
call SkipFixedLengthTextEntries
|
call SkipFixedLengthTextEntries
|
||||||
ld a, $2
|
ld a, NAME_MON_SCREEN
|
||||||
ld [wd07d], a
|
ld [wNamingScreenType], a
|
||||||
predef AskName
|
predef AskName
|
||||||
.asm_f33f
|
.asm_f33f
|
||||||
ld hl, wPartyMons
|
ld hl, wPartyMons
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ DayCareMText1: ; 56254 (15:6254)
|
||||||
call PrintText
|
call PrintText
|
||||||
xor a
|
xor a
|
||||||
ld [wUpdateSpritesEnabled], a
|
ld [wUpdateSpritesEnabled], a
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
ld [wMenuItemToSwap], a
|
ld [wMenuItemToSwap], a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
push af
|
push af
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ NameRaterText1: ; 1da56 (7:5a56)
|
||||||
ld hl, NameRaterText_1dab8
|
ld hl, NameRaterText_1dab8
|
||||||
call PrintText
|
call PrintText
|
||||||
xor a
|
xor a
|
||||||
ld [wd07d], a
|
ld [wPartyMenuTypeOrMessageID], a
|
||||||
ld [wUpdateSpritesEnabled], a
|
ld [wUpdateSpritesEnabled], a
|
||||||
ld [wMenuItemToSwap], a
|
ld [wMenuItemToSwap], a
|
||||||
call DisplayPartyMenu
|
call DisplayPartyMenu
|
||||||
|
|
@ -68,7 +68,7 @@ NameRaterText1: ; 1da56 (7:5a56)
|
||||||
jr nz, .asm_1daae
|
jr nz, .asm_1daae
|
||||||
ld hl, NameRaterText_1dac2
|
ld hl, NameRaterText_1dac2
|
||||||
call PrintText
|
call PrintText
|
||||||
callba Func_655c
|
callba DisplayNameRaterScreen
|
||||||
jr c, .asm_1daae
|
jr c, .asm_1daae
|
||||||
ld hl, NameRaterText_1dac7
|
ld hl, NameRaterText_1dac7
|
||||||
.asm_1daa8
|
.asm_1daa8
|
||||||
|
|
|
||||||
8
wram.asm
8
wram.asm
|
|
@ -1232,7 +1232,13 @@ W_ANIMATIONID:: ; d07c
|
||||||
; ID number of the current battle animation
|
; ID number of the current battle animation
|
||||||
ds 1
|
ds 1
|
||||||
|
|
||||||
wd07d:: ds 1 ; used with naming functions and party display type
|
wNamingScreenType:: ; d07d
|
||||||
|
|
||||||
|
wPartyMenuTypeOrMessageID:: ; d07d
|
||||||
|
|
||||||
|
wTempTilesetNumTiles:: ; d07d
|
||||||
|
; temporary storage for the number of tiles in a tileset
|
||||||
|
ds 1
|
||||||
|
|
||||||
wSavedListScrollOffset:: ; d07e
|
wSavedListScrollOffset:: ; d07e
|
||||||
; used by the pokemart code to save the existing value of wListScrollOffset
|
; used by the pokemart code to save the existing value of wListScrollOffset
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue