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

Document macros/map.asm

Browse Source 
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
This commit is contained in:
Remy Oukaour 2017-12-11 01:02:28 -05:00
parent c6fefd0fe8
commit 41acb0667a
22 changed files with 219 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
battle/core.asm
View File

@ -6676,7 +6676,7 @@ CheckSleepingTreeMon: ; 3eb38
; Get list for the time of day ; Get list for the time of day
ld hl, .Morn ld hl, .Morn
ld a, [TimeOfDay] ld a, [TimeOfDay]
cp DAY cp DAY_F
jr c, .Check jr c, .Check
ld hl, .Day ld hl, .Day
jr z, .Check jr z, .Check

6
battle/effect_commands.asm
View File

@ -9323,21 +9323,21 @@ BattleCommand_ClearHazards: ; 37b39
BattleCommand_HealMorn: ; 37b74 BattleCommand_HealMorn: ; 37b74
; healmorn ; healmorn
ld b, MORN ld b, MORN_F
jr BattleCommand_TimeBasedHealContinue jr BattleCommand_TimeBasedHealContinue
; 37b78 ; 37b78
BattleCommand_HealDay: ; 37b78 BattleCommand_HealDay: ; 37b78
; healday ; healday
ld b, DAY ld b, DAY_F
jr BattleCommand_TimeBasedHealContinue jr BattleCommand_TimeBasedHealContinue
; 37b7c ; 37b7c
BattleCommand_HealNite: ; 37b7c BattleCommand_HealNite: ; 37b7c
; healnite ; healnite
ld b, NITE ld b, NITE_F
; fallthrough ; fallthrough
; 37b7e ; 37b7e

32
constants/map_constants.asm
View File

@ -716,22 +716,22 @@ NUM_FRUIT_TREES EQU const_value +- 1
; elevator floors ; elevator floors
; used by `elevfloor` ; used by `elevfloor`
const_def const_def
const _B4F const FLOOR_B4F
const _B3F const FLOOR_B3F
const _B2F const FLOOR_B2F
const _B1F const FLOOR_B1F
const _1F const FLOOR_1F
const _2F const FLOOR_2F
const _3F const FLOOR_3F
const _4F const FLOOR_4F
const _5F const FLOOR_5F
const _6F const FLOOR_6F
const _7F const FLOOR_7F
const _8F const FLOOR_8F
const _9F const FLOOR_9F
const _10F const FLOOR_10F
const _11F const FLOOR_11F
const _ROOF const FLOOR_ROOF
; command queue members ; command queue members
CMDQUEUE_TYPE EQU 0 CMDQUEUE_TYPE EQU 0

16
constants/misc_constants.asm
View File

@ -50,14 +50,14 @@ NUM_HOF_TEAMS = 30
; joypad ; joypad
const_def const_def
const A_BUTTON_F const A_BUTTON_F ; 0
const B_BUTTON_F const B_BUTTON_F ; 1
const SELECT_F const SELECT_F ; 2
const START_F const START_F ; 3
const D_RIGHT_F const D_RIGHT_F ; 4
const D_LEFT_F const D_LEFT_F ; 5
const D_UP_F const D_UP_F ; 6
const D_DOWN_F const D_DOWN_F ; 7
NO_INPUT EQU %00000000 NO_INPUT EQU %00000000
A_BUTTON EQU 1 << A_BUTTON_F A_BUTTON EQU 1 << A_BUTTON_F

13
constants/wram_constants.asm
View File

@ -46,10 +46,15 @@ FACE_RIGHT EQU 1
; TimeOfDay: ; d269 ; TimeOfDay: ; d269
const_def const_def
const MORN ; 0 const MORN_F ; 0
const DAY ; 1 const DAY_F ; 1
const NITE ; 2 const NITE_F ; 2
const DARKNESS ; 3 const DARKNESS_F ; 3
MORN EQU 1 << MORN_F
DAY EQU 1 << DAY_F
NITE EQU 1 << NITE_F
DARKNESS EQU 1 << DARKNESS_F
; ScriptFlags: ; d434 ; ScriptFlags: ; d434
SCRIPT_RUNNING EQU 2 SCRIPT_RUNNING EQU 2

