mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Sync some files with pokegold
This commit is contained in:
parent
d132a20b7a
commit
97a11c623e
@ -163,7 +163,7 @@ CmdQueue_Type1:
|
||||
|
||||
CmdQueue_Type4:
|
||||
call CmdQueues_AnonJumptable
|
||||
; anonymous dw
|
||||
.anon_dw
|
||||
dw .zero
|
||||
dw .one
|
||||
|
||||
@ -207,7 +207,7 @@ CmdQueue_Type4:
|
||||
|
||||
CmdQueue_Type3:
|
||||
call CmdQueues_AnonJumptable
|
||||
; anonymous dw
|
||||
.anon_dw
|
||||
dw .zero
|
||||
dw .one
|
||||
dw .two
|
||||
|
@ -2746,7 +2746,7 @@ _UpdateSprites::
|
||||
.fill
|
||||
ld a, [wVramState]
|
||||
bit 1, a
|
||||
ld b, LOW(wVirtualOAMEnd)
|
||||
ld b, OBJECT_LENGTH * SPRITEOAMSTRUCT_LENGTH
|
||||
jr z, .ok
|
||||
ld b, 28 * SPRITEOAMSTRUCT_LENGTH
|
||||
.ok
|
||||
|
@ -31,19 +31,19 @@ PlayersHouse2F_MapScripts:
|
||||
|
||||
db 0, 0, 0 ; unused
|
||||
|
||||
Doll1Script::
|
||||
PlayersHouseDoll1Script::
|
||||
describedecoration DECODESC_LEFT_DOLL
|
||||
|
||||
Doll2Script:
|
||||
PlayersHouseDoll2Script:
|
||||
describedecoration DECODESC_RIGHT_DOLL
|
||||
|
||||
BigDollScript:
|
||||
PlayersHouseBigDollScript:
|
||||
describedecoration DECODESC_BIG_DOLL
|
||||
|
||||
GameConsoleScript:
|
||||
PlayersHouseGameConsoleScript:
|
||||
describedecoration DECODESC_CONSOLE
|
||||
|
||||
PosterScript:
|
||||
PlayersHousePosterScript:
|
||||
conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script
|
||||
|
||||
.Script:
|
||||
@ -124,10 +124,10 @@ PlayersHouse2F_MapEvents:
|
||||
bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript
|
||||
bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript
|
||||
bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript
|
||||
bg_event 6, 0, BGEVENT_IFSET, PosterScript
|
||||
bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
|
||||
|
||||
def_object_events
|
||||
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
|
||||
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
|
||||
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
|
||||
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
|
||||
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
|
||||
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
|
||||
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
|
||||
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
|
||||
|
@ -1,6 +1,6 @@
|
||||
; http://forums.glitchcity.info/index.php?topic=7509.msg206449#msg206449
|
||||
|
||||
dab Doll1Script ; related to "My Room" in Stadium 2?
|
||||
dab PlayersHouseDoll1Script ; related to "My Room" in Stadium 2?
|
||||
|
||||
Function1f4003: ; unreferenced
|
||||
ld a, BANK(s6_a000)
|
||||
|
Loading…
Reference in New Issue
Block a user