pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated signpost items and person_event flags

Browse Source
This commit is contained in:
PikalaxALT
2015-07-18 15:46:38 -04:00
parent 0fcef5fc08
commit e674869018
176 changed files with 1602 additions and 1633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/engine_flags.asm
View File

@@ -94,7 +94,7 @@
const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
const ENGINE_TEA_IN_BLUES_HOUSE
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
const ENGINE_5E
const ENGINE_DAILY_MOVE_TUTOR
const ENGINE_5F
const ENGINE_60
const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON

819
constants/event_flags.asm
View File

File diff suppressed because it is too large Load Diff

16
constants/map_constants.asm
View File

@@ -233,7 +233,7 @@ MAP_N_A EQU -1
mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16
mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5
mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5
mapgroup DAY_CARE, 4, 5
mapgroup DAYCARE, 4, 5
newgroup
mapgroup ROUTE_6, 9, 10
@@ -700,9 +700,9 @@ const_value SET 1
const OBJECT_32
; 33-39 are not used
; map object struct
const_def
const MAPOBJECT_VRAM_ID ; 0
const MAPOBJECT_OBJECT_STRUCT_ID ; 0
const MAPOBJECT_SPRITE ; 1
const MAPOBJECT_Y_COORD ; 2
const MAPOBJECT_X_COORD ; 3
@@ -712,9 +712,9 @@ const_value SET 1
const MAPOBJECT_TIMEOFDAY ; 7
const MAPOBJECT_COLOR ; 8
const MAPOBJECT_RANGE ; 9
const MAPOBJECT_POINTER_LO ; a
const MAPOBJECT_SCRIPT_POINTER ; a
const MAPOBJECT_POINTER_HI ; b
const MAPOBJECT_FLAG_LO ; c
const MAPOBJECT_EVENT_FLAG ; c
const MAPOBJECT_FLAG_HI ; d
const MAPOBJECT_E ; unused
const MAPOBJECT_F ; unused
@@ -725,6 +725,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
OBJECT_STRUCT_3_DATA_WIDTH EQU 6
OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
OW_DOWN EQU $0
OW_RIGHT EQU $4
OW_UP EQU $8
OW_LEFT EQU $c
const_def
const EMOTE_SHOCK ; 0
@@ -748,5 +752,5 @@ OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
const SIGNPOST_LEFT
const SIGNPOST_IFSET
const SIGNPOST_IFNOTSET
const SIGNPOST_ITEMIFSET
const SIGNPOST_ITEM
const SIGNPOST_COPY

43
constants/phone_constants.asm Normal file
View File

@@ -0,0 +1,43 @@
PHONE_SCHOOLBOY_JACK EQU $05
PHONE_POKEFAN_BEVERLY EQU $06
PHONE_SAILOR_HUEY EQU $07
PHONE_COOLTRAINERM_GAVEN EQU $0b
PHONE_COOLTRAINERF_BETH EQU $0c
PHONE_BIRDKEEPER_JOSE EQU $0d
PHONE_COOLTRAINERF_REENA EQU $0e
PHONE_YOUNGSTER_JOEY EQU $0f
PHONE_BUG_CATCHER_WADE EQU $10
PHONE_FISHER_RALPH EQU $11
PHONE_PICNICKER_LIZ EQU $12
PHONE_HIKER_ANTHONY EQU $13
PHONE_CAMPER_TODD EQU $14
PHONE_PICNICKER_GINA EQU $15
PHONE_JUGGLER_IRWIN EQU $16
PHONE_BUG_CATCHER_ARNIE EQU $17
PHONE_SCHOOLBOY_ALAN EQU $18
PHONE_LASS_DANA EQU $1a
PHONE_SCHOOLBOY_CHAD EQU $1b
PHONE_POKEFANM_DEREK EQU $1c
PHONE_FISHER_TULLY EQU $1d
PHONE_POKEMANIAC_BRENT EQU $1e
PHONE_PICNICKER_TIFFANY EQU $1f
PHONE_BIRDKEEPER_VANCE EQU $20
PHONE_FISHER_WILTON EQU $21
PHONE_BLACKBELT_KENJI EQU $22
PHONE_HIKER_PARRY EQU $23
PHONE_PICNICKER_ERIN EQU $24
const_def
const ELMCALL_NONE
const ELMCALL_POKERUS
const ELMCALL_ROBBED
const ELMCALL_ASSISTANT
const ELMCALL_WEIRDBROADCAST
const ELMCALL_SSTICKET
const ELMCALL_UNKNOWN
const MOMCALL_WORRIED
const ELMCALL_MASTERBALL

