Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-04-26 01:31:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some redundant or unusual event comments

Browse Source
This commit is contained in:
Rangi 2021-10-05 21:19:05 -04:00
parent 94ed208164
commit b398c245a2
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/maps/objects/BluesHouse.asm
View File

@ -8,8 +8,8 @@ BluesHouse_Object:
def_bg_events
def_object_events
object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1, 0 ; Daisy, sitting by map
object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1, 0
object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0
def_warps_to BLUES_HOUSE

2
data/maps/objects/CeladonCity.asm
View File

@ -10,7 +10,7 @@ CeladonCity_Object:
warp_event 41, 9, CELADON_POKECENTER, 0
warp_event 12, 27, CELADON_GYM, 0
warp_event 28, 19, GAME_CORNER, 0
warp_event 39, 19, CELADON_MART_5F, 0 ; beta warp_event! no longer used
warp_event 39, 19, CELADON_MART_5F, 0
warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 0
warp_event 31, 27, CELADON_DINER, 0
warp_event 35, 27, CELADON_CHIEF_HOUSE, 0

10
data/maps/objects/RedsHouse1F.asm
View File

@ -2,14 +2,14 @@ RedsHouse1F_Object:
db $a ; border block
def_warp_events
warp_event 2, 7, LAST_MAP, 0 ; exit1
warp_event 3, 7, LAST_MAP, 0 ; exit2
warp_event 7, 1, REDS_HOUSE_2F, 0 ; staircase
warp_event 2, 7, LAST_MAP, 0
warp_event 3, 7, LAST_MAP, 0
warp_event 7, 1, REDS_HOUSE_2F, 0
def_bg_events
bg_event 3, 1, 2 ; TV
bg_event 3, 1, 2 ; RedsHouse1FTVText
def_object_events
object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom
object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1
def_warps_to REDS_HOUSE_1F

2
data/maps/objects/Route19.asm
View File

@ -5,7 +5,7 @@ Route19_Object:
warp_event 5, 9, SUMMER_BEACH_HOUSE, 0
def_bg_events
bg_event 11, 11, 11
bg_event 11, 11, 11 ; Route19Text11
def_object_events
object_event 9, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_SWIMMER, 2

12
data/maps/objects/SummerBeachHouse.asm
View File

@ -6,13 +6,13 @@ SummerBeachHouse_Object:
warp_event 3, 7, LAST_MAP, 0
def_bg_events
bg_event 3, 0, 3
bg_event 7, 0, 4
bg_event 11, 0, 5
bg_event 13, 1, 6
bg_event 3, 0, 3 ; SummerBeachHouseSign1Text
bg_event 7, 0, 4 ; SummerBeachHouseSign2Text
bg_event 11, 0, 5 ; SummerBeachHouseSign3Text
bg_event 13, 1, 6 ; SummerBeachHouseSign4Text
def_object_events
object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; surfin' dude
object_event 5, 3, SPRITE_PIKACHU, WALK, 1, 2 ; pikachu
object_event 2, 3, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
object_event 5, 3, SPRITE_PIKACHU, WALK, 1, 2 ; person
def_warps_to SUMMER_BEACH_HOUSE