mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Harmonize some more symbols with pokegold
This commit is contained in:
parent
4342ced31f
commit
b9f2b93c17
@ -491,3 +491,5 @@ ENDM
|
|||||||
map_const ROUTE_30_BERRY_HOUSE, 4, 4 ; 9
|
map_const ROUTE_30_BERRY_HOUSE, 4, 4 ; 9
|
||||||
map_const MR_POKEMONS_HOUSE, 4, 4 ; 10
|
map_const MR_POKEMONS_HOUSE, 4, 4 ; 10
|
||||||
map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11
|
map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11
|
||||||
|
|
||||||
|
NUM_MAP_GROUPS EQU const_value ; 26
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
const SPRITE_YOUNGSTER ; 27
|
const SPRITE_YOUNGSTER ; 27
|
||||||
const SPRITE_LASS ; 28
|
const SPRITE_LASS ; 28
|
||||||
const SPRITE_TEACHER ; 29
|
const SPRITE_TEACHER ; 29
|
||||||
const SPRITE_BUENA ; 2a
|
const SPRITE_BEAUTY ; 2a
|
||||||
const SPRITE_SUPER_NERD ; 2b
|
const SPRITE_SUPER_NERD ; 2b
|
||||||
const SPRITE_ROCKER ; 2c
|
const SPRITE_ROCKER ; 2c
|
||||||
const SPRITE_POKEFAN_M ; 2d
|
const SPRITE_POKEFAN_M ; 2d
|
||||||
|
@ -294,7 +294,7 @@ IndigoGroupSprites:
|
|||||||
db SPRITE_SUDOWOODO
|
db SPRITE_SUDOWOODO
|
||||||
db SPRITE_BIG_SNORLAX
|
db SPRITE_BIG_SNORLAX
|
||||||
db SPRITE_POKEFAN_M
|
db SPRITE_POKEFAN_M
|
||||||
db SPRITE_BUENA
|
db SPRITE_BEAUTY
|
||||||
db SPRITE_GRAMPS
|
db SPRITE_GRAMPS
|
||||||
db SPRITE_YOUNGSTER
|
db SPRITE_YOUNGSTER
|
||||||
db SPRITE_FISHER
|
db SPRITE_FISHER
|
||||||
@ -496,7 +496,7 @@ CianwoodGroupSprites:
|
|||||||
db SPRITE_OLIVINE_RIVAL
|
db SPRITE_OLIVINE_RIVAL
|
||||||
db SPRITE_POKEFAN_M
|
db SPRITE_POKEFAN_M
|
||||||
db SPRITE_LASS
|
db SPRITE_LASS
|
||||||
db SPRITE_BUENA
|
db SPRITE_BEAUTY
|
||||||
db SPRITE_SWIMMER_GIRL
|
db SPRITE_SWIMMER_GIRL
|
||||||
db SPRITE_SAILOR
|
db SPRITE_SAILOR
|
||||||
db SPRITE_POKEFAN_F
|
db SPRITE_POKEFAN_F
|
||||||
@ -521,7 +521,7 @@ OlivineGroupSprites:
|
|||||||
db SPRITE_OLIVINE_RIVAL
|
db SPRITE_OLIVINE_RIVAL
|
||||||
db SPRITE_POKEFAN_M
|
db SPRITE_POKEFAN_M
|
||||||
db SPRITE_LASS
|
db SPRITE_LASS
|
||||||
db SPRITE_BUENA
|
db SPRITE_BEAUTY
|
||||||
db SPRITE_SWIMMER_GIRL
|
db SPRITE_SWIMMER_GIRL
|
||||||
db SPRITE_SAILOR
|
db SPRITE_SAILOR
|
||||||
db SPRITE_POKEFAN_F
|
db SPRITE_POKEFAN_F
|
||||||
|
@ -47,7 +47,7 @@ OverworldSprites:
|
|||||||
overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
||||||
overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
||||||
overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
||||||
overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
overworld_sprite BeautySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
||||||
overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
||||||
overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
|
overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
|
||||||
overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
||||||
|
@ -28,11 +28,11 @@ BTTrainerClassSprites:
|
|||||||
db SPRITE_JANINE
|
db SPRITE_JANINE
|
||||||
db SPRITE_COOLTRAINER_M
|
db SPRITE_COOLTRAINER_M
|
||||||
db SPRITE_COOLTRAINER_F
|
db SPRITE_COOLTRAINER_F
|
||||||
db SPRITE_BUENA
|
db SPRITE_BEAUTY
|
||||||
db SPRITE_SUPER_NERD
|
db SPRITE_SUPER_NERD
|
||||||
db SPRITE_ROCKET
|
db SPRITE_ROCKET
|
||||||
db SPRITE_GENTLEMAN
|
db SPRITE_GENTLEMAN
|
||||||
db SPRITE_BUENA
|
db SPRITE_BEAUTY
|
||||||
db SPRITE_TEACHER
|
db SPRITE_TEACHER
|
||||||
db SPRITE_SABRINA
|
db SPRITE_SABRINA
|
||||||
db SPRITE_BUG_CATCHER
|
db SPRITE_BUG_CATCHER
|
||||||
|
@ -76,7 +76,7 @@ Unused_CheckShininess:
|
|||||||
and a
|
and a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Unreferenced_Function8aa4:
|
Unreferenced_SGB_ApplyCreditsPals:
|
||||||
push de
|
push de
|
||||||
push bc
|
push bc
|
||||||
ld hl, PalPacket_9ce6
|
ld hl, PalPacket_9ce6
|
||||||
@ -205,7 +205,7 @@ Unreferenced_Function8b67:
|
|||||||
call GetPredefPal
|
call GetPredefPal
|
||||||
jp LoadHLPaletteIntoDE
|
jp LoadHLPaletteIntoDE
|
||||||
|
|
||||||
Unreferenced_Function8b81:
|
Unreferenced_GSIntro_LoadMonPalette:
|
||||||
call CheckCGB
|
call CheckCGB
|
||||||
jr nz, .cgb
|
jr nz, .cgb
|
||||||
ldh a, [hSGB]
|
ldh a, [hSGB]
|
||||||
|
@ -287,7 +287,7 @@ EXPORT PICS_FIX
|
|||||||
db BANK("Pics 23") ; BANK("Pics 1") + 22
|
db BANK("Pics 23") ; BANK("Pics 1") + 22
|
||||||
db BANK("Pics 24") ; BANK("Pics 1") + 23
|
db BANK("Pics 24") ; BANK("Pics 1") + 23
|
||||||
|
|
||||||
Function511ec:
|
Unreferenced_GSIntro_GetMonFrontpic:
|
||||||
ld a, c
|
ld a, c
|
||||||
push de
|
push de
|
||||||
ld hl, PokemonPicPointers
|
ld hl, PokemonPicPointers
|
||||||
|
@ -2503,8 +2503,8 @@ CableClubCheckWhichChris:
|
|||||||
ld [wScriptVar], a
|
ld [wScriptVar], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Unreferenced_Gen1LinkCommsBorderGFX:
|
Unreferenced_GSLinkCommsBorderGFX:
|
||||||
INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp"
|
INCBIN "gfx/trade/unused_gs_border_tiles.2bpp"
|
||||||
|
|
||||||
Unreferenced_Function29fe4:
|
Unreferenced_Function29fe4:
|
||||||
ld a, BANK(sPartyMail)
|
ld a, BANK(sPartyMail)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
PrepMysteryGiftDataToSend:
|
PrepMysteryGiftDataToSend:
|
||||||
ld de, wMysteryGiftStaging
|
ld de, wMysteryGiftStaging
|
||||||
ld a, $1
|
ld a, $1 + GS_VERSION
|
||||||
ld [de], a
|
ld [de], a
|
||||||
inc de ; wc801
|
inc de ; wc801
|
||||||
ld a, BANK(sGameData)
|
ld a, BANK(sGameData)
|
||||||
|
@ -363,8 +363,8 @@ Continue:
|
|||||||
ld c, 20
|
ld c, 20
|
||||||
call DelayFrames
|
call DelayFrames
|
||||||
farcall JumpRoamMons
|
farcall JumpRoamMons
|
||||||
farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
|
farcall MysteryGift_CopyReceivedDecosToPC
|
||||||
farcall Function140ae ; time-related
|
farcall ClockContinue
|
||||||
ld a, [wSpawnAfterChampion]
|
ld a, [wSpawnAfterChampion]
|
||||||
cp SPAWN_LANCE
|
cp SPAWN_LANCE
|
||||||
jr z, .SpawnAfterE4
|
jr z, .SpawnAfterE4
|
||||||
|
@ -4,7 +4,7 @@ INCBIN "gfx/mobile/mobile_menu.2bpp"
|
|||||||
MainMenu:
|
MainMenu:
|
||||||
xor a
|
xor a
|
||||||
ld [wDisableTextAcceleration], a
|
ld [wDisableTextAcceleration], a
|
||||||
call Function49ed0
|
call ClearTilemapEtc
|
||||||
ld b, SCGB_DIPLOMA
|
ld b, SCGB_DIPLOMA
|
||||||
call GetSGBLayout
|
call GetSGBLayout
|
||||||
call SetPalettes
|
call SetPalettes
|
||||||
@ -310,7 +310,7 @@ MainMenu_PrintCurrentTimeAndDay:
|
|||||||
.Day:
|
.Day:
|
||||||
db "DAY@"
|
db "DAY@"
|
||||||
|
|
||||||
Function49ed0:
|
ClearTilemapEtc:
|
||||||
xor a
|
xor a
|
||||||
ldh [hMapAnims], a
|
ldh [hMapAnims], a
|
||||||
call ClearTilemap
|
call ClearTilemap
|
||||||
|
@ -15,7 +15,7 @@ _ReplaceKrisSprite::
|
|||||||
call GetUsedSprite
|
call GetUsedSprite
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Function14146: ; mobile
|
_RefreshSprites: ; mobile
|
||||||
ld hl, wSpriteFlags
|
ld hl, wSpriteFlags
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
@ -26,7 +26,7 @@ Function14146: ; mobile
|
|||||||
ld [wSpriteFlags], a
|
ld [wSpriteFlags], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Function14157: ; mobile
|
_ClearSprites: ; mobile
|
||||||
ld hl, wSpriteFlags
|
ld hl, wSpriteFlags
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
|
@ -2817,9 +2817,9 @@ Script_checksave:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
; unused
|
; unused
|
||||||
ld a, [.byte]
|
ld a, [.gs_version]
|
||||||
ld [wScriptVar], a
|
ld [wScriptVar], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.byte
|
.gs_version
|
||||||
db 0
|
db GS_VERSION
|
||||||
|
@ -448,7 +448,7 @@ CheckCancelPrint:
|
|||||||
|
|
||||||
.pressed_b
|
.pressed_b
|
||||||
ld a, [wca80]
|
ld a, [wca80]
|
||||||
cp $c
|
cp $0c
|
||||||
jr nz, .cancel
|
jr nz, .cancel
|
||||||
.loop
|
.loop
|
||||||
ld a, [wPrinterOpcode]
|
ld a, [wPrinterOpcode]
|
||||||
|
@ -90,7 +90,7 @@ SaveRTC:
|
|||||||
|
|
||||||
StartClock::
|
StartClock::
|
||||||
call GetClock
|
call GetClock
|
||||||
call Function1409b
|
call _FixDays
|
||||||
call FixDays
|
call FixDays
|
||||||
jr nc, .skip_set
|
jr nc, .skip_set
|
||||||
; bit 5: Day count exceeds 139
|
; bit 5: Day count exceeds 139
|
||||||
@ -101,7 +101,7 @@ StartClock::
|
|||||||
call StartRTC
|
call StartRTC
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Function1409b:
|
_FixDays:
|
||||||
ld hl, hRTCDayHi
|
ld hl, hRTCDayHi
|
||||||
bit 7, [hl]
|
bit 7, [hl]
|
||||||
jr nz, .set_bit_7
|
jr nz, .set_bit_7
|
||||||
@ -116,7 +116,7 @@ Function1409b:
|
|||||||
call RecordRTCStatus ; set bit 7 on sRTCStatusFlags
|
call RecordRTCStatus ; set bit 7 on sRTCStatusFlags
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Function140ae:
|
ClockContinue:
|
||||||
call CheckRTCStatus
|
call CheckRTCStatus
|
||||||
ld c, a
|
ld c, a
|
||||||
and %11000000 ; Day count exceeded 255 or 16383
|
and %11000000 ; Day count exceeded 255 or 16383
|
||||||
|
@ -593,7 +593,7 @@ InitialClearDSTFlag:
|
|||||||
text_far _TimeAskOkayText
|
text_far _TimeAskOkayText
|
||||||
text_end
|
text_end
|
||||||
|
|
||||||
DebugDisplayTime:
|
Unreferenced_MrChrono:
|
||||||
hlcoord 1, 14
|
hlcoord 1, 14
|
||||||
lb bc, 3, SCREEN_WIDTH - 2
|
lb bc, 3, SCREEN_WIDTH - 2
|
||||||
call ClearBox
|
call ClearBox
|
||||||
|
@ -41,7 +41,7 @@ TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp"
|
|||||||
YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp"
|
YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp"
|
||||||
LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp"
|
LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp"
|
||||||
TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp"
|
TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp"
|
||||||
BuenaSpriteGFX:: INCBIN "gfx/sprites/buena.2bpp"
|
BeautySpriteGFX:: INCBIN "gfx/sprites/beauty.2bpp"
|
||||||
SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp"
|
SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp"
|
||||||
RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp"
|
RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp"
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
@ -108,4 +108,5 @@ INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm"
|
|||||||
TilesetBattleTowerOutsidePalMap:
|
TilesetBattleTowerOutsidePalMap:
|
||||||
INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
|
INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
|
||||||
|
|
||||||
ds 26, $06 ; unused
|
Unreferenced_MapGroupPalettes:
|
||||||
|
ds NUM_MAP_GROUPS, PAL_BG_ROOF
|
||||||
|
Before Width: | Height: | Size: 175 B After Width: | Height: | Size: 175 B |
@ -267,7 +267,7 @@ GetBaseData::
|
|||||||
jr .end
|
jr .end
|
||||||
|
|
||||||
.egg
|
.egg
|
||||||
ld de, UnusedEggFrontpic
|
ld de, UnusedEggPic
|
||||||
|
|
||||||
; Sprite dimensions
|
; Sprite dimensions
|
||||||
ld b, $55 ; 5x5
|
ld b, $55 ; 5x5
|
||||||
|
@ -23,7 +23,7 @@ AskSerial::
|
|||||||
xor a
|
xor a
|
||||||
ld [hl], a
|
ld [hl], a
|
||||||
|
|
||||||
ld a, 12
|
ld a, $0c
|
||||||
ld [wPrinterOpcode], a
|
ld [wPrinterOpcode], a
|
||||||
|
|
||||||
; handshake
|
; handshake
|
||||||
|
@ -381,3 +381,6 @@ receivetogepiegg EQUS "ReceiveTogepiEggScript"
|
|||||||
pcscript EQUS "PCScript"
|
pcscript EQUS "PCScript"
|
||||||
gamecornercoinvendor EQUS "GameCornerCoinVendorScript"
|
gamecornercoinvendor EQUS "GameCornerCoinVendorScript"
|
||||||
happinesschecknpc EQUS "HappinessCheckScript"
|
happinesschecknpc EQUS "HappinessCheckScript"
|
||||||
|
|
||||||
|
; constants/sprite_constants.asm
|
||||||
|
SPRITE_BUENA EQUS "SPRITE_BEAUTY"
|
||||||
|
2
main.asm
2
main.asm
@ -261,7 +261,7 @@ INCLUDE "data/pokemon/base_stats.asm"
|
|||||||
INCLUDE "data/pokemon/names.asm"
|
INCLUDE "data/pokemon/names.asm"
|
||||||
INCLUDE "data/pokemon/unused_pic_banks.asm"
|
INCLUDE "data/pokemon/unused_pic_banks.asm"
|
||||||
|
|
||||||
UnusedEggFrontpic::
|
UnusedEggPic::
|
||||||
; Another egg pic. This is shifted up a few pixels.
|
; Another egg pic. This is shifted up a few pixels.
|
||||||
INCBIN "gfx/pokemon/egg/unused_front.2bpp.lz"
|
INCBIN "gfx/pokemon/egg/unused_front.2bpp.lz"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
object_const_def ; object_event constants
|
object_const_def ; object_event constants
|
||||||
const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
|
const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER
|
||||||
const BATTLETOWEROUTSIDE_BUENA
|
const BATTLETOWEROUTSIDE_BEAUTY
|
||||||
const BATTLETOWEROUTSIDE_SAILOR
|
const BATTLETOWEROUTSIDE_SAILOR
|
||||||
const BATTLETOWEROUTSIDE_LASS
|
const BATTLETOWEROUTSIDE_LASS
|
||||||
|
|
||||||
@ -21,8 +21,8 @@ BattleTowerOutside_MapScripts:
|
|||||||
BattleTowerOutsideYoungsterScript:
|
BattleTowerOutsideYoungsterScript:
|
||||||
jumptextfaceplayer BattleTowerOutsideYoungsterText
|
jumptextfaceplayer BattleTowerOutsideYoungsterText
|
||||||
|
|
||||||
BattleTowerOutsideBuenaScript:
|
BattleTowerOutsideBeautyScript:
|
||||||
jumptextfaceplayer BattleTowerOutsideBuenaText
|
jumptextfaceplayer BattleTowerOutsideBeautyText
|
||||||
|
|
||||||
BattleTowerOutsideSailorScript:
|
BattleTowerOutsideSailorScript:
|
||||||
jumptextfaceplayer BattleTowerOutsideSailorText
|
jumptextfaceplayer BattleTowerOutsideSailorText
|
||||||
@ -63,7 +63,7 @@ BattleTowerOutsideYoungsterText:
|
|||||||
cont "in there!"
|
cont "in there!"
|
||||||
done
|
done
|
||||||
|
|
||||||
BattleTowerOutsideBuenaText_NotYetOpen:
|
BattleTowerOutsideBeautyText_NotYetOpen:
|
||||||
; unreferenced
|
; unreferenced
|
||||||
text "What on earth do"
|
text "What on earth do"
|
||||||
line "they do here?"
|
line "they do here?"
|
||||||
@ -75,7 +75,7 @@ BattleTowerOutsideBuenaText_NotYetOpen:
|
|||||||
line "#MON battles."
|
line "#MON battles."
|
||||||
done
|
done
|
||||||
|
|
||||||
BattleTowerOutsideBuenaText:
|
BattleTowerOutsideBeautyText:
|
||||||
text "You can use only"
|
text "You can use only"
|
||||||
line "three #MON."
|
line "three #MON."
|
||||||
|
|
||||||
@ -147,6 +147,6 @@ BattleTowerOutside_MapEvents:
|
|||||||
|
|
||||||
db 4 ; object events
|
db 4 ; object events
|
||||||
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
|
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
|
||||||
object_event 13, 11, SPRITE_BUENA, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
|
object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1
|
||||||
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
||||||
object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
|
object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
const CELADONGYM_ERIKA
|
const CELADONGYM_ERIKA
|
||||||
const CELADONGYM_LASS1
|
const CELADONGYM_LASS1
|
||||||
const CELADONGYM_LASS2
|
const CELADONGYM_LASS2
|
||||||
const CELADONGYM_BUENA
|
const CELADONGYM_BEAUTY
|
||||||
const CELADONGYM_TWIN1
|
const CELADONGYM_TWIN1
|
||||||
const CELADONGYM_TWIN2
|
const CELADONGYM_TWIN2
|
||||||
|
|
||||||
@ -282,6 +282,6 @@ CeladonGym_MapEvents:
|
|||||||
object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1
|
object_event 5, 3, SPRITE_ERIKA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGymErikaScript, -1
|
||||||
object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
|
object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
|
||||||
object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
|
object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
|
||||||
object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
|
object_event 3, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
|
||||||
object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe1, -1
|
object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe1, -1
|
||||||
object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe2, -1
|
object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe2, -1
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
object_const_def ; object_event constants
|
object_const_def ; object_event constants
|
||||||
const FASTSHIPCABINS_SW_SSW_NW_FISHER
|
const FASTSHIPCABINS_SW_SSW_NW_FISHER
|
||||||
const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
|
const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER
|
||||||
const FASTSHIPCABINS_SW_SSW_NW_BUENA
|
const FASTSHIPCABINS_SW_SSW_NW_BEAUTY
|
||||||
const FASTSHIPCABINS_SW_SSW_NW_ROCKER
|
const FASTSHIPCABINS_SW_SSW_NW_ROCKER
|
||||||
|
|
||||||
FastShipCabins_SW_SSW_NW_MapScripts:
|
FastShipCabins_SW_SSW_NW_MapScripts:
|
||||||
@ -240,5 +240,5 @@ FastShipCabins_SW_SSW_NW_MapEvents:
|
|||||||
db 4 ; object events
|
db 4 ; object events
|
||||||
object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
|
object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
|
||||||
object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
|
object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
|
||||||
object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
|
object_event 1, 26, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
|
||||||
object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
|
object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
const GOLDENRODGYM_WHITNEY
|
const GOLDENRODGYM_WHITNEY
|
||||||
const GOLDENRODGYM_LASS1
|
const GOLDENRODGYM_LASS1
|
||||||
const GOLDENRODGYM_LASS2
|
const GOLDENRODGYM_LASS2
|
||||||
const GOLDENRODGYM_BUENA1
|
const GOLDENRODGYM_BEAUTY1
|
||||||
const GOLDENRODGYM_BUENA2
|
const GOLDENRODGYM_BEAUTY2
|
||||||
const GOLDENRODGYM_GYM_GUY
|
const GOLDENRODGYM_GYM_GUY
|
||||||
|
|
||||||
GoldenrodGym_MapScripts:
|
GoldenrodGym_MapScripts:
|
||||||
@ -395,6 +395,6 @@ GoldenrodGym_MapEvents:
|
|||||||
object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1
|
object_event 8, 3, SPRITE_WHITNEY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymWhitneyScript, -1
|
||||||
object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
|
object_event 9, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1
|
||||||
object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
|
object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
|
||||||
object_event 0, 2, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
|
object_event 0, 2, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
|
||||||
object_event 19, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
|
object_event 19, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
|
||||||
object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
|
object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
object_const_def ; object_event constants
|
object_const_def ; object_event constants
|
||||||
const MAHOGANYGYM_PRYCE
|
const MAHOGANYGYM_PRYCE
|
||||||
const MAHOGANYGYM_BUENA1
|
const MAHOGANYGYM_BEAUTY1
|
||||||
const MAHOGANYGYM_ROCKER1
|
const MAHOGANYGYM_ROCKER1
|
||||||
const MAHOGANYGYM_BUENA2
|
const MAHOGANYGYM_BEAUTY2
|
||||||
const MAHOGANYGYM_ROCKER2
|
const MAHOGANYGYM_ROCKER2
|
||||||
const MAHOGANYGYM_ROCKER3
|
const MAHOGANYGYM_ROCKER3
|
||||||
const MAHOGANYGYM_GYM_GUY
|
const MAHOGANYGYM_GYM_GUY
|
||||||
@ -385,9 +385,9 @@ MahoganyGym_MapEvents:
|
|||||||
|
|
||||||
db 7 ; object events
|
db 7 ; object events
|
||||||
object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1
|
object_event 5, 3, SPRITE_PRYCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MahoganyGymPryceScript, -1
|
||||||
object_event 4, 6, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
|
object_event 4, 6, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierRoxanne, -1
|
||||||
object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
|
object_event 0, 17, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderRonald, -1
|
||||||
object_event 9, 17, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
|
object_event 9, 17, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
|
||||||
object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
|
object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
|
||||||
object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
|
object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
|
||||||
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
|
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
|
||||||
|
@ -736,5 +736,5 @@ RadioTower2F_MapEvents:
|
|||||||
object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
|
object_event 0, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt1Script, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
|
||||||
object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
|
object_event 1, 1, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTower2FBlackBelt2Script, EVENT_RADIO_TOWER_CIVILIANS_AFTER
|
||||||
object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
|
object_event 12, 1, SPRITE_JIGGLYPUFF, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1
|
||||||
object_event 14, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
|
object_event 14, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Buena, -1
|
||||||
object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTowerBuenaPrizeReceptionist, EVENT_GOLDENROD_CITY_CIVILIANS
|
object_event 12, 7, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTowerBuenaPrizeReceptionist, EVENT_GOLDENROD_CITY_CIVILIANS
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
const ROUTE38_STANDING_YOUNGSTER1
|
const ROUTE38_STANDING_YOUNGSTER1
|
||||||
const ROUTE38_LASS
|
const ROUTE38_LASS
|
||||||
const ROUTE38_STANDING_YOUNGSTER2
|
const ROUTE38_STANDING_YOUNGSTER2
|
||||||
const ROUTE38_BUENA1
|
const ROUTE38_BEAUTY1
|
||||||
const ROUTE38_SAILOR
|
const ROUTE38_SAILOR
|
||||||
const ROUTE38_FRUIT_TREE
|
const ROUTE38_FRUIT_TREE
|
||||||
const ROUTE38_BUENA2
|
const ROUTE38_BEAUTY2
|
||||||
|
|
||||||
Route38_MapScripts:
|
Route38_MapScripts:
|
||||||
db 0 ; scene scripts
|
db 0 ; scene scripts
|
||||||
@ -487,7 +487,7 @@ Route38_MapEvents:
|
|||||||
object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
|
object_event 4, 1, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1
|
||||||
object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
|
object_event 15, 3, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1
|
||||||
object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
|
object_event 12, 15, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1
|
||||||
object_event 19, 9, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
|
object_event 19, 9, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1
|
||||||
object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
|
object_event 24, 5, SPRITE_SAILOR, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1
|
||||||
object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route38FruitTree, -1
|
object_event 12, 10, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route38FruitTree, -1
|
||||||
object_event 5, 8, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
|
object_event 5, 8, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyOlivia, -1
|
||||||
|
@ -356,7 +356,7 @@ Route40_MapEvents:
|
|||||||
object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
|
object_event 6, 9, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
|
||||||
object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
|
object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
|
||||||
object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
|
object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
|
||||||
object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
|
object_event 8, 10, SPRITE_BEAUTY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
|
||||||
object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1
|
object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1
|
||||||
object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
|
object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
|
||||||
object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
object_const_def ; object_event constants
|
object_const_def ; object_event constants
|
||||||
const VERMILIONMART_CLERK
|
const VERMILIONMART_CLERK
|
||||||
const VERMILIONMART_SUPER_NERD
|
const VERMILIONMART_SUPER_NERD
|
||||||
const VERMILIONMART_BUENA
|
const VERMILIONMART_BEAUTY
|
||||||
|
|
||||||
VermilionMart_MapScripts:
|
VermilionMart_MapScripts:
|
||||||
db 0 ; scene scripts
|
db 0 ; scene scripts
|
||||||
@ -17,8 +17,8 @@ VermilionMartClerkScript:
|
|||||||
VermilionMartSuperNerdScript:
|
VermilionMartSuperNerdScript:
|
||||||
jumptextfaceplayer VermilionMartSuperNerdText
|
jumptextfaceplayer VermilionMartSuperNerdText
|
||||||
|
|
||||||
VermilionMartBuenaScript:
|
VermilionMartBeautyScript:
|
||||||
jumptextfaceplayer VermilionMartBuenaText
|
jumptextfaceplayer VermilionMartBeautyText
|
||||||
|
|
||||||
VermilionMartSuperNerdText:
|
VermilionMartSuperNerdText:
|
||||||
text "TEAM ROCKET is no"
|
text "TEAM ROCKET is no"
|
||||||
@ -28,7 +28,7 @@ VermilionMartSuperNerdText:
|
|||||||
line "me happy."
|
line "me happy."
|
||||||
done
|
done
|
||||||
|
|
||||||
VermilionMartBuenaText:
|
VermilionMartBeautyText:
|
||||||
text "I'm thinking about"
|
text "I'm thinking about"
|
||||||
line "going shopping in"
|
line "going shopping in"
|
||||||
cont "SAFFRON."
|
cont "SAFFRON."
|
||||||
@ -48,4 +48,4 @@ VermilionMart_MapEvents:
|
|||||||
db 3 ; object events
|
db 3 ; object events
|
||||||
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1
|
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMartClerkScript, -1
|
||||||
object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
|
object_event 5, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionMartSuperNerdScript, -1
|
||||||
object_event 8, 6, SPRITE_BUENA, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBuenaScript, -1
|
object_event 8, 6, SPRITE_BEAUTY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionMartBeautyScript, -1
|
||||||
|
@ -668,7 +668,7 @@ Function1163c0:
|
|||||||
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
|
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
|
||||||
call ByteFill
|
call ByteFill
|
||||||
call DelayFrame
|
call DelayFrame
|
||||||
farcall Function14146
|
farcall _RefreshSprites
|
||||||
ld b, SCGB_MAPPALS
|
ld b, SCGB_MAPPALS
|
||||||
call GetSGBLayout
|
call GetSGBLayout
|
||||||
ldh a, [rSVBK]
|
ldh a, [rSVBK]
|
||||||
@ -686,7 +686,7 @@ Function1163c0:
|
|||||||
ld a, $90
|
ld a, $90
|
||||||
ldh [hWY], a
|
ldh [hWY], a
|
||||||
call UpdateSprites
|
call UpdateSprites
|
||||||
farcall Function14157
|
farcall _ClearSprites
|
||||||
pop af
|
pop af
|
||||||
ldh [rSVBK], a
|
ldh [rSVBK], a
|
||||||
farcall ReloadMapPart
|
farcall ReloadMapPart
|
||||||
|
Loading…
Reference in New Issue
Block a user