6
engine/events.asm
View File

@@ -245,7 +245,7 @@ Function967d1: ; 967d1
; 967e1
Function967e1: ; 967e1
callba Function5920
callba RefreshMapAppearDisappear
callba Functiond4d2
callba Functionb8098
ret
@@ -648,7 +648,7 @@ TryObjectEvent: ; 969b5
; 96a04
.zero ; 96a04
ld hl, MAPOBJECT_POINTER_LO
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -660,7 +660,7 @@ TryObjectEvent: ; 969b5
; 96a12
.one ; 96a12
ld hl, MAPOBJECT_POINTER_LO
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
ld a, [hli]
ld h, [hl]

8
engine/map_objects.asm
View File

@@ -2761,7 +2761,7 @@ Function5602: ; 5602
call Function5629
.ok
call Function5920
call RefreshMapAppearDisappear
ret
; 561d
@@ -2769,7 +2769,7 @@ Function561d: ; 561d
call Function5645
ld a, 0
call Function5629
call Function5920
call RefreshMapAppearDisappear
ret
; 5629
@@ -2777,7 +2777,7 @@ Function5629: ; 5629
cp $10
ret nc
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -3320,7 +3320,7 @@ Function5903: ; 5903
db 6, 7, 8, 9
; 5920
Function5920:: ; 5920
RefreshMapAppearDisappear:: ; 5920
ld a, [VramState]
bit 0, a
ret z

32
engine/scripting.asm
View File

@@ -1253,10 +1253,10 @@ Script_appear: ; 0x972dd
call GetScriptByte
call GetScriptPerson
call Function1956
call _CopyObjectStruct
ld a, [$ffaf]
ld b, $0
call Function9730b
ld b, 0 ; clear
call ApplyEventActionAppearDisappear
ret
; 0x972ee
@@ -1267,35 +1267,35 @@ Script_disappear: ; 0x972ee
call GetScriptByte
call GetScriptPerson
cp $fe
jr nz, .asm_972fa ; 0x972f6 $2
cp -2
jr nz, .skip ; 0x972f6 $2
ld a, [$ffe0]
.asm_972fa
call Function199f
.skip
call DeleteObjectStruct
ld a, [$ffaf]
ld b, $1
call Function9730b
callba Function5920
ld b, 1 ; set
call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear
ret
; 0x9730b
Function9730b: ; 0x9730b
ApplyEventActionAppearDisappear: ; 0x9730b
push bc
call GetMapObject
ld hl, $000c
ld hl, MAPOBJECT_EVENT_FLAG
add hl, bc
pop bc
ld e, [hl]
inc hl
ld d, [hl]
ld a, $ff
ld a, -1
cp e
jr nz, .asm_97321 ; 0x9731a $5
jr nz, .okay ; 0x9731a $5
cp d
jr nz, .asm_97321 ; 0x9731d $2
jr nz, .okay ; 0x9731d $2
xor a
ret
.asm_97321
.okay
call EventFlagAction
ret
; 0x97325

184
engine/std_scripts.asm
View File

