foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some map text constants

Browse source
This commit is contained in:
dannye 2023-11-21 20:25:12 -06:00
parent a247120ac1
commit 3c76871600
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/maps/objects/FightingDojo.asm
View file

@ -17,11 +17,11 @@ FightingDojo_Object:
def_bg_events def_bg_events
def_object_events def_object_events
object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_KARATE_MASTER object_event 5, 3, SPRITE_HIKER, STAY, DOWN, TEXT_FIGHTINGDOJO_KARATE_MASTER, OPP_BLACKBELT, 1
object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT1 object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, TEXT_FIGHTINGDOJO_BLACKBELT1, OPP_BLACKBELT, 2
object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT2 object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, TEXT_FIGHTINGDOJO_BLACKBELT2, OPP_BLACKBELT, 3
object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT3 object_event 5, 5, SPRITE_HIKER, STAY, LEFT, TEXT_FIGHTINGDOJO_BLACKBELT3, OPP_BLACKBELT, 4
object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, TEXT_FIGHTINGDOJO_BLACKBELT4 object_event 5, 7, SPRITE_HIKER, STAY, LEFT, TEXT_FIGHTINGDOJO_BLACKBELT4, OPP_BLACKBELT, 5
object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONLEE_POKE_BALL
object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_FIGHTINGDOJO_HITMONCHAN_POKE_BALL

6
data/maps/objects/PewterNidoranHouse.asm
View file

@ -13,8 +13,8 @@ PewterNidoranHouse_Object:
def_bg_events def_bg_events
def_object_events def_object_events
object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, PEWTERNIDORANHOUSE_NIDORAN object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, TEXT_PEWTERNIDORANHOUSE_NIDORAN
object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, PEWTERNIDORANHOUSE_LITTLE_BOY object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, TEXT_PEWTERNIDORANHOUSE_LITTLE_BOY
object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, TEXT_PEWTERNIDORANHOUSE_MIDDLE_AGED_MAN
def_warps_to PEWTER_NIDORAN_HOUSE def_warps_to PEWTER_NIDORAN_HOUSE

10
data/maps/objects/Route18.asm
View file

@ -13,12 +13,12 @@ Route18_Object:
warp_event 40, 9, ROUTE_18_GATE_1F, 4 warp_event 40, 9, ROUTE_18_GATE_1F, 4
def_bg_events def_bg_events
bg_event 43, 7, SCRIPT_ROUTE18_SIGN bg_event 43, 7, TEXT_ROUTE18_SIGN
bg_event 33, 5, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN bg_event 33, 5, TEXT_ROUTE18_CYCLING_ROAD_SIGN
def_object_events def_object_events
object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, SCRIPT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8 object_event 36, 11, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE18_COOLTRAINER_M1, OPP_BIRD_KEEPER, 8
object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9 object_event 40, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE18_COOLTRAINER_M2, OPP_BIRD_KEEPER, 9
object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, SCRIPT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10 object_event 42, 13, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE18_COOLTRAINER_M3, OPP_BIRD_KEEPER, 10
def_warps_to ROUTE_18 def_warps_to ROUTE_18

6
data/maps/objects/SSAnneB1FRooms.asm
View file

@ -37,8 +37,8 @@ SSAnneB1FRooms_Object:
object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2 object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2
object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD
object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE
object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_ETHER, ETHER
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_TM_REST, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_SSANNEB1FROOMS_MAX_POTION, MAX_POTION
def_warps_to SS_ANNE_B1F_ROOMS def_warps_to SS_ANNE_B1F_ROOMS

10
scripts/Route18.asm
View file

@ -15,11 +15,11 @@ Route18_ScriptPointers:
Route18_TextPointers: Route18_TextPointers:
def_text_pointers def_text_pointers
dw_const Route18CooltrainerM1Text, SCRIPT_ROUTE18_COOLTRAINER_M1 dw_const Route18CooltrainerM1Text, TEXT_ROUTE18_COOLTRAINER_M1
dw_const Route18CooltrainerM2Text, SCRIPT_ROUTE18_COOLTRAINER_M2 dw_const Route18CooltrainerM2Text, TEXT_ROUTE18_COOLTRAINER_M2
dw_const Route18CooltrainerM3Text, SCRIPT_ROUTE18_COOLTRAINER_M3 dw_const Route18CooltrainerM3Text, TEXT_ROUTE18_COOLTRAINER_M3
dw_const Route18SignText, SCRIPT_ROUTE18_SIGN dw_const Route18SignText, TEXT_ROUTE18_SIGN
dw_const Route18CyclingRoadSignText, SCRIPT_ROUTE18_CYCLING_ROAD_SIGN dw_const Route18CyclingRoadSignText, TEXT_ROUTE18_CYCLING_ROAD_SIGN
Route18TrainerHeaders: Route18TrainerHeaders:
def_trainers def_trainers