You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Homogenize transition after trainer/talker (#30); Being writing usage docs
This commit is contained in:
@@ -26,6 +26,7 @@ StartBattleWithMapTrainerScript:
|
||||
startbattle
|
||||
reloadmapafterbattle
|
||||
trainerortalkerflagaction SET_FLAG
|
||||
scall AfterTrainerOrTalkerScript
|
||||
loadmem wRunningTrainerBattleScript, -1
|
||||
|
||||
AlreadyBeatenTrainerScript:
|
||||
@@ -53,10 +54,11 @@ SeenByTalkerScript::
|
||||
trainerortalkertext TRAINERORTALKERTEXT_TALKER
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
sjump AfterTrainerOrTalkerScript
|
||||
|
||||
.Script
|
||||
jumptalkerscript
|
||||
talkerscript
|
||||
sjump AfterTrainerOrTalkerScript
|
||||
|
||||
.TalkOrSkipTalker:
|
||||
ld a, [wTempTalkerType]
|
||||
@@ -87,4 +89,13 @@ SeenByTalkerScript::
|
||||
ld a, [wTempTalkerType]
|
||||
and TALKERTYPE_MASK
|
||||
ld [hScriptVar], a
|
||||
ret
|
||||
ret
|
||||
|
||||
AfterTrainerOrTalkerScript:
|
||||
wait 200
|
||||
readmem wSpacesLeft
|
||||
iftrue .not_landed
|
||||
turnobject PLAYER, DOWN
|
||||
wait 100
|
||||
.not_landed
|
||||
end
|
||||
|
@@ -236,7 +236,7 @@ ScriptCommandTable:
|
||||
dw Script_checksave ; a9
|
||||
dw Script_exitoverworld ; aa
|
||||
dw Script_reloadmapafterviewmapmode ; ab
|
||||
dw Script_jumptalkerscript ; ac
|
||||
dw Script_talkerscript ; ac
|
||||
assert_table_length NUM_EVENT_COMMANDS
|
||||
|
||||
StartScript:
|
||||
@@ -681,14 +681,14 @@ Script_trainerortalkertext:
|
||||
call MapTextbox
|
||||
ret
|
||||
|
||||
Script_jumptalkerscript:
|
||||
Script_talkerscript:
|
||||
ld hl, wTempTalkerTextOrScriptPointer
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
ld d, [hl]
|
||||
ld e, a
|
||||
ld a, [wSeenTrainerOrTalkerBank]
|
||||
ld b, a
|
||||
jp ScriptJump
|
||||
jp ScriptCall
|
||||
|
||||
Script_jumptrainerafterbattlescript:
|
||||
ld hl, wScriptAfterPointer
|
||||
|
Reference in New Issue
Block a user