@@ -287,25 +287,25 @@ DayToTextScript:
db "SATURDAY@"
GoldenrodRocketsScript:
clearevent EVENT_6CD
clearevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
end
RadioTowerRocketsScript:
setflag ENGINE_ROCKETS_IN_RADIO_TOWER
setevent EVENT_6CF
setevent EVENT_6D1
clearevent EVENT_6CE
setevent EVENT_GOLDENROD_CITY_CIVILIANS
setevent EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_756
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall ELMCALL_WEIRDBROADCAST
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
end
BugContestResultsWarpScript:
special WhiteBGMap
scall BugContestResults_EnsureNoDuplicateSprites
setevent EVENT_747
clearevent EVENT_748
scall BugContestResults_CopyContestantsToResults
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_2D2
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement $0, Movement_ContestResults_WalkAfterWarp
@@ -438,7 +438,7 @@ BugContestResults_NoRoomForBerry ; 0xbc375
jump BugContestResults_DidNotWin
; 0xbc380
BugContestResults_EnsureNoDuplicateSprites ; 0xbc380
BugContestResults_CopyContestantsToResults ; 0xbc380
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue .skip1
clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
@@ -482,35 +482,35 @@ BugContestResults_EnsureNoDuplicateSprites ; 0xbc380
end
InitializeEventsScript:
setevent EVENT_6CB
setevent EVENT_6CE
setevent EVENT_6CD
setevent EVENT_6D0
setevent EVENT_6F3
setevent EVENT_6E9
setevent EVENT_6F4
setevent EVENT_6D5
setevent EVENT_6DE
setevent EVENT_6DD
setevent EVENT_6DF
setevent EVENT_6C0
setevent EVENT_6E4
setevent EVENT_EARLS_ACADEMY_EARL
setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
setevent EVENT_RADIO_TOWER_CIVILIANS_AFTER
setevent EVENT_ILEX_FOREST_APPRENTICE
setevent EVENT_ILEX_FOREST_FARFETCHD
setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
setevent EVENT_RIVAL_TEAM_ROCKET_BASE
setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_6BE
setevent EVENT_6BF
setevent EVENT_6C1
setevent EVENT_6F9
setevent EVENT_6FD
setevent EVENT_RIVAL_CHERRYGROVE_CITY
setevent EVENT_RIVAL_AZALEA_TOWN
setevent EVENT_RIVAL_UNDERGROUND_PATH
setevent EVENT_AZALEA_TOWN_SLOWPOKES
setevent EVENT_KURTS_HOUSE_SLOWPOKE
setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
setevent EVENT_COP_IN_ELMS_LAB
setevent EVENT_703
setevent EVENT_704
setevent EVENT_BOULDER_IN_ICE_PATH_1
setevent EVENT_BOULDER_IN_ICE_PATH_2
setevent EVENT_BOULDER_IN_ICE_PATH_3
setevent EVENT_BOULDER_IN_ICE_PATH_4
setevent EVENT_715
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
setevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
setevent EVENT_BOULDER_IN_ICE_PATH_1A
setevent EVENT_BOULDER_IN_ICE_PATH_2A
setevent EVENT_BOULDER_IN_ICE_PATH_3A
setevent EVENT_BOULDER_IN_ICE_PATH_4A
setevent EVENT_ROUTE_30_YOUNGSTER_JOEY
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A
@@ -531,70 +531,70 @@ InitializeEventsScript:
setevent EVENT_BUG_CATCHING_CONTESTANT_8B
setevent EVENT_BUG_CATCHING_CONTESTANT_9B
setevent EVENT_BUG_CATCHING_CONTESTANT_10B
setevent EVENT_72C
setevent EVENT_72F
setevent EVENT_72D
setevent EVENT_735
setevent EVENT_736
setevent EVENT_73C
setevent EVENT_73D
setevent EVENT_741
setevent EVENT_742
setevent EVENT_743
setevent EVENT_744
setevent EVENT_FAST_SHIP_1F_GENTLEMAN
setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
setevent EVENT_LAKE_OF_RAGE_CIVILIANS
setevent EVENT_MAHOGANY_MART_OWNERS
setevent EVENT_TIN_TOWER_ROOF_HO_OH
setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
setevent EVENT_KRISS_HOUSE_2F_CONSOLE
setevent EVENT_KRISS_HOUSE_2F_DOLL_1
setevent EVENT_KRISS_HOUSE_2F_DOLL_2
setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
setevent EVENT_2A4
setevent EVENT_2AF
setevent EVENT_749
setevent EVENT_6D3
setevent EVENT_74D
setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
setevent EVENT_OLIVINE_GYM_JASMINE
setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
setevent EVENT_MET_BILL
setevent EVENT_713
setevent EVENT_ECRUTEAK_POKE_CENTER_BILL
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
setevent EVENT_6D4
setevent EVENT_LAKE_OF_RAGE_LANCE
setevent EVENT_WAREHOUSE_LAYOUT_1
setevent EVENT_WAREHOUSE_BLOCKED_OFF
setevent EVENT_6D8
setevent EVENT_6C3
setevent EVENT_6C2
setevent EVENT_6C6
setevent EVENT_75F
setevent EVENT_731
setevent EVENT_74A
setevent EVENT_DRAGONS_DEN_CLAIR
setevent EVENT_RIVAL_OLIVINE_CITY
setevent EVENT_RIVAL_VICTORY_ROAD
setevent EVENT_RIVAL_DRAGONS_DEN
setevent EVENT_LANCES_ROOM_OAK_AND_MARY
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
setevent EVENT_BURNED_TOWER_B1F_BEASTS_1
setevent EVENT_RED_IN_MT_SILVER
setevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
setevent EVENT_73A
setevent EVENT_73B
setevent EVENT_733
setevent EVENT_73F
setevent EVENT_78D
setevent EVENT_766
setevent EVENT_768
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
setevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
setevent EVENT_KURTS_HOUSE_KURT_2
setevent EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_FLORIA_AT_FLOWER_SHOP
setevent EVENT_FLORIA_AT_SUDOWOODO
setevent EVENT_76A
setevent EVENT_78E
setevent EVENT_78F
setevent EVENT_790
setevent EVENT_791
setevent EVENT_793
setevent EVENT_7A4
setevent EVENT_7A4
setevent EVENT_7A5
setevent EVENT_6EC
setevent EVENT_6ED
setevent EVENT_GOLDENROD_CITY_MOVE_TUTOR
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
setevent EVENT_DRAGON_SHRINE_CLAIR
setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
setevent EVENT_AZALEA_TOWN_KURT
setevent EVENT_AZALEA_TOWN_KURT
setevent EVENT_ILEX_FOREST_KURT
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
setevent EVENT_ILEX_FOREST_LASS
setevent EVENT_GOLDENROD_SALE_OFF
setevent EVENT_7A9
setevent EVENT_ECRUTEAK_CITY_GRAMPS
setevent EVENT_EUSINE_IN_BURNED_TOWER
setevent EVENT_6C8
setevent EVENT_7AC
setevent EVENT_7AD
setevent EVENT_7B5
setevent EVENT_7B6
setevent EVENT_7C5
setevent EVENT_KRISS_HOUSE_MOM_2
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
setevent EVENT_CIANWOOD_CITY_EUSINE
setevent EVENT_TIN_TOWER_1F_EUSINE
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_SET_WHEN_FOUGHT_HO_OH
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_7CF
setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO
@@ -607,16 +607,16 @@ InitializeEventsScript:
variablesprite SPRITE_COPYCAT, SPRITE_LASS
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
setevent EVENT_76D
setevent EVENT_76C
setevent EVENT_76E
setevent EVENT_CERULEAN_GYM_ROCKET
setevent EVENT_ROUTE_24_ROCKET
setevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setevent EVENT_TRAINERS_IN_CERULEAN_GYM
setevent EVENT_773
setevent EVENT_776
setevent EVENT_777
setevent EVENT_779
setevent EVENT_772
setevent EVENT_77B
setevent EVENT_COPYCATS_HOUSE_2F_DOLL
setevent EVENT_VIRIDIAN_GYM_BLUE
setevent EVENT_SEAFOAM_GYM_GYM_GUY
setevent EVENT_MT_MOON_SQUARE_CLEFAIRY
setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
setevent EVENT_036
return