12
engine/color.asm
View File

@ -1948,7 +1948,7 @@ LoadMapPals:
call AddNTimes call AddNTimes
ld de, UnknOBPals ld de, UnknOBPals
ld bc, 8 palettes ld bc, 8 palettes
ld a, $5 ; BANK(UnknOBPals) ld a, BANK(UnknOBPals)
call FarCopyWRAM call FarCopyWRAM
ld a, [wPermission] ld a, [wPermission]
@ -1967,13 +1967,13 @@ LoadMapPals:
add hl, de add hl, de
ld a, [TimeOfDayPal] ld a, [TimeOfDayPal]
and 3 and 3
cp NITE cp NITE_F
jr c, .morn_day jr c, .morn_day
rept 4 rept 4
inc hl inc hl
endr endr
.morn_day .morn_day
ld de, UnknBGPals + 6 palettes + 2 ld de, UnknBGPals palette PAL_BG_ROOF + 2
ld bc, 4 ld bc, 4
ld a, $5 ld a, $5
call FarCopyWRAM call FarCopyWRAM
@ -1983,10 +1983,10 @@ endr
dw .OutdoorColors ; unused dw .OutdoorColors ; unused
dw .OutdoorColors ; TOWN dw .OutdoorColors ; TOWN
dw .OutdoorColors ; ROUTE dw .OutdoorColors ; ROUTE
dw .IndoorColors ; INDOOR dw .IndoorColors ; INDOOR
dw .DungeonColors ; CAVE dw .DungeonColors ; CAVE
dw .Perm5Colors ; PERM_5 dw .Perm5Colors ; PERM_5
dw .IndoorColors ; GATE dw .IndoorColors ; GATE
dw .DungeonColors ; DUNGEON dw .DungeonColors ; DUNGEON
; Valid indices: $00 - $29 ; Valid indices: $00 - $29

4
engine/evolve.asm
View File

@ -133,13 +133,13 @@ EvolveAfterBattle_MasterLoop
; TR_NITE ; TR_NITE
ld a, [TimeOfDay] ld a, [TimeOfDay]
cp NITE cp NITE_F
jp nz, .dont_evolve_3 jp nz, .dont_evolve_3
jr .proceed jr .proceed
.happiness_daylight .happiness_daylight
ld a, [TimeOfDay] ld a, [TimeOfDay]
cp NITE cp NITE_F
jp z, .dont_evolve_3 jp z, .dont_evolve_3
jr .proceed jr .proceed

2
engine/fish.asm
View File

@ -81,7 +81,7 @@ endr
ld a, [TimeOfDay] ld a, [TimeOfDay]
and 3 and 3
cp NITE cp NITE_F
jr c, .time_species jr c, .time_species
inc hl inc hl
inc hl inc hl

2
engine/phone.asm
View File

@ -165,7 +165,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)
callba CheckTime callba CheckTime
pop af pop af
and (1 << MORN) + (1 << DAY) + (1 << NITE) and MORN + DAY + NITE
and c and c
pop de pop de

10
engine/rtc.asm
View File

@ -51,11 +51,11 @@ GetTimeOfDay:: ; 14032
TimesOfDay: ; 14044 TimesOfDay: ; 14044
; hours for the time of day ; hours for the time of day
; 04-09 morn | 10-17 day | 18-03 nite ; 04-09 morn | 10-17 day | 18-03 nite
db 04, NITE db 04, NITE_F
db 10, MORN db 10, MORN_F
db 18, DAY db 18, DAY_F
db 24, NITE db 24, NITE_F
db -1, MORN db -1, MORN_F
; 1404e ; 1404e
Unknown_1404e: ; Unreferenced Unknown_1404e: ; Unreferenced

24
engine/timeset.asm
View File