18
home.asm
View File

@@ -1497,11 +1497,11 @@ FacingPlayerDistance:: ; 36ad
; Return carry if the sprite at bc is facing the player,
; and its distance in d.
ld hl, $0010 ; x
ld hl, OBJECT_MAP_X ; x
add hl, bc
ld d, [hl]
ld hl, $0011 ; y
ld hl, OBJECT_MAP_Y ; y
add hl, bc
ld e, [hl]
@@ -1570,7 +1570,7 @@ Function36f5:: ; 36f5
add hl, bc
ld a, [hl]
call GetMapObject
ld hl, $000a
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -1580,7 +1580,7 @@ Function36f5:: ; 36f5
ld d, h
ld e, l
push de
ld b, $2
ld b, $2 ; check
call EventFlagAction
pop de
ld a, c
@@ -1593,19 +1593,19 @@ Function36f5:: ; 36f5
Function3718:: ; 3718
ld a, [BattleType]
cp BATTLETYPE_CANLOSE
jr .asm_3724
jr .canlose
ld hl, WalkingTile
jr .asm_3731
jr .ok
.asm_3724
.canlose
ld a, [wd0ee]
ld hl, WalkingTile
and $f
jr z, .asm_3731
jr z, .ok
ld hl, wd048 + 1
.asm_3731
.ok
ld a, [hli]
ld h, [hl]
ld l, a

18
home/map_objects.asm
View File

@@ -22,7 +22,7 @@ Function180e:: ; 180e
ld c, SPRITE_GFX_LIST_CAPACITY - 1
ld b, a
ld a, [hConnectionStripLength]
cp $0
cp 0
jr z, .nope
ld a, b
.loop
@@ -235,7 +235,7 @@ Function18de:: ; 18de
; Sets carry if the object is not visible on the screen.
ld [hConnectionStripLength], a
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -327,25 +327,25 @@ Function18f5:: ; 18f5
Function194d:: ; 194d
ld [hConnectionStripLength], a
call GetMapObject
call Function80e7
call CopyObjectStruct
ret
; 1956
Function1956:: ; 1956
_CopyObjectStruct:: ; 1956
ld [hConnectionStripLength], a
call Function271e
ld a, [hConnectionStripLength]
call GetMapObject
callba Function80e7
callba CopyObjectStruct
ret
; 1967
Function1967:: ; 1967
ld [hConnectionStripLength], a
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -375,7 +375,7 @@ Function1985:: ; 1985
ret
; 199f
Function199f:: ; 199f
DeleteObjectStruct:: ; 199f
call Function1967
call Function2712
ret
@@ -397,7 +397,7 @@ Function19a6:: ; 19a6
Function19b8:: ; 19b8
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
push af
@@ -620,7 +620,7 @@ DrawOnMap:: ; 1ad2
bit 0, a
ret z
callba Function55e0
callba Function5920
callba RefreshMapAppearDisappear
ret
; 1ae5

4
macros/trainer.asm Normal file
View File

@@ -0,0 +1,4 @@
trainerclass: MACRO
enum \1
const_value = 1
ENDM

108
main.asm
View File