@ -362,18 +362,18 @@ OakText_ResponseToSetTime: ; 0x908b8
ld c, l ld c, l
ld a, [wInitHourBuffer] ld a, [wInitHourBuffer]
cp 4 cp 4
jr c, .NITE jr c, .nite
cp 11 cp 11
jr c, .MORN jr c, .morn
cp 18 cp 18
jr c, .DAY jr c, .day
.NITE: .nite:
ld hl, .sodark ld hl, .sodark
ret ret
.MORN: .morn:
ld hl, .overslept ld hl, .overslept
ret ret
.DAY: .day:
ld hl, .yikes ld hl, .yikes
ret ret
; 908ec (24:48ec) ; 908ec (24:48ec)
@ -738,19 +738,19 @@ GetTimeOfDayString: ; 90b58 (24:4b58)
cp 18 cp 18
jr c, .day jr c, .day
.nite .nite
ld de, .NITE ld de, .nite_string
ret ret
.morn .morn
ld de, .MORN ld de, .morn_string
ret ret
.day .day
ld de, .DAY ld de, .day_string
ret ret
; 90b71 (24:4b71) ; 90b71 (24:4b71)
.NITE: db "NITE@" .nite_string: db "NITE@"
.MORN: db "MORN@" .morn_string: db "MORN@"
.DAY: db "DAY@" .day_string: db "DAY@"
; 90b7f ; 90b7f
AdjustHourForAMorPM: AdjustHourForAMorPM:

4
home/map_objects.asm
View File

@ -276,9 +276,7 @@ CheckObjectTime:: ; 18f5
ret ret
.TimeOfDayValues_191e: .TimeOfDayValues_191e:
db 1 << MORN ; 1 db MORN, DAY, NITE
db 1 << DAY ; 2
db 1 << NITE ; 4
.check_hour .check_hour
ld hl, MAPOBJECT_HOUR ld hl, MAPOBJECT_HOUR

6
macros/event.asm
View File

@ -287,9 +287,9 @@ checktime: macro
db \1 ; time db \1 ; time
endm endm
checkmorn EQUS "checktime 1 << MORN" checkmorn EQUS "checktime MORN"
checkday EQUS "checktime 1 << DAY" checkday EQUS "checktime DAY"
checknite EQUS "checktime 1 << NITE" checknite EQUS "checktime NITE"
enum checkpoke_command enum checkpoke_command
checkpoke: macro checkpoke: macro

205
macros/map.asm
View File