@@ -207,7 +207,7 @@ _ResetWRAM: ; 5bae
ld [wCurBox], a
ld [wd4b4], a
call Function5ca6
call SetDefaultBoxNames
ld a, 1
call GetSRAMBank
@@ -301,10 +301,10 @@ Function5ca1: ; 5ca1
ret
; 5ca6
Function5ca6: ; 5ca6
SetDefaultBoxNames: ; 5ca6
ld hl, wBoxNames
ld c, 0
.asm_5cab
.loop
push hl
ld de, .Box
call CopyName2
@@ -312,12 +312,12 @@ Function5ca6: ; 5ca6
ld a, c
inc a
cp 10
jr c, .asm_5cbe
jr c, .less
sub 10
ld [hl], "1"
inc hl
.asm_5cbe
.less
add "0"
ld [hli], a
ld [hl], "@"
@@ -327,7 +327,7 @@ Function5ca6: ; 5ca6
inc c
ld a, c
cp NUM_BOXES
jr c, .asm_5cab
jr c, .loop
ret
.Box
@@ -3291,7 +3291,7 @@ Function80b8: ; 80b8
; 80e7
Function80e7:: ; 80e7
CopyObjectStruct:: ; 80e7
call Function2707
and a
ret nz
@@ -3332,7 +3332,7 @@ Function8116: ; 8116
Function811d: ; 811d
ld a, [$ffb0]
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld [hl], a
ld a, [$ffaf]
@@ -3350,12 +3350,12 @@ Function811d: ; 811d
add hl, bc
ld a, [hl]
and $f0
jr z, .asm_814e
jr z, .no_color
swap a
and $7
ld [wc2f3], a
.asm_814e
.no_color
ld hl, MAPOBJECT_FACING
add hl, bc
ld a, [hl]
@@ -3389,7 +3389,7 @@ Function8177: ; 8177
ld a, [hl]
and a
jr z, .next
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -3415,7 +3415,7 @@ Function8177: ; 8177
cp MAPOBJECT_SCREEN_HEIGHT
jr nc, .next
push bc
call Function80e7
call CopyObjectStruct
pop bc
jp c, Function81c9
@@ -3479,7 +3479,7 @@ Function81ea: ; 81ea
ld a, d
cp [hl]
jr nz, .next
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -3494,7 +3494,7 @@ Function81ea: ; 81ea
jr nc, .next
push de
push bc
call Function80e7
call CopyObjectStruct
pop bc
pop de
@@ -3537,7 +3537,7 @@ Function823e: ; 823e
ld a, e
cp [hl]
jr nz, .next
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -3552,7 +3552,7 @@ Function823e: ; 823e
jr nc, .next
push de
push bc
call Function80e7
call CopyObjectStruct
pop bc
pop de
@@ -3688,7 +3688,7 @@ Function8341: ; 8341
push bc
ld a, c
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
call GetObjectStruct
@@ -3697,7 +3697,7 @@ Function8341: ; 8341
pop bc
ld a, b
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
call GetObjectStruct
@@ -23302,7 +23302,7 @@ Function16f7a: ; 16f7a (5:6f7a)
jr nz, .nottogepi
; set the event flag for hatching togepi
ld de, EVENT_TOGEPI_HATCHED
ld b, $1
ld b, $1 ; set
call EventFlagAction
.nottogepi
@@ -25223,14 +25223,14 @@ Function2454f: ; 2454f
ld bc, MapObjects
ld de, wd81e
xor a
.asm_24561
.loop
push af
push bc
push de
call Function245a7
jr c, .asm_2456c
jr c, .next
call Function2457d
.asm_2456c
.next
pop de
ld [de], a
inc de
@@ -25242,44 +25242,44 @@ Function2454f: ; 2454f
pop af
inc a
cp $10
jr nz, .asm_24561
jr nz, .loop
ret
Function2457d: ; 2457d (9:457d)
ld hl, $1
ld hl, MAPOBJECT_SPRITE
add hl, bc
ld a, [hl]
and a
jr z, .asm_245a3
ld hl, $c
jr z, .minus_one
ld hl, MAPOBJECT_EVENT_FLAG
add hl, bc
ld a, [hli]
ld e, a
ld a, [hl]
ld d, a
cp $ff
jr nz, .asm_24598
cp -1
jr nz, .clear
ld a, e
cp $ff
jr z, .asm_245a1
jr .asm_245a3
.asm_24598
ld b, $2
cp -1
jr z, .zero
jr .minus_one
.clear
ld b, $2 ; clear
call EventFlagAction
ld a, c
and a
jr nz, .asm_245a3
.asm_245a1
jr nz, .minus_one
.zero
xor a
ret
.asm_245a3
ld a, $ff
.minus_one
ld a, -1
scf
ret
Function245a7: ; 245a7 (9:45a7)
call Function18f5
ld a, $ff
ld a, -1
ret c
xor a
ret
@@ -25302,26 +25302,26 @@ Function245af:: ; 245af
; 245cb
Function245cb:: ; 245cb
.asm_245cb
.loop
call Function24609
jp c, Function245d6
call z, Function245e1
jr .asm_245cb
jr .loop
; 245d6
Function245d6: ; 245d6
call Function1ff8
ld [wcf73], a
ld a, $0
ld a, 0
ld [$ffaa], a
ret
; 245e1
Function245e1: ; 245e1
call Function245f1
ld a, $1
ld a, 1
ld [hBGMapMode], a
ld c, $3
ld c, 3
call DelayFrames
xor a
ld [hBGMapMode], a
@@ -49467,35 +49467,35 @@ UnknownScript_0x507af: ; 0x507af
_BasementKey: ; 507b4
ld a, [MapGroup]
cp GROUP_WAREHOUSE_ENTRANCE
jr nz, .asm_507db
jr nz, .nope
ld a, [MapNumber]
cp MAP_WAREHOUSE_ENTRANCE
jr nz, .asm_507db
jr nz, .nope
call GetFacingTileCoord
ld a, d
cp 22
jr nz, .asm_507db
jr nz, .nope
ld a, e
cp 10
jr nz, .asm_507db
jr nz, .nope
ld hl, UnknownScript_0x507e1
ld hl, UnlockBasementDoorScript
call Function31cd
ld a, $1
ld a, 1
ld [wd0ec], a
ret
.asm_507db
.nope
ld a, $0
ld [wd0ec], a
ret
; 507e1
UnknownScript_0x507e1: ; 0x507e1
UnlockBasementDoorScript: ; 0x507e1
loadmovesprites
farjump MapWarehouseEntranceSignpost0Script
farjump BasementDoorScript
; 0x507e6
@@ -49505,7 +49505,7 @@ _SacredAsh: ; 507e6
call CheckAnyFaintedMon
ret nc
ld hl, UnknownScript_0x50821
ld hl, SacredAshScript
call Function31cd
ld a, $1
ld [wd0ec], a
@@ -49548,7 +49548,7 @@ CheckAnyFaintedMon: ; 507fb
ret
; 50821
UnknownScript_0x50821: ; 0x50821
SacredAshScript: ; 0x50821
special HealParty
reloadmappart
playsound SFX_WARP_TO

27
maps/AzaleaTown.asm
View File

@@ -51,7 +51,7 @@ UnknownScript_0x198049:
writetext UnknownText_0x19814d
closetext
loadmovesprites
setevent EVENT_6BF
setevent EVENT_RIVAL_AZALEA_TOWN
checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x198071
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
@@ -158,8 +158,8 @@ UnknownScript_0x1980e5:
verbosegiveitem GS_BALL, 1
spriteface $d, LEFT
setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent EVENT_6ED
setevent EVENT_6EB
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
dotrigger $0
loadmovesprites
end
@@ -201,8 +201,7 @@ WhiteApricornTree:
fruittree $14
MapAzaleaTownSignpostItem8:
dw $00b1
db FULL_HEAL
dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
MovementData_0x198134:
@@ -478,19 +477,19 @@ AzaleaTown_MapEventHeader:
signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign
signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign
signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign
signpost 6, 31, SIGNPOST_ITEMIFSET, MapAzaleaTownSignpostItem8
signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8
; people-events
db 12
person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA
person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
person_event SPRITE_GRAMPS, 13, 25, DOWN << 2 | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1
person_event SPRITE_TEACHER, 17, 19, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1
person_event SPRITE_YOUNGSTER, 13, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1
person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_FRUIT_TREE, 6, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BF
person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC
person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4
person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT

2
maps/BattleTowerBattleRoom.asm
View File