@ -1,77 +1,110 @@
map: MACRO map: macro
;\1: map id
db GROUP_\1, MAP_\1 db GROUP_\1, MAP_\1
ENDM endm
roam_map: MACRO maptrigger: macro
; A map and an arbitrary number of some more maps. ;\1: script pointer
dw \1, 0
map \1 endm
db \2
rept \2
map \3
shift
endr
db 0
ENDM
person_event: macro
db \1 ; sprite
db \2 + 4 ; y
db \3 + 4 ; x
db \4 ; movement function
dn \5, \6 ; radius: y, x
db \7 ; clock_hour
db \8 ; clock_daytime
shift
dn \8, \9 ; color_function
shift
db \9 ; sight_range
shift
dw \9 ; pointer
shift
dw \9 ; event flag
endm
signpost: macro
db \1 ; y
db \2 ; x
db \3 ; function
dw \4 ; pointer
endm
xy_trigger: macro
db \1 ; number
db \2 ; y
db \3 ; x
db \4 ; unknown1
dw \5 ; script
db \6 ; unknown2
db \7 ; unknown3
endm
warp_def: macro warp_def: macro
db \1 ; y ;\1: y: top to bottom, starts at 0
db \2 ; x ;\2: x: left to right, starts at 0
db \3 ; warp_to ;\3: warp destination: starts at 1
map \4 ; map ;\4: map id: from constants/map_constants.asm
endm db \1, \2, \3
map \4
endm
xy_trigger: macro
;\1: number: controlled by dotrigger/domaptrigger
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\4: unknown1: $0
;\5: script pointer
;\6: unknown2: $0
;\7: unknown3: $0
db \1, \2, \3, \4
dw \5
db \6, \7
endm
signpost: macro
;\1: y: top to bottom, starts at 0
;\2: x: left to right, starts at 0
;\3: function: a SIGNPOST_* constant
;\4: script pointer
db \1, \2, \3
dw \4
endm
person_event: macro
;\1: sprite: a SPRITE_* constant
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\4: movement function: a SPRITEMOVEDATA_* constant
;\5, \6: movement radius: y, x
;\7: clock hour: ???
;\8: clock daytime: sum of MORN, DAY, and/or NITE, or 0 for always
;\9: color: a PAL_NPC_* constant, or 0 for sprite default
;\10: function: a PERSONTYPE_* constant
;\11: sight range: applies to PERSONTYPE_TRAINER
;\12: script pointer
;\13: event flag: an EVENT_* constant, or 0 for always
db \1, \2 + 4, \3 + 4, \4
dn \5, \6
db \7, \8
shift
dn \8, \9
shift
db \9
shift
dw \9
shift
dw \9
endm
map_header: MACRO newgroup: macro
; label, tileset, permission, location, music, phone service flag, time of day, fishing group const_value = const_value + 1
enum_start 1
endm
mapgroup: macro
;\1: map id
;\2: height: in blocks
;\3: width: in blocks
GROUP_\1 EQU const_value
enum MAP_\1
\1_HEIGHT EQU \2
\1_WIDTH EQU \3
endm
map_header: macro
;\1: map label
;\2: tileset: a TILESET_* constant
;\3: permission: TOWN, ROUTE, INDOOR, CAVE, PERM_5, GATE, or DUNGEON
;\4: location: from constants/landmark_constants.asm
;\5: music: a MUSIC_* constant
;\6: phone service flag: 1 to prevent phone calls
;\7: time of day: a PALETTE_* constant
;\8: fishing group: a FISHGROUP_* constant
\1_MapHeader: \1_MapHeader:
db BANK(\1_SecondMapHeader), \2, \3 db BANK(\1_SecondMapHeader), \2, \3
dw \1_SecondMapHeader dw \1_SecondMapHeader
db \4, \5 db \4, \5
dn \6, \7 dn \6, \7
db \8 db \8
ENDM endm
map_header_2: MACRO map_header_2: macro
; label, map, border block, connections ;\1: map label
;\2: map id
;\3: border block
;\4: connections: sum of NORTH, SOUTH, WEST, and/or EAST, or 0 for none
\1_SecondMapHeader:: \1_SecondMapHeader::
db \3 db \3
db \2_HEIGHT, \2_WIDTH db \2_HEIGHT, \2_WIDTH
@ -81,9 +114,9 @@ map_header_2: MACRO
dw \1_MapScriptHeader dw \1_MapScriptHeader
dw \1_MapEventHeader dw \1_MapEventHeader
db \4 db \4
ENDM endm
connection: MACRO connection: macro
if "\1" == "north" if "\1" == "north"
;\2: map id ;\2: map id
;\3: map label (eventually will be rolled into map id) ;\3: map label (eventually will be rolled into map id)
@ -151,27 +184,12 @@ if "\1" == "east"
db 0 db 0
dw OverworldMap + \2_WIDTH + 7 dw OverworldMap + \2_WIDTH + 7
endc endc
endm
ENDM
mapgroup: MACRO itemball: macro
GROUP_\1 EQU const_value ;\1: item: from constants/item_constants.asm
enum MAP_\1 ;\2: quantity: default 1
\1_HEIGHT EQU \2
\1_WIDTH EQU \3
ENDM
newgroup: MACRO
const_value = const_value + 1
enum_start 1
ENDM
elevfloor: MACRO
db \1, \2
map \3
ENDM
itemball: MACRO
if _NARG == 2 if _NARG == 2
db \1, \2 db \1, \2
else else
@ -179,11 +197,30 @@ else
endc endc
endm endm
stonetable: MACRO elevfloor: macro
;\1: floor: a FLOOR_* constant
;\2: warp destination: starts at 1
;\3: map id
db \1, \2
map \3
ENDM
stonetable: macro
;\1: warp id
;\2: person_event id
;\3: script pointer
db \1, \2 db \1, \2
dw \3 dw \3
endm endm
maptrigger: MACRO
dw \1, 0 roam_map: macro
; A map and an arbitrary number of some more maps.
map \1
db \2
rept \2
map \3
shift
endr
db 0
endm endm

10
main.asm
View File