@@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader:
; people-events
db 2
person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_791
person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 10, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, -1

4
maps/BattleTowerOutside.asm
View File

@@ -13,7 +13,7 @@ BattleTowerOutside_MapScriptHeader:
return
.Callback2
clearevent EVENT_7CF
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return
StandingYoungsterScript_0x9f85f:
@@ -144,5 +144,5 @@ BattleTowerOutside_MapEventHeader:
db 4
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1
person_event SPRITE_BUENA, 15, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1
person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_7CF
person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 28, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1

10
maps/BlackthornCity.asm
View File

@@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader:
; people-events
db 9
person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3
person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4
person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_74C
person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_74D
person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
person_event SPRITE_BLACK_BELT, 35, 28, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1
person_event SPRITE_COOLTRAINER_F, 29, 13, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1
person_event SPRITE_YOUNGSTER, 19, 17, UP << 2 | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1
person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_75D
person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 23, 39, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1

6
maps/BlackthornGym1F.asm
View File

@@ -47,9 +47,9 @@ ClairScript_0x194e24:
setevent EVENT_BEAT_COOLTRAINERM_MIKE
setevent EVENT_BEAT_COOLTRAINERF_FRAN
setevent EVENT_BEAT_COOLTRAINERF_LOLA
clearevent EVENT_736
setevent EVENT_74C
clearevent EVENT_74D
clearevent EVENT_MAHOGANY_MART_OWNERS
setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
end
.FightDone
writetext UnknownText_0x195162

20
maps/BurnedTower1F.asm
View File

@@ -97,7 +97,7 @@ UnknownScript_0x185c80:
closetext
loadmovesprites
dotrigger $2
setevent EVENT_6C5
setevent EVENT_RIVAL_BURNED_TOWER
special Functionc48f
pause 15
earthquake 50
@@ -129,13 +129,11 @@ BurnedTower1FRock:
jumpstd smashrock
MapBurnedTower1FSignpostItem0:
dw $0080
db ETHER
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
MapBurnedTower1FSignpostItem1:
dw $00ff
db ULTRA_BALL
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
ItemFragment_0x185ccb:
@@ -306,13 +304,13 @@ BurnedTower1F_MapEventHeader:
; signposts
db 2
signpost 7, 8, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem0
signpost 11, 13, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem1
signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0
signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1
; people-events
db 5
person_event SPRITE_ROCK, 8, 19, LEFT << 2 | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_765
person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_6C5
person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_764
person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_656
person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP

22
maps/BurnedTowerB1F.asm
View File

@@ -81,10 +81,10 @@ UnknownScript_0x18616b:
domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1
domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_7A8
clearevent EVENT_7A9
setevent EVENT_764
setevent EVENT_765
setevent EVENT_ECRUTEAK_GYM_GRAMPS
clearevent EVENT_ECRUTEAK_CITY_GRAMPS
setevent EVENT_BURNED_TOWER_MORTY
setevent EVENT_BURNED_TOWER_1F_EUSINE
appear $a
refreshscreen $0
changeblock $6, $e, $1b
@@ -252,11 +252,11 @@ BurnedTowerB1F_MapEventHeader:
; people-events
db 9
person_event SPRITE_BOULDER, 12, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1
person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_74A
person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_74A
person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_74A
person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B
person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B
person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B
person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_657
person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 16, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER

5
maps/CeladonCity.asm
View File

@@ -66,8 +66,7 @@ CeladonCityPokeCenterSign:
jumpstd pokecentersign
MapCeladonCitySignpostItem7:
dw $00fd
db PP_UP
dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
UnknownText_0x1a9f7d:
text "This POLIWRATH is"
@@ -254,7 +253,7 @@ CeladonCity_MapEventHeader:
signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign
signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips
signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign
signpost 21, 37, SIGNPOST_ITEMIFSET, MapCeladonCitySignpostItem7
signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7
; people-events
db 9

Some files were not shown because too many files have changed in this diff Show More