@ -269,10 +269,10 @@ CheckTime:: ; c000
ret ret
TimeOfDayTable: ; c012 TimeOfDayTable: ; c012
db MORN, 1 << MORN db MORN_F, MORN
db DAY, 1 << DAY db DAY_F, DAY
db NITE, 1 << NITE db NITE_F, NITE
db NITE, 1 << NITE db NITE_F, NITE
db -1 db -1
INCLUDE "engine/specials.asm" INCLUDE "engine/specials.asm"
@ -1430,7 +1430,7 @@ PlayBattleMusic: ; 2ee6c
ld de, MUSIC_JOHTO_WILD_BATTLE ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [TimeOfDay] ld a, [TimeOfDay]
cp NITE cp NITE_F
jr nz, .done jr nz, .done
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done jr .done

12
maps/CeladonDeptStoreElevator.asm
View File

@ -20,12 +20,12 @@ UnknownScript_0x713bd:
Elevator_0x713be: Elevator_0x713be:
db 6 ; floors db 6 ; floors
elevfloor _1F, 4, CELADON_DEPT_STORE_1F elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F
elevfloor _2F, 3, CELADON_DEPT_STORE_2F elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F
elevfloor _3F, 3, CELADON_DEPT_STORE_3F elevfloor FLOOR_3F, 3, CELADON_DEPT_STORE_3F
elevfloor _4F, 3, CELADON_DEPT_STORE_4F elevfloor FLOOR_4F, 3, CELADON_DEPT_STORE_4F
elevfloor _5F, 3, CELADON_DEPT_STORE_5F elevfloor FLOOR_5F, 3, CELADON_DEPT_STORE_5F
elevfloor _6F, 2, CELADON_DEPT_STORE_6F elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F
db $ff ; end db $ff ; end

4
maps/CeladonGameCorner.asm
View File

@ -341,7 +341,7 @@ CeladonGameCorner_MapEventHeader:
person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1
person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1
person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1
person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1
person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1
person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1

14
maps/GoldenrodDeptStoreElevator.asm
View File

@ -46,13 +46,13 @@ MapGoldenrodDeptStoreElevatorSignpost0Script:
Elevator_0x566e0: Elevator_0x566e0:
db 7 ; floors db 7 ; floors
elevfloor _B1F, 2, GOLDENROD_DEPT_STORE_B1F elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F
elevfloor _1F, 4, GOLDENROD_DEPT_STORE_1F elevfloor FLOOR_1F, 4, GOLDENROD_DEPT_STORE_1F
elevfloor _2F, 3, GOLDENROD_DEPT_STORE_2F elevfloor FLOOR_2F, 3, GOLDENROD_DEPT_STORE_2F
elevfloor _3F, 3, GOLDENROD_DEPT_STORE_3F elevfloor FLOOR_3F, 3, GOLDENROD_DEPT_STORE_3F
elevfloor _4F, 3, GOLDENROD_DEPT_STORE_4F elevfloor FLOOR_4F, 3, GOLDENROD_DEPT_STORE_4F
elevfloor _5F, 3, GOLDENROD_DEPT_STORE_5F elevfloor FLOOR_5F, 3, GOLDENROD_DEPT_STORE_5F
elevfloor _6F, 2, GOLDENROD_DEPT_STORE_6F elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F
db -1 ; end db -1 ; end

4
maps/GoldenrodGameCorner.asm
View File

@ -493,8 +493,8 @@ GoldenrodGameCorner_MapEventHeader:
person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1
person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1
person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1
person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1
person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1
person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1
person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1

6
maps/KrissHouse1F.asm
View File

@ -410,7 +410,7 @@ KrissHouse1F_MapEventHeader:
.PersonEvents: .PersonEvents:
db 5 db 5
person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1
person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << NITE), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2
person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR

8
maps/MountMoonGiftShop.asm
View File

@ -44,7 +44,7 @@ MountMoonGiftShop_MapEventHeader:
.PersonEvents: .PersonEvents:
db 4 db 4
person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1
person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1
person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1
person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1

2
predef/sgb.asm
View File

@ -556,7 +556,7 @@ endr
.GetMapPalsIndex: ; 8a0c .GetMapPalsIndex: ; 8a0c
ld a, [TimeOfDayPal] ld a, [TimeOfDayPal]
cp NITE cp NITE_F
jr c, .morn_day jr c, .morn_day
ld a, $19 ld a, $19
ret ret