diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7861a7d44..8c9d1a505 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1583,3 +1583,187 @@ EAST EQU 1 WEST EQU 2 SOUTH EQU 4 NORTH EQU 8 + +; sprites +SPRITE_CHRIS EQU $01 +SPRITE_CHRIS_BIKE EQU $02 +SPRITE_GAMEBOY_KID EQU $03 +SPRITE_SILVER EQU $04 +SPRITE_OAK EQU $05 +SPRITE_RED EQU $06 +SPRITE_BLUE EQU $07 +SPRITE_BILL EQU $08 +SPRITE_ELDER EQU $09 +SPRITE_JANINE EQU $0a +SPRITE_KURT EQU $0b +SPRITE_MOM EQU $0c +SPRITE_BLAINE EQU $0d +SPRITE_REDS_MOM EQU $0e +SPRITE_DAISY EQU $0f +SPRITE_ELM EQU $10 +SPRITE_WILL EQU $11 +SPRITE_FALKNER EQU $12 +SPRITE_WHITNEY EQU $13 +SPRITE_BUGSY EQU $14 +SPRITE_MORTY EQU $15 +SPRITE_CHUCK EQU $16 +SPRITE_JASMINE EQU $17 +SPRITE_PRYCE EQU $18 +SPRITE_CLAIR EQU $19 +SPRITE_BROCK EQU $1a +SPRITE_KAREN EQU $1b +SPRITE_BRUNO EQU $1c +SPRITE_MISTY EQU $1d +SPRITE_LANCE EQU $1e +SPRITE_SURGE EQU $1f +SPRITE_ERIKA EQU $20 +SPRITE_KOGA EQU $21 +SPRITE_SABRINA EQU $22 +SPRITE_COOLTRAINER_M EQU $23 +SPRITE_COOLTRAINER_F EQU $24 +SPRITE_BUG_CATCHER EQU $25 +SPRITE_TWIN EQU $26 +SPRITE_YOUNGSTER EQU $27 +SPRITE_LASS EQU $28 +SPRITE_TEACHER EQU $29 +SPRITE_BUENA EQU $2a +SPRITE_SUPER_NERD EQU $2b +SPRITE_ROCKER EQU $2c +SPRITE_POKEFAN_M EQU $2d +SPRITE_POKEFAN_F EQU $2e +SPRITE_GRAMPS EQU $2f +SPRITE_GRANNY EQU $30 +SPRITE_SWIMMER_GUY EQU $31 +SPRITE_SWIMMER_GIRL EQU $32 +SPRITE_BIG_SNORLAX EQU $33 +SPRITE_SURFING_PIKACHU EQU $34 +SPRITE_ROCKET EQU $35 +SPRITE_ROCKET_GIRL EQU $36 +SPRITE_NURSE EQU $37 +SPRITE_LINK_RECEPTIONIST EQU $38 +SPRITE_CLERK EQU $39 +SPRITE_FISHER EQU $3a +SPRITE_FISHING_GURU EQU $3b +SPRITE_SCIENTIST EQU $3c +SPRITE_KIMONO_GIRL EQU $3d +SPRITE_SAGE EQU $3e +SPRITE_UNUSED_GUY EQU $3f +SPRITE_GENTLEMAN EQU $40 +SPRITE_BLACK_BELT EQU $41 +SPRITE_RECEPTIONIST EQU $42 +SPRITE_OFFICER EQU $43 +SPRITE_CAL EQU $44 +SPRITE_SLOWPOKE EQU $45 +SPRITE_CAPTAIN EQU $46 +SPRITE_BIG_LAPRAS EQU $47 +SPRITE_GYM_GUY EQU $48 +SPRITE_SAILOR EQU $49 +SPRITE_BIKER EQU $4a +SPRITE_PHARMACIST EQU $4b +SPRITE_MONSTER EQU $4c +SPRITE_FAIRY EQU $4d +SPRITE_BIRD EQU $4e +SPRITE_DRAGON EQU $4f +SPRITE_BIG_ONIX EQU $50 +SPRITE_N64 EQU $51 +SPRITE_SUDOWOODO EQU $52 +SPRITE_SURF EQU $53 +SPRITE_POKE_BALL EQU $54 +SPRITE_POKEDEX EQU $55 +SPRITE_PAPER EQU $56 +SPRITE_VIRTUAL_BOY EQU $57 +SPRITE_OLD_LINK_RECEPTIONIST EQU $58 +SPRITE_ROCK EQU $59 +SPRITE_BOULDER EQU $5a +SPRITE_SNES EQU $5b +SPRITE_FAMICOM EQU $5c +SPRITE_FRUIT_TREE EQU $5d +SPRITE_GOLD_TROPHY EQU $5e +SPRITE_SILVER_TROPHY EQU $5f +SPRITE_KRIS EQU $60 +SPRITE_KRIS_BIKE EQU $61 +SPRITE_KURT_OUTSIDE EQU $62 +SPRITE_SUICUNE EQU $63 +SPRITE_ENTEI EQU $64 +SPRITE_RAIKOU EQU $65 +SPRITE_STANDING_YOUNGSTER EQU $66 + +SPRITE_POKEMON EQU $80 +SPRITE_UNOWN EQU $80 +SPRITE_GEODUDE EQU $81 +SPRITE_GROWLITHE EQU $82 +SPRITE_WEEDLE EQU $83 +SPRITE_SHELLDER EQU $84 +SPRITE_ODDISH EQU $85 +SPRITE_GENGAR EQU $86 +SPRITE_ZUBAT EQU $87 +SPRITE_MAGIKARP EQU $88 +SPRITE_SQUIRTLE EQU $89 +SPRITE_TOGEPI EQU $8a +SPRITE_BUTTERFREE EQU $8b +SPRITE_DIGLETT EQU $8c +SPRITE_POLIWAG EQU $8d +SPRITE_PIKACHU EQU $8e +SPRITE_CLEFAIRY EQU $8f +SPRITE_CHARMANDER EQU $90 +SPRITE_JYNX EQU $91 +SPRITE_STARMIE EQU $92 +SPRITE_BULBASAUR EQU $93 +SPRITE_JIGGLYPUFF EQU $94 +SPRITE_GRIMER EQU $95 +SPRITE_EKANS EQU $96 +SPRITE_PARAS EQU $97 +SPRITE_TENTACOOL EQU $98 +SPRITE_TAUROS EQU $99 +SPRITE_MACHOP EQU $9a +SPRITE_VOLTORB EQU $9b +SPRITE_LAPRAS EQU $9c +SPRITE_RHYDON EQU $9d +SPRITE_MOLTRES EQU $9e +SPRITE_SNORLAX EQU $9f +SPRITE_GYARADOS EQU $a0 +SPRITE_LUGIA EQU $a1 +SPRITE_HO_OH EQU $a2 + +SPRITE_DAYCARE_MON_1 EQU $e0 +SPRITE_DAYCARE_MON_2 EQU $e1 + +SPRITE_VARS EQU $f0 +SPRITE_CONSOLE EQU $f0 +SPRITE_DOLL_1 EQU $f1 +SPRITE_DOLL_2 EQU $f2 +SPRITE_BIG_DOLL EQU $f3 +SPRITE_WEIRD_TREE EQU $f4 +SPRITE_OLIVINE_RIVAL EQU $f5 +SPRITE_AZALEA_ROCKET EQU $f6 +SPRITE_FUSCHIA_GYM_1 EQU $f7 +SPRITE_FUSCHIA_GYM_2 EQU $f8 +SPRITE_FUSCHIA_GYM_3 EQU $f9 +SPRITE_FUSCHIA_GYM_4 EQU $fa +SPRITE_COPYCAT EQU $fb +SPRITE_JANINE_IMPERSONATOR EQU $fc + +; sprite types +WALKING_SPRITE EQU 1 +STANDING_SPRITE EQU 2 +STILL_SPRITE EQU 3 + +; sprite palettes +PAL_OW_RED EQU 0 +PAL_OW_BLUE EQU 1 +PAL_OW_GREEN EQU 2 +PAL_OW_BROWN EQU 3 +PAL_OW_PINK EQU 4 +PAL_OW_SILVER EQU 5 +PAL_OW_TREE EQU 6 +PAL_OW_ROCK EQU 7 + +; permissions +TOWN EQU 1 +ROUTE EQU 2 +INDOOR EQU 3 +CAVE EQU 4 + +GATE EQU 6 +DUNGEON EQU 7 + diff --git a/gfx/overworld/sprite_headers.asm b/gfx/overworld/sprite_headers.asm new file mode 100644 index 000000000..0b7eb4433 --- /dev/null +++ b/gfx/overworld/sprite_headers.asm @@ -0,0 +1,617 @@ +; Format: +; Address +; Length, Bank +; Type, Palette + +ChrisSprite: ; 14736 + dw ChrisSpriteGFX + db $3 * $40, BANK(ChrisSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1473c + +ChrisBikeSprite: ; 1473c + dw ChrisBikeSpriteGFX + db $3 * $40, BANK(ChrisBikeSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14742 + +GameboyKidSprite: ; 14742 + dw GameboyKidSpriteGFX + db $3 * $40, BANK(GameboyKidSpriteGFX) + db STANDING_SPRITE, PAL_OW_GREEN +; 14748 + +SilverSprite: ; 14748 + dw SilverSpriteGFX + db $3 * $40, BANK(SilverSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1474e + +OakSprite: ; 1474e + dw OakSpriteGFX + db $3 * $40, BANK(OakSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14754 + +RedSprite: ; 14754 + dw RedSpriteGFX + db $3 * $40, BANK(RedSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1475a + +BlueSprite: ; 1475a + dw BlueSpriteGFX + db $3 * $40, BANK(BlueSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14760 + +BillSprite: ; 14760 + dw BillSpriteGFX + db $3 * $40, BANK(BillSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14766 + +ElderSprite: ; 14766 + dw ElderSpriteGFX + db $3 * $40, BANK(ElderSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 1476c + +JanineSprite: ; 1476c + dw JanineSpriteGFX + db $3 * $40, BANK(JanineSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14772 + +KurtSprite: ; 14772 + dw KurtSpriteGFX + db $3 * $40, BANK(KurtSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14778 + +MomSprite: ; 14778 + dw MomSpriteGFX + db $3 * $40, BANK(MomSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1477e + +BlaineSprite: ; 1477e + dw BlaineSpriteGFX + db $3 * $40, BANK(BlaineSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14784 + +RedsMomSprite: ; 14784 + dw RedsMomSpriteGFX + db $3 * $40, BANK(RedsMomSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1478a + +DaisySprite: ; 1478a + dw DaisySpriteGFX + db $3 * $40, BANK(DaisySpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14790 + +ElmSprite: ; 14790 + dw ElmSpriteGFX + db $3 * $40, BANK(ElmSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14796 + +WillSprite: ; 14796 + dw WillSpriteGFX + db $3 * $40, BANK(WillSpriteGFX) + db STANDING_SPRITE, PAL_OW_RED +; 1479c + +FalknerSprite: ; 1479c + dw FalknerSpriteGFX + db $3 * $40, BANK(FalknerSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 147a2 + +WhitneySprite: ; 147a2 + dw WhitneySpriteGFX + db $3 * $40, BANK(WhitneySpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 147a8 + +BugsySprite: ; 147a8 + dw BugsySpriteGFX + db $3 * $40, BANK(BugsySpriteGFX) + db WALKING_SPRITE, PAL_OW_GREEN +; 147ae + +MortySprite: ; 147ae + dw MortySpriteGFX + db $3 * $40, BANK(MortySpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 147b4 + +ChuckSprite: ; 147b4 + dw ChuckSpriteGFX + db $3 * $40, BANK(ChuckSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 147ba + +JasmineSprite: ; 147ba + dw JasmineSpriteGFX + db $3 * $40, BANK(JasmineSpriteGFX) + db WALKING_SPRITE, PAL_OW_GREEN +; 147c0 + +PryceSprite: ; 147c0 + dw PryceSpriteGFX + db $3 * $40, BANK(PryceSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 147c6 + +ClairSprite: ; 147c6 + dw ClairSpriteGFX + db $3 * $40, BANK(ClairSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 147cc + +BrockSprite: ; 147cc + dw BrockSpriteGFX + db $3 * $40, BANK(BrockSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 147d2 + +KarenSprite: ; 147d2 + dw KarenSpriteGFX + db $3 * $40, BANK(KarenSpriteGFX) + db STANDING_SPRITE, PAL_OW_BLUE +; 147d8 + +BrunoSprite: ; 147d8 + dw BrunoSpriteGFX + db $3 * $40, BANK(BrunoSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 147de + +MistySprite: ; 147de + dw MistySpriteGFX + db $3 * $40, BANK(MistySpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 147e4 + +LanceSprite: ; 147e4 + dw LanceSpriteGFX + db $3 * $40, BANK(LanceSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 147ea + +SurgeSprite: ; 147ea + dw SurgeSpriteGFX + db $3 * $40, BANK(SurgeSpriteGFX) + db WALKING_SPRITE, PAL_OW_GREEN +; 147f0 + +ErikaSprite: ; 147f0 + dw ErikaSpriteGFX + db $3 * $40, BANK(ErikaSpriteGFX) + db WALKING_SPRITE, PAL_OW_GREEN +; 147f6 + +KogaSprite: ; 147f6 + dw KogaSpriteGFX + db $3 * $40, BANK(KogaSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 147fc + +SabrinaSprite: ; 147fc + dw SabrinaSpriteGFX + db $3 * $40, BANK(SabrinaSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14802 + +CooltrainerMSprite: ; 14802 + dw CooltrainerMSpriteGFX + db $3 * $40, BANK(CooltrainerMSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14808 + +CooltrainerFSprite: ; 14808 + dw CooltrainerFSpriteGFX + db $3 * $40, BANK(CooltrainerFSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 1480e + +BugCatcherSprite: ; 1480e + dw BugCatcherSpriteGFX + db $3 * $40, BANK(BugCatcherSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14814 + +TwinSprite: ; 14814 + dw TwinSpriteGFX + db $3 * $40, BANK(TwinSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1481a + +YoungsterSprite: ; 1481a + dw YoungsterSpriteGFX + db $3 * $40, BANK(YoungsterSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14820 + +LassSprite: ; 14820 + dw LassSpriteGFX + db $3 * $40, BANK(LassSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14826 + +TeacherSprite: ; 14826 + dw TeacherSpriteGFX + db $3 * $40, BANK(TeacherSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1482c + +BuenaSprite: ; 1482c + dw BuenaSpriteGFX + db $3 * $40, BANK(BuenaSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14832 + +SuperNerdSprite: ; 14832 + dw SuperNerdSpriteGFX + db $3 * $40, BANK(SuperNerdSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14838 + +RockerSprite: ; 14838 + dw RockerSpriteGFX + db $3 * $40, BANK(RockerSpriteGFX) + db WALKING_SPRITE, PAL_OW_GREEN +; 1483e + +PokefanMSprite: ; 1483e + dw PokefanMSpriteGFX + db $3 * $40, BANK(PokefanMSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14844 + +PokefanFSprite: ; 14844 + dw PokefanFSpriteGFX + db $3 * $40, BANK(PokefanFSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 1484a + +GrampsSprite: ; 1484a + dw GrampsSpriteGFX + db $3 * $40, BANK(GrampsSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14850 + +GrannySprite: ; 14850 + dw GrannySpriteGFX + db $3 * $40, BANK(GrannySpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14856 + +SwimmerGuySprite: ; 14856 + dw SwimmerGuySpriteGFX + db $3 * $40, BANK(SwimmerGuySpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 1485c + +SwimmerGirlSprite: ; 1485c + dw SwimmerGirlSpriteGFX + db $3 * $40, BANK(SwimmerGirlSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14862 + +BigSnorlaxSprite: ; 14862 + dw BigSnorlaxSpriteGFX + db $3 * $40, BANK(BigSnorlaxSpriteGFX) + db STANDING_SPRITE, PAL_OW_BLUE +; 14868 + +SurfingPikachuSprite: ; 14868 + dw SurfingPikachuSpriteGFX + db $3 * $40, BANK(SurfingPikachuSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1486e + +RocketSprite: ; 1486e + dw RocketSpriteGFX + db $3 * $40, BANK(RocketSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 14874 + +RocketGirlSprite: ; 14874 + dw RocketGirlSpriteGFX + db $3 * $40, BANK(RocketGirlSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 1487a + +NurseSprite: ; 1487a + dw NurseSpriteGFX + db $3 * $40, BANK(NurseSpriteGFX) + db STANDING_SPRITE, PAL_OW_RED +; 14880 + +LinkReceptionistSprite: ; 14880 + dw LinkReceptionistSpriteGFX + db $3 * $40, BANK(LinkReceptionistSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14886 + +ClerkSprite: ; 14886 + dw ClerkSpriteGFX + db $3 * $40, BANK(ClerkSpriteGFX) + db WALKING_SPRITE, PAL_OW_GREEN +; 1488c + +FisherSprite: ; 1488c + dw FisherSpriteGFX + db $3 * $40, BANK(FisherSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14892 + +FishingGuruSprite: ; 14892 + dw FishingGuruSpriteGFX + db $3 * $40, BANK(FishingGuruSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14898 + +ScientistSprite: ; 14898 + dw ScientistSpriteGFX + db $3 * $40, BANK(ScientistSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 1489e + +KimonoGirlSprite: ; 1489e + dw KimonoGirlSpriteGFX + db $3 * $40, BANK(KimonoGirlSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 148a4 + +SageSprite: ; 148a4 + dw SageSpriteGFX + db $3 * $40, BANK(SageSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 148aa + +UnusedGuySprite: ; 148aa + dw UnusedGuySpriteGFX + db $3 * $40, BANK(UnusedGuySpriteGFX) + db STANDING_SPRITE, PAL_OW_RED +; 148b0 + +GentlemanSprite: ; 148b0 + dw GentlemanSpriteGFX + db $3 * $40, BANK(GentlemanSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 148b6 + +BlackBeltSprite: ; 148b6 + dw BlackBeltSpriteGFX + db $3 * $40, BANK(BlackBeltSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 148bc + +ReceptionistSprite: ; 148bc + dw ReceptionistSpriteGFX + db $3 * $40, BANK(ReceptionistSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 148c2 + +OfficerSprite: ; 148c2 + dw OfficerSpriteGFX + db $3 * $40, BANK(OfficerSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 148c8 + +CalSprite: ; 148c8 + dw CalSpriteGFX + db $3 * $40, BANK(CalSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 148ce + +SlowpokeSprite: ; 148ce + dw SlowpokeSpriteGFX + db $1 * $40, BANK(SlowpokeSpriteGFX) + db STILL_SPRITE, PAL_OW_RED +; 148d4 + +CaptainSprite: ; 148d4 + dw CaptainSpriteGFX + db $3 * $40, BANK(CaptainSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 148da + +BigLaprasSprite: ; 148da + dw BigLaprasSpriteGFX + db $3 * $40, BANK(BigLaprasSpriteGFX) + db STANDING_SPRITE, PAL_OW_BLUE +; 148e0 + +GymGuySprite: ; 148e0 + dw GymGuySpriteGFX + db $3 * $40, BANK(GymGuySpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 148e6 + +SailorSprite: ; 148e6 + dw SailorSpriteGFX + db $3 * $40, BANK(SailorSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 148ec + +BikerSprite: ; 148ec + dw BikerSpriteGFX + db $3 * $40, BANK(BikerSpriteGFX) + db WALKING_SPRITE, PAL_OW_BROWN +; 148f2 + +PharmacistSprite: ; 148f2 + dw PharmacistSpriteGFX + db $3 * $40, BANK(PharmacistSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 148f8 + +MonsterSprite: ; 148f8 + dw MonsterSpriteGFX + db $3 * $40, BANK(MonsterSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 148fe + +FairySprite: ; 148fe + dw FairySpriteGFX + db $3 * $40, BANK(FairySpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14904 + +BirdSprite: ; 14904 + dw BirdSpriteGFX + db $3 * $40, BANK(BirdSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 1490a + +DragonSprite: ; 1490a + dw DragonSpriteGFX + db $3 * $40, BANK(DragonSpriteGFX) + db WALKING_SPRITE, PAL_OW_RED +; 14910 + +BigOnixSprite: ; 14910 + dw BigOnixSpriteGFX + db $3 * $40, BANK(BigOnixSpriteGFX) + db STANDING_SPRITE, PAL_OW_BROWN +; 14916 + +N64Sprite: ; 14916 + dw N64SpriteGFX + db $1 * $40, BANK(N64SpriteGFX) + db STILL_SPRITE, PAL_OW_BROWN +; 1491c + +SudowoodoSprite: ; 1491c + dw SudowoodoSpriteGFX + db $3 * $40, BANK(SudowoodoSpriteGFX) + db STANDING_SPRITE, PAL_OW_GREEN +; 14922 + +SurfSprite: ; 14922 + dw SurfSpriteGFX + db $3 * $40, BANK(SurfSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14928 + +PokeBallSprite: ; 14928 + dw PokeBallSpriteGFX + db $1 * $40, BANK(PokeBallSpriteGFX) + db STILL_SPRITE, PAL_OW_RED +; 1492e + +PokedexSprite: ; 1492e + dw PokedexSpriteGFX + db $1 * $40, BANK(PokedexSpriteGFX) + db STILL_SPRITE, PAL_OW_BROWN +; 14934 + +PaperSprite: ; 14934 + dw PaperSpriteGFX + db $1 * $40, BANK(PaperSpriteGFX) + db STILL_SPRITE, PAL_OW_BLUE +; 1493a + +VirtualBoySprite: ; 1493a + dw VirtualBoySpriteGFX + db $1 * $40, BANK(VirtualBoySpriteGFX) + db STILL_SPRITE, PAL_OW_RED +; 14940 + +OldLinkReceptionistSprite: ; 14940 + dw OldLinkReceptionistSpriteGFX + db $3 * $40, BANK(OldLinkReceptionistSpriteGFX) + db STANDING_SPRITE, PAL_OW_RED +; 14946 + +RockSprite: ; 14946 + dw RockSpriteGFX + db $1 * $40, BANK(RockSpriteGFX) + db STILL_SPRITE, PAL_OW_ROCK +; 1494c + +BoulderSprite: ; 1494c + dw BoulderSpriteGFX + db $1 * $40, BANK(BoulderSpriteGFX) + db STILL_SPRITE, PAL_OW_ROCK +; 14952 + +SnesSprite: ; 14952 + dw SnesSpriteGFX + db $1 * $40, BANK(SnesSpriteGFX) + db STILL_SPRITE, PAL_OW_BLUE +; 14958 + +FamicomSprite: ; 14958 + dw FamicomSpriteGFX + db $1 * $40, BANK(FamicomSpriteGFX) + db STILL_SPRITE, PAL_OW_RED +; 1495e + +FruitTreeSprite: ; 1495e + dw FruitTreeSpriteGFX + db $1 * $40, BANK(FruitTreeSpriteGFX) + db STILL_SPRITE, PAL_OW_TREE +; 14964 + +GoldTrophySprite: ; 14964 + dw GoldTrophySpriteGFX + db $1 * $40, BANK(GoldTrophySpriteGFX) + db STILL_SPRITE, PAL_OW_BROWN +; 1496a + +SilverTrophySprite: ; 1496a + dw SilverTrophySpriteGFX + db $1 * $40, BANK(SilverTrophySpriteGFX) + db STILL_SPRITE, PAL_OW_SILVER +; 14970 + +KrisSprite: ; 14970 + dw KrisSpriteGFX + db $3 * $40, BANK(KrisSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 14976 + +KrisBikeSprite: ; 14976 + dw KrisBikeSpriteGFX + db $3 * $40, BANK(KrisBikeSpriteGFX) + db WALKING_SPRITE, PAL_OW_BLUE +; 1497c + +KurtOutsideSprite: ; 1497c + dw KurtOutsideSpriteGFX + db $3 * $40, BANK(KurtOutsideSpriteGFX) + db STANDING_SPRITE, PAL_OW_BROWN +; 14982 + +SuicuneSprite: ; 14982 + dw SuicuneSpriteGFX + db $1 * $40, BANK(SuicuneSpriteGFX) + db STILL_SPRITE, PAL_OW_BLUE +; 14988 + +EnteiSprite: ; 14988 + dw EnteiSpriteGFX + db $1 * $40, BANK(EnteiSpriteGFX) + db STILL_SPRITE, PAL_OW_RED +; 1498e + +RaikouSprite: ; 1498e + dw RaikouSpriteGFX + db $1 * $40, BANK(RaikouSpriteGFX) + db STILL_SPRITE, PAL_OW_RED +; 14994 + +StandingYoungsterSprite: ; 14994 + dw StandingYoungsterSpriteGFX + db $3 * $40, BANK(StandingYoungsterSpriteGFX) + db STANDING_SPRITE, PAL_OW_BLUE +; 1499a + diff --git a/gfx/overworld/sprites_1.asm b/gfx/overworld/sprites_1.asm index 5f9db89e3..03e2ee2de 100644 --- a/gfx/overworld/sprites_1.asm +++ b/gfx/overworld/sprites_1.asm @@ -1,252 +1,382 @@ +ChrisSpriteGFX: ; c0000 INCBIN "gfx/overworld/000.2bpp" INCBIN "gfx/overworld/001.2bpp" INCBIN "gfx/overworld/002.2bpp" INCBIN "gfx/overworld/003.2bpp" INCBIN "gfx/overworld/004.2bpp" INCBIN "gfx/overworld/005.2bpp" +; c0180 + +ChrisBikeSpriteGFX: ; c0180 INCBIN "gfx/overworld/006.2bpp" INCBIN "gfx/overworld/007.2bpp" INCBIN "gfx/overworld/008.2bpp" INCBIN "gfx/overworld/009.2bpp" INCBIN "gfx/overworld/010.2bpp" INCBIN "gfx/overworld/011.2bpp" +; c0300 + +GameboyKidSpriteGFX: ; c0300 INCBIN "gfx/overworld/012.2bpp" INCBIN "gfx/overworld/013.2bpp" INCBIN "gfx/overworld/014.2bpp" +; c03c0 + +SilverSpriteGFX: ; c03c0 INCBIN "gfx/overworld/015.2bpp" INCBIN "gfx/overworld/016.2bpp" INCBIN "gfx/overworld/017.2bpp" INCBIN "gfx/overworld/018.2bpp" INCBIN "gfx/overworld/019.2bpp" INCBIN "gfx/overworld/020.2bpp" +; c0540 + +OakSpriteGFX: ; c0540 INCBIN "gfx/overworld/021.2bpp" INCBIN "gfx/overworld/022.2bpp" INCBIN "gfx/overworld/023.2bpp" INCBIN "gfx/overworld/024.2bpp" INCBIN "gfx/overworld/025.2bpp" INCBIN "gfx/overworld/026.2bpp" +; c06c0 + +RedSpriteGFX: ; c06c0 INCBIN "gfx/overworld/027.2bpp" INCBIN "gfx/overworld/028.2bpp" INCBIN "gfx/overworld/029.2bpp" INCBIN "gfx/overworld/030.2bpp" INCBIN "gfx/overworld/031.2bpp" INCBIN "gfx/overworld/032.2bpp" +; c0840 + +BlueSpriteGFX: ; c0840 INCBIN "gfx/overworld/033.2bpp" INCBIN "gfx/overworld/034.2bpp" INCBIN "gfx/overworld/035.2bpp" INCBIN "gfx/overworld/036.2bpp" INCBIN "gfx/overworld/037.2bpp" INCBIN "gfx/overworld/038.2bpp" +; c09c0 + +BillSpriteGFX: ; c09c0 INCBIN "gfx/overworld/039.2bpp" INCBIN "gfx/overworld/040.2bpp" INCBIN "gfx/overworld/041.2bpp" INCBIN "gfx/overworld/042.2bpp" INCBIN "gfx/overworld/043.2bpp" INCBIN "gfx/overworld/044.2bpp" +; c0b40 + +ElderSpriteGFX: ; c0b40 INCBIN "gfx/overworld/045.2bpp" INCBIN "gfx/overworld/046.2bpp" INCBIN "gfx/overworld/047.2bpp" INCBIN "gfx/overworld/048.2bpp" INCBIN "gfx/overworld/049.2bpp" INCBIN "gfx/overworld/050.2bpp" +; c0cc0 + +JanineSpriteGFX: ; c0cc0 INCBIN "gfx/overworld/051.2bpp" INCBIN "gfx/overworld/052.2bpp" INCBIN "gfx/overworld/053.2bpp" INCBIN "gfx/overworld/054.2bpp" INCBIN "gfx/overworld/055.2bpp" INCBIN "gfx/overworld/056.2bpp" +; c0e40 + +KurtSpriteGFX: ; c0e40 INCBIN "gfx/overworld/057.2bpp" INCBIN "gfx/overworld/058.2bpp" INCBIN "gfx/overworld/059.2bpp" INCBIN "gfx/overworld/060.2bpp" INCBIN "gfx/overworld/061.2bpp" INCBIN "gfx/overworld/062.2bpp" +; c0fc0 + +MomSpriteGFX: ; c0fc0 INCBIN "gfx/overworld/063.2bpp" INCBIN "gfx/overworld/064.2bpp" INCBIN "gfx/overworld/065.2bpp" INCBIN "gfx/overworld/066.2bpp" INCBIN "gfx/overworld/067.2bpp" INCBIN "gfx/overworld/068.2bpp" +; c1140 + +BlaineSpriteGFX: ; c1140 INCBIN "gfx/overworld/069.2bpp" INCBIN "gfx/overworld/070.2bpp" INCBIN "gfx/overworld/071.2bpp" INCBIN "gfx/overworld/072.2bpp" INCBIN "gfx/overworld/073.2bpp" INCBIN "gfx/overworld/074.2bpp" +; c12c0 + +RedsMomSpriteGFX: ; c12c0 INCBIN "gfx/overworld/075.2bpp" INCBIN "gfx/overworld/076.2bpp" INCBIN "gfx/overworld/077.2bpp" INCBIN "gfx/overworld/078.2bpp" INCBIN "gfx/overworld/079.2bpp" INCBIN "gfx/overworld/080.2bpp" +; c1440 + +DaisySpriteGFX: ; c1440 INCBIN "gfx/overworld/081.2bpp" INCBIN "gfx/overworld/082.2bpp" INCBIN "gfx/overworld/083.2bpp" INCBIN "gfx/overworld/084.2bpp" INCBIN "gfx/overworld/085.2bpp" INCBIN "gfx/overworld/086.2bpp" +; c15c0 + +ElmSpriteGFX: ; c15c0 INCBIN "gfx/overworld/087.2bpp" INCBIN "gfx/overworld/088.2bpp" INCBIN "gfx/overworld/089.2bpp" INCBIN "gfx/overworld/090.2bpp" INCBIN "gfx/overworld/091.2bpp" INCBIN "gfx/overworld/092.2bpp" +; c1740 + +WillSpriteGFX: ; c1740 INCBIN "gfx/overworld/093.2bpp" INCBIN "gfx/overworld/094.2bpp" INCBIN "gfx/overworld/095.2bpp" +; c1800 + +FalknerSpriteGFX: ; c1800 INCBIN "gfx/overworld/096.2bpp" INCBIN "gfx/overworld/097.2bpp" INCBIN "gfx/overworld/098.2bpp" INCBIN "gfx/overworld/099.2bpp" INCBIN "gfx/overworld/100.2bpp" INCBIN "gfx/overworld/101.2bpp" +; c1980 + +WhitneySpriteGFX: ; c1980 INCBIN "gfx/overworld/102.2bpp" INCBIN "gfx/overworld/103.2bpp" INCBIN "gfx/overworld/104.2bpp" INCBIN "gfx/overworld/105.2bpp" INCBIN "gfx/overworld/106.2bpp" INCBIN "gfx/overworld/107.2bpp" +; c1b00 + +BugsySpriteGFX: ; c1b00 INCBIN "gfx/overworld/108.2bpp" INCBIN "gfx/overworld/109.2bpp" INCBIN "gfx/overworld/110.2bpp" INCBIN "gfx/overworld/111.2bpp" INCBIN "gfx/overworld/112.2bpp" INCBIN "gfx/overworld/113.2bpp" +; c1c80 + +MortySpriteGFX: ; c1c80 INCBIN "gfx/overworld/114.2bpp" INCBIN "gfx/overworld/115.2bpp" INCBIN "gfx/overworld/116.2bpp" INCBIN "gfx/overworld/117.2bpp" INCBIN "gfx/overworld/118.2bpp" INCBIN "gfx/overworld/119.2bpp" +; c1e00 + +ChuckSpriteGFX: ; c1e00 INCBIN "gfx/overworld/120.2bpp" INCBIN "gfx/overworld/121.2bpp" INCBIN "gfx/overworld/122.2bpp" INCBIN "gfx/overworld/123.2bpp" INCBIN "gfx/overworld/124.2bpp" INCBIN "gfx/overworld/125.2bpp" +; c1f80 + +JasmineSpriteGFX: ; c1f80 INCBIN "gfx/overworld/126.2bpp" INCBIN "gfx/overworld/127.2bpp" INCBIN "gfx/overworld/128.2bpp" INCBIN "gfx/overworld/129.2bpp" INCBIN "gfx/overworld/130.2bpp" INCBIN "gfx/overworld/131.2bpp" +; c2100 + +PryceSpriteGFX: ; c2100 INCBIN "gfx/overworld/132.2bpp" INCBIN "gfx/overworld/133.2bpp" INCBIN "gfx/overworld/134.2bpp" INCBIN "gfx/overworld/135.2bpp" INCBIN "gfx/overworld/136.2bpp" INCBIN "gfx/overworld/137.2bpp" +; c2280 + +ClairSpriteGFX: ; c2280 INCBIN "gfx/overworld/138.2bpp" INCBIN "gfx/overworld/139.2bpp" INCBIN "gfx/overworld/140.2bpp" INCBIN "gfx/overworld/141.2bpp" INCBIN "gfx/overworld/142.2bpp" INCBIN "gfx/overworld/143.2bpp" +; c2400 + +BrockSpriteGFX: ; c2400 INCBIN "gfx/overworld/144.2bpp" INCBIN "gfx/overworld/145.2bpp" INCBIN "gfx/overworld/146.2bpp" INCBIN "gfx/overworld/147.2bpp" INCBIN "gfx/overworld/148.2bpp" INCBIN "gfx/overworld/149.2bpp" +; c2580 + +KarenSpriteGFX: ; c2580 INCBIN "gfx/overworld/150.2bpp" INCBIN "gfx/overworld/151.2bpp" INCBIN "gfx/overworld/152.2bpp" +; c2640 + +BrunoSpriteGFX: ; c2640 INCBIN "gfx/overworld/153.2bpp" INCBIN "gfx/overworld/154.2bpp" INCBIN "gfx/overworld/155.2bpp" INCBIN "gfx/overworld/156.2bpp" INCBIN "gfx/overworld/157.2bpp" INCBIN "gfx/overworld/158.2bpp" +; c27c0 + +MistySpriteGFX: ; c27c0 INCBIN "gfx/overworld/159.2bpp" INCBIN "gfx/overworld/160.2bpp" INCBIN "gfx/overworld/161.2bpp" INCBIN "gfx/overworld/162.2bpp" INCBIN "gfx/overworld/163.2bpp" INCBIN "gfx/overworld/164.2bpp" +; c2940 + +LanceSpriteGFX: ; c2940 INCBIN "gfx/overworld/165.2bpp" INCBIN "gfx/overworld/166.2bpp" INCBIN "gfx/overworld/167.2bpp" INCBIN "gfx/overworld/168.2bpp" INCBIN "gfx/overworld/169.2bpp" INCBIN "gfx/overworld/170.2bpp" +; c2ac0 + +SurgeSpriteGFX: ; c2ac0 INCBIN "gfx/overworld/171.2bpp" INCBIN "gfx/overworld/172.2bpp" INCBIN "gfx/overworld/173.2bpp" INCBIN "gfx/overworld/174.2bpp" INCBIN "gfx/overworld/175.2bpp" INCBIN "gfx/overworld/176.2bpp" +; c2c40 + +ErikaSpriteGFX: ; c2c40 INCBIN "gfx/overworld/177.2bpp" INCBIN "gfx/overworld/178.2bpp" INCBIN "gfx/overworld/179.2bpp" INCBIN "gfx/overworld/180.2bpp" INCBIN "gfx/overworld/181.2bpp" INCBIN "gfx/overworld/182.2bpp" +; c2dc0 + +KogaSpriteGFX: ; c2dc0 INCBIN "gfx/overworld/183.2bpp" INCBIN "gfx/overworld/184.2bpp" INCBIN "gfx/overworld/185.2bpp" INCBIN "gfx/overworld/186.2bpp" INCBIN "gfx/overworld/187.2bpp" INCBIN "gfx/overworld/188.2bpp" +; c2f40 + +SabrinaSpriteGFX: ; c2f40 INCBIN "gfx/overworld/189.2bpp" INCBIN "gfx/overworld/190.2bpp" INCBIN "gfx/overworld/191.2bpp" INCBIN "gfx/overworld/192.2bpp" INCBIN "gfx/overworld/193.2bpp" INCBIN "gfx/overworld/194.2bpp" +; c30c0 + +CooltrainerMSpriteGFX: ; c30c0 INCBIN "gfx/overworld/195.2bpp" INCBIN "gfx/overworld/196.2bpp" INCBIN "gfx/overworld/197.2bpp" INCBIN "gfx/overworld/198.2bpp" INCBIN "gfx/overworld/199.2bpp" INCBIN "gfx/overworld/200.2bpp" +; c3240 + +CooltrainerFSpriteGFX: ; c3240 INCBIN "gfx/overworld/201.2bpp" INCBIN "gfx/overworld/202.2bpp" INCBIN "gfx/overworld/203.2bpp" INCBIN "gfx/overworld/204.2bpp" INCBIN "gfx/overworld/205.2bpp" INCBIN "gfx/overworld/206.2bpp" +; c33c0 + +BugCatcherSpriteGFX: ; c33c0 INCBIN "gfx/overworld/207.2bpp" INCBIN "gfx/overworld/208.2bpp" INCBIN "gfx/overworld/209.2bpp" INCBIN "gfx/overworld/210.2bpp" INCBIN "gfx/overworld/211.2bpp" INCBIN "gfx/overworld/212.2bpp" +; c3540 + +TwinSpriteGFX: ; c3540 INCBIN "gfx/overworld/213.2bpp" INCBIN "gfx/overworld/214.2bpp" INCBIN "gfx/overworld/215.2bpp" INCBIN "gfx/overworld/216.2bpp" INCBIN "gfx/overworld/217.2bpp" INCBIN "gfx/overworld/218.2bpp" +; c36c0 + +YoungsterSpriteGFX: ; c36c0 INCBIN "gfx/overworld/219.2bpp" INCBIN "gfx/overworld/220.2bpp" INCBIN "gfx/overworld/221.2bpp" INCBIN "gfx/overworld/222.2bpp" INCBIN "gfx/overworld/223.2bpp" INCBIN "gfx/overworld/224.2bpp" +; c3840 + +LassSpriteGFX: ; c3840 INCBIN "gfx/overworld/225.2bpp" INCBIN "gfx/overworld/226.2bpp" INCBIN "gfx/overworld/227.2bpp" INCBIN "gfx/overworld/228.2bpp" INCBIN "gfx/overworld/229.2bpp" INCBIN "gfx/overworld/230.2bpp" +; c39c0 + +TeacherSpriteGFX: ; c39c0 INCBIN "gfx/overworld/231.2bpp" INCBIN "gfx/overworld/232.2bpp" INCBIN "gfx/overworld/233.2bpp" INCBIN "gfx/overworld/234.2bpp" INCBIN "gfx/overworld/235.2bpp" INCBIN "gfx/overworld/236.2bpp" +; c3b40 + +BuenaSpriteGFX: ; c3b40 INCBIN "gfx/overworld/237.2bpp" INCBIN "gfx/overworld/238.2bpp" INCBIN "gfx/overworld/239.2bpp" INCBIN "gfx/overworld/240.2bpp" INCBIN "gfx/overworld/241.2bpp" INCBIN "gfx/overworld/242.2bpp" +; c3cc0 + +SuperNerdSpriteGFX: ; c3cc0 INCBIN "gfx/overworld/243.2bpp" INCBIN "gfx/overworld/244.2bpp" INCBIN "gfx/overworld/245.2bpp" INCBIN "gfx/overworld/246.2bpp" INCBIN "gfx/overworld/247.2bpp" INCBIN "gfx/overworld/248.2bpp" +; c3e40 + +RockerSpriteGFX: ; c3e40 INCBIN "gfx/overworld/249.2bpp" INCBIN "gfx/overworld/250.2bpp" INCBIN "gfx/overworld/251.2bpp" @@ -254,3 +384,5 @@ INCBIN "gfx/overworld/252.2bpp" INCBIN "gfx/overworld/253.2bpp" INCBIN "gfx/overworld/254.2bpp" INCBIN "gfx/overworld/255.2bpp" +; c4000 + diff --git a/gfx/overworld/sprites_2.asm b/gfx/overworld/sprites_2.asm index 3240d6178..cc80d3df3 100644 --- a/gfx/overworld/sprites_2.asm +++ b/gfx/overworld/sprites_2.asm @@ -1,256 +1,430 @@ +PokefanMSpriteGFX: ; c4000 INCBIN "gfx/overworld/256.2bpp" INCBIN "gfx/overworld/257.2bpp" INCBIN "gfx/overworld/258.2bpp" INCBIN "gfx/overworld/259.2bpp" INCBIN "gfx/overworld/260.2bpp" INCBIN "gfx/overworld/261.2bpp" +; c4180 + +PokefanFSpriteGFX: ; c4180 INCBIN "gfx/overworld/262.2bpp" INCBIN "gfx/overworld/263.2bpp" INCBIN "gfx/overworld/264.2bpp" INCBIN "gfx/overworld/265.2bpp" INCBIN "gfx/overworld/266.2bpp" INCBIN "gfx/overworld/267.2bpp" +; c4300 + +GrampsSpriteGFX: ; c4300 INCBIN "gfx/overworld/268.2bpp" INCBIN "gfx/overworld/269.2bpp" INCBIN "gfx/overworld/270.2bpp" INCBIN "gfx/overworld/271.2bpp" INCBIN "gfx/overworld/272.2bpp" INCBIN "gfx/overworld/273.2bpp" +; c4480 + +GrannySpriteGFX: ; c4480 INCBIN "gfx/overworld/274.2bpp" INCBIN "gfx/overworld/275.2bpp" INCBIN "gfx/overworld/276.2bpp" INCBIN "gfx/overworld/277.2bpp" INCBIN "gfx/overworld/278.2bpp" INCBIN "gfx/overworld/279.2bpp" +; c4600 + +SwimmerGuySpriteGFX: ; c4600 INCBIN "gfx/overworld/280.2bpp" INCBIN "gfx/overworld/281.2bpp" INCBIN "gfx/overworld/282.2bpp" INCBIN "gfx/overworld/283.2bpp" INCBIN "gfx/overworld/284.2bpp" INCBIN "gfx/overworld/285.2bpp" +; c4780 + +SwimmerGirlSpriteGFX: ; c4780 INCBIN "gfx/overworld/286.2bpp" INCBIN "gfx/overworld/287.2bpp" INCBIN "gfx/overworld/288.2bpp" INCBIN "gfx/overworld/289.2bpp" INCBIN "gfx/overworld/290.2bpp" INCBIN "gfx/overworld/291.2bpp" +; c4900 + +BigSnorlaxSpriteGFX: ; c4900 INCBIN "gfx/overworld/292.2bpp" INCBIN "gfx/overworld/293.2bpp" +; c4980 + +SurfingPikachuSpriteGFX: ; c4980 INCBIN "gfx/overworld/294.2bpp" INCBIN "gfx/overworld/295.2bpp" INCBIN "gfx/overworld/296.2bpp" INCBIN "gfx/overworld/297.2bpp" INCBIN "gfx/overworld/298.2bpp" INCBIN "gfx/overworld/299.2bpp" +; c4b00 + +RocketSpriteGFX: ; c4b00 INCBIN "gfx/overworld/300.2bpp" INCBIN "gfx/overworld/301.2bpp" INCBIN "gfx/overworld/302.2bpp" INCBIN "gfx/overworld/303.2bpp" INCBIN "gfx/overworld/304.2bpp" INCBIN "gfx/overworld/305.2bpp" +; c4c80 + +RocketGirlSpriteGFX: ; c4c80 INCBIN "gfx/overworld/306.2bpp" INCBIN "gfx/overworld/307.2bpp" INCBIN "gfx/overworld/308.2bpp" INCBIN "gfx/overworld/309.2bpp" INCBIN "gfx/overworld/310.2bpp" INCBIN "gfx/overworld/311.2bpp" +; c4e00 + +NurseSpriteGFX: ; c4e00 INCBIN "gfx/overworld/312.2bpp" INCBIN "gfx/overworld/313.2bpp" INCBIN "gfx/overworld/314.2bpp" +; c4ec0 + +LinkReceptionistSpriteGFX: ; c4ec0 INCBIN "gfx/overworld/315.2bpp" INCBIN "gfx/overworld/316.2bpp" INCBIN "gfx/overworld/317.2bpp" INCBIN "gfx/overworld/318.2bpp" INCBIN "gfx/overworld/319.2bpp" INCBIN "gfx/overworld/320.2bpp" +; c5040 + +ClerkSpriteGFX: ; c5040 INCBIN "gfx/overworld/321.2bpp" INCBIN "gfx/overworld/322.2bpp" INCBIN "gfx/overworld/323.2bpp" INCBIN "gfx/overworld/324.2bpp" INCBIN "gfx/overworld/325.2bpp" INCBIN "gfx/overworld/326.2bpp" +; c51c0 + +FisherSpriteGFX: ; c51c0 INCBIN "gfx/overworld/327.2bpp" INCBIN "gfx/overworld/328.2bpp" INCBIN "gfx/overworld/329.2bpp" INCBIN "gfx/overworld/330.2bpp" INCBIN "gfx/overworld/331.2bpp" INCBIN "gfx/overworld/332.2bpp" +; c5340 + +FishingGuruSpriteGFX: ; c5340 INCBIN "gfx/overworld/333.2bpp" INCBIN "gfx/overworld/334.2bpp" INCBIN "gfx/overworld/335.2bpp" INCBIN "gfx/overworld/336.2bpp" INCBIN "gfx/overworld/337.2bpp" INCBIN "gfx/overworld/338.2bpp" +; c54c0 + +ScientistSpriteGFX: ; c54c0 INCBIN "gfx/overworld/339.2bpp" INCBIN "gfx/overworld/340.2bpp" INCBIN "gfx/overworld/341.2bpp" INCBIN "gfx/overworld/342.2bpp" INCBIN "gfx/overworld/343.2bpp" INCBIN "gfx/overworld/344.2bpp" +; c5640 + +KimonoGirlSpriteGFX: ; c5640 INCBIN "gfx/overworld/345.2bpp" INCBIN "gfx/overworld/346.2bpp" INCBIN "gfx/overworld/347.2bpp" INCBIN "gfx/overworld/348.2bpp" INCBIN "gfx/overworld/349.2bpp" INCBIN "gfx/overworld/350.2bpp" +; c57c0 + +SageSpriteGFX: ; c57c0 INCBIN "gfx/overworld/351.2bpp" INCBIN "gfx/overworld/352.2bpp" INCBIN "gfx/overworld/353.2bpp" INCBIN "gfx/overworld/354.2bpp" INCBIN "gfx/overworld/355.2bpp" INCBIN "gfx/overworld/356.2bpp" +; c5940 + +UnusedGuySpriteGFX: ; c5940 INCBIN "gfx/overworld/357.2bpp" INCBIN "gfx/overworld/358.2bpp" INCBIN "gfx/overworld/359.2bpp" INCBIN "gfx/overworld/360.2bpp" INCBIN "gfx/overworld/361.2bpp" INCBIN "gfx/overworld/362.2bpp" +; c5ac0 + +GentlemanSpriteGFX: ; c5ac0 INCBIN "gfx/overworld/363.2bpp" INCBIN "gfx/overworld/364.2bpp" INCBIN "gfx/overworld/365.2bpp" INCBIN "gfx/overworld/366.2bpp" INCBIN "gfx/overworld/367.2bpp" INCBIN "gfx/overworld/368.2bpp" +; c5c40 + +BlackBeltSpriteGFX: ; c5c40 INCBIN "gfx/overworld/369.2bpp" INCBIN "gfx/overworld/370.2bpp" INCBIN "gfx/overworld/371.2bpp" INCBIN "gfx/overworld/372.2bpp" INCBIN "gfx/overworld/373.2bpp" INCBIN "gfx/overworld/374.2bpp" +; c5dc0 + +ReceptionistSpriteGFX: ; c5dc0 INCBIN "gfx/overworld/375.2bpp" INCBIN "gfx/overworld/376.2bpp" INCBIN "gfx/overworld/377.2bpp" INCBIN "gfx/overworld/378.2bpp" INCBIN "gfx/overworld/379.2bpp" INCBIN "gfx/overworld/380.2bpp" +; c5f40 + +OfficerSpriteGFX: ; c5f40 INCBIN "gfx/overworld/381.2bpp" INCBIN "gfx/overworld/382.2bpp" INCBIN "gfx/overworld/383.2bpp" INCBIN "gfx/overworld/384.2bpp" INCBIN "gfx/overworld/385.2bpp" INCBIN "gfx/overworld/386.2bpp" +; c60c0 + +CalSpriteGFX: ; c60c0 INCBIN "gfx/overworld/387.2bpp" INCBIN "gfx/overworld/388.2bpp" INCBIN "gfx/overworld/389.2bpp" INCBIN "gfx/overworld/390.2bpp" INCBIN "gfx/overworld/391.2bpp" INCBIN "gfx/overworld/392.2bpp" +; c6240 + +SlowpokeSpriteGFX: ; c6240 INCBIN "gfx/overworld/393.2bpp" +; c6280 + +CaptainSpriteGFX: ; c6280 INCBIN "gfx/overworld/394.2bpp" INCBIN "gfx/overworld/395.2bpp" INCBIN "gfx/overworld/396.2bpp" INCBIN "gfx/overworld/397.2bpp" INCBIN "gfx/overworld/398.2bpp" INCBIN "gfx/overworld/399.2bpp" +; c6400 + +BigLaprasSpriteGFX: ; c6400 INCBIN "gfx/overworld/400.2bpp" INCBIN "gfx/overworld/401.2bpp" +; c6480 + +GymGuySpriteGFX: ; c6480 INCBIN "gfx/overworld/402.2bpp" INCBIN "gfx/overworld/403.2bpp" INCBIN "gfx/overworld/404.2bpp" INCBIN "gfx/overworld/405.2bpp" INCBIN "gfx/overworld/406.2bpp" INCBIN "gfx/overworld/407.2bpp" +; c6600 + +SailorSpriteGFX: ; c6600 INCBIN "gfx/overworld/408.2bpp" INCBIN "gfx/overworld/409.2bpp" INCBIN "gfx/overworld/410.2bpp" INCBIN "gfx/overworld/411.2bpp" INCBIN "gfx/overworld/412.2bpp" INCBIN "gfx/overworld/413.2bpp" +; c6780 + +BikerSpriteGFX: ; c6780 INCBIN "gfx/overworld/414.2bpp" INCBIN "gfx/overworld/415.2bpp" INCBIN "gfx/overworld/416.2bpp" INCBIN "gfx/overworld/417.2bpp" INCBIN "gfx/overworld/418.2bpp" INCBIN "gfx/overworld/419.2bpp" +; c6900 + +PharmacistSpriteGFX: ; c6900 INCBIN "gfx/overworld/420.2bpp" INCBIN "gfx/overworld/421.2bpp" INCBIN "gfx/overworld/422.2bpp" INCBIN "gfx/overworld/423.2bpp" INCBIN "gfx/overworld/424.2bpp" INCBIN "gfx/overworld/425.2bpp" +; c6a80 + +MonsterSpriteGFX: ; c6a80 INCBIN "gfx/overworld/426.2bpp" INCBIN "gfx/overworld/427.2bpp" INCBIN "gfx/overworld/428.2bpp" INCBIN "gfx/overworld/429.2bpp" INCBIN "gfx/overworld/430.2bpp" INCBIN "gfx/overworld/431.2bpp" +; c6c00 + +FairySpriteGFX: ; c6c00 INCBIN "gfx/overworld/432.2bpp" INCBIN "gfx/overworld/433.2bpp" INCBIN "gfx/overworld/434.2bpp" INCBIN "gfx/overworld/435.2bpp" INCBIN "gfx/overworld/436.2bpp" INCBIN "gfx/overworld/437.2bpp" +; c6d80 + +BirdSpriteGFX: ; c6d80 INCBIN "gfx/overworld/438.2bpp" INCBIN "gfx/overworld/439.2bpp" INCBIN "gfx/overworld/440.2bpp" INCBIN "gfx/overworld/441.2bpp" INCBIN "gfx/overworld/442.2bpp" INCBIN "gfx/overworld/443.2bpp" +; c6f00 + +DragonSpriteGFX: ; c6f00 INCBIN "gfx/overworld/444.2bpp" INCBIN "gfx/overworld/445.2bpp" INCBIN "gfx/overworld/446.2bpp" INCBIN "gfx/overworld/447.2bpp" INCBIN "gfx/overworld/448.2bpp" INCBIN "gfx/overworld/449.2bpp" +; c7080 + +BigOnixSpriteGFX: ; c7080 INCBIN "gfx/overworld/450.2bpp" INCBIN "gfx/overworld/451.2bpp" INCBIN "gfx/overworld/452.2bpp" +; c7140 + +N64SpriteGFX: ; c7140 INCBIN "gfx/overworld/453.2bpp" +; c7180 + +SudowoodoSpriteGFX: ; c7180 INCBIN "gfx/overworld/454.2bpp" INCBIN "gfx/overworld/455.2bpp" +; c7200 + +SurfSpriteGFX: ; c7200 INCBIN "gfx/overworld/456.2bpp" INCBIN "gfx/overworld/457.2bpp" INCBIN "gfx/overworld/458.2bpp" INCBIN "gfx/overworld/459.2bpp" INCBIN "gfx/overworld/460.2bpp" INCBIN "gfx/overworld/461.2bpp" +; c7380 + +PokeBallSpriteGFX: ; c7380 INCBIN "gfx/overworld/462.2bpp" INCBIN "gfx/overworld/463.2bpp" INCBIN "gfx/overworld/464.2bpp" INCBIN "gfx/overworld/465.2bpp" INCBIN "gfx/overworld/466.2bpp" INCBIN "gfx/overworld/467.2bpp" +; c7500 + +PokedexSpriteGFX: ; c7500 INCBIN "gfx/overworld/468.2bpp" INCBIN "gfx/overworld/469.2bpp" INCBIN "gfx/overworld/470.2bpp" INCBIN "gfx/overworld/471.2bpp" INCBIN "gfx/overworld/472.2bpp" INCBIN "gfx/overworld/473.2bpp" +; c7680 + +PaperSpriteGFX: ; c7680 INCBIN "gfx/overworld/474.2bpp" INCBIN "gfx/overworld/475.2bpp" INCBIN "gfx/overworld/476.2bpp" INCBIN "gfx/overworld/477.2bpp" INCBIN "gfx/overworld/478.2bpp" INCBIN "gfx/overworld/479.2bpp" +; c7800 + +VirtualBoySpriteGFX: ; c7800 INCBIN "gfx/overworld/480.2bpp" +; c7840 + +OldLinkReceptionistSpriteGFX: ; c7840 INCBIN "gfx/overworld/481.2bpp" +; c7880 + +RockSpriteGFX: ; c7880 INCBIN "gfx/overworld/482.2bpp" +; c78c0 + +BoulderSpriteGFX: ; c78c0 INCBIN "gfx/overworld/483.2bpp" +; c7900 + +SnesSpriteGFX: ; c7900 INCBIN "gfx/overworld/484.2bpp" +; c7940 + +FamicomSpriteGFX: ; c7940 INCBIN "gfx/overworld/485.2bpp" +; c7980 + +FruitTreeSpriteGFX: ; c7980 INCBIN "gfx/overworld/486.2bpp" +; c79c0 + +GoldTrophySpriteGFX: ; c79c0 INCBIN "gfx/overworld/487.2bpp" +; c7a00 + +SilverTrophySpriteGFX: ; c7a00 INCBIN "gfx/overworld/488.2bpp" +; c7a40 + +KrisSpriteGFX: ; c7a40 INCBIN "gfx/overworld/489.2bpp" INCBIN "gfx/overworld/490.2bpp" INCBIN "gfx/overworld/491.2bpp" INCBIN "gfx/overworld/492.2bpp" INCBIN "gfx/overworld/493.2bpp" INCBIN "gfx/overworld/494.2bpp" +; c7bc0 + +KrisBikeSpriteGFX: ; c7bc0 INCBIN "gfx/overworld/495.2bpp" INCBIN "gfx/overworld/496.2bpp" INCBIN "gfx/overworld/497.2bpp" INCBIN "gfx/overworld/498.2bpp" INCBIN "gfx/overworld/499.2bpp" INCBIN "gfx/overworld/500.2bpp" +; c7d40 + +KurtOutsideSpriteGFX: ; c7d40 INCBIN "gfx/overworld/501.2bpp" INCBIN "gfx/overworld/502.2bpp" INCBIN "gfx/overworld/503.2bpp" +; c7e00 + +SuicuneSpriteGFX: ; c7e00 INCBIN "gfx/overworld/504.2bpp" +; c7e40 + +EnteiSpriteGFX: ; c7e40 INCBIN "gfx/overworld/505.2bpp" +; c7e80 + +RaikouSpriteGFX: ; c7e80 INCBIN "gfx/overworld/506.2bpp" +; c7ec0 + +StandingYoungsterSpriteGFX: ; c7ec0 INCBIN "gfx/overworld/507.2bpp" INCBIN "gfx/overworld/508.2bpp" INCBIN "gfx/overworld/509.2bpp" INCBIN "gfx/overworld/510.2bpp" INCBIN "gfx/overworld/511.2bpp" +; c8000 + diff --git a/main.asm b/main.asm index f1d61a74f..a769710bb 100644 --- a/main.asm +++ b/main.asm @@ -2575,7 +2575,29 @@ UpdateGameTimer: ; 20ad ; 210f -INCBIN "baserom.gbc", $210f, $23a3 - $210f +INCBIN "baserom.gbc", $210f, $22ee - $210f + + +CheckOutdoorMap: ; 22ee + cp ROUTE + ret z + cp TOWN + ret +; 22f4 + +CheckIndoorMap: ; 22f4 + cp INDOOR + ret z + cp CAVE + ret z + cp DUNGEON + ret z + cp GATE + ret +; 2300 + + +INCBIN "baserom.gbc", $2300, $23a3 - $2300 GetMapConnection: ; 23a3 @@ -3113,8 +3135,25 @@ GetSecondaryMapHeaderPointer: ; 0x2c7d pop de pop bc ret +; 2c8a + + +GetMapPermission: ; 2c8a + push hl + push de + push bc + ld de, 2 + call GetMapHeaderMember + ld a, c + pop bc + pop de + pop hl + ret +; 2c98 + + +INCBIN "baserom.gbc", $2c98, $2caf - $2c98 -INCBIN "baserom.gbc", $2c8a, $2caf-$2c8a GetWorldMapLocation: ; 0x2caf ; given a map group/id in bc, return its location on the Pokégear map. @@ -3130,7 +3169,9 @@ GetWorldMapLocation: ; 0x2caf ret ; 0x2cbd -INCBIN "baserom.gbc", $2cbd, $2d63-$2cbd + +INCBIN "baserom.gbc", $2cbd, $2d63 - $2cbd + FarJpHl: ; 2d63 ; Jump to a:hl. @@ -8756,8 +8797,10 @@ root set root+1 SECTION "bank5",ROMX,BANK[$5] + INCBIN "baserom.gbc", $14000, $14032 - $14000 + GetTimeOfDay: ; 14032 ; get time of day based on the current hour ld a, [hHours] ; hour @@ -8791,7 +8834,1238 @@ TimesOfDay: ; 14044 db 24, NITE ; 1404c -INCBIN "baserom.gbc", $1404c, $152ab - $1404c + +INCBIN "baserom.gbc", $1404c, $14183 - $1404c + + +GetPlayerSprite: ; 14183 +; Get Chris or Kris's sprite. + + ld hl, .Chris + ld a, [$d45b] + bit 2, a + jr nz, .go + ld a, [PlayerGender] + bit 0, a + jr z, .go + ld hl, .Kris + +.go + ld a, [PlayerState] + ld c, a +.loop + ld a, [hli] + cp c + jr z, .asm_141ac + inc hl + cp $ff + jr nz, .loop + +; Any player state not in the array defaults to Chris's sprite. + xor a ; ld a, PLAYER_NORMAL + ld [PlayerState], a + ld a, SPRITE_CHRIS + jr .asm_141ad + +.asm_141ac + ld a, [hl] + +.asm_141ad + ld [UsedSprites + 0], a + ld [$d4d6], a + ld [$d71f], a + ret + +.Chris + db PLAYER_NORMAL, SPRITE_CHRIS + db PLAYER_BIKE, SPRITE_CHRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db $ff + +.Kris + db PLAYER_NORMAL, SPRITE_KRIS + db PLAYER_BIKE, SPRITE_KRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db $ff +; 141c9 + + +AddMapSprites: ; 141c9 + call GetMapPermission + call CheckOutdoorMap + jr z, .outdoor + call AddIndoorSprites + ret +.outdoor + call AddOutdoorSprites + ret +; 141d9 + + +AddIndoorSprites: ; 141d9 + ld hl, MapObjects + 1 * OBJECT_LENGTH + 1 ; sprite + ld a, 1 +.loop + push af + ld a, [hl] + call AddSpriteGFX + ld de, OBJECT_LENGTH + add hl, de + pop af + inc a + cp NUM_OBJECTS + jr nz, .loop + ret +; 141ee + + +AddOutdoorSprites: ; 141ee + ld a, [MapGroup] + dec a + ld c, a + ld b, 0 + ld hl, OutdoorSprites + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld c, $17 +.loop + push bc + ld a, [hli] + call AddSpriteGFX + pop bc + dec c + jr nz, .loop + ret +; 14209 + + +INCBIN "baserom.gbc", $14209, $14236 - $14209 + + +SafeGetSprite: ; 14236 + push hl + call GetSprite + pop hl + ret +; 1423c + +GetSprite: ; 1423c + call GetMonSprite + ret c + + ld hl, SpriteHeaders + dec a + ld c, a + ld b, 0 + ld a, 6 + call AddNTimes + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + swap a + ld c, a + ld b, [hl] + ld a, [hli] + ld l, [hl] + ld h, a + ret +; 14259 + + +GetMonSprite: ; 14259 +; Return carry if a monster sprite was loaded. + + cp SPRITE_POKEMON + jr c, .Normal + cp SPRITE_DAYCARE_MON_1 + jr z, .BreedMon1 + cp SPRITE_DAYCARE_MON_2 + jr z, .BreedMon2 + cp SPRITE_VARS + jr nc, .Variable + jr .Icon + +.Normal + and a + ret + +.Icon + sub SPRITE_POKEMON + ld e, a + ld d, 0 + ld hl, SpriteMons + add hl, de + ld a, [hl] + jr .Mon + +.BreedMon1 + ld a, [BreedMon1Species] + jr .Mon + +.BreedMon2 + ld a, [BreedMon2Species] + +.Mon + ld e, a + and a + jr z, .asm_1429f + + ld a, $23 + ld hl, $682b + rst FarCall ; callba LoadMonSprite + + ld l, 1 + ld h, 0 + scf + ret + +.Variable + sub SPRITE_VARS + ld e, a + ld d, 0 + ld hl, VariableSprites + add hl, de + ld a, [hl] + and a + jp nz, GetMonSprite + +.asm_1429f + ld a, 1 + ld l, 1 + ld h, 0 + and a + ret +; 142a7 + + +Function142a7: ; 142a7 + cp SPRITE_POKEMON + jr nc, .asm_142c2 + + push hl + push bc + ld hl, SpriteHeaders + 4 + dec a + ld c, a + ld b, 0 + ld a, 6 + call AddNTimes + ld a, [hl] + pop bc + pop hl + cp 3 + jr nz, .asm_142c2 + scf + ret + +.asm_142c2 + and a + ret +; 142c4 + + +GetSpritePalette: ; 142c4 + ld a, c + call GetMonSprite + jr c, .asm_142d8 + + ld hl, SpriteHeaders + 5 ; palette + dec a + ld c, a + ld b, 0 + ld a, 6 + call AddNTimes + ld c, [hl] + ret + +.asm_142d8 + xor a + ld c, a + ret +; 142db + + +Function142db: ; 142db + call LoadSpriteGFX + call SortUsedSprites + call ArrangeUsedSprites + ret +; 142e5 + + +AddSpriteGFX: ; 142e5 +; Add any new sprite ids to a list of graphics to be loaded. +; Return carry if the list is full. + + push hl + push bc + ld b, a + ld hl, UsedSprites + 2 + ld c, $1f +.loop + ld a, [hl] + cp b + jr z, .exists + and a + jr z, .new + inc hl + inc hl + dec c + jr nz, .loop + + pop bc + pop hl + scf + ret + +.exists + pop bc + pop hl + and a + ret + +.new + ld [hl], b + pop bc + pop hl + and a + ret +; 14306 + + +LoadSpriteGFX: ; 14306 + + ld hl, UsedSprites + ld b, $20 +.loop + ld a, [hli] + and a + jr z, .done + push hl + call .LoadSprite + pop hl + ld [hli], a + dec b + jr nz, .loop + +.done + ret + +.LoadSprite + call GetSprite + ld a, l + ret +; 1431e + + +SortUsedSprites: ; 1431e +; Bubble-sort sprites by type. + +; Run backwards through UsedSprites to find the last one. + + ld c, $20 + ld de, UsedSprites + ($20 - 1) * 2 +.FindLastSprite + ld a, [de] + and a + jr nz, .FoundLastSprite + dec de + dec de + dec c + jr nz, .FindLastSprite +.FoundLastSprite + dec c + jr z, .quit + +; If the length of the current sprite is +; higher than a later one, swap them. + + inc de + ld hl, UsedSprites + 1 + +.CheckSprite + push bc + push de + push hl + +.CheckFollowing + ld a, [de] + cp [hl] + jr nc, .next + +; Swap the two sprites. + + ld b, a + ld a, [hl] + ld [hl], b + ld [de], a + dec de + dec hl + ld a, [de] + ld b, a + ld a, [hl] + ld [hl], b + ld [de], a + inc de + inc hl + +; Keep doing this until everything's in order. + +.next + dec de + dec de + dec c + jr nz, .CheckFollowing + + pop hl + inc hl + inc hl + pop de + pop bc + dec c + jr nz, .CheckSprite + +.quit + ret +; 14355 + + +ArrangeUsedSprites: ; 14355 +; Get the length of each sprite and space them out in VRAM. +; Crystal introduces a second table in VRAM bank 0. + + ld hl, UsedSprites + ld c, $20 + ld b, 0 +.FirstTableLength +; Keep going until the end of the list. + ld a, [hli] + and a + jr z, .quit + + ld a, [hl] + call GetSpriteLength + +; Spill over into the second table after $80 tiles. + add b + cp $80 + jr z, .next + jr nc, .SecondTable + +.next + ld [hl], b + inc hl + ld b, a + +; Assumes the next table will be reached before c hits 0. + dec c + jr nz, .FirstTableLength + +.SecondTable +; The second tile table starts at tile $80. + ld b, $80 + dec hl +.SecondTableLength +; Keep going until the end of the list. + ld a, [hli] + and a + jr z, .quit + + ld a, [hl] + call GetSpriteLength + +; There are only two tables, so don't go any further than that. + add b + jr c, .quit + + ld [hl], b + ld b, a + inc hl + + dec c + jr nz, .SecondTableLength + +.quit + ret +; 14386 + + +GetSpriteLength: ; 14386 +; Return the length of sprite type a in tiles. + + cp WALKING_SPRITE + jr z, .AnyDirection + cp STANDING_SPRITE + jr z, .AnyDirection + cp STILL_SPRITE + jr z, .OneDirection + + ld a, 12 + ret + +.AnyDirection + ld a, 12 + ret + +.OneDirection + ld a, 4 + ret +; 1439b + + +INCBIN "baserom.gbc", $1439b, $14495 - $1439b + + +SpriteMons: ; 14495 + db UNOWN + db GEODUDE + db GROWLITHE + db WEEDLE + db SHELLDER + db ODDISH + db GENGAR + db ZUBAT + db MAGIKARP + db SQUIRTLE + db TOGEPI + db BUTTERFREE + db DIGLETT + db POLIWAG + db PIKACHU + db CLEFAIRY + db CHARMANDER + db JYNX + db STARMIE + db BULBASAUR + db JIGGLYPUFF + db GRIMER + db EKANS + db PARAS + db TENTACOOL + db TAUROS + db MACHOP + db VOLTORB + db LAPRAS + db RHYDON + db MOLTRES + db SNORLAX + db GYARADOS + db LUGIA + db HO_OH +; 144b8 + + +OutdoorSprites: ; 144b8 +; Valid sprite IDs for each map group. + + dw Group1Sprites + dw Group2Sprites + dw Group3Sprites + dw Group4Sprites + dw Group5Sprites + dw Group6Sprites + dw Group7Sprites + dw Group8Sprites + dw Group9Sprites + dw Group10Sprites + dw Group11Sprites + dw Group12Sprites + dw Group13Sprites + dw Group14Sprites + dw Group15Sprites + dw Group16Sprites + dw Group17Sprites + dw Group18Sprites + dw Group19Sprites + dw Group20Sprites + dw Group21Sprites + dw Group22Sprites + dw Group23Sprites + dw Group24Sprites + dw Group25Sprites + dw Group26Sprites +; 144ec + + +Group13Sprites: ; 144ec + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_YOUNGSTER + db SPRITE_BLUE + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_SWIMMER_GIRL + db SPRITE_SWIMMER_GUY + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 14503 + +Group23Sprites: ; 14503 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_YOUNGSTER + db SPRITE_BLUE + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_SWIMMER_GIRL + db SPRITE_SWIMMER_GUY + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 1451a + +Group14Sprites: ; 1451a + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_YOUNGSTER + db SPRITE_BLUE + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_SWIMMER_GIRL + db SPRITE_SWIMMER_GUY + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 14531 + +Group6Sprites: ; 14531 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_YOUNGSTER + db SPRITE_BLUE + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_SWIMMER_GIRL + db SPRITE_SWIMMER_GUY + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 14548 + +Group7Sprites: ; 14548 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_COOLTRAINER_M + db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_F + db SPRITE_FISHER + db SPRITE_YOUNGSTER + db SPRITE_LASS + db SPRITE_POKEFAN_M + db SPRITE_ROCKET + db SPRITE_MISTY + db SPRITE_POKE_BALL + db SPRITE_SLOWPOKE +; 1455f + +Group25Sprites: ; 1455f + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_COOLTRAINER_M + db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_F + db SPRITE_FISHER + db SPRITE_YOUNGSTER + db SPRITE_LASS + db SPRITE_POKEFAN_M + db SPRITE_ROCKET + db SPRITE_MISTY + db SPRITE_POKE_BALL + db SPRITE_SLOWPOKE +; 14576 + +Group21Sprites: ; 14576 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_FISHER + db SPRITE_POLIWAG + db SPRITE_TEACHER + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_LASS + db SPRITE_BIKER + db SPRITE_SILVER + db SPRITE_BLUE + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 1458d + +Group18Sprites: ; 1458d + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_POKEFAN_M + db SPRITE_MACHOP + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_FISHER + db SPRITE_TEACHER + db SPRITE_SUPER_NERD + db SPRITE_BIG_SNORLAX + db SPRITE_BIKER + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 145a4 + +Group12Sprites: ; 145a4 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_POKEFAN_M + db SPRITE_MACHOP + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_FISHER + db SPRITE_TEACHER + db SPRITE_SUPER_NERD + db SPRITE_BIG_SNORLAX + db SPRITE_BIKER + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 145bb + +Group17Sprites: ; 145bb + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_POKEFAN_M + db SPRITE_MACHOP + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_FISHER + db SPRITE_TEACHER + db SPRITE_SUPER_NERD + db SPRITE_BIG_SNORLAX + db SPRITE_BIKER + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 145d2 + +Group16Sprites: ; 145d2 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_POKEFAN_M + db SPRITE_BUENA + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_FISHER + db SPRITE_TEACHER + db SPRITE_SUPER_NERD + db SPRITE_MACHOP + db SPRITE_BIKER + db SPRITE_POKE_BALL + db SPRITE_BOULDER +; 145e9 + +Group24Sprites: ; 145e9 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_SILVER + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M + db SPRITE_YOUNGSTER + db SPRITE_MONSTER + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 14600 + +Group26Sprites: ; 14600 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_SILVER + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M + db SPRITE_YOUNGSTER + db SPRITE_MONSTER + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 14617 + +Group19Sprites: ; 14617 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_SILVER + db SPRITE_TEACHER + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M + db SPRITE_YOUNGSTER + db SPRITE_MONSTER + db SPRITE_GRAMPS + db SPRITE_BUG_CATCHER + db SPRITE_COOLTRAINER_F + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 1462e + +Group10Sprites: ; 1462e + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_FISHER + db SPRITE_LASS + db SPRITE_OFFICER + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_COOLTRAINER_M + db SPRITE_BUG_CATCHER + db SPRITE_SUPER_NERD + db SPRITE_WEIRD_TREE + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 14645 + +Group4Sprites: ; 14645 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_FISHER + db SPRITE_LASS + db SPRITE_OFFICER + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_COOLTRAINER_M + db SPRITE_BUG_CATCHER + db SPRITE_SUPER_NERD + db SPRITE_WEIRD_TREE + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE +; 1465c + +Group8Sprites: ; 1465c + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_KURT_OUTSIDE + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_OFFICER + db SPRITE_POKEFAN_M + db SPRITE_BLACK_BELT + db SPRITE_TEACHER + db SPRITE_AZALEA_ROCKET + db SPRITE_LASS + db SPRITE_SILVER + db SPRITE_FRUIT_TREE + db SPRITE_SLOWPOKE +; 14673 + +Group11Sprites: ; 14673 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_POKE_BALL + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_OFFICER + db SPRITE_POKEFAN_M + db SPRITE_DAYCARE_MON_1 + db SPRITE_COOLTRAINER_F + db SPRITE_ROCKET + db SPRITE_LASS + db SPRITE_DAYCARE_MON_2 + db SPRITE_FRUIT_TREE + db SPRITE_SLOWPOKE +; 1468a + +Group22Sprites: ; 1468a + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_STANDING_YOUNGSTER + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_OLIVINE_RIVAL + db SPRITE_POKEFAN_M + db SPRITE_LASS + db SPRITE_BUENA + db SPRITE_SWIMMER_GIRL + db SPRITE_SAILOR + db SPRITE_POKEFAN_F + db SPRITE_SUPER_NERD + db SPRITE_TAUROS + db SPRITE_FRUIT_TREE + db SPRITE_ROCK +; 146a1 + +Group1Sprites: ; 146a1 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_STANDING_YOUNGSTER + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_OLIVINE_RIVAL + db SPRITE_POKEFAN_M + db SPRITE_LASS + db SPRITE_BUENA + db SPRITE_SWIMMER_GIRL + db SPRITE_SAILOR + db SPRITE_POKEFAN_F + db SPRITE_SUPER_NERD + db SPRITE_TAUROS + db SPRITE_FRUIT_TREE + db SPRITE_ROCK +; 146b8 + +Group9Sprites: ; 146b8 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_LANCE + db SPRITE_GRAMPS + db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_F + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M + db SPRITE_LASS + db SPRITE_YOUNGSTER + db SPRITE_GYARADOS + db SPRITE_FRUIT_TREE + db SPRITE_POKE_BALL +; 146cf + +Group2Sprites: ; 146cf + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_LASS + db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_M + db SPRITE_POKEFAN_M + db SPRITE_BLACK_BELT + db SPRITE_COOLTRAINER_F + db SPRITE_FISHER + db SPRITE_FRUIT_TREE + db SPRITE_POKE_BALL +; 146e6 + +Group5Sprites: ; 146e6 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_GRAMPS + db SPRITE_YOUNGSTER + db SPRITE_LASS + db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_M + db SPRITE_POKEFAN_M + db SPRITE_BLACK_BELT + db SPRITE_COOLTRAINER_F + db SPRITE_FISHER + db SPRITE_FRUIT_TREE + db SPRITE_POKE_BALL +; 146fd + +Group3Sprites: ; 146fd + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_GAMEBOY_KID + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_LASS + db SPRITE_POKEFAN_F + db SPRITE_TEACHER + db SPRITE_YOUNGSTER + db SPRITE_GROWLITHE + db SPRITE_POKEFAN_M + db SPRITE_ROCKER + db SPRITE_FISHER + db SPRITE_SCIENTIST + db SPRITE_POKE_BALL + db SPRITE_BOULDER +; 14714 + +Group15Sprites: ; 14714 + db SPRITE_SUICUNE + db SPRITE_SILVER_TROPHY + db SPRITE_FAMICOM + db SPRITE_POKEDEX + db SPRITE_WILL + db SPRITE_KAREN + db SPRITE_NURSE + db SPRITE_OLD_LINK_RECEPTIONIST + db SPRITE_BIG_LAPRAS + db SPRITE_BIG_ONIX + db SPRITE_SUDOWOODO + db SPRITE_BIG_SNORLAX + db SPRITE_SAILOR + db SPRITE_FISHING_GURU + db SPRITE_GENTLEMAN + db SPRITE_SUPER_NERD + db SPRITE_HO_OH + db SPRITE_TEACHER + db SPRITE_COOLTRAINER_F + db SPRITE_YOUNGSTER + db SPRITE_FAIRY + db SPRITE_POKE_BALL + db SPRITE_ROCK +; 1472b + +Group20Sprites: ; 1472b + db SPRITE_OAK + db SPRITE_FISHER + db SPRITE_TEACHER + db SPRITE_TWIN + db SPRITE_POKEFAN_M + db SPRITE_GRAMPS + db SPRITE_FAIRY + db SPRITE_SILVER + db SPRITE_FISHING_GURU + db SPRITE_POKE_BALL + db SPRITE_POKEDEX +; 14736 + + +SpriteHeaders: ; 14736 +INCLUDE "gfx/overworld/sprite_headers.asm" +; 1499a + + +INCBIN "baserom.gbc", $1499a, $152ab - $1499a + BlackoutPoints: ; 0x152ab db GROUP_KRISS_HOUSE_2F, MAP_KRISS_HOUSE_2F, 3, 3 @@ -15013,7 +16287,7 @@ WaterToLandSprite: ; 803f9 push bc ld a, PLAYER_NORMAL ld [PlayerState], a - call $e4a ; GetPlayerSprite + call $e4a ; UpdateSprites pop bc ret ; 80404 diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index eec4cb56b..73bb27e3c 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -6,7 +6,7 @@ AzaleaGym_MapScriptHeader: ; 0x18ec1c db 0 ; 0x18ec1e -UnknownScript_0x18ec1e: ; 0x18ec1e +BugsyScript_0x18ec1e: ; 0x18ec1e faceplayer loadfont checkbit1 $04be @@ -443,13 +443,13 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc ; people-events db 7 - person_event $14, 11, 9, $3, $0, 255, 255, $a0, 0, UnknownScript_0x18ec1e, $ffff - person_event $25, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff - person_event $25, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff - person_event $25, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff - person_event $26, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff - person_event $26, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff - person_event $48, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff + person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, $ffff + person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, $ffff + person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, $ffff + person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, $ffff + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, $ffff + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, $ffff + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, $ffff ; 0x18f441 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 4dffd48ea..56d1f60a4 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -6,18 +6,18 @@ AzaleaMart_MapScriptHeader: ; 0x18e03e db 0 ; 0x18e040 -UnknownScript_0x18e040: ; 0x18e040 +ClerkScript_0x18e040: ; 0x18e040 loadfont pokemart $0, $0003 loadmovesprites end ; 0x18e047 -UnknownScript_0x18e047: ; 0x18e047 +CooltrainerMScript_0x18e047: ; 0x18e047 jumptextfaceplayer UnknownText_0x18e04d ; 0x18e04a -UnknownScript_0x18e04a: ; 0x18e04a +BugCatcherScript_0x18e04a: ; 0x18e04a jumptextfaceplayer UnknownText_0x18e0b6 ; 0x18e04d @@ -58,8 +58,8 @@ AzaleaMart_MapEventHeader: ; 0x18e118 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x18e040, $ffff - person_event $23, 9, 6, $7, $0, 255, 255, $0, 0, UnknownScript_0x18e047, $ffff - person_event $25, 6, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x18e04a, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, $ffff + person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, $ffff + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, $ffff ; 0x18e14f diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index b2fd2ee80..050b8dc79 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -13,19 +13,19 @@ UnknownScript_0x18db27: ; 0x18db27 end ; 0x18db28 -UnknownScript_0x18db28: ; 0x18db28 +NurseScript_0x18db28: ; 0x18db28 jumpstd $0000 ; 0x18db2b -UnknownScript_0x18db2b: ; 0x18db2b +GentlemanScript_0x18db2b: ; 0x18db2b jumptextfaceplayer UnknownText_0x18db34 ; 0x18db2e -UnknownScript_0x18db2e: ; 0x18db2e +FishingGuruScript_0x18db2e: ; 0x18db2e jumptextfaceplayer UnknownText_0x18dbee ; 0x18db31 -UnknownScript_0x18db31: ; 0x18db31 +PokefanFScript_0x18db31: ; 0x18db31 jumptextfaceplayer UnknownText_0x18dc19 ; 0x18db34 @@ -87,9 +87,9 @@ AzaleaPokeCenter1F_MapEventHeader: ; 0x18dccf ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x18db28, $ffff - person_event $40, 10, 13, $4, $10, 255, 255, $0, 0, UnknownScript_0x18db2b, $ffff - person_event $3b, 5, 10, $6, $0, 255, 255, $0, 0, UnknownScript_0x18db2e, $ffff - person_event $2e, 8, 5, $2, $21, 255, 255, $0, 0, UnknownScript_0x18db31, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, $ffff + person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, $ffff + person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, $ffff + person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, $ffff ; 0x18dd18 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 2613d53d6..04eda0034 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -108,15 +108,15 @@ UnknownScript_0x198091: ; 0x198091 end ; 0x1980ab -UnknownScript_0x1980ab: ; 0x1980ab +AzaleaRocketScript_0x1980ab: ; 0x1980ab jumptextfaceplayer UnknownText_0x19837b ; 0x1980ae -UnknownScript_0x1980ae: ; 0x1980ae +AzaleaRocketScript_0x1980ae: ; 0x1980ae jumptextfaceplayer UnknownText_0x1983c7 ; 0x1980b1 -UnknownScript_0x1980b1: ; 0x1980b1 +GrampsScript_0x1980b1: ; 0x1980b1 faceplayer loadfont checkbit1 $002b @@ -134,15 +134,15 @@ UnknownScript_0x1980bf: ; 0x1980bf end ; 0x1980c5 -UnknownScript_0x1980c5: ; 0x1980c5 +TeacherScript_0x1980c5: ; 0x1980c5 jumptextfaceplayer UnknownText_0x1984ce ; 0x1980c8 -UnknownScript_0x1980c8: ; 0x1980c8 +YoungsterScript_0x1980c8: ; 0x1980c8 jumptextfaceplayer UnknownText_0x19851a ; 0x1980cb -UnknownScript_0x1980cb: ; 0x1980cb +SlowpokeScript_0x1980cb: ; 0x1980cb loadfont 2writetext UnknownText_0x1985b0 pause 60 @@ -183,7 +183,7 @@ UnknownScript_0x1980e5: ; 0x1980e5 end ; 0x19810c -UnknownScript_0x19810c: ; 0x19810c +KurtOutsideScript_0x19810c: ; 0x19810c faceplayer loadfont 2writetext UnknownText_0x198628 @@ -225,7 +225,7 @@ MapAzaleaTownSignpost6Script: ; 0x19812c jumpstd $0011 ; 0x19812f -UnknownScript_0x19812f: ; 0x19812f +FruitTreeScript_0x19812f: ; 0x19812f fruittree $14 ; 0x198131 @@ -485,17 +485,17 @@ AzaleaTown_MapEventHeader: ; 0x1987c1 ; people-events db 12 - person_event $f6, 13, 35, $6, $0, 255, 255, $0, 0, UnknownScript_0x1980ab, $06fa - person_event $2f, 13, 25, $2, $21, 255, 255, $0, 0, UnknownScript_0x1980b1, $ffff - person_event $29, 17, 19, $4, $20, 255, 255, $90, 0, UnknownScript_0x1980c5, $ffff - person_event $27, 13, 11, $5, $1, 255, 255, $a0, 0, UnknownScript_0x1980c8, $ffff - person_event $45, 21, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9 - person_event $45, 13, 22, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9 - person_event $45, 13, 33, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9 - person_event $45, 19, 19, $1, $0, 255, 255, $0, 0, UnknownScript_0x1980cb, $06f9 - person_event $5d, 6, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x19812f, $ffff - person_event $f6, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf - person_event $f6, 20, 14, $6, $0, 255, 255, $0, 0, UnknownScript_0x1980ae, $06fc - person_event $62, 9, 10, $8, $0, 255, 255, $0, 0, UnknownScript_0x19810c, $07a4 + person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, $06fa + person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, $ffff + person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, $ffff + person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, $ffff + person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 + person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 + person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 + person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, $06f9 + person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19812f, $ffff + person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, $06bf + person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, $06fc + person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, $07a4 ; 0x1988d0 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index ecfa62f21..9965f4924 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -55,7 +55,7 @@ UnknownScript_0x9e3e0: ; 0x9e3e0 end ; 0x9e3e2 -UnknownScript_0x9e3e2: ; 0x9e3e2 +ReceptionistScript_0x9e3e2: ; 0x9e3e2 writebyte $2 special $0086 if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 @@ -267,7 +267,7 @@ UnknownScript_0x9e555: ; 0x9e555 2jump UnknownScript_0x9e4b0 ; 0x9e55d -UnknownScript_0x9e55d: ; 0x9e55d +YoungsterScript_0x9e55d: ; 0x9e55d faceplayer loadfont 2writetext UnknownText_0x9f264 @@ -277,15 +277,15 @@ UnknownScript_0x9e55d: ; 0x9e55d end ; 0x9e568 -UnknownScript_0x9e568: ; 0x9e568 +CooltrainerFScript_0x9e568: ; 0x9e568 jumptextfaceplayer UnknownText_0x9f2a4 ; 0x9e56b -UnknownScript_0x9e56b: ; 0x9e56b +BugCatcherScript_0x9e56b: ; 0x9e56b jumptextfaceplayer UnknownText_0x9f35b ; 0x9e56e -UnknownScript_0x9e56e: ; 0x9e56e +GrannyScript_0x9e56e: ; 0x9e56e jumptextfaceplayer UnknownText_0x9f2e3 ; 0x9e571 @@ -773,10 +773,10 @@ BattleTower1F_MapEventHeader: ; 0x9f3b4 ; people-events db 5 - person_event $42, 10, 11, $6, $0, 255, 255, $0, 0, UnknownScript_0x9e3e2, $ffff - person_event $27, 13, 18, $9, $0, 255, 255, $b0, 0, UnknownScript_0x9e55d, $ffff - person_event $24, 13, 8, $5, $1, 255, 255, $80, 0, UnknownScript_0x9e568, $ffff - person_event $25, 7, 5, $2, $11, 255, 255, $90, 0, UnknownScript_0x9e56b, $ffff - person_event $30, 7, 18, $4, $10, 255, 255, $0, 0, UnknownScript_0x9e56e, $ffff + person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, $ffff + person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, $ffff + person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, $ffff + person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, $ffff + person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, $ffff ; 0x9f40f diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 8297da4f2..1fb6dd4e9 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -161,7 +161,7 @@ BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e ; people-events db 2 - person_event $27, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791 - person_event $42, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff + person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791 + person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff ; 0x9f558 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 4078c14d3..a0874bf4f 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -66,6 +66,6 @@ BattleTowerElevator_MapEventHeader: ; 0x9f594 ; people-events db 1 - person_event $42, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff + person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, $ffff ; 0x9f5b1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index dd74470a7..88493fc5c 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -107,6 +107,6 @@ BattleTowerHallway_MapEventHeader: ; 0x9f62f ; people-events db 1 - person_event $42, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff + person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, $ffff ; 0x9f660 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a35e6d3e9..a6dc3a09e 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -21,15 +21,15 @@ UnknownScript_0x9f85b: ; 0x9f85b return ; 0x9f85f -UnknownScript_0x9f85f: ; 0x9f85f +StandingYoungsterScript_0x9f85f: ; 0x9f85f jumptextfaceplayer UnknownText_0x9f930 ; 0x9f862 -UnknownScript_0x9f862: ; 0x9f862 +BuenaScript_0x9f862: ; 0x9f862 jumptextfaceplayer UnknownText_0x9f9db ; 0x9f865 -UnknownScript_0x9f865: ; 0x9f865 +SailorScript_0x9f865: ; 0x9f865 jumptextfaceplayer UnknownText_0x9fa8c ; 0x9f868 @@ -138,10 +138,10 @@ BattleTowerOutside_MapEventHeader: ; 0x9fb5f ; people-events db 4 - person_event $66, 16, 10, $7, $0, 255, 255, $80, 0, UnknownScript_0x9f85f, $ffff - person_event $2a, 15, 17, $2, $11, 255, 255, $a0, 0, UnknownScript_0x9f862, $ffff - person_event $49, 22, 16, $5, $1, 255, 255, $0, 0, UnknownScript_0x9f865, $07cf - person_event $28, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, $ffff + person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, $ffff + person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, $07cf + person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, $ffff ; 0x9fbb2 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 76a2a01cf..a1647dcfe 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -6,7 +6,7 @@ BillsHouse_MapScriptHeader: ; 0x189536 db 0 ; 0x189538 -UnknownScript_0x189538: ; 0x189538 +GrampsScript_0x189538: ; 0x189538 faceplayer loadfont checkbit1 $0000 @@ -368,6 +368,6 @@ BillsHouse_MapEventHeader: ; 0x189b42 ; people-events db 1 - person_event $2f, 7, 6, $7, $20, 255, 255, $90, 0, UnknownScript_0x189538, $ffff + person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, $ffff ; 0x189b5f diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index df808ce0f..a366aed77 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -29,7 +29,7 @@ UnknownScript_0x1a46e5: ; 0x1a46e5 return ; 0x1a46e8 -UnknownScript_0x1a46e8: ; 0x1a46e8 +SuperNerdScript_0x1a46e8: ; 0x1a46e8 faceplayer loadfont checkbit1 $04c4 @@ -56,15 +56,15 @@ UnknownScript_0x1a4702: ; 0x1a4702 end ; 0x1a4708 -UnknownScript_0x1a4708: ; 0x1a4708 +GrampsScript_0x1a4708: ; 0x1a4708 jumptextfaceplayer UnknownText_0x1a48c3 ; 0x1a470b -UnknownScript_0x1a470b: ; 0x1a470b +GrampsScript_0x1a470b: ; 0x1a470b jumptextfaceplayer UnknownText_0x1a48fb ; 0x1a470e -UnknownScript_0x1a470e: ; 0x1a470e +BlackBeltScript_0x1a470e: ; 0x1a470e faceplayer loadfont checkbit1 $0021 @@ -82,19 +82,19 @@ UnknownScript_0x1a471c: ; 0x1a471c end ; 0x1a4722 -UnknownScript_0x1a4722: ; 0x1a4722 +CooltrainerFScript_0x1a4722: ; 0x1a4722 jumptextfaceplayer UnknownText_0x1a49bd ; 0x1a4725 -UnknownScript_0x1a4725: ; 0x1a4725 +YoungsterScript_0x1a4725: ; 0x1a4725 jumptextfaceplayer UnknownText_0x1a49f1 ; 0x1a4728 -UnknownScript_0x1a4728: ; 0x1a4728 +CooltrainerFScript_0x1a4728: ; 0x1a4728 jumptextfaceplayer UnknownText_0x1a4b1e ; 0x1a472b -UnknownScript_0x1a472b: ; 0x1a472b +YoungsterScript_0x1a472b: ; 0x1a472b faceplayer loadfont checkbit1 $006d @@ -336,14 +336,14 @@ BlackthornCity_MapEventHeader: ; 0x1a4c57 ; people-events db 9 - person_event $2b, 16, 22, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a46e8, $06e3 - person_event $2b, 16, 23, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a46e8, $06e4 - person_event $2f, 6, 24, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a4708, $074c - person_event $2f, 6, 25, $8, $0, 255, 255, $0, 0, UnknownScript_0x1a470b, $074d - person_event $41, 35, 28, $5, $1, 255, 255, $90, 0, UnknownScript_0x1a470e, $ffff - person_event $24, 29, 13, $5, $2, 255, 255, $80, 0, UnknownScript_0x1a4722, $ffff - person_event $27, 19, 17, $5, $1, 255, 255, $0, 0, UnknownScript_0x1a4725, $ffff - person_event $27, 24, 26, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a472b, $075d - person_event $24, 23, 39, $7, $0, 255, 255, $a0, 0, UnknownScript_0x1a4728, $ffff + person_event SPRITE_SUPER_NERD, 16, 22, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, $06e3 + person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, $06e4 + person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, $074c + person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, $074d + person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, $ffff + person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, $ffff + person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, $ffff + person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, YoungsterScript_0x1a472b, $075d + person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, $ffff ; 0x1a4d1d diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 8eb3e91fc..79a316008 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -6,7 +6,7 @@ BlackthornDodrioTradeHouse_MapScriptHeader: ; 0x195a28 db 0 ; 0x195a2a -UnknownScript_0x195a2a: ; 0x195a2a +LassScript_0x195a2a: ; 0x195a2a faceplayer loadfont trade $3 @@ -38,6 +38,6 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; 0x195a34 ; people-events db 1 - person_event $28, 7, 6, $3, $0, 255, 255, $a0, 0, UnknownScript_0x195a2a, $ffff + person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, LassScript_0x195a2a, $ffff ; 0x195a5b diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index b27e98399..dd00e45de 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -6,11 +6,11 @@ BlackthornDragonSpeechHouse_MapScriptHeader: ; 0x195947 db 0 ; 0x195949 -UnknownScript_0x195949: ; 0x195949 +GrannyScript_0x195949: ; 0x195949 jumptextfaceplayer UnknownText_0x19595c ; 0x19594c -UnknownScript_0x19594c: ; 0x19594c +EkansScript_0x19594c: ; 0x19594c loadfont 2writetext UnknownText_0x1959ee cry DRATINI @@ -56,7 +56,7 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; 0x1959fe ; people-events db 2 - person_event $30, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x195949, $ffff - person_event $96, 9, 9, $16, $0, 255, 255, $90, 0, UnknownScript_0x19594c, $ffff + person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, $ffff + person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, $ffff ; 0x195a28 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index c6106ec08..bcda61cf6 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -26,7 +26,7 @@ UnknownScript_0x194e23: ; 0x194e23 return ; 0x194e24 -UnknownScript_0x194e24: ; 0x194e24 +ClairScript_0x194e24: ; 0x194e24 faceplayer loadfont checkbit2 $0022 @@ -428,10 +428,10 @@ BlackthornGym1F_MapEventHeader: ; 0x1956ae ; people-events db 5 - person_event $19, 7, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x194e24, $ffff - person_event $23, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, $ffff - person_event $23, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, $ffff - person_event $24, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff - person_event $48, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff + person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, $ffff + person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, $ffff + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, $ffff ; 0x195722 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index fb191e358..1867308d3 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -65,7 +65,7 @@ UnknownScript_0x195758: ; 0x195758 ; 0x19575e -UnknownScript_0x19575e: ; 0x19575e +BoulderScript_0x19575e: ; 0x19575e jumpstd $000e ; 0x195761 @@ -189,13 +189,13 @@ BlackthornGym2F_MapEventHeader: ; 0x1958c0 ; people-events db 8 - person_event $23, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff - person_event $24, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff - person_event $5a, 6, 12, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $0706 - person_event $5a, 7, 6, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $0707 - person_event $5a, 20, 10, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $0708 - person_event $5a, 7, 7, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $ffff - person_event $5a, 5, 10, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $ffff - person_event $5a, 18, 12, $19, $0, 255, 255, $0, 0, UnknownScript_0x19575e, $ffff + person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, $ffff + person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, $ffff + person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0706 + person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0707 + person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $0708 + person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff + person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff + person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x19575e, $ffff ; 0x195947 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 136cfdc4d..4e4db575b 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -6,18 +6,18 @@ BlackthornMart_MapScriptHeader: ; 0x195a5b db 0 ; 0x195a5d -UnknownScript_0x195a5d: ; 0x195a5d +ClerkScript_0x195a5d: ; 0x195a5d loadfont pokemart $0, $0011 loadmovesprites end ; 0x195a64 -UnknownScript_0x195a64: ; 0x195a64 +CooltrainerMScript_0x195a64: ; 0x195a64 jumptextfaceplayer UnknownText_0x195a6a ; 0x195a67 -UnknownScript_0x195a67: ; 0x195a67 +BlackBeltScript_0x195a67: ; 0x195a67 jumptextfaceplayer UnknownText_0x195ae9 ; 0x195a6a @@ -58,8 +58,8 @@ BlackthornMart_MapEventHeader: ; 0x195b40 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x195a5d, $ffff - person_event $23, 10, 11, $5, $2, 255, 255, $0, 0, UnknownScript_0x195a64, $ffff - person_event $41, 6, 9, $6, $0, 255, 255, $a0, 0, UnknownScript_0x195a67, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, $ffff + person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, $ffff ; 0x195b77 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index cee45f037..cf06b7cc7 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -6,19 +6,19 @@ BlackthornPokeCenter1F_MapScriptHeader: ; 0x195b77 db 0 ; 0x195b79 -UnknownScript_0x195b79: ; 0x195b79 +NurseScript_0x195b79: ; 0x195b79 jumpstd $0000 ; 0x195b7c -UnknownScript_0x195b7c: ; 0x195b7c +GentlemanScript_0x195b7c: ; 0x195b7c jumptextfaceplayer UnknownText_0x195b85 ; 0x195b7f -UnknownScript_0x195b7f: ; 0x195b7f +TwinScript_0x195b7f: ; 0x195b7f jumptextfaceplayer UnknownText_0x195bfd ; 0x195b82 -UnknownScript_0x195b82: ; 0x195b82 +CooltrainerMScript_0x195b82: ; 0x195b82 jumpstd $0033 ; 0x195b85 @@ -61,9 +61,9 @@ BlackthornPokeCenter1F_MapEventHeader: ; 0x195c69 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x195b79, $ffff - person_event $40, 7, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x195b7c, $ffff - person_event $26, 8, 5, $3, $0, 255, 255, $a0, 0, UnknownScript_0x195b7f, $ffff - person_event $23, 10, 11, $5, $1, 255, 255, $80, 0, UnknownScript_0x195b82, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, $ffff + person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, $ffff + person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, $ffff ; 0x195cb2 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 3b79b485d..dcc5815fa 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -6,7 +6,7 @@ BluesHouse_MapScriptHeader: ; 0x19b0ce db 0 ; 0x19b0d0 -UnknownScript_0x19b0d0: ; 0x19b0d0 +DaisyScript_0x19b0d0: ; 0x19b0d0 faceplayer loadfont checkcode $a @@ -154,6 +154,6 @@ BluesHouse_MapEventHeader: ; 0x19b3a8 ; people-events db 1 - person_event $f, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x19b0d0, $ffff + person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, $ffff ; 0x19b3c5 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 9bf6d24fd..9669b1090 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1809ad: ; 0x1809ad end ; 0x1809c5 -UnknownScript_0x1809c5: ; 0x1809c5 +BrunoScript_0x1809c5: ; 0x1809c5 faceplayer loadfont checkbit1 $05ba @@ -144,6 +144,6 @@ BrunosRoom_MapEventHeader: ; 0x180b88 ; people-events db 1 - person_event $1c, 11, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1809c5, $ffff + person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, $ffff ; 0x180baf diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index e3c5b0162..b15ead9d8 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -129,15 +129,15 @@ UnknownScript_0x185c80: ; 0x185c80 end ; 0x185cbc -UnknownScript_0x185cbc: ; 0x185cbc +SuperNerdScript_0x185cbc: ; 0x185cbc jumptextfaceplayer UnknownText_0x185f99 ; 0x185cbf -UnknownScript_0x185cbf: ; 0x185cbf +MortyScript_0x185cbf: ; 0x185cbf jumptextfaceplayer UnknownText_0x186002 ; 0x185cc2 -UnknownScript_0x185cc2: ; 0x185cc2 +RockScript_0x185cc2: ; 0x185cc2 jumpstd $000f ; 0x185cc5 @@ -303,10 +303,10 @@ BurnedTower1F_MapEventHeader: ; 0x1860b2 ; people-events db 5 - person_event $59, 8, 19, $18, $0, 255, 255, $0, 0, UnknownScript_0x185cc2, $ffff - person_event $2b, 16, 16, $3, $0, 255, 255, $90, 0, UnknownScript_0x185cbc, $0765 - person_event $4, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5 - person_event $15, 18, 18, $2, $11, 255, 255, $b0, 0, UnknownScript_0x185cbf, $0764 - person_event $54, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656 + person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, RockScript_0x185cc2, $ffff + person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, $0765 + person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, $06c5 + person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, $0764 + person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, $0656 ; 0x186151 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 4335680e0..9788884da 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -98,7 +98,7 @@ UnknownScript_0x18616b: ; 0x18616b end ; 0x186212 -UnknownScript_0x186212: ; 0x186212 +SuperNerdScript_0x186212: ; 0x186212 faceplayer loadfont 2writetext UnknownText_0x18626a @@ -123,7 +123,7 @@ ItemFragment_0x186231: ; 0x186231 db TM_20, 1 ; 0x186233 -UnknownScript_0x186233: ; 0x186233 +BoulderScript_0x186233: ; 0x186233 jumpstd $000e ; 0x186236 @@ -254,15 +254,15 @@ BurnedTowerB1F_MapEventHeader: ; 0x1863de ; people-events db 9 - person_event $5a, 12, 21, $19, $0, 255, 255, $0, 0, UnknownScript_0x186233, $ffff - person_event $65, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, $074a - person_event $64, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, $074a - person_event $63, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, $074a - person_event $65, 7, 11, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b - person_event $64, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b - person_event $63, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b - person_event $54, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657 - person_event $2b, 16, 14, $7, $0, 255, 255, $90, 0, UnknownScript_0x186212, $07aa + person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x186233, $ffff + person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, $074a + person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, $074a + person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, $074a + person_event SPRITE_RAIKOU, 7, 11, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b + person_event SPRITE_ENTEI, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b + person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b + person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657 + person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, $07aa ; 0x18647f diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index ed1d54080..fa44d4a09 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -6,7 +6,7 @@ CeladonCafe_MapScriptHeader: ; 0x73047 db 0 ; 0x73049 -UnknownScript_0x73049: ; 0x73049 +SuperNerdScript_0x73049: ; 0x73049 faceplayer loadfont 2writetext UnknownText_0x730de @@ -15,7 +15,7 @@ UnknownScript_0x73049: ; 0x73049 end ; 0x73051 -UnknownScript_0x73051: ; 0x73051 +FisherScript_0x73051: ; 0x73051 loadfont 2writetext UnknownText_0x73129 closetext @@ -29,7 +29,7 @@ UnknownScript_0x73051: ; 0x73051 end ; 0x73062 -UnknownScript_0x73062: ; 0x73062 +FisherScript_0x73062: ; 0x73062 loadfont 2writetext UnknownText_0x7316a closetext @@ -43,7 +43,7 @@ UnknownScript_0x73062: ; 0x73062 end ; 0x73073 -UnknownScript_0x73073: ; 0x73073 +FisherScript_0x73073: ; 0x73073 loadfont 2writetext UnknownText_0x731ae closetext @@ -57,7 +57,7 @@ UnknownScript_0x73073: ; 0x73073 end ; 0x73084 -UnknownScript_0x73084: ; 0x73084 +TeacherScript_0x73084: ; 0x73084 checkitem COIN_CASE iftrue UnknownScript_0x7309a loadfont @@ -222,10 +222,10 @@ CeladonCafe_MapEventHeader: ; 0x73316 ; people-events db 5 - person_event $2b, 7, 13, $8, $0, 255, 255, $b0, 0, UnknownScript_0x73049, $ffff - person_event $3a, 10, 8, $8, $0, 255, 255, $0, 0, UnknownScript_0x73051, $ffff - person_event $3a, 11, 5, $9, $0, 255, 255, $a0, 0, UnknownScript_0x73062, $ffff - person_event $3a, 6, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x73073, $ffff - person_event $29, 7, 8, $8, $0, 255, 255, $0, 0, UnknownScript_0x73084, $ffff + person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, $ffff + person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, $ffff + person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, $ffff + person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff + person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff ; 0x73371 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 375f8960a..72b2029a0 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -15,11 +15,11 @@ UnknownScript_0x1a9f3f: ; 0x1a9f3f return ; 0x1a9f43 -UnknownScript_0x1a9f43: ; 0x1a9f43 +FisherScript_0x1a9f43: ; 0x1a9f43 jumptextfaceplayer UnknownText_0x1a9f7d ; 0x1a9f46 -UnknownScript_0x1a9f46: ; 0x1a9f46 +PoliwagScript_0x1a9f46: ; 0x1a9f46 loadfont 2writetext UnknownText_0x1a9fcb cry POLIWRATH @@ -28,31 +28,31 @@ UnknownScript_0x1a9f46: ; 0x1a9f46 end ; 0x1a9f50 -UnknownScript_0x1a9f50: ; 0x1a9f50 +TeacherScript_0x1a9f50: ; 0x1a9f50 jumptextfaceplayer UnknownText_0x1a9fde ; 0x1a9f53 -UnknownScript_0x1a9f53: ; 0x1a9f53 +GrampsScript_0x1a9f53: ; 0x1a9f53 jumptextfaceplayer UnknownText_0x1aa043 ; 0x1a9f56 -UnknownScript_0x1a9f56: ; 0x1a9f56 +GrampsScript_0x1a9f56: ; 0x1a9f56 jumptextfaceplayer UnknownText_0x1aa0dc ; 0x1a9f59 -UnknownScript_0x1a9f59: ; 0x1a9f59 +YoungsterScript_0x1a9f59: ; 0x1a9f59 jumptextfaceplayer UnknownText_0x1aa115 ; 0x1a9f5c -UnknownScript_0x1a9f5c: ; 0x1a9f5c +YoungsterScript_0x1a9f5c: ; 0x1a9f5c jumptextfaceplayer UnknownText_0x1aa155 ; 0x1a9f5f -UnknownScript_0x1a9f5f: ; 0x1a9f5f +TeacherScript_0x1a9f5f: ; 0x1a9f5f jumptextfaceplayer UnknownText_0x1aa1bd ; 0x1a9f62 -UnknownScript_0x1a9f62: ; 0x1a9f62 +LassScript_0x1a9f62: ; 0x1a9f62 jumptextfaceplayer UnknownText_0x1aa306 ; 0x1a9f65 @@ -256,14 +256,14 @@ CeladonCity_MapEventHeader: ; 0x1aa497 ; people-events db 9 - person_event $3a, 15, 30, $9, $0, 255, 255, $a0, 0, UnknownScript_0x1a9f43, $ffff - person_event $8d, 15, 31, $16, $0, 255, 255, $90, 0, UnknownScript_0x1a9f46, $ffff - person_event $29, 28, 24, $5, $2, 255, 255, $80, 0, UnknownScript_0x1a9f50, $ffff - person_event $2f, 20, 18, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1a9f53, $ffff - person_event $2f, 35, 12, $7, $0, 255, 255, $80, 0, UnknownScript_0x1a9f56, $ffff - person_event $27, 17, 22, $5, $2, 255, 255, $90, 0, UnknownScript_0x1a9f59, $ffff - person_event $27, 37, 28, $7, $0, 255, 255, $a0, 0, UnknownScript_0x1a9f5c, $ffff - person_event $29, 18, 10, $2, $22, 255, 255, $a0, 0, UnknownScript_0x1a9f5f, $ffff - person_event $28, 26, 11, $4, $20, 255, 255, $80, 0, UnknownScript_0x1a9f62, $ffff + person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, $ffff + person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, PoliwagScript_0x1a9f46, $ffff + person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, $ffff + person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, $ffff + person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, $ffff + person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, $ffff + person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, $ffff + person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, $ffff + person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, $ffff ; 0x1aa567 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index efab2e450..b1c57a1b8 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -6,15 +6,15 @@ CeladonDeptStore1F_MapScriptHeader: ; 0x709de db 0 ; 0x709e0 -UnknownScript_0x709e0: ; 0x709e0 +ReceptionistScript_0x709e0: ; 0x709e0 jumptextfaceplayer UnknownText_0x709ef ; 0x709e3 -UnknownScript_0x709e3: ; 0x709e3 +GentlemanScript_0x709e3: ; 0x709e3 jumptextfaceplayer UnknownText_0x70a35 ; 0x709e6 -UnknownScript_0x709e6: ; 0x709e6 +TeacherScript_0x709e6: ; 0x709e6 jumptextfaceplayer UnknownText_0x70aa9 ; 0x709e9 @@ -85,8 +85,8 @@ CeladonDeptStore1F_MapEventHeader: ; 0x70b60 ; people-events db 3 - person_event $42, 5, 14, $6, $0, 255, 255, $80, 0, UnknownScript_0x709e0, $ffff - person_event $40, 8, 15, $2, $11, 255, 255, $0, 0, UnknownScript_0x709e3, $ffff - person_event $29, 7, 9, $5, $1, 255, 255, $a0, 0, UnknownScript_0x709e6, $ffff + person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, $ffff + person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, $ffff + person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, $ffff ; 0x70bab diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index ce3990b38..cb9ba1d96 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -6,7 +6,7 @@ CeladonDeptStore2F_MapScriptHeader: ; 0x70bab db 0 ; 0x70bad -UnknownScript_0x70bad: ; 0x70bad +ClerkScript_0x70bad: ; 0x70bad faceplayer loadfont pokemart $0, $0017 @@ -14,7 +14,7 @@ UnknownScript_0x70bad: ; 0x70bad end ; 0x70bb5 -UnknownScript_0x70bb5: ; 0x70bb5 +ClerkScript_0x70bb5: ; 0x70bb5 faceplayer loadfont pokemart $0, $0018 @@ -22,11 +22,11 @@ UnknownScript_0x70bb5: ; 0x70bb5 end ; 0x70bbd -UnknownScript_0x70bbd: ; 0x70bbd +PokefanMScript_0x70bbd: ; 0x70bbd jumptextfaceplayer UnknownText_0x70bc9 ; 0x70bc0 -UnknownScript_0x70bc0: ; 0x70bc0 +YoungsterScript_0x70bc0: ; 0x70bc0 jumptextfaceplayer UnknownText_0x70c3e ; 0x70bc3 @@ -84,9 +84,9 @@ CeladonDeptStore2F_MapEventHeader: ; 0x70cd4 ; people-events db 4 - person_event $39, 9, 17, $7, $0, 255, 255, $90, 0, UnknownScript_0x70bad, $ffff - person_event $39, 9, 18, $7, $0, 255, 255, $90, 0, UnknownScript_0x70bb5, $ffff - person_event $2d, 6, 9, $7, $0, 255, 255, $80, 0, UnknownScript_0x70bbd, $ffff - person_event $27, 6, 10, $8, $0, 255, 255, $a0, 0, UnknownScript_0x70bc0, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, $ffff + person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, $ffff + person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, $ffff + person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, $ffff ; 0x70d27 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 45ae65b08..81cb9fa1c 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -6,7 +6,7 @@ CeladonDeptStore3F_MapScriptHeader: ; 0x70d27 db 0 ; 0x70d29 -UnknownScript_0x70d29: ; 0x70d29 +ClerkScript_0x70d29: ; 0x70d29 faceplayer loadfont pokemart $0, $0019 @@ -14,11 +14,11 @@ UnknownScript_0x70d29: ; 0x70d29 end ; 0x70d31 -UnknownScript_0x70d31: ; 0x70d31 +YoungsterScript_0x70d31: ; 0x70d31 jumptextfaceplayer UnknownText_0x70d53 ; 0x70d34 -UnknownScript_0x70d34: ; 0x70d34 +GameboyKidScript_0x70d34: ; 0x70d34 faceplayer loadfont 2writetext UnknownText_0x70d86 @@ -28,7 +28,7 @@ UnknownScript_0x70d34: ; 0x70d34 end ; 0x70d3f -UnknownScript_0x70d3f: ; 0x70d3f +GameboyKidScript_0x70d3f: ; 0x70d3f faceplayer loadfont 2writetext UnknownText_0x70dc7 @@ -38,7 +38,7 @@ UnknownScript_0x70d3f: ; 0x70d3f end ; 0x70d4a -UnknownScript_0x70d4a: ; 0x70d4a +SuperNerdScript_0x70d4a: ; 0x70d4a jumptextfaceplayer UnknownText_0x70e61 ; 0x70d4d @@ -108,10 +108,10 @@ CeladonDeptStore3F_MapEventHeader: ; 0x70eab ; people-events db 5 - person_event $39, 5, 11, $6, $0, 255, 255, $90, 0, UnknownScript_0x70d29, $ffff - person_event $27, 8, 10, $4, $10, 255, 255, $a0, 0, UnknownScript_0x70d31, $ffff - person_event $3, 5, 13, $6, $0, 255, 255, $80, 0, UnknownScript_0x70d34, $ffff - person_event $3, 5, 14, $6, $0, 255, 255, $90, 0, UnknownScript_0x70d3f, $ffff - person_event $2b, 8, 17, $2, $11, 255, 255, $80, 0, UnknownScript_0x70d4a, $ffff + person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, $ffff + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, $ffff + person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, $ffff + person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, $ffff + person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, $ffff ; 0x70f0b diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 89682df30..adec9fac4 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -6,7 +6,7 @@ CeladonDeptStore4F_MapScriptHeader: ; 0x70f0b db 0 ; 0x70f0d -UnknownScript_0x70f0d: ; 0x70f0d +ClerkScript_0x70f0d: ; 0x70f0d faceplayer loadfont pokemart $0, $001a @@ -14,11 +14,11 @@ UnknownScript_0x70f0d: ; 0x70f0d end ; 0x70f15 -UnknownScript_0x70f15: ; 0x70f15 +SuperNerdScript_0x70f15: ; 0x70f15 jumptextfaceplayer UnknownText_0x70f21 ; 0x70f18 -UnknownScript_0x70f18: ; 0x70f18 +YoungsterScript_0x70f18: ; 0x70f18 jumptextfaceplayer UnknownText_0x70f55 ; 0x70f1b @@ -69,8 +69,8 @@ CeladonDeptStore4F_MapEventHeader: ; 0x70fbc ; people-events db 3 - person_event $39, 9, 17, $7, $0, 255, 255, $90, 0, UnknownScript_0x70f0d, $ffff - person_event $2b, 10, 11, $5, $1, 255, 255, $a0, 0, UnknownScript_0x70f15, $ffff - person_event $27, 6, 12, $7, $0, 255, 255, $0, 0, UnknownScript_0x70f18, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, $ffff + person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, $ffff + person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, $ffff ; 0x71002 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 08a075485..07df1ab38 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -6,7 +6,7 @@ CeladonDeptStore5F_MapScriptHeader: ; 0x71002 db 0 ; 0x71004 -UnknownScript_0x71004: ; 0x71004 +ClerkScript_0x71004: ; 0x71004 faceplayer loadfont pokemart $0, $001b @@ -14,7 +14,7 @@ UnknownScript_0x71004: ; 0x71004 end ; 0x7100c -UnknownScript_0x7100c: ; 0x7100c +ClerkScript_0x7100c: ; 0x7100c faceplayer loadfont pokemart $0, $001c @@ -22,15 +22,15 @@ UnknownScript_0x7100c: ; 0x7100c end ; 0x71014 -UnknownScript_0x71014: ; 0x71014 +GentlemanScript_0x71014: ; 0x71014 jumptextfaceplayer UnknownText_0x71023 ; 0x71017 -UnknownScript_0x71017: ; 0x71017 +SailorScript_0x71017: ; 0x71017 jumptextfaceplayer UnknownText_0x71072 ; 0x7101a -UnknownScript_0x7101a: ; 0x7101a +TeacherScript_0x7101a: ; 0x7101a jumptextfaceplayer UnknownText_0x710b6 ; 0x7101d @@ -89,10 +89,10 @@ CeladonDeptStore5F_MapEventHeader: ; 0x71110 ; people-events db 5 - person_event $39, 9, 11, $7, $0, 255, 255, $90, 0, UnknownScript_0x71004, $ffff - person_event $39, 9, 12, $7, $0, 255, 255, $90, 0, UnknownScript_0x7100c, $ffff - person_event $40, 9, 17, $2, $11, 255, 255, $80, 0, UnknownScript_0x71014, $ffff - person_event $49, 8, 7, $2, $11, 255, 255, $90, 0, UnknownScript_0x71017, $ffff - person_event $29, 11, 5, $9, $0, 255, 255, $a0, 0, UnknownScript_0x7101a, $ffff + person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, $ffff + person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, $ffff + person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, $ffff + person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, $ffff + person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, $ffff ; 0x71170 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d5218388b..0beb27557 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -15,11 +15,11 @@ UnknownScript_0x71175: ; 0x71175 return ; 0x7117a -UnknownScript_0x7117a: ; 0x7117a +SuperNerdScript_0x7117a: ; 0x7117a jumptextfaceplayer UnknownText_0x712c7 ; 0x7117d -UnknownScript_0x7117d: ; 0x7117d +YoungsterScript_0x7117d: ; 0x7117d jumptextfaceplayer UnknownText_0x71310 ; 0x71180 @@ -181,7 +181,7 @@ CeladonDeptStore6F_MapEventHeader: ; 0x71363 ; people-events db 2 - person_event $2b, 6, 13, $7, $0, 255, 255, $0, 0, UnknownScript_0x7117a, $ffff - person_event $27, 9, 16, $2, $12, 255, 255, $80, 0, UnknownScript_0x7117d, $ffff + person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, $ffff + person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, $ffff ; 0x713ab diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 73a74c364..12d01a398 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -6,15 +6,15 @@ CeladonGameCorner_MapScriptHeader: ; 0x7211b db 0 ; 0x7211d -UnknownScript_0x7211d: ; 0x7211d +ClerkScript_0x7211d: ; 0x7211d jumpstd $0032 ; 0x72120 -UnknownScript_0x72120: ; 0x72120 +ReceptionistScript_0x72120: ; 0x72120 jumptextfaceplayer UnknownText_0x721d0 ; 0x72123 -UnknownScript_0x72123: ; 0x72123 +PokefanMScript_0x72123: ; 0x72123 faceplayer loadfont 2writetext UnknownText_0x72215 @@ -24,7 +24,7 @@ UnknownScript_0x72123: ; 0x72123 end ; 0x7212e -UnknownScript_0x7212e: ; 0x7212e +TeacherScript_0x7212e: ; 0x7212e faceplayer loadfont 2writetext UnknownText_0x72242 @@ -34,7 +34,7 @@ UnknownScript_0x7212e: ; 0x7212e end ; 0x72139 -UnknownScript_0x72139: ; 0x72139 +FishingGuruScript_0x72139: ; 0x72139 faceplayer loadfont 2writetext UnknownText_0x72295 @@ -44,7 +44,7 @@ UnknownScript_0x72139: ; 0x72139 end ; 0x72144 -UnknownScript_0x72144: ; 0x72144 +FisherScript_0x72144: ; 0x72144 faceplayer loadfont checkbit1 $00ce @@ -96,7 +96,7 @@ CeladonGymGuyScript: ; 0x7218d jumptextfaceplayer CeladonGymGuyText ; 0x72190 -UnknownScript_0x72190: ; 0x72190 +GrampsScript_0x72190: ; 0x72190 faceplayer loadfont 2writetext UnknownText_0x724ad @@ -319,14 +319,14 @@ CeladonGameCorner_MapEventHeader: ; 0x725a4 ; people-events db 9 - person_event $39, 6, 9, $6, $0, 255, 255, $a0, 0, UnknownScript_0x7211d, $ffff - person_event $42, 6, 7, $6, $0, 255, 255, $a0, 0, UnknownScript_0x72120, $ffff - person_event $2d, 14, 18, $8, $0, 255, 255, $80, 0, UnknownScript_0x72123, $ffff - person_event $29, 11, 21, $9, $0, 255, 255, $90, 0, UnknownScript_0x7212e, $ffff - person_event $3b, 11, 15, $9, $0, 255, 255, $a0, 0, UnknownScript_0x72139, $ffff - person_event $3a, 14, 12, $8, $0, 255, 2, $80, 0, UnknownScript_0x72144, $ffff - person_event $3a, 14, 12, $8, $0, 255, 4, $80, 0, UnknownScript_0x72144, $ffff - person_event $48, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, $ffff - person_event $2f, 12, 6, $8, $0, 255, 255, $a0, 0, UnknownScript_0x72190, $ffff + person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, $ffff + person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, $ffff + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, $ffff + person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, $ffff + person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, $ffff + person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, $ffff + person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, $ffff + person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, $ffff + person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, $ffff ; 0x726e7 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index eb4fa063d..c013ea83e 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -6,11 +6,11 @@ CeladonGameCornerPrizeRoom_MapScriptHeader: ; 0x726e7 db 0 ; 0x726e9 -UnknownScript_0x726e9: ; 0x726e9 +GentlemanScript_0x726e9: ; 0x726e9 jumptextfaceplayer UnknownText_0x728b8 ; 0x726ec -UnknownScript_0x726ec: ; 0x726ec +PharmacistScript_0x726ec: ; 0x726ec jumptextfaceplayer UnknownText_0x728e9 ; 0x726ef @@ -302,7 +302,7 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; 0x72a34 ; people-events db 2 - person_event $40, 6, 4, $6, $0, 255, 255, $80, 0, UnknownScript_0x726e9, $ffff - person_event $4b, 8, 8, $4, $10, 255, 255, $a0, 0, UnknownScript_0x726ec, $ffff + person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, $ffff + person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, $ffff ; 0x72a68 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 857b09dba..20fffeacf 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -6,7 +6,7 @@ CeladonGym_MapScriptHeader: ; 0x72a68 db 0 ; 0x72a6a -UnknownScript_0x72a6a: ; 0x72a6a +ErikaScript_0x72a6a: ; 0x72a6a faceplayer loadfont checkbit2 $0026 @@ -356,11 +356,11 @@ CeladonGym_MapEventHeader: ; 0x72fdf ; people-events db 6 - person_event $20, 7, 9, $6, $0, 255, 255, $a0, 0, UnknownScript_0x72a6a, $ffff - person_event $28, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, $ffff - person_event $28, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, $ffff - person_event $2a, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff - person_event $26, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff - person_event $26, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff + person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, $ffff + person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, $ffff + person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, $ffff + person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff ; 0x73047 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 184d5eadb..ca60e32f3 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -6,11 +6,11 @@ CeladonMansion1F_MapScriptHeader: ; 0x713ed db 0 ; 0x713ef -UnknownScript_0x713ef: ; 0x713ef +GrannyScript_0x713ef: ; 0x713ef jumptextfaceplayer UnknownText_0x71416 ; 0x713f2 -UnknownScript_0x713f2: ; 0x713f2 +GrowlitheScript_0x713f2: ; 0x713f2 loadfont 2writetext UnknownText_0x71470 cry MEOWTH @@ -19,7 +19,7 @@ UnknownScript_0x713f2: ; 0x713f2 end ; 0x713fc -UnknownScript_0x713fc: ; 0x713fc +ClefairyScript_0x713fc: ; 0x713fc loadfont 2writetext UnknownText_0x7147f cry CLEFAIRY @@ -28,7 +28,7 @@ UnknownScript_0x713fc: ; 0x713fc end ; 0x71406 -UnknownScript_0x71406: ; 0x71406 +GrowlitheScript_0x71406: ; 0x71406 loadfont 2writetext UnknownText_0x71496 cry NIDORAN_F @@ -96,9 +96,9 @@ CeladonMansion1F_MapEventHeader: ; 0x714cc ; people-events db 4 - person_event $30, 9, 5, $3, $0, 255, 255, $0, 0, UnknownScript_0x713ef, $ffff - person_event $82, 10, 6, $16, $0, 255, 255, $0, 0, UnknownScript_0x713f2, $ffff - person_event $8f, 8, 7, $16, $0, 255, 255, $0, 0, UnknownScript_0x713fc, $ffff - person_event $82, 8, 8, $16, $2, 255, 255, $90, 0, UnknownScript_0x71406, $ffff + person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, GrannyScript_0x713ef, $ffff + person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x713f2, $ffff + person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, ClefairyScript_0x713fc, $ffff + person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x71406, $ffff ; 0x7152e diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index e3f303660..359ce3d4b 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -6,7 +6,7 @@ CeladonMansion3F_MapScriptHeader: ; 0x7166e db 0 ; 0x71670 -UnknownScript_0x71670: ; 0x71670 +CooltrainerMScript_0x71670: ; 0x71670 faceplayer loadfont 2writetext UnknownText_0x716ce @@ -32,7 +32,7 @@ UnknownScript_0x7167e: ; 0x7167e end ; 0x71696 -UnknownScript_0x71696: ; 0x71696 +GymGuyScript_0x71696: ; 0x71696 faceplayer loadfont checkbit1 $00d6 @@ -66,11 +66,11 @@ UnknownScript_0x716b6: ; 0x716b6 end ; 0x716bc -UnknownScript_0x716bc: ; 0x716bc +SuperNerdScript_0x716bc: ; 0x716bc jumptextfaceplayer UnknownText_0x71895 ; 0x716bf -UnknownScript_0x716bf: ; 0x716bf +FisherScript_0x716bf: ; 0x716bf jumptextfaceplayer UnknownText_0x718ca ; 0x716c2 @@ -208,9 +208,9 @@ CeladonMansion3F_MapEventHeader: ; 0x719d5 ; people-events db 4 - person_event $23, 10, 7, $3, $0, 255, 255, $80, 0, UnknownScript_0x71670, $ffff - person_event $48, 8, 7, $7, $0, 255, 255, $90, 0, UnknownScript_0x71696, $ffff - person_event $2b, 11, 4, $7, $0, 255, 255, $90, 0, UnknownScript_0x716bc, $ffff - person_event $3a, 8, 4, $7, $2, 255, 255, $80, 0, UnknownScript_0x716bf, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, $ffff + person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, $ffff + person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, $ffff + person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, $ffff ; 0x71a37 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 63d92a6cb..b18547de5 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -6,7 +6,7 @@ CeladonMansionRoof_MapScriptHeader: ; 0x71a37 db 0 ; 0x71a39 -UnknownScript_0x71a39: ; 0x71a39 +FisherScript_0x71a39: ; 0x71a39 jumptextfaceplayer UnknownText_0x71a3f ; 0x71a3c @@ -49,6 +49,6 @@ CeladonMansionRoof_MapEventHeader: ; 0x71ad4 ; people-events db 1 - person_event $3a, 9, 11, $4, $10, 255, 255, $90, 0, UnknownScript_0x71a39, $ffff + person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, $ffff ; 0x71afb diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 37df1933d..49bdbd44c 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -6,7 +6,7 @@ CeladonMansionRoofHouse_MapScriptHeader: ; 0x71afb db 0 ; 0x71afd -UnknownScript_0x71afd: ; 0x71afd +PharmacistScript_0x71afd: ; 0x71afd faceplayer loadfont checkbit1 $00da @@ -112,6 +112,6 @@ CeladonMansionRoofHouse_MapEventHeader: ; 0x71e03 ; people-events db 1 - person_event $4b, 6, 7, $6, $20, 255, 255, $a0, 0, UnknownScript_0x71afd, $ffff + person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, $ffff ; 0x71e20 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index af804648c..1431977ec 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -6,23 +6,23 @@ CeladonPokeCenter1F_MapScriptHeader: ; 0x71e20 db 0 ; 0x71e22 -UnknownScript_0x71e22: ; 0x71e22 +NurseScript_0x71e22: ; 0x71e22 jumpstd $0000 ; 0x71e25 -UnknownScript_0x71e25: ; 0x71e25 +GentlemanScript_0x71e25: ; 0x71e25 jumpstd $0033 ; 0x71e28 -UnknownScript_0x71e28: ; 0x71e28 +CooltrainerFScript_0x71e28: ; 0x71e28 jumptextfaceplayer UnknownText_0x71e70 ; 0x71e2b -UnknownScript_0x71e2b: ; 0x71e2b +PharmacistScript_0x71e2b: ; 0x71e2b jumptextfaceplayer UnknownText_0x71ec1 ; 0x71e2e -UnknownScript_0x71e2e: ; 0x71e2e +SuperNerdScript_0x71e2e: ; 0x71e2e faceplayer loadfont 2writetext UnknownText_0x71f22 @@ -150,10 +150,10 @@ CeladonPokeCenter1F_MapEventHeader: ; 0x720b8 ; people-events db 5 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x71e22, $ffff - person_event $40, 9, 5, $5, $1, 255, 255, $0, 0, UnknownScript_0x71e25, $ffff - person_event $4b, 7, 4, $6, $0, 255, 255, $80, 0, UnknownScript_0x71e2b, $ffff - person_event $24, 10, 12, $5, $1, 255, 255, $a0, 0, UnknownScript_0x71e28, $ffff - person_event $2b, 7, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x71e2e, $07b7 + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, $ffff + person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, $ffff + person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, $ffff + person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, $07b7 ; 0x7210e diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 5dc9ffafc..86a934390 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -15,7 +15,7 @@ UnknownScript_0x184005: ; 0x184005 return ; 0x184009 -UnknownScript_0x184009: ; 0x184009 +CooltrainerMScript_0x184009: ; 0x184009 faceplayer loadfont checkbit1 $00c9 @@ -33,11 +33,11 @@ UnknownScript_0x184017: ; 0x184017 end ; 0x18401d -UnknownScript_0x18401d: ; 0x18401d +SuperNerdScript_0x18401d: ; 0x18401d jumptextfaceplayer UnknownText_0x1841a8 ; 0x184020 -UnknownScript_0x184020: ; 0x184020 +SlowpokeScript_0x184020: ; 0x184020 loadfont 2writetext UnknownText_0x1841e9 cry SLOWBRO @@ -46,7 +46,7 @@ UnknownScript_0x184020: ; 0x184020 end ; 0x18402a -UnknownScript_0x18402a: ; 0x18402a +CooltrainerFScript_0x18402a: ; 0x18402a faceplayer loadfont 2writetext UnknownText_0x1841fa @@ -69,7 +69,7 @@ UnknownScript_0x18402a: ; 0x18402a end ; 0x18404a -UnknownScript_0x18404a: ; 0x18404a +FisherScript_0x18404a: ; 0x18404a faceplayer loadfont checkbit1 $00c9 @@ -90,7 +90,7 @@ UnknownScript_0x18405e: ; 0x18405e end ; 0x184064 -UnknownScript_0x184064: ; 0x184064 +YoungsterScript_0x184064: ; 0x184064 faceplayer loadfont 2writetext UnknownText_0x1842a9 @@ -309,11 +309,11 @@ CeruleanCity_MapEventHeader: ; 0x18445d ; people-events db 6 - person_event $23, 27, 19, $2, $22, 255, 255, $90, 0, UnknownScript_0x184009, $ffff - person_event $2b, 19, 27, $2, $11, 255, 255, $90, 0, UnknownScript_0x18401d, $ffff - person_event $45, 28, 24, $1, $0, 255, 255, $0, 0, UnknownScript_0x184020, $ffff - person_event $24, 28, 25, $8, $0, 255, 255, $a0, 0, UnknownScript_0x18402a, $ffff - person_event $3a, 30, 34, $5, $1, 255, 255, $80, 0, UnknownScript_0x18404a, $ffff - person_event $27, 16, 10, $3, $1, 255, 255, $80, 0, UnknownScript_0x184064, $ffff + person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, $ffff + person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, $ffff + person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x184020, $ffff + person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, $ffff + person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, $ffff + person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, $ffff ; 0x1844fc diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index c0c0c404b..907c75f98 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -56,7 +56,7 @@ UnknownScript_0x1883de: ; 0x1883de end ; 0x188432 -UnknownScript_0x188432: ; 0x188432 +MistyScript_0x188432: ; 0x188432 faceplayer loadfont checkbit2 $0024 @@ -432,11 +432,11 @@ CeruleanGym_MapEventHeader: ; 0x188a51 ; people-events db 6 - person_event $35, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $076d - person_event $1d, 7, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x188432, $076f - person_event $32, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, $076f - person_event $32, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, $076f - person_event $31, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, $076f - person_event $48, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, $076f + person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $076d + person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, $076f + person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, $076f + person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, $076f + person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, $076f + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, $076f ; 0x188abe diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 740af60cf..502184e9a 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -6,7 +6,7 @@ CeruleanGymBadgeSpeechHouse_MapScriptHeader: ; 0x188000 db 0 ; 0x188002 -UnknownScript_0x188002: ; 0x188002 +PokefanMScript_0x188002: ; 0x188002 jumptextfaceplayer UnknownText_0x188005 ; 0x188005 @@ -32,6 +32,6 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; 0x18802b ; people-events db 1 - person_event $2d, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x188002, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, $ffff ; 0x188048 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 14bd3e3b5..79d6927f8 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -6,18 +6,18 @@ CeruleanMart_MapScriptHeader: ; 0x188abe db 0 ; 0x188ac0 -UnknownScript_0x188ac0: ; 0x188ac0 +ClerkScript_0x188ac0: ; 0x188ac0 loadfont pokemart $0, $0014 loadmovesprites end ; 0x188ac7 -UnknownScript_0x188ac7: ; 0x188ac7 +CooltrainerMScript_0x188ac7: ; 0x188ac7 jumptextfaceplayer UnknownText_0x188acd ; 0x188aca -UnknownScript_0x188aca: ; 0x188aca +CooltrainerFScript_0x188aca: ; 0x188aca jumptextfaceplayer UnknownText_0x188b46 ; 0x188acd @@ -57,8 +57,8 @@ CeruleanMart_MapEventHeader: ; 0x188b9b ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x188ac0, $ffff - person_event $23, 10, 5, $6, $0, 255, 255, $a0, 0, UnknownScript_0x188ac7, $ffff - person_event $24, 6, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x188aca, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, $ffff ; 0x188bd2 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 060725f09..f12a60dff 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -6,11 +6,11 @@ CeruleanPokeCenter1F_MapScriptHeader: ; 0x18820d db 0 ; 0x18820f -UnknownScript_0x18820f: ; 0x18820f +NurseScript_0x18820f: ; 0x18820f jumpstd $0000 ; 0x188212 -UnknownScript_0x188212: ; 0x188212 +SuperNerdScript_0x188212: ; 0x188212 special $00a0 iftrue UnknownScript_0x18821b jumptextfaceplayer UnknownText_0x188221 @@ -20,7 +20,7 @@ UnknownScript_0x18821b: ; 0x18821b jumptextfaceplayer UnknownText_0x18828c ; 0x18821e -UnknownScript_0x18821e: ; 0x18821e +GymGuyScript_0x18821e: ; 0x18821e jumptextfaceplayer UnknownText_0x1882ff ; 0x188221 @@ -73,8 +73,8 @@ CeruleanPokeCenter1F_MapEventHeader: ; 0x188386 ; people-events db 3 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x18820f, $ffff - person_event $2b, 8, 12, $5, $1, 255, 255, $0, 0, UnknownScript_0x188212, $ffff - person_event $48, 9, 5, $2, $11, 255, 255, $a0, 0, UnknownScript_0x18821e, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, $ffff + person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, $ffff + person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, $ffff ; 0x1883c2 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index e41e105a7..10fa5cc3a 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -6,15 +6,15 @@ CeruleanPoliceStation_MapScriptHeader: ; 0x188048 db 0 ; 0x18804a -UnknownScript_0x18804a: ; 0x18804a +FishingGuruScript_0x18804a: ; 0x18804a jumptextfaceplayer UnknownText_0x18805a ; 0x18804d -UnknownScript_0x18804d: ; 0x18804d +PokefanFScript_0x18804d: ; 0x18804d jumptextfaceplayer UnknownText_0x1880c3 ; 0x188050 -UnknownScript_0x188050: ; 0x188050 +DiglettScript_0x188050: ; 0x188050 loadfont 2writetext UnknownText_0x1880e7 cry DIGLETT @@ -58,8 +58,8 @@ CeruleanPoliceStation_MapEventHeader: ; 0x1880fa ; people-events db 3 - person_event $3b, 5, 9, $7, $0, 255, 255, $a0, 0, UnknownScript_0x18804a, $ffff - person_event $2e, 8, 9, $8, $0, 255, 255, $90, 0, UnknownScript_0x18804d, $ffff - person_event $8c, 9, 7, $16, $0, 255, 255, $b0, 0, UnknownScript_0x188050, $ffff + person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, $ffff + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, $ffff + person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, $ffff ; 0x188131 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 2b717ac17..0b51b911f 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -6,15 +6,15 @@ CeruleanTradeSpeechHouse_MapScriptHeader: ; 0x188131 db 0 ; 0x188133 -UnknownScript_0x188133: ; 0x188133 +GrannyScript_0x188133: ; 0x188133 jumptextfaceplayer UnknownText_0x18814d ; 0x188136 -UnknownScript_0x188136: ; 0x188136 +GrampsScript_0x188136: ; 0x188136 jumptextfaceplayer UnknownText_0x18818a ; 0x188139 -UnknownScript_0x188139: ; 0x188139 +RhydonScript_0x188139: ; 0x188139 loadfont 2writetext UnknownText_0x18819c cry KANGASKHAN @@ -23,7 +23,7 @@ UnknownScript_0x188139: ; 0x188139 end ; 0x188143 -UnknownScript_0x188143: ; 0x188143 +ZubatScript_0x188143: ; 0x188143 loadfont 2writetext UnknownText_0x1881b5 cry ZUBAT @@ -69,9 +69,9 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; 0x1881c9 ; people-events db 4 - person_event $30, 8, 6, $9, $0, 255, 255, $90, 0, UnknownScript_0x188133, $ffff - person_event $2f, 6, 5, $2, $0, 255, 255, $a0, 0, UnknownScript_0x188136, $ffff - person_event $9d, 6, 9, $16, $0, 255, 255, $b0, 0, UnknownScript_0x188139, $ffff - person_event $87, 10, 9, $16, $0, 255, 255, $0, 0, UnknownScript_0x188143, $ffff + person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, $ffff + person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, $ffff + person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, $ffff + person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, $ffff ; 0x18820d diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 7735a1774..fa98ab51d 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -6,7 +6,7 @@ CharcoalKiln_MapScriptHeader: ; 0x18dd18 db 0 ; 0x18dd1a -UnknownScript_0x18dd1a: ; 0x18dd1a +BlackBeltScript_0x18dd1a: ; 0x18dd1a faceplayer loadfont checkbit1 $0010 @@ -33,7 +33,7 @@ UnknownScript_0x18dd34: ; 0x18dd34 end ; 0x18dd3a -UnknownScript_0x18dd3a: ; 0x18dd3a +YoungsterScript_0x18dd3a: ; 0x18dd3a faceplayer loadfont checkbit1 $005e @@ -64,7 +64,7 @@ UnknownScript_0x18dd61: ; 0x18dd61 end ; 0x18dd63 -UnknownScript_0x18dd63: ; 0x18dd63 +MoltresScript_0x18dd63: ; 0x18dd63 faceplayer loadfont 2writetext UnknownText_0x18dfe5 @@ -163,8 +163,8 @@ CharcoalKiln_MapEventHeader: ; 0x18dff8 ; people-events db 3 - person_event $41, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x18dd1a, $06f7 - person_event $27, 7, 9, $2, $11, 255, 255, $0, 0, UnknownScript_0x18dd3a, $06f6 - person_event $9e, 10, 9, $16, $22, 255, 255, $b0, 0, UnknownScript_0x18dd63, $06f5 + person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x18dd1a, $06f7 + person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, YoungsterScript_0x18dd3a, $06f6 + person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, MoltresScript_0x18dd63, $06f5 ; 0x18e03e diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index ffc485bfa..2e31ffec3 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -27,7 +27,7 @@ UnknownScript_0x19c00f: ; 0x19c00f return ; 0x19c013 -UnknownScript_0x19c013: ; 0x19c013 +GrampsScript_0x19c013: ; 0x19c013 faceplayer loadfont 2writetext UnknownText_0x19c1e3 @@ -189,7 +189,7 @@ UnknownScript_0x19c12f: ; 0x19c12f end ; 0x19c146 -UnknownScript_0x19c146: ; 0x19c146 +TeacherScript_0x19c146: ; 0x19c146 faceplayer loadfont checkbit2 $0001 @@ -207,7 +207,7 @@ UnknownScript_0x19c154: ; 0x19c154 end ; 0x19c15a -UnknownScript_0x19c15a: ; 0x19c15a +YoungsterScript_0x19c15a: ; 0x19c15a faceplayer loadfont checkbit2 $000b @@ -225,7 +225,7 @@ UnknownScript_0x19c168: ; 0x19c168 end ; 0x19c16e -UnknownScript_0x19c16e: ; 0x19c16e +FisherScript_0x19c16e: ; 0x19c16e faceplayer loadfont checkbit1 $004d @@ -574,10 +574,10 @@ CherrygroveCity_MapEventHeader: ; 0x19c829 ; people-events db 5 - person_event $2f, 10, 36, $6, $0, 255, 255, $0, 0, UnknownScript_0x19c013, $06fe - person_event $4, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, $06be - person_event $29, 16, 31, $5, $1, 255, 255, $90, 0, UnknownScript_0x19c146, $ffff - person_event $27, 11, 27, $5, $1, 255, 255, $80, 0, UnknownScript_0x19c15a, $ffff - person_event $3a, 16, 11, $9, $0, 255, 255, $a0, 0, UnknownScript_0x19c16e, $ffff + person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, GrampsScript_0x19c013, $06fe + person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, $06be + person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, $ffff + person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, $ffff + person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, FisherScript_0x19c16e, $ffff ; 0x19c8ad diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index a155d8002..ae6497192 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -6,7 +6,7 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: ; 0x196cb0 db 0 ; 0x196cb2 -UnknownScript_0x196cb2: ; 0x196cb2 +YoungsterScript_0x196cb2: ; 0x196cb2 loadfont 2writetext UnknownText_0x196cc3 closetext @@ -14,7 +14,7 @@ UnknownScript_0x196cb2: ; 0x196cb2 end ; 0x196cb9 -UnknownScript_0x196cb9: ; 0x196cb9 +LassScript_0x196cb9: ; 0x196cb9 loadfont 2writetext UnknownText_0x196cfc closetext @@ -58,7 +58,7 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; 0x196d2e ; people-events db 2 - person_event $28, 9, 7, $8, $0, 255, 255, $a0, 0, UnknownScript_0x196cb9, $ffff - person_event $27, 9, 6, $9, $0, 255, 255, $80, 0, UnknownScript_0x196cb2, $ffff + person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, $ffff + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, $ffff ; 0x196d62 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index b137fefca..fd9c2d86b 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -6,11 +6,11 @@ CherrygroveGymSpeechHouse_MapScriptHeader: ; 0x196adf db 0 ; 0x196ae1 -UnknownScript_0x196ae1: ; 0x196ae1 +PokefanMScript_0x196ae1: ; 0x196ae1 jumptextfaceplayer UnknownText_0x196aea ; 0x196ae4 -UnknownScript_0x196ae4: ; 0x196ae4 +BugCatcherScript_0x196ae4: ; 0x196ae4 jumptextfaceplayer UnknownText_0x196b65 ; 0x196ae7 @@ -58,7 +58,7 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; 0x196bd1 ; people-events db 2 - person_event $2d, 7, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x196ae1, $ffff - person_event $25, 9, 9, $5, $1, 255, 255, $80, 0, UnknownScript_0x196ae4, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, $ffff + person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, $ffff ; 0x196c05 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 9fa702a69..03c8f821c 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -6,7 +6,7 @@ CherrygroveMart_MapScriptHeader: ; 0x196808 db 0 ; 0x19680a -UnknownScript_0x19680a: ; 0x19680a +ClerkScript_0x19680a: ; 0x19680a loadfont checkbit1 $001f iftrue UnknownScript_0x196817 @@ -21,7 +21,7 @@ UnknownScript_0x196817: ; 0x196817 end ; 0x19681d -UnknownScript_0x19681d: ; 0x19681d +CooltrainerMScript_0x19681d: ; 0x19681d faceplayer loadfont checkbit1 $001f @@ -39,7 +39,7 @@ UnknownScript_0x19682b: ; 0x19682b end ; 0x196831 -UnknownScript_0x196831: ; 0x196831 +YoungsterScript_0x196831: ; 0x196831 jumptextfaceplayer UnknownText_0x1968a0 ; 0x196834 @@ -85,8 +85,8 @@ CherrygroveMart_MapEventHeader: ; 0x196934 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x19680a, $ffff - person_event $23, 10, 11, $5, $2, 255, 255, $0, 0, UnknownScript_0x19681d, $ffff - person_event $27, 9, 6, $6, $0, 255, 255, $80, 0, UnknownScript_0x196831, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, $ffff + person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, $ffff ; 0x19696b diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 20986c5f0..dd3704143 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -6,19 +6,19 @@ CherrygrovePokeCenter1F_MapScriptHeader: ; 0x19696b db 0 ; 0x19696d -UnknownScript_0x19696d: ; 0x19696d +NurseScript_0x19696d: ; 0x19696d jumpstd $0000 ; 0x196970 -UnknownScript_0x196970: ; 0x196970 +FisherScript_0x196970: ; 0x196970 jumptextfaceplayer UnknownText_0x19698a ; 0x196973 -UnknownScript_0x196973: ; 0x196973 +GentlemanScript_0x196973: ; 0x196973 jumptextfaceplayer UnknownText_0x1969c8 ; 0x196976 -UnknownScript_0x196976: ; 0x196976 +TeacherScript_0x196976: ; 0x196976 faceplayer loadfont checkbit1 $001f @@ -83,9 +83,9 @@ CherrygrovePokeCenter1F_MapEventHeader: ; 0x196a96 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x19696d, $ffff - person_event $3a, 7, 6, $7, $0, 255, 255, $80, 0, UnknownScript_0x196970, $ffff - person_event $40, 10, 12, $7, $0, 255, 255, $0, 0, UnknownScript_0x196973, $ffff - person_event $29, 10, 5, $9, $0, 255, 255, $a0, 0, UnknownScript_0x196976, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, $ffff + person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, $ffff + person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, $ffff + person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, $ffff ; 0x196adf diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 952fe0bc3..9662b256d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -78,7 +78,7 @@ UnknownScript_0x1a0083: ; 0x1a0083 end ; 0x1a0084 -UnknownScript_0x1a0084: ; 0x1a0084 +PokefanFScript_0x1a0084: ; 0x1a0084 faceplayer loadfont checkbit1 $0011 @@ -109,15 +109,15 @@ UnknownScript_0x1a00b1: ; 0x1a00b1 end ; 0x1a00b3 -UnknownScript_0x1a00b3: ; 0x1a00b3 +StandingYoungsterScript_0x1a00b3: ; 0x1a00b3 jumptextfaceplayer UnknownText_0x1a02df ; 0x1a00b6 -UnknownScript_0x1a00b6: ; 0x1a00b6 +PokefanMScript_0x1a00b6: ; 0x1a00b6 jumptextfaceplayer UnknownText_0x1a0319 ; 0x1a00b9 -UnknownScript_0x1a00b9: ; 0x1a00b9 +LassScript_0x1a00b9: ; 0x1a00b9 jumptextfaceplayer UnknownText_0x1a0394 ; 0x1a00bc @@ -149,7 +149,7 @@ MapCianwoodCitySignpost2Script: ; 0x1a00ce jumpstd $0010 ; 0x1a00d1 -UnknownScript_0x1a00d1: ; 0x1a00d1 +RockScript_0x1a00d1: ; 0x1a00d1 jumpstd $000f ; 0x1a00d4 @@ -394,17 +394,17 @@ CianwoodCity_MapEventHeader: ; 0x1a0772 ; people-events db 12 - person_event $66, 41, 25, $3, $0, 255, 255, $a0, 0, UnknownScript_0x1a00b3, $ffff - person_event $2d, 37, 21, $5, $1, 255, 255, $0, 0, UnknownScript_0x1a00b6, $ffff - person_event $28, 46, 18, $4, $20, 255, 255, $0, 0, UnknownScript_0x1a00b9, $ffff - person_event $59, 20, 12, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a00d1, $ffff - person_event $59, 21, 13, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a00d1, $ffff - person_event $59, 29, 8, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a00d1, $ffff - person_event $59, 33, 9, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a00d1, $ffff - person_event $59, 31, 14, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a00d1, $ffff - person_event $59, 23, 8, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a00d1, $ffff - person_event $2e, 50, 14, $5, $1, 255, 255, $0, 0, UnknownScript_0x1a0084, $ffff - person_event $2b, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, $07ad - person_event $63, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, $07ae + person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, $ffff + person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, $ffff + person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, $ffff + person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, RockScript_0x1a00d1, $ffff + person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, $ffff + person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, $07ad + person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, $07ae ; 0x1a0867 diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 7d30cd27a..dfb4ef991 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -6,7 +6,7 @@ CianwoodCityPhotoStudio_MapScriptHeader: ; 0x9e0de db 0 ; 0x9e0e0 -UnknownScript_0x9e0e0: ; 0x9e0e0 +FishingGuruScript_0x9e0e0: ; 0x9e0e0 faceplayer loadfont 2writetext UnknownText_0x9e0f9 @@ -63,6 +63,6 @@ CianwoodCityPhotoStudio_MapEventHeader: ; 0x9e191 ; people-events db 1 - person_event $3b, 7, 6, $6, $0, 255, 255, $80, 0, UnknownScript_0x9e0e0, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff ; 0x9e1ae diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index bb4ed9530..78e86e053 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -6,7 +6,7 @@ CianwoodGym_MapScriptHeader: ; 0x9d60d db 0 ; 0x9d60f -UnknownScript_0x9d60f: ; 0x9d60f +ChuckScript_0x9d60f: ; 0x9d60f faceplayer loadfont checkbit1 $04c2 @@ -197,7 +197,7 @@ BlackbeltLungScript: ; 0x9d6d8 end ; 0x9d6e0 -UnknownScript_0x9d6e0: ; 0x9d6e0 +BoulderScript_0x9d6e0: ; 0x9d6e0 jumpstd $000e ; 0x9d6e3 @@ -378,14 +378,14 @@ CianwoodGym_MapEventHeader: ; 0x9db3e ; people-events db 9 - person_event $16, 5, 8, $6, $0, 255, 255, $b0, 0, UnknownScript_0x9d60f, $ffff - person_event $41, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, $ffff - person_event $41, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, $ffff - person_event $41, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, $ffff - person_event $41, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, $ffff - person_event $5a, 5, 9, $19, $0, 255, 255, $0, 0, UnknownScript_0x9d6e0, $ffff - person_event $5a, 11, 7, $19, $0, 255, 255, $0, 0, UnknownScript_0x9d6e0, $ffff - person_event $5a, 11, 8, $19, $0, 255, 255, $0, 0, UnknownScript_0x9d6e0, $ffff - person_event $5a, 11, 9, $19, $0, 255, 255, $0, 0, UnknownScript_0x9d6e0, $ffff + person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, $ffff + person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, $ffff + person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, $ffff + person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, $ffff + person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, $ffff + person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff + person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff + person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff + person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, BoulderScript_0x9d6e0, $ffff ; 0x9dbcd diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index f9d420567..663d07cfc 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -6,15 +6,15 @@ CianwoodLugiaSpeechHouse_MapScriptHeader: ; 0x9e1ae db 0 ; 0x9e1b0 -UnknownScript_0x9e1b0: ; 0x9e1b0 +TeacherScript_0x9e1b0: ; 0x9e1b0 jumptextfaceplayer UnknownText_0x9e1bc ; 0x9e1b3 -UnknownScript_0x9e1b3: ; 0x9e1b3 +LassScript_0x9e1b3: ; 0x9e1b3 jumptextfaceplayer UnknownText_0x9e23f ; 0x9e1b6 -UnknownScript_0x9e1b6: ; 0x9e1b6 +TwinScript_0x9e1b6: ; 0x9e1b6 jumptextfaceplayer UnknownText_0x9e2a9 ; 0x9e1b9 @@ -74,8 +74,8 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; 0x9e32b ; people-events db 3 - person_event $29, 8, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x9e1b0, $ffff - person_event $28, 9, 10, $5, $1, 255, 255, $a0, 0, UnknownScript_0x9e1b3, $ffff - person_event $26, 6, 4, $7, $0, 255, 255, $90, 0, UnknownScript_0x9e1b6, $ffff + person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, $ffff + person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, $ffff + person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, $ffff ; 0x9e36c diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 82256d97a..674ea5931 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -13,7 +13,7 @@ UnknownScript_0x9df9d: ; 0x9df9d end ; 0x9df9e -UnknownScript_0x9df9e: ; 0x9df9e +PharmacistScript_0x9df9e: ; 0x9df9e faceplayer loadfont checkbit1 $0023 @@ -89,6 +89,6 @@ CianwoodPharmacy_MapEventHeader: ; 0x9e0b7 ; people-events db 1 - person_event $4b, 7, 6, $6, $0, 255, 255, $80, 0, UnknownScript_0x9df9e, $ffff + person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, PharmacistScript_0x9df9e, $ffff ; 0x9e0de diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 62200965c..a8f3ff202 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -6,11 +6,11 @@ CianwoodPokeCenter1F_MapScriptHeader: ; 0x9dbcd db 0 ; 0x9dbcf -UnknownScript_0x9dbcf: ; 0x9dbcf +NurseScript_0x9dbcf: ; 0x9dbcf jumpstd $0000 ; 0x9dbd2 -UnknownScript_0x9dbd2: ; 0x9dbd2 +LassScript_0x9dbd2: ; 0x9dbd2 jumptextfaceplayer UnknownText_0x9dbed ; 0x9dbd5 @@ -32,7 +32,7 @@ CianwoodGymGuyScript: ; 0x9dbd5 end ; 0x9dbea -UnknownScript_0x9dbea: ; 0x9dbea +SuperNerdScript_0x9dbea: ; 0x9dbea jumptextfaceplayer UnknownText_0x9ded7 ; 0x9dbed @@ -129,9 +129,9 @@ CianwoodPokeCenter1F_MapEventHeader: ; 0x9df4e ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x9dbcf, $ffff - person_event $28, 9, 5, $4, $10, 255, 255, $a0, 0, UnknownScript_0x9dbd2, $ffff - person_event $48, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, $ffff - person_event $2b, 10, 12, $5, $1, 255, 255, $90, 0, UnknownScript_0x9dbea, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, $ffff + person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, $ffff + person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, $ffff + person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, $ffff ; 0x9df97 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index f6066672b..424ea6c20 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -15,7 +15,7 @@ UnknownScript_0x1ac9ac: ; 0x1ac9ac return ; 0x1ac9b0 -UnknownScript_0x1ac9b0: ; 0x1ac9b0 +BlueScript_0x1ac9b0: ; 0x1ac9b0 faceplayer loadfont 2writetext UnknownText_0x1ac9d2 @@ -133,6 +133,6 @@ CinnabarIsland_MapEventHeader: ; 0x1accf4 ; people-events db 1 - person_event $7, 10, 13, $3, $0, 255, 255, $0, 0, UnknownScript_0x1ac9b0, $0775 + person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, BlueScript_0x1ac9b0, $0775 ; 0x1acd20 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index ac0f1a31a..21829be43 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -6,15 +6,15 @@ CinnabarPokeCenter1F_MapScriptHeader: ; 0x1ab32a db 0 ; 0x1ab32c -UnknownScript_0x1ab32c: ; 0x1ab32c +NurseScript_0x1ab32c: ; 0x1ab32c jumpstd $0000 ; 0x1ab32f -UnknownScript_0x1ab32f: ; 0x1ab32f +CooltrainerFScript_0x1ab32f: ; 0x1ab32f jumptextfaceplayer UnknownText_0x1ab335 ; 0x1ab332 -UnknownScript_0x1ab332: ; 0x1ab332 +FisherScript_0x1ab332: ; 0x1ab332 jumptextfaceplayer UnknownText_0x1ab37f ; 0x1ab335 @@ -50,8 +50,8 @@ CinnabarPokeCenter1F_MapEventHeader: ; 0x1ab3ab ; people-events db 3 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x1ab32c, $ffff - person_event $24, 10, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x1ab32f, $ffff - person_event $3a, 8, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x1ab332, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, $ffff + person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, $ffff ; 0x1ab3e7 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index a21d7ce1c..dd351bc89 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -61,7 +61,7 @@ MapColosseumSignpost1Script: ; 0x193493 end ; 0x193499 -UnknownScript_0x193499: ; 0x193499 +ChrisScript_0x193499: ; 0x193499 loadfont 2writetext UnknownText_0x1934a0 closetext @@ -93,7 +93,7 @@ Colosseum_MapEventHeader: ; 0x1934b7 ; people-events db 2 - person_event $1, 8, 7, $9, $0, 255, 255, $0, 0, UnknownScript_0x193499, $0000 - person_event $1, 8, 10, $8, $0, 255, 255, $0, 0, UnknownScript_0x193499, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x1934eb diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index f97b1127e..07b90ec65 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -6,11 +6,11 @@ CopycatsHouse1F_MapScriptHeader: ; 0x18ad11 db 0 ; 0x18ad13 -UnknownScript_0x18ad13: ; 0x18ad13 +PokefanMScript_0x18ad13: ; 0x18ad13 jumptextfaceplayer UnknownText_0x18ad34 ; 0x18ad16 -UnknownScript_0x18ad16: ; 0x18ad16 +PokefanFScript_0x18ad16: ; 0x18ad16 faceplayer loadfont checkbit1 $00c9 @@ -28,7 +28,7 @@ UnknownScript_0x18ad24: ; 0x18ad24 end ; 0x18ad2a -UnknownScript_0x18ad2a: ; 0x18ad2a +ClefairyScript_0x18ad2a: ; 0x18ad2a loadfont 2writetext UnknownText_0x18ae4b cry BLISSEY @@ -85,8 +85,8 @@ CopycatsHouse1F_MapEventHeader: ; 0x18ae5e ; people-events db 3 - person_event $2d, 7, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x18ad13, $ffff - person_event $2e, 8, 9, $8, $0, 255, 255, $a0, 0, UnknownScript_0x18ad16, $ffff - person_event $8f, 10, 10, $16, $0, 255, 255, $0, 0, UnknownScript_0x18ad2a, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, $ffff + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, $ffff + person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, $ffff ; 0x18ae9a diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 360af3486..6a63af393 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -25,7 +25,7 @@ UnknownScript_0x18aeb0: ; 0x18aeb0 return ; 0x18aeb1 -UnknownScript_0x18aeb1: ; 0x18aeb1 +CopycatScript_0x18aeb1: ; 0x18aeb1 faceplayer checkbit1 $00d1 iftrue UnknownScript_0x18af6f @@ -184,7 +184,7 @@ UnknownScript_0x18afba: ; 0x18afba end ; 0x18afbc -UnknownScript_0x18afbc: ; 0x18afbc +MoltresScript_0x18afbc: ; 0x18afbc loadfont 2writetext UnknownText_0x18b476 cry DODRIO @@ -195,7 +195,9 @@ UnknownScript_0x18afbc: ; 0x18afbc end ; 0x18afca -UnknownScript_0x18afca: ; 0x18afca +FairyScript_0x18afca: +MonsterScript_0x18afca: +BirdScript_0x18afca: ; 0x18afca jumptext UnknownText_0x18b4c4 ; 0x18afcd @@ -368,11 +370,11 @@ CopycatsHouse2F_MapEventHeader: ; 0x18b4f0 ; people-events db 6 - person_event $fb, 7, 8, $8, $0, 255, 255, $80, 0, UnknownScript_0x18aeb1, $06ee - person_event $9e, 8, 10, $16, $0, 255, 255, $b0, 0, UnknownScript_0x18afbc, $ffff - person_event $4d, 5, 10, $6, $0, 255, 255, $80, 0, UnknownScript_0x18afca, $0773 - person_event $4c, 5, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x18afca, $ffff - person_event $4e, 5, 11, $6, $0, 255, 255, $90, 0, UnknownScript_0x18afca, $ffff - person_event $fb, 7, 8, $8, $0, 255, 255, $90, 0, UnknownScript_0x18aeb1, $06ef + person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, CopycatScript_0x18aeb1, $06ee + person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x18afbc, $ffff + person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, FairyScript_0x18afca, $0773 + person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, MonsterScript_0x18afca, $ffff + person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, BirdScript_0x18afca, $ffff + person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, CopycatScript_0x18aeb1, $06ef ; 0x18b553 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 03f53a080..d99010d75 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -151,7 +151,7 @@ Kimono_girlMikiScript: ; 0x994be end ; 0x994c6 -UnknownScript_0x994c6: ; 0x994c6 +GentlemanScript_0x994c6: ; 0x994c6 faceplayer loadfont 2writetext UnknownText_0x9980a @@ -205,7 +205,7 @@ UnknownScript_0x99515: ; 0x99515 end ; 0x9951b -UnknownScript_0x9951b: ; 0x9951b +RhydonScript_0x9951b: ; 0x9951b loadfont 2writetext UnknownText_0x99a0a cry RHYDON @@ -214,11 +214,11 @@ UnknownScript_0x9951b: ; 0x9951b end ; 0x99525 -UnknownScript_0x99525: ; 0x99525 +CooltrainerMScript_0x99525: ; 0x99525 jumptextfaceplayer UnknownText_0x99a24 ; 0x99528 -UnknownScript_0x99528: ; 0x99528 +GrannyScript_0x99528: ; 0x99528 jumptextfaceplayer UnknownText_0x99aaa ; 0x9952b @@ -425,14 +425,14 @@ DanceTheatre_MapEventHeader: ; 0x99baa ; people-events db 9 - person_event $3d, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, $ffff - person_event $3d, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, $ffff - person_event $3d, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, $ffff - person_event $3d, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, $ffff - person_event $3d, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, $ffff - person_event $40, 14, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x994c6, $ffff - person_event $9d, 12, 10, $16, $0, 255, 255, $90, 0, UnknownScript_0x9951b, $ffff - person_event $23, 14, 14, $8, $0, 255, 255, $80, 0, UnknownScript_0x99525, $ffff - person_event $30, 10, 7, $7, $0, 255, 255, $0, 0, UnknownScript_0x99528, $ffff + person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, $ffff + person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, $ffff + person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, $ffff + person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, $ffff + person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, $ffff + person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, $ffff + person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, $ffff + person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, $ffff + person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, $ffff ; 0x99c39 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 4ca52f54d..04357d05d 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -6,7 +6,7 @@ DarkCaveBlackthornEntrance_MapScriptHeader: ; 0x18c71e db 0 ; 0x18c720 -UnknownScript_0x18c720: ; 0x18c720 +PharmacistScript_0x18c720: ; 0x18c720 faceplayer loadfont checkbit1 $0072 @@ -72,8 +72,8 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; 0x18c83d ; people-events db 3 - person_event $4b, 7, 11, $3, $0, 255, 255, $0, 0, UnknownScript_0x18c720, $ffff - person_event $54, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, $06a1 - person_event $54, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, $06a2 + person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, $ffff + person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, $06a1 + person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, $06a2 ; 0x18c874 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 616224301..06b3fdf27 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -22,7 +22,7 @@ ItemFragment_0x18c694: ; 0x18c694 db DIRE_HIT, 1 ; 0x18c696 -UnknownScript_0x18c696: ; 0x18c696 +RockScript_0x18c696: ; 0x18c696 jumpstd $000f ; 0x18c699 @@ -51,13 +51,13 @@ DarkCaveVioletEntrance_MapEventHeader: ; 0x18c69c ; people-events db 8 - person_event $54, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, $069e - person_event $59, 18, 20, $18, $0, 255, 255, $0, 0, UnknownScript_0x18c696, $ffff - person_event $59, 10, 31, $18, $0, 255, 255, $0, 0, UnknownScript_0x18c696, $ffff - person_event $59, 18, 11, $18, $0, 255, 255, $0, 0, UnknownScript_0x18c696, $ffff - person_event $59, 35, 40, $18, $0, 255, 255, $0, 0, UnknownScript_0x18c696, $ffff - person_event $54, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, $069f - person_event $54, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0 - person_event $54, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce + person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, $069e + person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff + person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff + person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff + person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff + person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, $069f + person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0 + person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce ; 0x18c71e diff --git a/maps/DayCare.asm b/maps/DayCare.asm index d9328ace1..a3799b9fe 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -24,7 +24,7 @@ UnknownScript_0x62f88: ; 0x62f88 return ; 0x62f8f -UnknownScript_0x62f8f: ; 0x62f8f +GrampsScript_0x62f8f: ; 0x62f8f faceplayer loadfont checkbit1 $033e @@ -61,7 +61,7 @@ UnknownScript_0x62fbd: ; 0x62fbd end ; 0x62fc3 -UnknownScript_0x62fc3: ; 0x62fc3 +GrannyScript_0x62fc3: ; 0x62fc3 faceplayer loadfont checkbit2 $0005 @@ -169,8 +169,8 @@ DayCare_MapEventHeader: ; 0x63250 ; people-events db 2 - person_event $2f, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x62f8f, $06e5 - person_event $30, 7, 9, $8, $0, 255, 255, $80, 0, UnknownScript_0x62fc3, $ffff + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, $06e5 + person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, $ffff ; 0x6328e diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 6c8ee5b5b..9d583f741 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -6,7 +6,7 @@ DiglettsCave_MapScriptHeader: ; 0x74000 db 0 ; 0x74002 -UnknownScript_0x74002: ; 0x74002 +PokefanMScript_0x74002: ; 0x74002 jumptextfaceplayer UnknownText_0x74008 ; 0x74005 @@ -45,6 +45,6 @@ DiglettsCave_MapEventHeader: ; 0x74049 ; people-events db 1 - person_event $2d, 35, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x74002, $ffff + person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, $ffff ; 0x7407f diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 24b701ef1..f2bdbc4ce 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -192,7 +192,7 @@ UnknownScript_0x18d100: ; 0x18d100 end ; 0x18d1a5 -UnknownScript_0x18d1a5: ; 0x18d1a5 +ElderScript_0x18d1a5: ; 0x18d1a5 faceplayer loadfont checkbit1 $0000 @@ -256,7 +256,7 @@ UnknownScript_0x18d1ff: ; 0x18d1ff end ; 0x18d205 -UnknownScript_0x18d205: ; 0x18d205 +ElderScript_0x18d205: ; 0x18d205 faceplayer loadfont 2writetext UnknownText_0x18d840 @@ -265,7 +265,7 @@ UnknownScript_0x18d205: ; 0x18d205 end ; 0x18d20d -UnknownScript_0x18d20d: ; 0x18d20d +ElderScript_0x18d20d: ; 0x18d20d faceplayer loadfont 2writetext UnknownText_0x18d8b1 @@ -673,9 +673,9 @@ DragonShrine_MapEventHeader: ; 0x18dabc ; people-events db 4 - person_event $9, 5, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x18d1a5, $0000 - person_event $9, 8, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x18d205, $0000 - person_event $9, 8, 11, $8, $0, 255, 255, $0, 0, UnknownScript_0x18d20d, $0000 - person_event $19, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, $0790 + person_event SPRITE_ELDER, 5, 9, $6, $0, 255, 255, $0, 0, ElderScript_0x18d1a5, $0000 + person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, $0000 + person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, $0000 + person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, $0790 ; 0x18db00 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index d57796fbd..8319b8b02 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -201,7 +201,7 @@ TwinsLeaandpia2Script: ; 0x18c952 end ; 0x18c95a -UnknownScript_0x18c95a: ; 0x18c95a +PokeBallScript_0x18c95a: ; 0x18c95a giveitem DRAGON_FANG, $1 iffalse UnknownScript_0x18c970 disappear $2 @@ -226,7 +226,7 @@ UnknownScript_0x18c970: ; 0x18c970 end ; 0x18c97e -UnknownScript_0x18c97e: ; 0x18c97e +SilverScript_0x18c97e: ; 0x18c97e playmusic $001f faceplayer loadfont @@ -484,14 +484,14 @@ DragonsDenB1F_MapEventHeader: ; 0x18cf73 ; people-events db 9 - person_event $54, 20, 39, $1, $0, 255, 255, $0, 0, UnknownScript_0x18c95a, $06a8 - person_event $19, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, $06d8 - person_event $4, 27, 24, $2, $22, 255, 255, $0, 0, UnknownScript_0x18c97e, $06c6 - person_event $23, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff - person_event $24, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff - person_event $26, 21, 8, $9, $0, 255, 255, $82, 1, $4932, $ffff - person_event $26, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff - person_event $54, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf - person_event $54, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 + person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, $06a8 + person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, $06d8 + person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, $06c6 + person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, $ffff + person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, $ffff + person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, $4932, $ffff + person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, $ffff + person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, $07bf + person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, $07c0 ; 0x18d014 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 141de61b2..2ec6485e2 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -6,7 +6,7 @@ EarlsPokemonAcademy_MapScriptHeader: ; 0x68a5a db 0 ; 0x68a5c -UnknownScript_0x68a5c: ; 0x68a5c +FisherScript_0x68a5c: ; 0x68a5c applymovement $2, MovementData_0x68b2d faceplayer loadfont @@ -33,11 +33,11 @@ UnknownScript_0x68a7d: ; 0x68a7d end ; 0x68a83 -UnknownScript_0x68a83: ; 0x68a83 +YoungsterScript_0x68a83: ; 0x68a83 jumptextfaceplayer UnknownText_0x68d80 ; 0x68a86 -UnknownScript_0x68a86: ; 0x68a86 +GameboyKidScript_0x68a86: ; 0x68a86 faceplayer loadfont 2writetext UnknownText_0x68dda @@ -47,7 +47,7 @@ UnknownScript_0x68a86: ; 0x68a86 end ; 0x68a91 -UnknownScript_0x68a91: ; 0x68a91 +GameboyKidScript_0x68a91: ; 0x68a91 faceplayer loadfont 2writetext UnknownText_0x68e07 @@ -57,7 +57,7 @@ UnknownScript_0x68a91: ; 0x68a91 end ; 0x68a9c -UnknownScript_0x68a9c: ; 0x68a9c +YoungsterScript_0x68a9c: ; 0x68a9c jumptextfaceplayer UnknownText_0x68e39 ; 0x68a9f @@ -134,7 +134,7 @@ UnknownText_0x68af2: ; 0x68af2 ; 0x68b0b -UnknownScript_0x68b0b: ; 0x68b0b +PokedexScript_0x68b0b: ; 0x68b0b loadfont 2writetext UnknownText_0x69136 yesorno @@ -403,11 +403,11 @@ EarlsPokemonAcademy_MapEventHeader: ; 0x69375 ; people-events db 6 - person_event $3a, 6, 8, $6, $0, 255, 255, $a0, 0, UnknownScript_0x68a5c, $06cb - person_event $27, 9, 6, $7, $0, 255, 255, $80, 0, UnknownScript_0x68a83, $ffff - person_event $3, 15, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x68a86, $ffff - person_event $3, 15, 8, $8, $0, 255, 255, $80, 0, UnknownScript_0x68a91, $ffff - person_event $27, 11, 8, $7, $0, 255, 255, $0, 0, UnknownScript_0x68a9c, $ffff - person_event $55, 8, 6, $1, $0, 255, 255, $0, 0, UnknownScript_0x68b0b, $ffff + person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, FisherScript_0x68a5c, $06cb + person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, $ffff + person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, $ffff + person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, $ffff + person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, $ffff + person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, PokedexScript_0x68b0b, $ffff ; 0x693e7 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 89e82fd38..ec560c2c3 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -15,23 +15,23 @@ UnknownScript_0x1a4005: ; 0x1a4005 return ; 0x1a4009 -UnknownScript_0x1a4009: ; 0x1a4009 +GrampsScript_0x1a4009: ; 0x1a4009 jumptextfaceplayer UnknownText_0x1a4105 ; 0x1a400c -UnknownScript_0x1a400c: ; 0x1a400c +GrampsScript_0x1a400c: ; 0x1a400c jumptextfaceplayer UnknownText_0x1a4147 ; 0x1a400f -UnknownScript_0x1a400f: ; 0x1a400f +GrampsScript_0x1a400f: ; 0x1a400f jumptextfaceplayer UnknownText_0x1a43cb ; 0x1a4012 -UnknownScript_0x1a4012: ; 0x1a4012 +LassScript_0x1a4012: ; 0x1a4012 jumptextfaceplayer UnknownText_0x1a41db ; 0x1a4015 -UnknownScript_0x1a4015: ; 0x1a4015 +LassScript_0x1a4015: ; 0x1a4015 faceplayer loadfont checkbit1 $007b @@ -49,7 +49,7 @@ UnknownScript_0x1a4023: ; 0x1a4023 end ; 0x1a4029 -UnknownScript_0x1a4029: ; 0x1a4029 +FisherScript_0x1a4029: ; 0x1a4029 faceplayer loadfont checkbit1 $0020 @@ -67,7 +67,7 @@ UnknownScript_0x1a4037: ; 0x1a4037 end ; 0x1a403d -UnknownScript_0x1a403d: ; 0x1a403d +YoungsterScript_0x1a403d: ; 0x1a403d jumptextfaceplayer UnknownText_0x1a4386 ; 0x1a4040 @@ -283,12 +283,12 @@ EcruteakCity_MapEventHeader: ; 0x1a45fc ; people-events db 7 - person_event $2f, 19, 22, $2, $11, 255, 255, $0, 0, UnknownScript_0x1a4009, $ffff - person_event $2f, 25, 24, $3, $0, 255, 255, $0, 0, UnknownScript_0x1a400c, $ffff - person_event $28, 33, 25, $5, $2, 255, 255, $90, 0, UnknownScript_0x1a4012, $ffff - person_event $28, 13, 7, $7, $0, 255, 255, $0, 0, UnknownScript_0x1a4015, $ffff - person_event $3a, 26, 13, $5, $1, 255, 255, $a0, 0, UnknownScript_0x1a4029, $ffff - person_event $27, 18, 14, $2, $11, 255, 255, $80, 0, UnknownScript_0x1a403d, $ffff - person_event $2f, 11, 7, $2, $11, 255, 255, $a0, 0, UnknownScript_0x1a400f, $07a9 + person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, $ffff + person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, $ffff + person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, $ffff + person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, $ffff + person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, $ffff + person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, $ffff + person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, $07a9 ; 0x1a46d0 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 0ea780dce..cd3db22f0 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -19,7 +19,7 @@ UnknownScript_0x99d57: ; 0x99d57 end ; 0x99d58 -UnknownScript_0x99d58: ; 0x99d58 +MortyScript_0x99d58: ; 0x99d58 faceplayer loadfont checkbit1 $04c0 @@ -484,12 +484,12 @@ EcruteakGym_MapEventHeader: ; 0x9a4e9 ; people-events db 7 - person_event $15, 5, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x99d58, $ffff - person_event $3e, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, $ffff - person_event $3e, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, $ffff - person_event $30, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, $ffff - person_event $30, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, $ffff - person_event $48, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, $ffff - person_event $2f, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, $07a8 + person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, $ffff + person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, $ffff + person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, $ffff + person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, $ffff + person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, $ffff + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, $ffff + person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, $07a8 ; 0x9a5f9 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 0208b8023..b67c8fa9e 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -74,7 +74,7 @@ UnknownScript_0x98061: ; 0x98061 end ; 0x98062 -UnknownScript_0x98062: ; 0x98062 +SageScript_0x98062: ; 0x98062 faceplayer loadfont checkbit1 $0021 @@ -132,7 +132,7 @@ UnknownScript_0x980aa: ; 0x980aa end ; 0x980b0 -UnknownScript_0x980b0: ; 0x980b0 +SageScript_0x980b0: ; 0x980b0 faceplayer loadfont checkbit1 $0078 @@ -150,7 +150,7 @@ UnknownScript_0x980be: ; 0x980be end ; 0x980c4 -UnknownScript_0x980c4: ; 0x980c4 +GrampsScript_0x980c4: ; 0x980c4 jumptextfaceplayer UnknownText_0x984ab ; 0x980c7 @@ -291,9 +291,9 @@ EcruteakHouse_MapEventHeader: ; 0x98502 ; people-events db 4 - person_event $3e, 10, 8, $6, $0, 255, 255, $0, 0, UnknownScript_0x98062, $0766 - person_event $3e, 10, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x98062, $0767 - person_event $3e, 13, 10, $2, $11, 255, 255, $0, 0, UnknownScript_0x980b0, $07b1 - person_event $2f, 15, 7, $2, $11, 255, 255, $0, 0, UnknownScript_0x980c4, $07b1 + person_event SPRITE_SAGE, 10, 8, $6, $0, 255, 255, $0, 0, SageScript_0x98062, $0766 + person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, $0767 + person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, $07b1 + person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, $07b1 ; 0x98565 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index d05472432..b3b192323 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -6,7 +6,7 @@ EcruteakItemfinderHouse_MapScriptHeader: ; 0x9a5f9 db 0 ; 0x9a5fb -UnknownScript_0x9a5fb: ; 0x9a5fb +CooltrainerMScript_0x9a5fb: ; 0x9a5fb faceplayer loadfont checkbit1 $005a @@ -32,7 +32,7 @@ UnknownScript_0x9a61a: ; 0x9a61a end ; 0x9a620 -UnknownScript_0x9a620: ; 0x9a620 +PokedexScript_0x9a620: ; 0x9a620 loadfont 2writetext UnknownText_0x9a826 yesorno @@ -161,7 +161,7 @@ EcruteakItemfinderHouse_MapEventHeader: ; 0x9a9f5 ; people-events db 2 - person_event $23, 7, 6, $6, $0, 255, 255, $80, 0, UnknownScript_0x9a5fb, $ffff - person_event $55, 7, 7, $1, $0, 255, 255, $0, 0, UnknownScript_0x9a620, $ffff + person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, $ffff + person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, $ffff ; 0x9aa24 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 022819b51..2597eed2d 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -6,11 +6,11 @@ EcruteakLugiaSpeechHouse_MapScriptHeader: ; 0x99332 db 0 ; 0x99334 -UnknownScript_0x99334: ; 0x99334 +GrampsScript_0x99334: ; 0x99334 jumptextfaceplayer UnknownText_0x9933d ; 0x99337 -UnknownScript_0x99337: ; 0x99337 +YoungsterScript_0x99337: ; 0x99337 jumptextfaceplayer UnknownText_0x993ec ; 0x9933a @@ -57,7 +57,7 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; 0x99431 ; people-events db 2 - person_event $2f, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x99334, $ffff - person_event $27, 8, 9, $8, $0, 255, 255, $0, 0, UnknownScript_0x99337, $ffff + person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, $ffff + person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, $ffff ; 0x99460 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 03ce7404e..f7865f4a8 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -6,18 +6,18 @@ EcruteakMart_MapScriptHeader: ; 0x99c39 db 0 ; 0x99c3b -UnknownScript_0x99c3b: ; 0x99c3b +ClerkScript_0x99c3b: ; 0x99c3b loadfont pokemart $0, $000e loadmovesprites end ; 0x99c42 -UnknownScript_0x99c42: ; 0x99c42 +SuperNerdScript_0x99c42: ; 0x99c42 jumptextfaceplayer UnknownText_0x99c48 ; 0x99c45 -UnknownScript_0x99c45: ; 0x99c45 +GrannyScript_0x99c45: ; 0x99c45 jumptextfaceplayer UnknownText_0x99cd5 ; 0x99c48 @@ -57,8 +57,8 @@ EcruteakMart_MapEventHeader: ; 0x99d12 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x99c3b, $ffff - person_event $2b, 6, 9, $5, $1, 255, 255, $a0, 0, UnknownScript_0x99c42, $ffff - person_event $30, 10, 10, $7, $0, 255, 255, $0, 0, UnknownScript_0x99c45, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, $ffff + person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, $ffff + person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, $ffff ; 0x99d49 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 4ff5e713a..4a13e61cd 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -57,11 +57,11 @@ UnknownScript_0x98e95: ; 0x98e95 end ; 0x98eb0 -UnknownScript_0x98eb0: ; 0x98eb0 +NurseScript_0x98eb0: ; 0x98eb0 jumpstd $0000 ; 0x98eb3 -UnknownScript_0x98eb3: ; 0x98eb3 +PokefanMScript_0x98eb3: ; 0x98eb3 special $00a0 iftrue UnknownScript_0x98ebc jumptextfaceplayer UnknownText_0x99155 @@ -71,11 +71,11 @@ UnknownScript_0x98ebc: ; 0x98ebc jumptextfaceplayer UnknownText_0x991aa ; 0x98ebf -UnknownScript_0x98ebf: ; 0x98ebf +CooltrainerFScript_0x98ebf: ; 0x98ebf jumptextfaceplayer UnknownText_0x99240 ; 0x98ec2 -UnknownScript_0x98ec2: ; 0x98ec2 +GymGuyScript_0x98ec2: ; 0x98ec2 jumptextfaceplayer UnknownText_0x99286 ; 0x98ec5 @@ -208,10 +208,10 @@ EcruteakPokeCenter1F_MapEventHeader: ; 0x992dc ; people-events db 5 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x98eb0, $ffff - person_event $2d, 10, 11, $a, $0, 255, 255, $0, 0, UnknownScript_0x98eb3, $ffff - person_event $24, 8, 5, $3, $0, 255, 255, $0, 0, UnknownScript_0x98ebf, $ffff - person_event $48, 5, 11, $6, $0, 255, 255, $a0, 0, UnknownScript_0x98ec2, $ffff - person_event $8, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, $0713 + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, $ffff + person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, $ffff + person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, $ffff + person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, $ffff + person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, $0713 ; 0x99332 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 1998d6639..ac8fa01db 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -6,11 +6,11 @@ ElmsHouse_MapScriptHeader: ; 0x7aee9 db 0 ; 0x7aeeb -UnknownScript_0x7aeeb: ; 0x7aeeb +TeacherScript_0x7aeeb: ; 0x7aeeb jumptextfaceplayer UnknownText_0x7aef7 ; 0x7aeee -UnknownScript_0x7aeee: ; 0x7aeee +BugCatcherScript_0x7aeee: ; 0x7aeee jumptextfaceplayer UnknownText_0x7af6b ; 0x7aef1 @@ -92,7 +92,7 @@ ElmsHouse_MapEventHeader: ; 0x7b0ea ; people-events db 2 - person_event $29, 9, 5, $4, $10, 255, 255, $a0, 0, UnknownScript_0x7aeeb, $ffff - person_event $25, 8, 9, $7, $0, 255, 255, $0, 0, UnknownScript_0x7aeee, $ffff + person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, TeacherScript_0x7aeeb, $ffff + person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, BugCatcherScript_0x7aeee, $ffff ; 0x7b123 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 4eec97501..f94e297c5 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1381,11 +1381,11 @@ ElmsLab_MapEventHeader: ; 0x7a3de ; people-events db 6 - person_event $10, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, $ffff - person_event $3c, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, $0701 - person_event $54, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, $0640 - person_event $54, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641 - person_event $54, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642 - person_event $43, 7, 9, $7, $0, 255, 255, $90, 0, $4f1a, $0702 + person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, $ffff + person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, $0701 + person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, $0640 + person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, $0641 + person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, $0642 + person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, $4f1a, $0702 ; 0x7a4cc diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index cde928772..eb9286e6e 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -44,7 +44,7 @@ UnknownScript_0x7515d: ; 0x7515d end ; 0x75160 -UnknownScript_0x75160: ; 0x75160 +SailorScript_0x75160: ; 0x75160 faceplayer loadfont checkbit1 $0031 @@ -108,7 +108,7 @@ UnknownScript_0x751c7: ; 0x751c7 end ; 0x751d0 -UnknownScript_0x751d0: ; 0x751d0 +SailorScript_0x751d0: ; 0x751d0 faceplayer loadfont checkbit1 $0030 @@ -126,7 +126,7 @@ UnknownScript_0x751de: ; 0x751de end ; 0x751e4 -UnknownScript_0x751e4: ; 0x751e4 +SailorScript_0x751e4: ; 0x751e4 jumptextfaceplayer UnknownText_0x753c0 ; 0x751e7 @@ -329,9 +329,9 @@ FastShip1F_MapEventHeader: ; 0x754f1 ; people-events db 4 - person_event $49, 6, 29, $6, $0, 255, 255, $0, 0, UnknownScript_0x75160, $ffff - person_event $49, 11, 18, $9, $0, 255, 255, $0, 0, UnknownScript_0x751d0, $ffff - person_event $49, 21, 26, $5, $2, 255, 255, $0, 0, UnknownScript_0x751e4, $ffff - person_event $40, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, $072c + person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, $ffff + person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, $ffff + person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, $ffff + person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, $072c ; 0x75577 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 7b59b8c2d..027a575e9 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -44,7 +44,7 @@ UnknownScript_0x76766: ; 0x76766 end ; 0x76767 -UnknownScript_0x76767: ; 0x76767 +SailorScript_0x76767: ; 0x76767 faceplayer loadfont checkbit1 $0030 @@ -635,17 +635,17 @@ FastShipB1F_MapEventHeader: ; 0x76ee9 ; people-events db 12 - person_event $49, 10, 34, $6, $0, 255, 255, $90, 0, UnknownScript_0x76767, $072e - person_event $49, 10, 35, $6, $0, 255, 255, $90, 0, UnknownScript_0x76767, $072f - person_event $49, 15, 13, $7, $0, 255, 255, $92, 3, TrainerSailorJeff, $0739 - person_event $28, 8, 10, $7, $0, 255, 255, $a2, 1, TrainerPicnickerDebra, $0739 - person_event $2b, 13, 30, $9, $0, 255, 255, $92, 1, TrainerJugglerFritz, $0739 - person_event $49, 8, 21, $9, $0, 255, 255, $92, 4, TrainerSailorGarrett, $073a - person_event $3a, 12, 29, $7, $0, 255, 255, $a2, 3, TrainerFisherJonah, $073a - person_event $41, 15, 19, $1f, $0, 255, 255, $b2, 3, TrainerBlackbeltWai, $073a - person_event $49, 8, 27, $9, $0, 255, 255, $92, 4, TrainerSailorKenneth, $073b - person_event $29, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, $073b - person_event $27, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, $073b - person_event $27, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, $073b + person_event SPRITE_SAILOR, 10, 34, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, $072e + person_event SPRITE_SAILOR, 10, 35, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, $072f + person_event SPRITE_SAILOR, 15, 13, $7, $0, 255, 255, $92, 3, TrainerSailorJeff, $0739 + person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a2, 1, TrainerPicnickerDebra, $0739 + person_event SPRITE_SUPER_NERD, 13, 30, $9, $0, 255, 255, $92, 1, TrainerJugglerFritz, $0739 + person_event SPRITE_SAILOR, 8, 21, $9, $0, 255, 255, $92, 4, TrainerSailorGarrett, $073a + person_event SPRITE_FISHER, 12, 29, $7, $0, 255, 255, $a2, 3, TrainerFisherJonah, $073a + person_event SPRITE_BLACK_BELT, 15, 19, $1f, $0, 255, 255, $b2, 3, TrainerBlackbeltWai, $073a + person_event SPRITE_SAILOR, 8, 27, $9, $0, 255, 255, $92, 4, TrainerSailorKenneth, $073b + person_event SPRITE_TEACHER, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, $073b + person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, $073b + person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, $073b ; 0x76faa diff --git a/maps/FastShipCabins.asm b/maps/FastShipCabins.asm index 50d3afb9c..4e3ef010b 100644 --- a/maps/FastShipCabins.asm +++ b/maps/FastShipCabins.asm @@ -10,7 +10,7 @@ UnknownScript_0x75ea6: ; 0x75ea6 end ; 0x75ea7 -UnknownScript_0x75ea7: ; 0x75ea7 +CaptainScript_0x75ea7: ; 0x75ea7 faceplayer loadfont checkbit1 $0030 @@ -28,7 +28,7 @@ UnknownScript_0x75eb5: ; 0x75eb5 end ; 0x75ebb -UnknownScript_0x75ebb: ; 0x75ebb +TwinScript_0x75ebb: ; 0x75ebb spriteface $5, $3 loadfont 2writetext UnknownText_0x761e0 @@ -77,7 +77,7 @@ UnknownScript_0x75f09: ; 0x75f09 2jump UnknownScript_0x75f37 ; 0x75f1f -UnknownScript_0x75f1f: ; 0x75f1f +GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont checkbit1 $0071 @@ -129,7 +129,7 @@ UnknownScript_0x75f67: ; 0x75f67 end ; 0x75f6d -UnknownScript_0x75f6d: ; 0x75f6d +TwinScript_0x75f6d: ; 0x75f6d faceplayer loadfont 2writetext UnknownText_0x7630d @@ -596,16 +596,16 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 ; people-events db 11 - person_event $46, 29, 7, $6, $0, 255, 255, $90, 0, UnknownScript_0x75ea7, $ffff - person_event $40, 21, 6, $9, $0, 255, 255, $90, 0, UnknownScript_0x75f1f, $0730 - person_event $26, 21, 7, $a, $0, 255, 255, $0, 0, UnknownScript_0x75f6d, $0731 - person_event $26, 29, 6, $a, $0, 255, 255, $0, 0, UnknownScript_0x75ebb, $0732 - person_event $2d, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, $0739 - person_event $26, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, $0739 - person_event $26, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, $0739 - person_event $2b, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, $073a - person_event $2d, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b - person_event $2e, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b - person_event $2b, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a + person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, $ffff + person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, $0730 + person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, $0731 + person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, $0732 + person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, $0739 + person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, $0739 + person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, $0739 + person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, $073a + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b + person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b + person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a ; 0x76730 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 593d79c47..e9b2de6d9 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -180,7 +180,7 @@ BurglarCoreyScript: ; 0x755e9 end ; 0x755f1 -UnknownScript_0x755f1: ; 0x755f1 +SailorScript_0x755f1: ; 0x755f1 playmusic $000a faceplayer loadfont @@ -384,12 +384,12 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; 0x759ce ; people-events db 7 - person_event $23, 7, 8, $a, $0, 255, 255, $82, 2, TrainerCooltrainermSean, $073a - person_event $24, 9, 5, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfCarol, $073a - person_event $2b, 9, 5, $7, $0, 255, 255, $92, 3, TrainerPokemaniacEthan, $073b - person_event $2d, 21, 8, $7, $0, 255, 255, $b2, 3, TrainerHikerNoland, $0739 - person_event $49, 30, 8, $3, $0, 255, 255, $90, 0, UnknownScript_0x755f1, $072d - person_event $40, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, $073a - person_event $4b, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, $073b + person_event SPRITE_COOLTRAINER_M, 7, 8, $a, $0, 255, 255, $82, 2, TrainerCooltrainermSean, $073a + person_event SPRITE_COOLTRAINER_F, 9, 5, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfCarol, $073a + person_event SPRITE_SUPER_NERD, 9, 5, $7, $0, 255, 255, $92, 3, TrainerPokemaniacEthan, $073b + person_event SPRITE_POKEFAN_M, 21, 8, $7, $0, 255, 255, $b2, 3, TrainerHikerNoland, $0739 + person_event SPRITE_SAILOR, 30, 8, $3, $0, 255, 255, $90, 0, SailorScript_0x755f1, $072d + person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, $073a + person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, $073b ; 0x75a4d diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 50d3afb9c..4e3ef010b 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -10,7 +10,7 @@ UnknownScript_0x75ea6: ; 0x75ea6 end ; 0x75ea7 -UnknownScript_0x75ea7: ; 0x75ea7 +CaptainScript_0x75ea7: ; 0x75ea7 faceplayer loadfont checkbit1 $0030 @@ -28,7 +28,7 @@ UnknownScript_0x75eb5: ; 0x75eb5 end ; 0x75ebb -UnknownScript_0x75ebb: ; 0x75ebb +TwinScript_0x75ebb: ; 0x75ebb spriteface $5, $3 loadfont 2writetext UnknownText_0x761e0 @@ -77,7 +77,7 @@ UnknownScript_0x75f09: ; 0x75f09 2jump UnknownScript_0x75f37 ; 0x75f1f -UnknownScript_0x75f1f: ; 0x75f1f +GentlemanScript_0x75f1f: ; 0x75f1f faceplayer loadfont checkbit1 $0071 @@ -129,7 +129,7 @@ UnknownScript_0x75f67: ; 0x75f67 end ; 0x75f6d -UnknownScript_0x75f6d: ; 0x75f6d +TwinScript_0x75f6d: ; 0x75f6d faceplayer loadfont 2writetext UnknownText_0x7630d @@ -596,16 +596,16 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; 0x76678 ; people-events db 11 - person_event $46, 29, 7, $6, $0, 255, 255, $90, 0, UnknownScript_0x75ea7, $ffff - person_event $40, 21, 6, $9, $0, 255, 255, $90, 0, UnknownScript_0x75f1f, $0730 - person_event $26, 21, 7, $a, $0, 255, 255, $0, 0, UnknownScript_0x75f6d, $0731 - person_event $26, 29, 6, $a, $0, 255, 255, $0, 0, UnknownScript_0x75ebb, $0732 - person_event $2d, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, $0739 - person_event $26, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, $0739 - person_event $26, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, $0739 - person_event $2b, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, $073a - person_event $2d, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b - person_event $2e, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b - person_event $2b, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a + person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, $ffff + person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, $0730 + person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, $0731 + person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, $0732 + person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, $0739 + person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, $0739 + person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, $0739 + person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, $073a + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, $073b + person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, $073b + person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, $073a ; 0x76730 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index fbec6e09f..37d937531 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -312,9 +312,9 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; 0x75e42 ; people-events db 4 - person_event $3a, 19, 5, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherLyle, $0739 - person_event $25, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, $073b - person_event $2a, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, $073a - person_event $2c, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, $073b + person_event SPRITE_FISHER, 19, 5, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherLyle, $0739 + person_event SPRITE_BUG_CATCHER, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, $073b + person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, $073a + person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, $073b ; 0x75ea4 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 2d2380a53..bc3f9b151 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -6,7 +6,7 @@ FightingDojo_MapScriptHeader: ; 0x189b5f db 0 ; 0x189b61 -UnknownScript_0x189b61: ; 0x189b61 +BlackBeltScript_0x189b61: ; 0x189b61 jumptextfaceplayer UnknownText_0x189b6c ; 0x189b64 @@ -60,7 +60,7 @@ FightingDojo_MapEventHeader: ; 0x189bf8 ; people-events db 2 - person_event $41, 8, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x189b61, $ffff - person_event $54, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d + person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, $ffff + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, $077d ; 0x189c2c diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 268207e15..0f5bbe634 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -6,11 +6,11 @@ FuchsiaBillSpeechHouse_MapScriptHeader: ; 0x1963bb db 0 ; 0x1963bd -UnknownScript_0x1963bd: ; 0x1963bd +PokefanFScript_0x1963bd: ; 0x1963bd jumptextfaceplayer UnknownText_0x1963c3 ; 0x1963c0 -UnknownScript_0x1963c0: ; 0x1963c0 +YoungsterScript_0x1963c0: ; 0x1963c0 jumptextfaceplayer UnknownText_0x1963f9 ; 0x1963c3 @@ -43,7 +43,7 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; 0x196428 ; people-events db 2 - person_event $2e, 7, 6, $9, $0, 255, 255, $80, 0, UnknownScript_0x1963bd, $ffff - person_event $27, 8, 10, $4, $10, 255, 255, $0, 0, UnknownScript_0x1963c0, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, $ffff + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, $ffff ; 0x196452 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index f8f570948..eaa058535 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -15,15 +15,15 @@ UnknownScript_0x194b1e: ; 0x194b1e return ; 0x194b22 -UnknownScript_0x194b22: ; 0x194b22 +YoungsterScript_0x194b22: ; 0x194b22 jumptextfaceplayer UnknownText_0x194b45 ; 0x194b25 -UnknownScript_0x194b25: ; 0x194b25 +PokefanMScript_0x194b25: ; 0x194b25 jumptextfaceplayer UnknownText_0x194b83 ; 0x194b28 -UnknownScript_0x194b28: ; 0x194b28 +TeacherScript_0x194b28: ; 0x194b28 jumptextfaceplayer UnknownText_0x194bd3 ; 0x194b2b @@ -59,7 +59,7 @@ MapFuchsiaCitySignpost7Script: ; 0x194b40 jumpstd $0011 ; 0x194b43 -UnknownScript_0x194b43: ; 0x194b43 +FruitTreeScript_0x194b43: ; 0x194b43 fruittree $1e ; 0x194b45 @@ -161,9 +161,9 @@ FuchsiaCity_MapEventHeader: ; 0x194d67 ; people-events db 4 - person_event $27, 22, 27, $2, $11, 255, 255, $a0, 0, UnknownScript_0x194b22, $ffff - person_event $2d, 12, 17, $2, $11, 255, 255, $b0, 0, UnknownScript_0x194b25, $ffff - person_event $29, 18, 20, $2, $11, 255, 255, $80, 0, UnknownScript_0x194b28, $ffff - person_event $5d, 5, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x194b43, $ffff + person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, $ffff + person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, $ffff + person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, $ffff + person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, $ffff ; 0x194e00 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 35d58994f..4364525fe 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -6,7 +6,7 @@ FuchsiaGym_MapScriptHeader: ; 0x195db7 db 0 ; 0x195db9 -UnknownScript_0x195db9: ; 0x195db9 +JanineScript_0x195db9: ; 0x195db9 checkbit2 $0027 iftrue UnknownScript_0x195e00 applymovement $2, MovementData_0x195f27 @@ -55,7 +55,7 @@ UnknownScript_0x195e15: ; 0x195e15 end ; 0x195e1b -UnknownScript_0x195e1b: ; 0x195e1b +FuschiaGym1Script_0x195e1b: ; 0x195e1b checkbit1 $0517 iftrue UnknownScript_0x195e2c applymovement $3, MovementData_0x195f27 @@ -92,7 +92,7 @@ UnknownScript_0x195e4f: ; 0x195e4f end ; 0x195e55 -UnknownScript_0x195e55: ; 0x195e55 +FuschiaGym2Script_0x195e55: ; 0x195e55 checkbit1 $051a iftrue UnknownScript_0x195e66 applymovement $4, MovementData_0x195f27 @@ -129,7 +129,7 @@ UnknownScript_0x195e89: ; 0x195e89 end ; 0x195e8f -UnknownScript_0x195e8f: ; 0x195e8f +FuschiaGym3Script_0x195e8f: ; 0x195e8f checkbit1 $0482 iftrue UnknownScript_0x195ea0 applymovement $5, MovementData_0x195f27 @@ -166,7 +166,7 @@ UnknownScript_0x195ec3: ; 0x195ec3 end ; 0x195ec9 -UnknownScript_0x195ec9: ; 0x195ec9 +FuschiaGym4Script_0x195ec9: ; 0x195ec9 checkbit1 $041e iftrue UnknownScript_0x195eda applymovement $6, MovementData_0x195f27 @@ -395,11 +395,11 @@ FuchsiaGym_MapEventHeader: ; 0x196353 ; people-events db 6 - person_event $a, 14, 5, $3, $0, 255, 255, $90, 0, UnknownScript_0x195db9, $ffff - person_event $f7, 11, 9, $a, $0, 255, 255, $90, 0, UnknownScript_0x195e1b, $ffff - person_event $f8, 15, 9, $a, $0, 255, 255, $90, 0, UnknownScript_0x195e55, $ffff - person_event $f9, 8, 13, $a, $0, 255, 255, $90, 0, UnknownScript_0x195e8f, $ffff - person_event $fa, 6, 8, $a, $0, 255, 255, $90, 0, UnknownScript_0x195ec9, $ffff - person_event $48, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, $ffff + person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, $ffff + person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, $ffff + person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, $ffff + person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, $ffff + person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, $ffff + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, $ffff ; 0x1963bb diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index c3f6ec5de..9f4b22add 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -6,18 +6,18 @@ FuchsiaMart_MapScriptHeader: ; 0x195ce6 db 0 ; 0x195ce8 -UnknownScript_0x195ce8: ; 0x195ce8 +ClerkScript_0x195ce8: ; 0x195ce8 loadfont pokemart $0, $001d loadmovesprites end ; 0x195cef -UnknownScript_0x195cef: ; 0x195cef +FisherScript_0x195cef: ; 0x195cef jumptextfaceplayer UnknownText_0x195cf5 ; 0x195cf2 -UnknownScript_0x195cf2: ; 0x195cf2 +CooltrainerFScript_0x195cf2: ; 0x195cf2 jumptextfaceplayer UnknownText_0x195d36 ; 0x195cf5 @@ -52,8 +52,8 @@ FuchsiaMart_MapEventHeader: ; 0x195d6e ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x195ce8, $ffff - person_event $3a, 6, 7, $8, $0, 255, 255, $80, 0, UnknownScript_0x195cef, $ffff - person_event $24, 10, 11, $5, $2, 255, 255, $a0, 0, UnknownScript_0x195cf2, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, $ffff + person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, $ffff ; 0x195da5 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 046e348eb..2a4f72184 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -13,19 +13,19 @@ UnknownScript_0x196458: ; 0x196458 end ; 0x196459 -UnknownScript_0x196459: ; 0x196459 +NurseScript_0x196459: ; 0x196459 jumpstd $0000 ; 0x19645c -UnknownScript_0x19645c: ; 0x19645c +CooltrainerMScript_0x19645c: ; 0x19645c jumptextfaceplayer UnknownText_0x196494 ; 0x19645f -UnknownScript_0x19645f: ; 0x19645f +CooltrainerFScript_0x19645f: ; 0x19645f jumptextfaceplayer UnknownText_0x1964dc ; 0x196462 -UnknownScript_0x196462: ; 0x196462 +JanineImpersonatorScript_0x196462: ; 0x196462 faceplayer loadfont 2writetext UnknownText_0x19652e @@ -107,9 +107,9 @@ FuchsiaPokeCenter1F_MapEventHeader: ; 0x19656e ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $a0, 0, UnknownScript_0x196459, $ffff - person_event $23, 8, 12, $5, $1, 255, 255, $0, 0, UnknownScript_0x19645c, $ffff - person_event $24, 8, 5, $5, $1, 255, 255, $0, 0, UnknownScript_0x19645f, $ffff - person_event $fc, 7, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x196462, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, $ffff + person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, $ffff + person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, $ffff + person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, $ffff ; 0x1965b7 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 80734f80b..e31454948 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -10,7 +10,7 @@ UnknownScript_0x5474f: ; 0x5474f end ; 0x54750 -UnknownScript_0x54750: ; 0x54750 +ClerkScript_0x54750: ; 0x54750 faceplayer loadfont checkbit1 $005b @@ -125,6 +125,6 @@ GoldenrodBikeShop_MapEventHeader: ; 0x54907 ; people-events db 1 - person_event $39, 6, 11, $8, $0, 255, 255, $80, 0, UnknownScript_0x54750, $ffff + person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, $ffff ; 0x54951 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index f3356b3f8..2c938011f 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -6,7 +6,7 @@ GoldenrodBillsHouse_MapScriptHeader: ; 0x54be2 db 0 ; 0x54be4 -UnknownScript_0x54be4: ; 0x54be4 +BillScript_0x54be4: ; 0x54be4 faceplayer loadfont checkbit1 $004f @@ -51,7 +51,7 @@ UnknownScript_0x54c1f: ; 0x54c1f end ; 0x54c25 -UnknownScript_0x54c25: ; 0x54c25 +PokefanFScript_0x54c25: ; 0x54c25 faceplayer loadfont checkbit1 $0712 @@ -69,7 +69,7 @@ UnknownScript_0x54c33: ; 0x54c33 end ; 0x54c39 -UnknownScript_0x54c39: ; 0x54c39 +TwinScript_0x54c39: ; 0x54c39 faceplayer loadfont checkcellnum $3 @@ -251,8 +251,8 @@ GoldenrodBillsHouse_MapEventHeader: ; 0x5509f ; people-events db 3 - person_event $8, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x54be4, $0712 - person_event $2e, 7, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x54c25, $ffff - person_event $26, 8, 9, $2, $11, 255, 255, $a0, 0, UnknownScript_0x54c39, $ffff + person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillScript_0x54be4, $0712 + person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x54c25, $ffff + person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, TwinScript_0x54c39, $ffff ; 0x550e5 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 4251f96b7..d0eecc9e3 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -43,7 +43,7 @@ UnknownScript_0x198908: ; 0x198908 return ; 0x198909 -UnknownScript_0x198909: ; 0x198909 +PokefanMScript_0x198909: ; 0x198909 faceplayer loadfont 2writetext UnknownText_0x199042 @@ -163,15 +163,15 @@ UnknownScript_0x1989dd: ; 0x1989dd end ; 0x1989e3 -UnknownScript_0x1989e3: ; 0x1989e3 +PokefanMScript_0x1989e3: ; 0x1989e3 jumptextfaceplayer UnknownText_0x198a69 ; 0x1989e6 -UnknownScript_0x1989e6: ; 0x1989e6 +YoungsterScript_0x1989e6: ; 0x1989e6 jumptextfaceplayer UnknownText_0x198aa9 ; 0x1989e9 -UnknownScript_0x1989e9: ; 0x1989e9 +CooltrainerFScript_0x1989e9: ; 0x1989e9 faceplayer loadfont checkbit1 $0021 @@ -189,7 +189,7 @@ UnknownScript_0x1989f7: ; 0x1989f7 end ; 0x1989fd -UnknownScript_0x1989fd: ; 0x1989fd +CooltrainerFScript_0x1989fd: ; 0x1989fd faceplayer loadfont checkbit2 $0000 @@ -207,19 +207,19 @@ UnknownScript_0x198a0b: ; 0x198a0b end ; 0x198a11 -UnknownScript_0x198a11: ; 0x198a11 +YoungsterScript_0x198a11: ; 0x198a11 jumptextfaceplayer UnknownText_0x198c36 ; 0x198a14 -UnknownScript_0x198a14: ; 0x198a14 +LassScript_0x198a14: ; 0x198a14 jumptextfaceplayer UnknownText_0x198c83 ; 0x198a17 -UnknownScript_0x198a17: ; 0x198a17 +GrampsScript_0x198a17: ; 0x198a17 jumptextfaceplayer UnknownText_0x198ccf ; 0x198a1a -UnknownScript_0x198a1a: ; 0x198a1a +RocketScript_0x198a1a: ; 0x198a1a loadfont 2writetext UnknownText_0x198d0d keeptextopen @@ -231,27 +231,27 @@ UnknownScript_0x198a1a: ; 0x198a1a end ; 0x198a29 -UnknownScript_0x198a29: ; 0x198a29 +RocketScript_0x198a29: ; 0x198a29 jumptextfaceplayer UnknownText_0x198d4e ; 0x198a2c -UnknownScript_0x198a2c: ; 0x198a2c +RocketScript_0x198a2c: ; 0x198a2c jumptextfaceplayer UnknownText_0x198d6d ; 0x198a2f -UnknownScript_0x198a2f: ; 0x198a2f +RocketScript_0x198a2f: ; 0x198a2f jumptextfaceplayer UnknownText_0x198daa ; 0x198a32 -UnknownScript_0x198a32: ; 0x198a32 +RocketScript_0x198a32: ; 0x198a32 jumptextfaceplayer UnknownText_0x198de2 ; 0x198a35 -UnknownScript_0x198a35: ; 0x198a35 +RocketScript_0x198a35: ; 0x198a35 jumptextfaceplayer UnknownText_0x198e1f ; 0x198a38 -UnknownScript_0x198a38: ; 0x198a38 +RocketScript_0x198a38: ; 0x198a38 jumptextfaceplayer UnknownText_0x198e4b ; 0x198a3b @@ -605,20 +605,20 @@ GoldenrodCity_MapEventHeader: ; 0x1991d1 ; people-events db 15 - person_event $2d, 22, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x1989e3, $06cf - person_event $27, 21, 34, $2, $11, 255, 255, $0, 0, UnknownScript_0x1989e6, $06cf - person_event $24, 20, 16, $8, $0, 255, 255, $a0, 0, UnknownScript_0x1989e9, $06cf - person_event $24, 30, 24, $2, $21, 255, 255, $0, 0, UnknownScript_0x1989fd, $06cf - person_event $27, 21, 23, $2, $11, 255, 255, $80, 0, UnknownScript_0x198a11, $06cf - person_event $28, 14, 21, $5, $2, 255, 255, $a0, 0, UnknownScript_0x198a14, $06cf - person_event $2f, 31, 15, $5, $1, 255, 255, $0, 0, UnknownScript_0x198a17, $06cf - person_event $35, 20, 8, $7, $0, 255, 255, $0, 0, UnknownScript_0x198a1a, $06cc - person_event $35, 24, 32, $7, $0, 255, 255, $0, 0, UnknownScript_0x198a29, $06cd - person_event $35, 19, 12, $6, $0, 255, 255, $0, 0, UnknownScript_0x198a2c, $06cd - person_event $35, 27, 20, $9, $0, 255, 255, $0, 0, UnknownScript_0x198a2f, $06ce - person_event $35, 24, 33, $7, $0, 255, 255, $0, 0, UnknownScript_0x198a32, $06ce - person_event $35, 11, 33, $6, $0, 255, 255, $0, 0, UnknownScript_0x198a35, $06ce - person_event $35, 14, 35, $8, $0, 255, 255, $0, 0, UnknownScript_0x198a38, $06ce - person_event $2d, 26, 16, $3, $0, 255, 255, $80, 0, UnknownScript_0x198909, $076a + person_event SPRITE_POKEFAN_M, 22, 11, $7, $0, 255, 255, $0, 0, PokefanMScript_0x1989e3, $06cf + person_event SPRITE_YOUNGSTER, 21, 34, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1989e6, $06cf + person_event SPRITE_COOLTRAINER_F, 20, 16, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1989e9, $06cf + person_event SPRITE_COOLTRAINER_F, 30, 24, $2, $21, 255, 255, $0, 0, CooltrainerFScript_0x1989fd, $06cf + person_event SPRITE_YOUNGSTER, 21, 23, $2, $11, 255, 255, $80, 0, YoungsterScript_0x198a11, $06cf + person_event SPRITE_LASS, 14, 21, $5, $2, 255, 255, $a0, 0, LassScript_0x198a14, $06cf + person_event SPRITE_GRAMPS, 31, 15, $5, $1, 255, 255, $0, 0, GrampsScript_0x198a17, $06cf + person_event SPRITE_ROCKET, 20, 8, $7, $0, 255, 255, $0, 0, RocketScript_0x198a1a, $06cc + person_event SPRITE_ROCKET, 24, 32, $7, $0, 255, 255, $0, 0, RocketScript_0x198a29, $06cd + person_event SPRITE_ROCKET, 19, 12, $6, $0, 255, 255, $0, 0, RocketScript_0x198a2c, $06cd + person_event SPRITE_ROCKET, 27, 20, $9, $0, 255, 255, $0, 0, RocketScript_0x198a2f, $06ce + person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, $06ce + person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, $06ce + person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, $06ce + person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, PokefanMScript_0x198909, $076a ; 0x199321 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 213a471f7..02f1c4fb3 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -6,19 +6,19 @@ GoldenrodDeptStore1F_MapScriptHeader: ; 0x5597f db 0 ; 0x55981 -UnknownScript_0x55981: ; 0x55981 +ReceptionistScript_0x55981: ; 0x55981 jumptextfaceplayer UnknownText_0x55993 ; 0x55984 -UnknownScript_0x55984: ; 0x55984 +GentlemanScript_0x55984: ; 0x55984 jumptextfaceplayer UnknownText_0x559b7 ; 0x55987 -UnknownScript_0x55987: ; 0x55987 +PokefanFScript_0x55987: ; 0x55987 jumptextfaceplayer UnknownText_0x55a1a ; 0x5598a -UnknownScript_0x5598a: ; 0x5598a +BugCatcherScript_0x5598a: ; 0x5598a jumptextfaceplayer UnknownText_0x55a3a ; 0x5598d @@ -91,9 +91,9 @@ GoldenrodDeptStore1F_MapEventHeader: ; 0x55b03 ; people-events db 4 - person_event $42, 5, 14, $6, $0, 255, 255, $0, 0, UnknownScript_0x55981, $ffff - person_event $2e, 8, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x55987, $ffff - person_event $25, 9, 9, $5, $1, 255, 255, $a0, 0, UnknownScript_0x5598a, $ffff - person_event $40, 9, 15, $2, $11, 255, 255, $0, 0, UnknownScript_0x55984, $ffff + person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, $ffff + person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, $ffff + person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, $ffff + person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, $ffff ; 0x55b5b diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index d0061baa5..b66405bb3 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -6,7 +6,7 @@ GoldenrodDeptStore2F_MapScriptHeader: ; 0x55b5b db 0 ; 0x55b5d -UnknownScript_0x55b5d: ; 0x55b5d +ClerkScript_0x55b5d: ; 0x55b5d faceplayer loadfont pokemart $0, $0005 @@ -14,7 +14,7 @@ UnknownScript_0x55b5d: ; 0x55b5d end ; 0x55b65 -UnknownScript_0x55b65: ; 0x55b65 +ClerkScript_0x55b65: ; 0x55b65 faceplayer loadfont pokemart $0, $0006 @@ -22,15 +22,15 @@ UnknownScript_0x55b65: ; 0x55b65 end ; 0x55b6d -UnknownScript_0x55b6d: ; 0x55b6d +YoungsterScript_0x55b6d: ; 0x55b6d jumptextfaceplayer UnknownText_0x55c25 ; 0x55b70 -UnknownScript_0x55b70: ; 0x55b70 +CooltrainerFScript_0x55b70: ; 0x55b70 jumptextfaceplayer UnknownText_0x55c7b ; 0x55b73 -UnknownScript_0x55b73: ; 0x55b73 +GentlemanScript_0x55b73: ; 0x55b73 jumptextfaceplayer UnknownText_0x55cb7 ; 0x55b76 @@ -114,10 +114,10 @@ GoldenrodDeptStore2F_MapEventHeader: ; 0x55d56 ; people-events db 5 - person_event $39, 9, 17, $7, $0, 255, 255, $0, 0, UnknownScript_0x55b5d, $ffff - person_event $39, 10, 17, $8, $0, 255, 255, $0, 0, UnknownScript_0x55b65, $ffff - person_event $27, 10, 13, $4, $10, 255, 255, $0, 0, UnknownScript_0x55b6d, $ffff - person_event $24, 6, 10, $5, $2, 255, 255, $80, 0, UnknownScript_0x55b70, $ffff - person_event $40, 10, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x55b73, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, $ffff + person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, $ffff + person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, $ffff + person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, $ffff ; 0x55db6 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 3d6ee9738..c9c8baaa1 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -6,7 +6,7 @@ GoldenrodDeptStore3F_MapScriptHeader: ; 0x55db6 db 0 ; 0x55db8 -UnknownScript_0x55db8: ; 0x55db8 +ClerkScript_0x55db8: ; 0x55db8 faceplayer loadfont pokemart $0, $0007 @@ -14,11 +14,11 @@ UnknownScript_0x55db8: ; 0x55db8 end ; 0x55dc0 -UnknownScript_0x55dc0: ; 0x55dc0 +SuperNerdScript_0x55dc0: ; 0x55dc0 jumptextfaceplayer UnknownText_0x55dcc ; 0x55dc3 -UnknownScript_0x55dc3: ; 0x55dc3 +RockerScript_0x55dc3: ; 0x55dc3 jumptextfaceplayer UnknownText_0x55e15 ; 0x55dc6 @@ -74,8 +74,8 @@ GoldenrodDeptStore3F_MapEventHeader: ; 0x55ea1 ; people-events db 3 - person_event $39, 5, 10, $6, $0, 255, 255, $0, 0, UnknownScript_0x55db8, $ffff - person_event $2b, 9, 16, $a, $10, 255, 255, $80, 0, UnknownScript_0x55dc0, $ffff - person_event $2c, 9, 6, $4, $10, 255, 255, $0, 0, UnknownScript_0x55dc3, $ffff + person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, $ffff + person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, $ffff + person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, $ffff ; 0x55ee7 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 3f6a3ca44..572892b2b 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -6,7 +6,7 @@ GoldenrodDeptStore4F_MapScriptHeader: ; 0x55ee7 db 0 ; 0x55ee9 -UnknownScript_0x55ee9: ; 0x55ee9 +ClerkScript_0x55ee9: ; 0x55ee9 faceplayer loadfont pokemart $0, $0008 @@ -14,15 +14,15 @@ UnknownScript_0x55ee9: ; 0x55ee9 end ; 0x55ef1 -UnknownScript_0x55ef1: ; 0x55ef1 +CooltrainerMScript_0x55ef1: ; 0x55ef1 jumptextfaceplayer UnknownText_0x55f08 ; 0x55ef4 -UnknownScript_0x55ef4: ; 0x55ef4 +BugCatcherScript_0x55ef4: ; 0x55ef4 jumptextfaceplayer UnknownText_0x55f52 ; 0x55ef7 -UnknownScript_0x55ef7: ; 0x55ef7 +GameboyKidScript_0x55ef7: ; 0x55ef7 faceplayer loadfont 2writetext UnknownText_0x55f74 @@ -92,9 +92,9 @@ GoldenrodDeptStore4F_MapEventHeader: ; 0x56038 ; people-events db 4 - person_event $39, 9, 17, $7, $0, 255, 255, $0, 0, UnknownScript_0x55ee9, $ffff - person_event $23, 11, 15, $9, $0, 255, 255, $0, 0, UnknownScript_0x55ef1, $ffff - person_event $25, 6, 11, $5, $1, 255, 255, $0, 0, UnknownScript_0x55ef4, $ffff - person_event $3, 5, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x55ef7, $ffff + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, $ffff + person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, $ffff + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, $ffff + person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, $ffff ; 0x5608b diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index bdc1f294c..ed991d26e 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -22,7 +22,7 @@ UnknownScript_0x56099: ; 0x56099 return ; 0x5609c -UnknownScript_0x5609c: ; 0x5609c +ClerkScript_0x5609c: ; 0x5609c faceplayer loadfont checkbit1 $005f @@ -62,7 +62,7 @@ UnknownScript_0x560c8: ; 0x560c8 end ; 0x560ce -UnknownScript_0x560ce: ; 0x560ce +ReceptionistScript_0x560ce: ; 0x560ce faceplayer loadfont checkcode $b @@ -112,7 +112,7 @@ UnknownScript_0x56116: ; 0x56116 end ; 0x56118 -UnknownScript_0x56118: ; 0x56118 +TwinScript_0x56118: ; 0x56118 faceplayer loadfont special $0066 @@ -131,11 +131,11 @@ UnknownScript_0x5612a: ; 0x5612a end ; 0x56130 -UnknownScript_0x56130: ; 0x56130 +LassScript_0x56130: ; 0x56130 jumptextfaceplayer UnknownText_0x562ad ; 0x56133 -UnknownScript_0x56133: ; 0x56133 +CooltrainerMScript_0x56133: ; 0x56133 faceplayer loadfont trade $0 @@ -144,7 +144,7 @@ UnknownScript_0x56133: ; 0x56133 end ; 0x5613a -UnknownScript_0x5613a: ; 0x5613a +PokefanMScript_0x5613a: ; 0x5613a jumptextfaceplayer UnknownText_0x562f3 ; 0x5613d @@ -245,11 +245,11 @@ GoldenrodDeptStore5F_MapEventHeader: ; 0x56386 ; people-events db 6 - person_event $39, 9, 12, $7, $0, 255, 255, $0, 0, UnknownScript_0x5609c, $ffff - person_event $28, 10, 7, $2, $11, 255, 255, $0, 0, UnknownScript_0x56130, $ffff - person_event $23, 7, 10, $3, $0, 255, 255, $0, 0, UnknownScript_0x56133, $ffff - person_event $2d, 9, 17, $2, $22, 255, 255, $0, 0, UnknownScript_0x5613a, $ffff - person_event $26, 5, 13, $6, $0, 255, 255, $a0, 0, UnknownScript_0x56118, $ffff - person_event $42, 9, 11, $7, $0, 255, 255, $80, 0, UnknownScript_0x560ce, $0763 + person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, $ffff + person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, $ffff + person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, $ffff + person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, $ffff + person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, $ffff + person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, $0763 ; 0x563f3 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 78098e8ac..f1475e5bd 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -91,11 +91,11 @@ MenuData2_0x56480: ; 0x56480 ; 0x564bf -UnknownScript_0x564bf: ; 0x564bf +LassScript_0x564bf: ; 0x564bf jumptextfaceplayer UnknownText_0x5654b ; 0x564c2 -UnknownScript_0x564c2: ; 0x564c2 +SuperNerdScript_0x564c2: ; 0x564c2 jumptextfaceplayer UnknownText_0x565ca ; 0x564c5 @@ -179,7 +179,7 @@ GoldenrodDeptStore6F_MapEventHeader: ; 0x5664a ; people-events db 2 - person_event $28, 6, 14, $5, $1, 255, 255, $a0, 0, UnknownScript_0x564bf, $ffff - person_event $2b, 6, 12, $7, $0, 255, 255, $80, 0, UnknownScript_0x564c2, $ffff + person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, $ffff + person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, $ffff ; 0x56697 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 36fbfa895..012ad97c4 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -47,19 +47,19 @@ UnknownScript_0x7d7ac: ; 0x7d7ac return ; 0x7d7b0 -UnknownScript_0x7d7b0: ; 0x7d7b0 +BlackBeltScript_0x7d7b0: ; 0x7d7b0 jumptextfaceplayer UnknownText_0x7d7cb ; 0x7d7b3 -UnknownScript_0x7d7b3: ; 0x7d7b3 +BlackBeltScript_0x7d7b3: ; 0x7d7b3 jumptextfaceplayer UnknownText_0x7d82c ; 0x7d7b6 -UnknownScript_0x7d7b6: ; 0x7d7b6 +BlackBeltScript_0x7d7b6: ; 0x7d7b6 jumptextfaceplayer UnknownText_0x7d875 ; 0x7d7b9 -UnknownScript_0x7d7b9: ; 0x7d7b9 +MachopScript_0x7d7b9: ; 0x7d7b9 loadfont 2writetext UnknownText_0x7d8bb cry MACHOKE @@ -131,13 +131,13 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; 0x7d8ce ; people-events db 8 - person_event $54, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c3, $0675 - person_event $54, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, $0676 - person_event $54, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, $0677 - person_event $54, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, $0678 - person_event $41, 14, 13, $4, $10, 255, 255, $a0, 0, UnknownScript_0x7d7b0, $ffff - person_event $41, 12, 8, $3, $0, 255, 255, $80, 0, UnknownScript_0x7d7b3, $ffff - person_event $41, 17, 10, $5, $1, 255, 255, $90, 0, UnknownScript_0x7d7b6, $ffff - person_event $9a, 11, 11, $16, $0, 255, 255, $90, 0, UnknownScript_0x7d7b9, $ffff + person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c3, $0675 + person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, $0676 + person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, $0677 + person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, $0678 + person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, $ffff + person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, $ffff + person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, $ffff + person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, $ffff ; 0x7d94b diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 06d9e2af1..a582edd5d 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -38,18 +38,18 @@ UnknownScript_0x56738: ; 0x56738 return ; 0x5673f -UnknownScript_0x5673f: ; 0x5673f +ClerkScript_0x5673f: ; 0x5673f loadfont pokemart $4, $0000 loadmovesprites end ; 0x56746 -UnknownScript_0x56746: ; 0x56746 +PokefanFScript_0x56746: ; 0x56746 jumptextfaceplayer UnknownText_0x5677f ; 0x56749 -UnknownScript_0x56749: ; 0x56749 +FisherScript_0x56749: ; 0x56749 faceplayer loadfont 2writetext UnknownText_0x567d2 @@ -59,11 +59,11 @@ UnknownScript_0x56749: ; 0x56749 end ; 0x56754 -UnknownScript_0x56754: ; 0x56754 +TwinScript_0x56754: ; 0x56754 jumptextfaceplayer UnknownText_0x56839 ; 0x56757 -UnknownScript_0x56757: ; 0x56757 +SuperNerdScript_0x56757: ; 0x56757 loadfont 2writetext UnknownText_0x56867 closetext @@ -77,15 +77,15 @@ UnknownScript_0x56757: ; 0x56757 end ; 0x5676a -UnknownScript_0x5676a: ; 0x5676a +PokefanMScript_0x5676a: ; 0x5676a jumptextfaceplayer UnknownText_0x5688e ; 0x5676d -UnknownScript_0x5676d: ; 0x5676d +TeacherScript_0x5676d: ; 0x5676d jumptextfaceplayer UnknownText_0x56901 ; 0x56770 -UnknownScript_0x56770: ; 0x56770 +BugCatcherScript_0x56770: ; 0x56770 jumptextfaceplayer UnknownText_0x56942 ; 0x56773 @@ -224,13 +224,13 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; 0x56b6d ; people-events db 8 - person_event $39, 8, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x5673f, $06f0 - person_event $2e, 7, 14, $5, $1, 255, 255, $80, 0, UnknownScript_0x56746, $ffff - person_event $3a, 5, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x56749, $ffff - person_event $26, 8, 7, $2, $11, 255, 255, $a0, 0, UnknownScript_0x56754, $06f1 - person_event $2b, 10, 18, $9, $0, 255, 255, $a0, 0, UnknownScript_0x56757, $06f1 - person_event $2d, 4, 11, $5, $1, 255, 255, $0, 0, UnknownScript_0x5676a, $06f0 - person_event $29, 7, 9, $2, $11, 255, 255, $a0, 0, UnknownScript_0x5676d, $06f0 - person_event $25, 10, 5, $7, $0, 255, 255, $80, 0, UnknownScript_0x56770, $06f0 + person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, $06f0 + person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, $ffff + person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, $ffff + person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, $06f1 + person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, $06f1 + person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, $06f0 + person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, $06f0 + person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, $06f0 ; 0x56bf4 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index e4459d7cf..51153e393 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -6,7 +6,7 @@ GoldenrodFlowerShop_MapScriptHeader: ; 0x5535b db 0 ; 0x5535d -UnknownScript_0x5535d: ; 0x5535d +TeacherScript_0x5535d: ; 0x5535d checkbit1 $002a iftrue UnknownScript_0x5538f checkbit1 $005c @@ -50,7 +50,7 @@ UnknownScript_0x5539f: ; 0x5539f jumptextfaceplayer UnknownText_0x553d4 ; 0x553a2 -UnknownScript_0x553a2: ; 0x553a2 +LassScript_0x553a2: ; 0x553a2 faceplayer loadfont checkbit1 $002a @@ -171,7 +171,7 @@ GoldenrodFlowerShop_MapEventHeader: ; 0x5561e ; people-events db 2 - person_event $29, 8, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x5535d, $ffff - person_event $28, 10, 9, $2, $11, 255, 255, $90, 0, UnknownScript_0x553a2, $0768 + person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, $ffff + person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, $0768 ; 0x55648 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 2f8df16f3..827a4fb44 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -31,7 +31,7 @@ UnknownScript_0x56c19: ;0x56c19 return ; 0x56c1a -UnknownScript_0x56c1a: ; 0x56c1a +PokefanMScript_0x56c1a: ; 0x56c1a faceplayer loadfont 2writetext UnknownText_0x5718a @@ -41,11 +41,11 @@ UnknownScript_0x56c1a: ; 0x56c1a end ; 0x56c25 -UnknownScript_0x56c25: ; 0x56c25 +ClerkScript_0x56c25: ; 0x56c25 jumpstd $0032 ; 0x56c28 -UnknownScript_0x56c28: ; 0x56c28 +ReceptionistScript_0x56c28: ; 0x56c28 faceplayer loadfont 2writetext UnknownText_0x56e50 @@ -161,7 +161,7 @@ MenuData2_0x56cd1: ; 0x56cd1 ; 0x56d01 -UnknownScript_0x56d01: ; 0x56d01 +ReceptionistScript_0x56d01: ; 0x56d01 faceplayer loadfont 2writetext UnknownText_0x56e50 @@ -256,7 +256,7 @@ MenuData2_0x56db8: ; 0x56db8 ; 0x56df1 -UnknownScript_0x56df1: ; 0x56df1 +PharmacistScript_0x56df1: ; 0x56df1 faceplayer loadfont 2writetext UnknownText_0x56f55 @@ -266,7 +266,7 @@ UnknownScript_0x56df1: ; 0x56df1 end ; 0x56dfc -UnknownScript_0x56dfc: ; 0x56dfc +PokefanMScript_0x56dfc: ; 0x56dfc faceplayer loadfont 2writetext UnknownText_0x56f9e @@ -276,7 +276,7 @@ UnknownScript_0x56dfc: ; 0x56dfc end ; 0x56e07 -UnknownScript_0x56e07: ; 0x56e07 +CooltrainerMScript_0x56e07: ; 0x56e07 faceplayer loadfont 2writetext UnknownText_0x56ff4 @@ -286,7 +286,7 @@ UnknownScript_0x56e07: ; 0x56e07 end ; 0x56e12 -UnknownScript_0x56e12: ; 0x56e12 +PokefanFScript_0x56e12: ; 0x56e12 faceplayer loadfont 2writetext UnknownText_0x5702b @@ -296,11 +296,11 @@ UnknownScript_0x56e12: ; 0x56e12 end ; 0x56e1d -UnknownScript_0x56e1d: ; 0x56e1d +CooltrainerFScript_0x56e1d: ; 0x56e1d jumptextfaceplayer UnknownText_0x57097 ; 0x56e20 -UnknownScript_0x56e20: ; 0x56e20 +GentlemanScript_0x56e20: ; 0x56e20 faceplayer loadfont 2writetext UnknownText_0x570b1 @@ -310,7 +310,7 @@ UnknownScript_0x56e20: ; 0x56e20 end ; 0x56e2b -UnknownScript_0x56e2b: ; 0x56e2b +PokefanMScript_0x56e2b: ; 0x56e2b jumptextfaceplayer UnknownText_0x5710d ; 0x56e2e @@ -501,18 +501,18 @@ GoldenrodGameCorner_MapEventHeader: ; 0x571db ; people-events db 12 - person_event $39, 6, 7, $6, $0, 255, 255, $80, 0, UnknownScript_0x56c25, $ffff - person_event $42, 6, 20, $6, $0, 255, 255, $80, 0, UnknownScript_0x56c28, $ffff - person_event $42, 6, 22, $6, $0, 255, 255, $80, 0, UnknownScript_0x56d01, $ffff - person_event $4b, 11, 12, $8, $0, 255, 2, $90, 0, UnknownScript_0x56df1, $ffff - person_event $4b, 11, 12, $8, $0, 255, 4, $90, 0, UnknownScript_0x56df1, $ffff - person_event $2d, 14, 15, $9, $0, 255, 255, $b0, 0, UnknownScript_0x56dfc, $ffff - person_event $23, 12, 18, $8, $0, 255, 255, $90, 0, UnknownScript_0x56e07, $ffff - person_event $2e, 10, 21, $9, $0, 255, 255, $80, 0, UnknownScript_0x56e12, $ffff - person_event $24, 7, 14, $2, $12, 255, 255, $a0, 0, UnknownScript_0x56e1d, $ffff - person_event $40, 14, 9, $9, $0, 255, 255, $90, 0, UnknownScript_0x56e20, $ffff - person_event $2d, 13, 6, $2, $11, 255, 255, $b0, 0, UnknownScript_0x56e2b, $ffff - person_event $2d, 14, 21, $9, $0, 255, 255, $80, 0, UnknownScript_0x56c1a, $076b + person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, $ffff + person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, $ffff + person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, $ffff + person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, $ffff + person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, $ffff + person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, $ffff + person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, $ffff + person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, $ffff + person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, $ffff + person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, $ffff + person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, $076b ; 0x57322 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index a43226b14..33e6a1895 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -18,7 +18,7 @@ UnknownScript_0x5400b: ; 0x5400b end ; 0x5400c -UnknownScript_0x5400c: ; 0x5400c +WhitneyScript_0x5400c: ; 0x5400c faceplayer checkbit1 $04bf iftrue UnknownScript_0x54037 @@ -457,11 +457,11 @@ GoldenrodGym_MapEventHeader: ; 0x546dd ; people-events db 6 - person_event $13, 7, 12, $6, $0, 255, 255, $80, 0, UnknownScript_0x5400c, $ffff - person_event $28, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, $ffff - person_event $28, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, $ffff - person_event $2a, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, $ffff - person_event $2a, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, $ffff - person_event $48, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, $ffff + person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, $ffff + person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, $ffff + person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, $ffff + person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, $ffff + person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, $ffff + person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, $ffff ; 0x5474d diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 5a1a185b8..609bb37af 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -6,7 +6,7 @@ GoldenrodHappinessRater_MapScriptHeader: ; 0x54951 db 0 ; 0x54953 -UnknownScript_0x54953: ; 0x54953 +TeacherScript_0x54953: ; 0x54953 faceplayer loadfont special $0059 @@ -62,11 +62,11 @@ UnknownScript_0x54991: ; 0x54991 end ; 0x54997 -UnknownScript_0x54997: ; 0x54997 +PokefanMScript_0x54997: ; 0x54997 jumptextfaceplayer UnknownText_0x54b04 ; 0x5499a -UnknownScript_0x5499a: ; 0x5499a +TwinScript_0x5499a: ; 0x5499a jumptextfaceplayer UnknownText_0x54b67 ; 0x5499d @@ -159,8 +159,8 @@ GoldenrodHappinessRater_MapEventHeader: ; 0x54b9c ; people-events db 3 - person_event $29, 8, 6, $6, $0, 255, 255, $90, 0, UnknownScript_0x54953, $ffff - person_event $2d, 7, 9, $8, $0, 255, 255, $0, 0, UnknownScript_0x54997, $ffff - person_event $26, 10, 9, $5, $1, 255, 255, $a0, 0, UnknownScript_0x5499a, $ffff + person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, $ffff + person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, $ffff + person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, $ffff ; 0x54be2 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 73839e455..1b305969f 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -13,7 +13,7 @@ UnknownScript_0x550eb: ; 0x550eb end ; 0x550ec -UnknownScript_0x550ec: ; 0x550ec +OfficerScript_0x550ec: ; 0x550ec faceplayer loadfont checkbit1 $00cd @@ -74,7 +74,7 @@ UnknownScript_0x55130: ; 0x55130 end ; 0x55143 -UnknownScript_0x55143: ; 0x55143 +GentlemanScript_0x55143: ; 0x55143 jumptextfaceplayer UnknownText_0x552a3 ; 0x55146 @@ -187,7 +187,7 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; 0x5531f ; people-events db 2 - person_event $43, 13, 13, $6, $0, 255, 255, $0, 0, UnknownScript_0x550ec, $ffff - person_event $40, 18, 15, $2, $22, 255, 255, $0, 0, UnknownScript_0x55143, $0749 + person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, $ffff + person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, $0749 ; 0x5535b diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 8065db87c..821c2eddb 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -6,7 +6,7 @@ GoldenrodNameRatersHouse_MapScriptHeader: ; 0x5577a db 0 ; 0x5577c -UnknownScript_0x5577c: ; 0x5577c +GentlemanScript_0x5577c: ; 0x5577c faceplayer loadfont special $0057 @@ -45,6 +45,6 @@ GoldenrodNameRatersHouse_MapEventHeader: ; 0x55953 ; people-events db 1 - person_event $40, 8, 6, $6, $2, 255, 255, $0, 0, UnknownScript_0x5577c, $ffff + person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, $ffff ; 0x5597f diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 64baf4ed5..0a2597ef4 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -6,11 +6,11 @@ GoldenrodPPSpeechHouse_MapScriptHeader: ; 0x55648 db 0 ; 0x5564a -UnknownScript_0x5564a: ; 0x5564a +FisherScript_0x5564a: ; 0x5564a jumptextfaceplayer UnknownText_0x55659 ; 0x5564d -UnknownScript_0x5564d: ; 0x5564d +LassScript_0x5564d: ; 0x5564d jumptextfaceplayer UnknownText_0x556ca ; 0x55650 @@ -68,7 +68,7 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; 0x55741 ; people-events db 2 - person_event $3a, 8, 6, $4, $10, 255, 255, $a0, 0, UnknownScript_0x5564a, $ffff - person_event $28, 7, 9, $8, $10, 255, 255, $0, 0, UnknownScript_0x5564d, $ffff + person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, $ffff + person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, $ffff ; 0x5577a diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index cc5302f1d..e871c383b 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -6,7 +6,7 @@ GoldenrodPokeCenter1F_MapScriptHeader: ; 0x60f8f db 0 ; 0x60f91 -UnknownScript_0x60f91: ; 0x60f91 +NurseScript_0x60f91: ; 0x60f91 jumpstd $0000 ; 0x60f94 @@ -78,15 +78,15 @@ UnknownScript_0x6101d: ; 0x6101d end ; 0x6101e -UnknownScript_0x6101e: ; 0x6101e +GameboyKidScript_0x6101e: ; 0x6101e jumptextfaceplayer UnknownText_0x62105 ; 0x61021 -UnknownScript_0x61021: ; 0x61021 +LassScript_0x61021: ; 0x61021 jumptextfaceplayer UnknownText_0x62260 ; 0x61024 -UnknownScript_0x61024: ; 0x61024 +PokefanFScript_0x61024: ; 0x61024 faceplayer loadfont 2writetext UnknownText_0x623fb @@ -736,10 +736,10 @@ GoldenrodPokeCenter1F_MapEventHeader: ; 0x62564 ; people-events db 5 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x60f91, $ffff - person_event $38, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, $ffff - person_event $3, 5, 10, $6, $0, 255, 255, $a0, 0, UnknownScript_0x6101e, $ffff - person_event $28, 8, 5, $5, $1, 255, 255, $0, 0, UnknownScript_0x61021, $ffff - person_event $2e, 9, 11, $6, $0, 255, 255, $b0, 0, UnknownScript_0x61024, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, $ffff + person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, $ffff + person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, $ffff + person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, $ffff + person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, $ffff ; 0x625cf diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 0e94da1e9..e1b4dc5eb 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -6,15 +6,15 @@ GoldenrodPokeComCenter2FMobile_MapScriptHeader: ; 0x625cf db 0 ; 0x625d1 -UnknownScript_0x625d1: ; 0x625d1 +ScientistScript_0x625d1: ; 0x625d1 jumptextfaceplayer UnknownText_0x62674 ; 0x625d4 -UnknownScript_0x625d4: ; 0x625d4 +ScientistScript_0x625d4: ; 0x625d4 jumptextfaceplayer UnknownText_0x626f9 ; 0x625d7 -UnknownScript_0x625d7: ; 0x625d7 +ScientistScript_0x625d7: ; 0x625d7 jumptextfaceplayer UnknownText_0x62795 ; 0x625da @@ -267,8 +267,8 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; 0x62c32 ; people-events db 3 - person_event $3c, 32, 8, $4, $10, 255, 255, $80, 0, UnknownScript_0x625d1, $ffff - person_event $3c, 31, 11, $7, $0, 255, 255, $90, 0, UnknownScript_0x625d4, $ffff - person_event $3c, 33, 11, $7, $0, 255, 255, $a0, 0, UnknownScript_0x625d7, $ffff + person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, $ffff + person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, $ffff + person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, $ffff ; 0x62c78 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 7f0ac3030..11357169e 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -6,7 +6,7 @@ GuideGentsHouse_MapScriptHeader: ; 0x196c05 db 0 ; 0x196c07 -UnknownScript_0x196c07: ; 0x196c07 +GrampsScript_0x196c07: ; 0x196c07 jumptextfaceplayer UnknownText_0x196c0d ; 0x196c0a @@ -44,6 +44,6 @@ GuideGentsHouse_MapEventHeader: ; 0x196c89 ; people-events db 1 - person_event $2f, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x196c07, $06ff + person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x196c07, $06ff ; 0x196cb0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 591963f1a..a4c955064 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -119,7 +119,7 @@ HallOfFame_MapEventHeader: ; 0x181678 ; people-events db 1 - person_event $1e, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff + person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $ffff ; 0x181695 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 9f49341f1..ef1c76b01 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -37,8 +37,8 @@ IcePath1F_MapEventHeader: ; 0x7e478 ; people-events db 3 - person_event $54, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, $0688 - person_event $54, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689 - person_event $54, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be + person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, $0688 + person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, $0689 + person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, $07be ; 0x7e4b9 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 302fa9234..f09402904 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -77,7 +77,7 @@ UnknownScript_0x7e504: ; 0x7e504 ; 0x7e50a -UnknownScript_0x7e50a: ; 0x7e50a +BoulderScript_0x7e50a: ; 0x7e50a jumpstd $000e ; 0x7e50d @@ -121,10 +121,10 @@ IcePathB1F_MapEventHeader: ; 0x7e52d ; people-events db 5 - person_event $5a, 11, 15, $19, $0, 255, 255, $0, 0, UnknownScript_0x7e50a, $0709 - person_event $5a, 12, 11, $19, $0, 255, 255, $0, 0, UnknownScript_0x7e50a, $070a - person_event $5a, 13, 12, $19, $0, 255, 255, $0, 0, UnknownScript_0x7e50a, $070b - person_event $5a, 11, 21, $19, $0, 255, 255, $0, 0, UnknownScript_0x7e50a, $070c - person_event $54, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a + person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $0709 + person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070a + person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070b + person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e50a, $070c + person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, $068a ; 0x7e5a1 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 016aae602..8571aace5 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -34,6 +34,6 @@ IcePathB2FBlackthornSide_MapEventHeader: ; 0x7e64b ; people-events db 1 - person_event $54, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d + person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, $068d ; 0x7e66d diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 49d50f4ca..11d9f72f7 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -6,7 +6,7 @@ IcePathB2FMahoganySide_MapScriptHeader: ; 0x7e5a1 db 0 ; 0x7e5a3 -UnknownScript_0x7e5a3: ; 0x7e5a3 +BoulderScript_0x7e5a3: ; 0x7e5a3 jumptext UnknownText_0x7e5ad ; 0x7e5a6 @@ -51,11 +51,11 @@ IcePathB2FMahoganySide_MapEventHeader: ; 0x7e5cd ; people-events db 6 - person_event $5a, 7, 15, $1, $0, 255, 255, $0, 0, UnknownScript_0x7e5a3, $070d - person_event $5a, 11, 8, $1, $0, 255, 255, $0, 0, UnknownScript_0x7e5a3, $070e - person_event $5a, 16, 7, $1, $0, 255, 255, $0, 0, UnknownScript_0x7e5a3, $070f - person_event $5a, 17, 16, $1, $0, 255, 255, $0, 0, UnknownScript_0x7e5a3, $0710 - person_event $54, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, $068b - person_event $54, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, $068c + person_event SPRITE_BOULDER, 7, 15, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $070d + person_event SPRITE_BOULDER, 11, 8, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $070e + person_event SPRITE_BOULDER, 16, 7, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $070f + person_event SPRITE_BOULDER, 17, 16, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, $0710 + person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, $068b + person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, $068c ; 0x7e644 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index b9d71310f..c77898e15 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -10,7 +10,7 @@ ItemFragment_0x7e66f: ; 0x7e66f db NEVERMELTICE, 1 ; 0x7e671 -UnknownScript_0x7e671: ; 0x7e671 +RockScript_0x7e671: ; 0x7e671 jumpstd $000f ; 0x7e674 @@ -31,7 +31,7 @@ IcePathB3F_MapEventHeader: ; 0x7e674 ; people-events db 2 - person_event $54, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e - person_event $59, 10, 10, $18, $0, 255, 255, $0, 0, UnknownScript_0x7e671, $ffff + person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, $068e + person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, RockScript_0x7e671, $ffff ; 0x7e69e diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 0e25231bd..9e8baa9fa 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -88,7 +88,7 @@ UnknownScript_0x6eb74: ; 0x6eb74 return ; 0x6eb7b -UnknownScript_0x6eb7b: ; 0x6eb7b +YoungsterScript_0x6eb7b: ; 0x6eb7b faceplayer loadfont checkbit1 $0029 @@ -106,7 +106,7 @@ UnknownScript_0x6eb89: ; 0x6eb89 end ; 0x6eb8f -UnknownScript_0x6eb8f: ; 0x6eb8f +BirdScript_0x6eb8f: ; 0x6eb8f copybytetovar FarfetchdPosition if_equal $1, UnknownScript_0x6ebba if_equal $2, UnknownScript_0x6ebd9 @@ -370,7 +370,7 @@ UnknownScript_0x6eda1: ; 0x6eda1 end ; 0x6edae -UnknownScript_0x6edae: ; 0x6edae +BlackBeltScript_0x6edae: ; 0x6edae faceplayer loadfont checkbit1 $0010 @@ -398,7 +398,7 @@ UnknownScript_0x6edd8: ; 0x6edd8 end ; 0x6edde -UnknownScript_0x6edde: ; 0x6edde +RockerScript_0x6edde: ; 0x6edde faceplayer loadfont checkbit1 $005f @@ -445,7 +445,7 @@ Bug_catcherWayneScript: ; 0x6ee05 end ; 0x6ee0d -UnknownScript_0x6ee0d: ; 0x6ee0d +LassScript_0x6ee0d: ; 0x6ee0d jumptextfaceplayer UnknownText_0x6f2af ; 0x6ee10 @@ -1016,17 +1016,17 @@ IlexForest_MapEventHeader: ; 0x6f5e7 ; people-events db 11 - person_event $4e, 35, 18, $3, $0, 255, 255, $b0, 0, UnknownScript_0x6eb8f, $06e9 - person_event $27, 32, 11, $6, $0, 255, 255, $a0, 0, UnknownScript_0x6eb7b, $06f3 - person_event $41, 32, 9, $9, $0, 255, 255, $0, 0, UnknownScript_0x6edae, $06f4 - person_event $2c, 18, 19, $9, $0, 255, 255, $0, 0, UnknownScript_0x6edde, $ffff - person_event $54, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, $0671 - person_event $b, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, $07a5 - person_event $28, 28, 7, $9, $0, 255, 255, $a0, 0, UnknownScript_0x6ee0d, $06ed - person_event $27, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, $ffff - person_event $54, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, $07b9 - person_event $54, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, $07ba - person_event $54, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, $07bb + person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, $06e9 + person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, $06f3 + person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, $06f4 + person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, $ffff + person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, $0671 + person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, $07a5 + person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, $06ed + person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, $ffff + person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, $07b9 + person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, $07ba + person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, $07bb ; 0x6f6a4 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 0fbc3442c..e515ccbe3 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -6,11 +6,11 @@ IlexForestAzaleaGate_MapScriptHeader: ; 0x62c78 db 0 ; 0x62c7a -UnknownScript_0x62c7a: ; 0x62c7a +OfficerScript_0x62c7a: ; 0x62c7a jumptextfaceplayer UnknownText_0x62c80 ; 0x62c7d -UnknownScript_0x62c7d: ; 0x62c7d +GrannyScript_0x62c7d: ; 0x62c7d jumptextfaceplayer UnknownText_0x62cb0 ; 0x62c80 @@ -47,7 +47,7 @@ IlexForestAzaleaGate_MapEventHeader: ; 0x62cf4 ; people-events db 2 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x62c7a, $ffff - person_event $30, 7, 5, $6, $0, 255, 255, $b0, 0, UnknownScript_0x62c7d, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, $ffff + person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, $ffff ; 0x62d28 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 5df517633..1b1274b47 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -140,22 +140,22 @@ UnknownScript_0x18012b: ; 0x18012b end ; 0x18012c -UnknownScript_0x18012c: ; 0x18012c +NurseScript_0x18012c: ; 0x18012c jumpstd $0000 ; 0x18012f -UnknownScript_0x18012f: ; 0x18012f +ClerkScript_0x18012f: ; 0x18012f loadfont pokemart $0, $0020 loadmovesprites end ; 0x180136 -UnknownScript_0x180136: ; 0x180136 +CooltrainerMScript_0x180136: ; 0x180136 jumptextfaceplayer UnknownText_0x180178 ; 0x180139 -UnknownScript_0x180139: ; 0x180139 +GrampsScript_0x180139: ; 0x180139 faceplayer loadfont 2writetext UnknownText_0x180335 @@ -178,7 +178,7 @@ UnknownScript_0x180154: ; 0x180154 end ; 0x18015a -UnknownScript_0x18015a: ; 0x18015a +JynxScript_0x18015a: ; 0x18015a loadfont 2writetext UnknownText_0x180433 cry ABRA @@ -317,11 +317,11 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441 ; people-events db 6 - person_event $37, 11, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x18012c, $ffff - person_event $39, 11, 15, $6, $0, 255, 255, $0, 0, UnknownScript_0x18012f, $ffff - person_event $23, 15, 15, $2, $22, 255, 255, $0, 0, UnknownScript_0x180136, $ffff - person_event $4, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, $077b - person_event $2f, 13, 5, $6, $0, 255, 255, $90, 0, UnknownScript_0x180139, $077c - person_event $91, 13, 4, $16, $0, 255, 255, $b0, 0, UnknownScript_0x18015a, $077c + person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, $ffff + person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, $ffff + person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, $ffff + person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, $077b + person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, GrampsScript_0x180139, $077c + person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, JynxScript_0x18015a, $077c ; 0x1804b9 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index bc2e5bce8..d6af8bce0 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x180bd6: ; 0x180bd6 end ; 0x180bee -UnknownScript_0x180bee: ; 0x180bee +KarenScript_0x180bee: ; 0x180bee faceplayer loadfont checkbit1 $05bb @@ -149,6 +149,6 @@ KarensRoom_MapEventHeader: ; 0x180e05 ; people-events db 1 - person_event $1b, 11, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x180bee, $ffff + person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, $ffff ; 0x180e2c diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 782bd3145..e2395373e 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x180742: ; 0x180742 end ; 0x18075a -UnknownScript_0x18075a: ; 0x18075a +KogaScript_0x18075a: ; 0x18075a faceplayer loadfont checkbit1 $05b9 @@ -148,6 +148,6 @@ KogasRoom_MapEventHeader: ; 0x18095f ; people-events db 1 - person_event $21, 11, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x18075a, $ffff + person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, $ffff ; 0x180986 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 019eb61b2..20e0dbfcc 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -123,7 +123,7 @@ UnknownScript_0x7a57e: ; 0x7a57e end ; 0x7a582 -UnknownScript_0x7a582: ; 0x7a582 +MomScript_0x7a582: ; 0x7a582 faceplayer setbit1 $0001 checktriggers @@ -167,7 +167,7 @@ UnknownScript_0x7a5b8: ; 0x7a5b8 end ; 0x7a5c1 -UnknownScript_0x7a5c1: ; 0x7a5c1 +PokefanFScript_0x7a5c1: ; 0x7a5c1 faceplayer loadfont checktime $1 @@ -407,10 +407,10 @@ KrissHouse1F_MapEventHeader: ; 0x7ab31 ; people-events db 5 - person_event $c, 8, 11, $8, $0, 255, 255, $0, 0, UnknownScript_0x7a582, $06c7 - person_event $c, 6, 6, $7, $0, 255, 1, $0, 0, UnknownScript_0x7a582, $06c8 - person_event $c, 8, 11, $8, $0, 255, 2, $0, 0, UnknownScript_0x7a582, $06c8 - person_event $c, 6, 4, $7, $0, 255, 4, $0, 0, UnknownScript_0x7a582, $06c8 - person_event $2e, 8, 8, $9, $0, 255, 255, $80, 0, UnknownScript_0x7a5c1, $0792 + person_event SPRITE_MOM, 8, 11, $8, $0, 255, 255, $0, 0, MomScript_0x7a582, $06c7 + person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, $06c8 + person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, $06c8 + person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, $06c8 + person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, PokefanFScript_0x7a5c1, $0792 ; 0x7abab diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index e16872dd6..6a6394238 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -38,19 +38,19 @@ UnknownScript_0x7abc5: ; 0x7abc5 db 0, 0, 0 ; filler -UnknownScript_0x7abcc: ; 0x7abcc +Doll1Script_0x7abcc: ; 0x7abcc describedecoration $1 ; 0x7abce -UnknownScript_0x7abce: ; 0x7abce +Doll2Script_0x7abce: ; 0x7abce describedecoration $2 ; 0x7abd0 -UnknownScript_0x7abd0: ; 0x7abd0 +BigDollScript_0x7abd0: ; 0x7abd0 describedecoration $3 ; 0x7abd2 -UnknownScript_0x7abd2: ; 0x7abd2 +ConsoleScript_0x7abd2: ; 0x7abd2 describedecoration $4 ; 0x7abd4 @@ -154,9 +154,9 @@ KrissHouse2F_MapEventHeader: ; 0x7ac99 ; people-events db 4 - person_event $f0, 6, 8, $1, $0, 255, 255, $0, 0, UnknownScript_0x7abd2, $0741 - person_event $f1, 8, 8, $1, $0, 255, 255, $0, 0, UnknownScript_0x7abcc, $0742 - person_event $f2, 8, 9, $1, $0, 255, 255, $0, 0, UnknownScript_0x7abce, $0743 - person_event $f3, 5, 4, $21, $0, 255, 255, $0, 0, UnknownScript_0x7abd0, $0744 + person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, ConsoleScript_0x7abd2, $0741 + person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1Script_0x7abcc, $0742 + person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2Script_0x7abce, $0743 + person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDollScript_0x7abd0, $0744 ; 0x7acec diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index ae0845ebc..5fdf07c71 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -6,11 +6,11 @@ KrissNeighborsHouse_MapScriptHeader: ; 0x7acec db 0 ; 0x7acee -UnknownScript_0x7acee: ; 0x7acee +CooltrainerFScript_0x7acee: ; 0x7acee jumptextfaceplayer UnknownText_0x7ad2f ; 0x7acf1 -UnknownScript_0x7acf1: ; 0x7acf1 +PokefanFScript_0x7acf1: ; 0x7acf1 jumptextfaceplayer UnknownText_0x7add4 ; 0x7acf4 @@ -116,7 +116,7 @@ KrissNeighborsHouse_MapEventHeader: ; 0x7aeb0 ; people-events db 2 - person_event $24, 7, 6, $9, $0, 255, 255, $80, 0, UnknownScript_0x7acee, $ffff - person_event $2e, 7, 9, $8, $0, 255, 255, $80, 0, UnknownScript_0x7acf1, $0793 + person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, CooltrainerFScript_0x7acee, $ffff + person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, PokefanFScript_0x7acf1, $0793 ; 0x7aee9 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 0536d9630..df8ec978c 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -33,7 +33,7 @@ UnknownScript_0x18e177: ; 0x18e177 return ; 0x18e178 -UnknownScript_0x18e178: ; 0x18e178 +KurtScript_0x18e178: ; 0x18e178 faceplayer loadfont checkbit1 $0035 @@ -344,7 +344,7 @@ UnknownScript_0x18e3ac: ; 0x18e3ac end ; 0x18e3bd -UnknownScript_0x18e3bd: ; 0x18e3bd +KurtScript_0x18e3bd: ; 0x18e3bd faceplayer loadfont checkbit1 $00bf @@ -378,7 +378,7 @@ UnknownScript_0x18e3e0: ; 0x18e3e0 end ; 0x18e3ed -UnknownScript_0x18e3ed: ; 0x18e3ed +TwinScript_0x18e3ed: ; 0x18e3ed faceplayer checkbit1 $0000 iftrue UnknownScript_0x18e42f @@ -423,7 +423,7 @@ UnknownScript_0x18e427: ; 0x18e427 end ; 0x18e42e -UnknownScript_0x18e42e: ; 0x18e42e +TwinScript_0x18e42e: ; 0x18e42e faceplayer UnknownScript_0x18e42f: ; 0x18e42f loadfont @@ -452,7 +452,7 @@ UnknownScript_0x18e448: ; 0x18e448 end ; 0x18e44f -UnknownScript_0x18e44f: ; 0x18e44f +SlowpokeScript_0x18e44f: ; 0x18e44f faceplayer loadfont 2writetext UnknownText_0x18eb56 @@ -714,10 +714,10 @@ KurtsHouse_MapEventHeader: ; 0x18eba8 ; people-events db 5 - person_event $b, 6, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x18e178, $073e - person_event $26, 7, 9, $3, $0, 255, 255, $0, 0, UnknownScript_0x18e3ed, $078c - person_event $45, 7, 10, $1, $0, 255, 255, $0, 0, UnknownScript_0x18e44f, $06fd - person_event $b, 7, 18, $7, $0, 255, 255, $0, 0, UnknownScript_0x18e3bd, $073f - person_event $26, 8, 15, $9, $0, 255, 255, $0, 0, UnknownScript_0x18e42e, $078d + person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, $073e + person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, TwinScript_0x18e3ed, $078c + person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x18e44f, $06fd + person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, $073f + person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, TwinScript_0x18e42e, $078d ; 0x18ec1c diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 4273d31d7..6e4e71be9 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -41,7 +41,7 @@ UnknownScript_0x7001f: ; 0x7001f return ; 0x70022 -UnknownScript_0x70022: ; 0x70022 +LanceScript_0x70022: ; 0x70022 checkbit1 $0026 iftrue UnknownScript_0x70057 loadfont @@ -81,7 +81,7 @@ UnknownScript_0x70057: ; 0x70057 2jump UnknownScript_0x70035 ; 0x70063 -UnknownScript_0x70063: ; 0x70063 +GyaradosScript_0x70063: ; 0x70063 loadfont 2writetext UnknownText_0x703cb pause 15 @@ -107,7 +107,7 @@ UnknownScript_0x7007a: ; 0x7007a end ; 0x7008e -UnknownScript_0x7008e: ; 0x7008e +GrampsScript_0x7008e: ; 0x7008e faceplayer loadfont checkbit1 $0022 @@ -125,11 +125,11 @@ UnknownScript_0x7009c: ; 0x7009c end ; 0x700a2 -UnknownScript_0x700a2: ; 0x700a2 +SuperNerdScript_0x700a2: ; 0x700a2 jumptextfaceplayer UnknownText_0x70444 ; 0x700a5 -UnknownScript_0x700a5: ; 0x700a5 +CooltrainerFScript_0x700a5: ; 0x700a5 jumptextfaceplayer UnknownText_0x704bb ; 0x700a8 @@ -270,7 +270,7 @@ CooltrainerfLoisScript: ; 0x70106 end ; 0x7010e -UnknownScript_0x7010e: ; 0x7010e +SuperNerdScript_0x7010e: ; 0x7010e faceplayer loadfont checkbit1 $006b @@ -582,17 +582,17 @@ LakeofRage_MapEventHeader: ; 0x70919 ; people-events db 12 - person_event $1e, 32, 25, $7, $0, 255, 255, $0, 0, UnknownScript_0x70022, $06d4 - person_event $2f, 30, 24, $7, $0, 255, 255, $0, 0, UnknownScript_0x7008e, $ffff - person_event $2b, 17, 40, $8, $0, 255, 255, $0, 0, UnknownScript_0x700a2, $ffff - person_event $24, 33, 29, $5, $1, 255, 255, $0, 0, UnknownScript_0x700a5, $ffff - person_event $3a, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, $0735 - person_event $3a, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, $0735 - person_event $23, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, $0735 - person_event $24, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, $0735 - person_event $a0, 26, 22, $16, $0, 255, 255, $80, 0, UnknownScript_0x70063, $0751 - person_event $2b, 8, 8, $6, $0, 255, 255, $0, 0, UnknownScript_0x7010e, $075c - person_event $54, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, $0645 - person_event $54, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, $0646 + person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, $06d4 + person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, $ffff + person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, $ffff + person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, $ffff + person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, $0735 + person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, $0735 + person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, $0735 + person_event SPRITE_COOLTRAINER_F, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, $0735 + person_event SPRITE_GYARADOS, 26, 22, $16, $0, 255, 255, $80, 0, GyaradosScript_0x70063, $0751 + person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7010e, $075c + person_event SPRITE_POKE_BALL, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, $0645 + person_event SPRITE_POKE_BALL, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, $0646 ; 0x709de diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index db5a38bb6..783275c69 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -6,7 +6,7 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: ; 0x19a525 db 0 ; 0x19a527 -UnknownScript_0x19a527: ; 0x19a527 +FisherScript_0x19a527: ; 0x19a527 faceplayer loadfont checkbit1 $0058 @@ -82,6 +82,6 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; 0x19a685 ; people-events db 1 - person_event $3a, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x19a527, $ffff + person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, FisherScript_0x19a527, $ffff ; 0x19a6ac diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index cb60d991f..f044ef9dd 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -6,7 +6,7 @@ LakeofRageMagikarpHouse_MapScriptHeader: ; 0x19a6ac db 0 ; 0x19a6ae -UnknownScript_0x19a6ae: ; 0x19a6ae +FishingGuruScript_0x19a6ae: ; 0x19a6ae faceplayer loadfont checkbit1 $003a @@ -214,6 +214,6 @@ LakeofRageMagikarpHouse_MapEventHeader: ; 0x19aae2 ; people-events db 1 - person_event $3b, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x19a6ae, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, $ffff ; 0x19ab09 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 55b1d28c6..4db16287d 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -348,8 +348,8 @@ LancesRoom_MapEventHeader: ; 0x1813f4 ; people-events db 3 - person_event $1e, 7, 9, $6, $0, 255, 255, $0, 0, $4e7b, $ffff - person_event $29, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f - person_event $5, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f + person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, $4e7b, $ffff + person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, $075f + person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, $075f ; 0x181445 diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index ac66847e2..d009b2f5e 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -6,19 +6,19 @@ LavRadioTower1F_MapScriptHeader: ; 0x7ee61 db 0 ; 0x7ee63 -UnknownScript_0x7ee63: ; 0x7ee63 +ReceptionistScript_0x7ee63: ; 0x7ee63 jumptextfaceplayer UnknownText_0x7eebf ; 0x7ee66 -UnknownScript_0x7ee66: ; 0x7ee66 +OfficerScript_0x7ee66: ; 0x7ee66 jumptextfaceplayer UnknownText_0x7eefa ; 0x7ee69 -UnknownScript_0x7ee69: ; 0x7ee69 +SuperNerdScript_0x7ee69: ; 0x7ee69 jumptextfaceplayer UnknownText_0x7ef90 ; 0x7ee6c -UnknownScript_0x7ee6c: ; 0x7ee6c +GentlemanScript_0x7ee6c: ; 0x7ee6c faceplayer loadfont checkbit2 $0003 @@ -53,7 +53,7 @@ UnknownScript_0x7ee6c: ; 0x7ee6c db "EXPN CARD@" ; 0x7eea2 -UnknownScript_0x7eea2: ; 0x7eea2 +SuperNerdScript_0x7eea2: ; 0x7eea2 faceplayer loadfont checkbit2 $0003 @@ -216,10 +216,10 @@ LavRadioTower1F_MapEventHeader: ; 0x7f3b9 ; people-events db 5 - person_event $42, 10, 10, $7, $0, 255, 255, $a0, 0, UnknownScript_0x7ee63, $ffff - person_event $43, 5, 19, $6, $0, 255, 255, $a0, 0, UnknownScript_0x7ee66, $ffff - person_event $2b, 7, 5, $2, $11, 255, 255, $80, 0, UnknownScript_0x7ee69, $ffff - person_event $40, 5, 13, $7, $0, 255, 255, $0, 0, UnknownScript_0x7ee6c, $ffff - person_event $2b, 10, 18, $9, $0, 255, 255, $0, 0, UnknownScript_0x7eea2, $ffff + person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, $ffff + person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, $ffff + person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, $ffff + person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, $ffff + person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, $ffff ; 0x7f414 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index d7b8551d5..8fdd778c6 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -6,18 +6,18 @@ LavenderMart_MapScriptHeader: ; 0x7eb1a db 0 ; 0x7eb1c -UnknownScript_0x7eb1c: ; 0x7eb1c +ClerkScript_0x7eb1c: ; 0x7eb1c loadfont pokemart $0, $0015 loadmovesprites end ; 0x7eb23 -UnknownScript_0x7eb23: ; 0x7eb23 +PokefanMScript_0x7eb23: ; 0x7eb23 jumptextfaceplayer UnknownText_0x7eb29 ; 0x7eb26 -UnknownScript_0x7eb26: ; 0x7eb26 +RockerScript_0x7eb26: ; 0x7eb26 jumptextfaceplayer UnknownText_0x7ebac ; 0x7eb29 @@ -58,8 +58,8 @@ LavenderMart_MapEventHeader: ; 0x7ec0e ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x7eb1c, $ffff - person_event $2d, 10, 10, $5, $2, 255, 255, $80, 0, UnknownScript_0x7eb23, $ffff - person_event $2c, 6, 13, $3, $0, 255, 255, $0, 0, UnknownScript_0x7eb26, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, $ffff + person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, $ffff + person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, $ffff ; 0x7ec45 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index f60e92cee..7ae8469cf 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -13,7 +13,7 @@ UnknownScript_0x7eaf1: ; 0x7eaf1 end ; 0x7eaf2 -UnknownScript_0x7eaf2: ; 0x7eaf2 +GentlemanScript_0x7eaf2: ; 0x7eaf2 faceplayer loadfont special $0057 @@ -43,6 +43,6 @@ LavenderNameRater_MapEventHeader: ; 0x7eafd ; people-events db 1 - person_event $40, 7, 6, $6, $0, 255, 255, $80, 0, UnknownScript_0x7eaf2, $ffff + person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, GentlemanScript_0x7eaf2, $ffff ; 0x7eb1a diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 4074ab9c5..91229efef 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -6,19 +6,19 @@ LavenderPokeCenter1F_MapScriptHeader: ; 0x7e69e db 0 ; 0x7e6a0 -UnknownScript_0x7e6a0: ; 0x7e6a0 +NurseScript_0x7e6a0: ; 0x7e6a0 jumpstd $0000 ; 0x7e6a3 -UnknownScript_0x7e6a3: ; 0x7e6a3 +GentlemanScript_0x7e6a3: ; 0x7e6a3 jumptextfaceplayer UnknownText_0x7e6bd ; 0x7e6a6 -UnknownScript_0x7e6a6: ; 0x7e6a6 +TeacherScript_0x7e6a6: ; 0x7e6a6 jumptextfaceplayer UnknownText_0x7e710 ; 0x7e6a9 -UnknownScript_0x7e6a9: ; 0x7e6a9 +YoungsterScript_0x7e6a9: ; 0x7e6a9 faceplayer loadfont checkbit1 $00c9 @@ -92,9 +92,9 @@ LavenderPokeCenter1F_MapEventHeader: ; 0x7e872 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x7e6a0, $ffff - person_event $40, 10, 11, $5, $1, 255, 255, $0, 0, UnknownScript_0x7e6a3, $ffff - person_event $29, 7, 9, $6, $0, 255, 255, $a0, 0, UnknownScript_0x7e6a6, $ffff - person_event $27, 9, 5, $4, $10, 255, 255, $80, 0, UnknownScript_0x7e6a9, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, $ffff + person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, $ffff + person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, $ffff + person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, $ffff ; 0x7e8bb diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index e21d779ec..26dcd0931 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -15,19 +15,19 @@ UnknownScript_0x1ad6e0: ; 0x1ad6e0 return ; 0x1ad6e4 -UnknownScript_0x1ad6e4: ; 0x1ad6e4 +PokefanMScript_0x1ad6e4: ; 0x1ad6e4 jumptextfaceplayer UnknownText_0x1ad702 ; 0x1ad6e7 -UnknownScript_0x1ad6e7: ; 0x1ad6e7 +TeacherScript_0x1ad6e7: ; 0x1ad6e7 jumptextfaceplayer UnknownText_0x1ad73a ; 0x1ad6ea -UnknownScript_0x1ad6ea: ; 0x1ad6ea +GrampsScript_0x1ad6ea: ; 0x1ad6ea jumptextfaceplayer UnknownText_0x1ad75c ; 0x1ad6ed -UnknownScript_0x1ad6ed: ; 0x1ad6ed +YoungsterScript_0x1ad6ed: ; 0x1ad6ed jumptextfaceplayer UnknownText_0x1ad7ac ; 0x1ad6f0 @@ -136,9 +136,9 @@ LavenderTown_MapEventHeader: ; 0x1ad8ac ; people-events db 4 - person_event $2d, 11, 16, $5, $1, 255, 255, $80, 0, UnknownScript_0x1ad6e4, $ffff - person_event $29, 19, 6, $5, $1, 255, 255, $90, 0, UnknownScript_0x1ad6e7, $ffff - person_event $2f, 16, 18, $7, $0, 255, 255, $0, 0, UnknownScript_0x1ad6ea, $ffff - person_event $27, 15, 10, $5, $1, 255, 255, $a0, 1, UnknownScript_0x1ad6ed, $ffff + person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, $ffff + person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, $ffff + person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, $ffff + person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, $ffff ; 0x1ad927 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 2f9f3ccc7..49f79569e 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -6,7 +6,7 @@ LavenderTownSpeechHouse_MapScriptHeader: ; 0x7ea45 db 0 ; 0x7ea47 -UnknownScript_0x7ea47: ; 0x7ea47 +PokefanFScript_0x7ea47: ; 0x7ea47 jumptextfaceplayer UnknownText_0x7ea4d ; 0x7ea4a @@ -44,6 +44,6 @@ LavenderTownSpeechHouse_MapEventHeader: ; 0x7eac4 ; people-events db 1 - person_event $2e, 7, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x7ea47, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, $ffff ; 0x7eaeb diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 8b9895269..ed98ad765 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -6,7 +6,7 @@ MahoganyGym_MapScriptHeader: ; 0x199a9c db 0 ; 0x199a9e -UnknownScript_0x199a9e: ; 0x199a9e +PryceScript_0x199a9e: ; 0x199a9e faceplayer loadfont checkbit1 $04c3 @@ -450,12 +450,12 @@ MahoganyGym_MapEventHeader: ; 0x19a2df ; people-events db 7 - person_event $18, 7, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x199a9e, $ffff - person_event $2a, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, $ffff - person_event $2c, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, $ffff - person_event $2a, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, $ffff - person_event $2c, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff - person_event $2c, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff - person_event $48, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff + person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, $ffff + person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, $ffff + person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, $ffff + person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, $ffff + person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff + person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff ; 0x19a354 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 64f5d7601..c5ef6464a 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -34,7 +34,7 @@ UnknownScript_0x6c362: ; 0x6c362 return ; 0x6c367 -UnknownScript_0x6c367: ; 0x6c367 +PharmacistScript_0x6c367: ; 0x6c367 faceplayer loadfont checkbit1 $0060 @@ -51,7 +51,7 @@ UnknownScript_0x6c375: ; 0x6c375 end ; 0x6c37b -UnknownScript_0x6c37b: ; 0x6c37b +BlackBeltScript_0x6c37b: ; 0x6c37b faceplayer loadfont checkbit1 $0060 @@ -113,7 +113,7 @@ UnknownScript_0x6c38f: ; 0x6c38f end ; 0x6c3ee -UnknownScript_0x6c3ee: ; 0x6c3ee +GrannyScript_0x6c3ee: ; 0x6c3ee faceplayer loadfont pokemart $0, $0010 @@ -246,10 +246,10 @@ MahoganyMart1F_MapEventHeader: ; 0x6c5fb ; people-events db 5 - person_event $4b, 7, 8, $6, $0, 255, 255, $0, 0, UnknownScript_0x6c367, $06da - person_event $41, 10, 5, $3, $0, 255, 255, $0, 0, UnknownScript_0x6c37b, $06da - person_event $1e, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 - person_event $4f, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 - person_event $30, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x6c3ee, $0736 + person_event SPRITE_PHARMACIST, 7, 8, $6, $0, 255, 255, $0, 0, PharmacistScript_0x6c367, $06da + person_event SPRITE_BLACK_BELT, 10, 5, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x6c37b, $06da + person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 + person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 + person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, $0736 ; 0x6c651 diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index e934c3bd2..b90190e3a 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -6,19 +6,19 @@ MahoganyPokeCenter1F_MapScriptHeader: ; 0x19a354 db 0 ; 0x19a356 -UnknownScript_0x19a356: ; 0x19a356 +NurseScript_0x19a356: ; 0x19a356 jumpstd $0000 ; 0x19a359 -UnknownScript_0x19a359: ; 0x19a359 +PokefanMScript_0x19a359: ; 0x19a359 jumptextfaceplayer UnknownText_0x19a362 ; 0x19a35c -UnknownScript_0x19a35c: ; 0x19a35c +YoungsterScript_0x19a35c: ; 0x19a35c jumptextfaceplayer UnknownText_0x19a3b3 ; 0x19a35f -UnknownScript_0x19a35f: ; 0x19a35f +CooltrainerFScript_0x19a35f: ; 0x19a35f jumptextfaceplayer UnknownText_0x19a418 ; 0x19a362 @@ -67,9 +67,9 @@ MahoganyPokeCenter1F_MapEventHeader: ; 0x19a46a ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x19a356, $ffff - person_event $2d, 6, 11, $2, $11, 255, 255, $80, 0, UnknownScript_0x19a359, $ffff - person_event $27, 7, 5, $9, $0, 255, 255, $a0, 0, UnknownScript_0x19a35c, $ffff - person_event $24, 7, 6, $8, $0, 255, 255, $0, 0, UnknownScript_0x19a35f, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, $ffff + person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, $ffff + person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, $ffff ; 0x19a4b3 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index e6be8f1e3..34a94be42 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -6,11 +6,11 @@ MahoganyRedGyaradosSpeechHouse_MapScriptHeader: ; 0x19997d db 0 ; 0x19997f -UnknownScript_0x19997f: ; 0x19997f +BlackBeltScript_0x19997f: ; 0x19997f jumptextfaceplayer UnknownText_0x19999c ; 0x199982 -UnknownScript_0x199982: ; 0x199982 +TeacherScript_0x199982: ; 0x199982 faceplayer loadfont checkbit2 $0013 @@ -73,7 +73,7 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; 0x199a72 ; people-events db 2 - person_event $41, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x19997f, $ffff - person_event $29, 9, 10, $4, $10, 255, 255, $90, 0, UnknownScript_0x199982, $ffff + person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, $ffff + person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, $ffff ; 0x199a9c diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 223c9e35c..a3ab060f0 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -39,7 +39,7 @@ UnknownScript_0x190013: ; 0x190013 end ; 0x19002e -UnknownScript_0x19002e: ; 0x19002e +PokefanMScript_0x19002e: ; 0x19002e faceplayer UnknownScript_0x19002f: ; 0x19002f checkbit1 $0022 @@ -97,7 +97,7 @@ UnknownScript_0x190078: ; 0x190078 end ; 0x19007e -UnknownScript_0x19007e: ; 0x19007e +GrampsScript_0x19007e: ; 0x19007e faceplayer loadfont checkbit1 $0022 @@ -115,11 +115,11 @@ UnknownScript_0x19008c: ; 0x19008c end ; 0x190092 -UnknownScript_0x190092: ; 0x190092 +FisherScript_0x190092: ; 0x190092 jumptextfaceplayer UnknownText_0x190276 ; 0x190095 -UnknownScript_0x190095: ; 0x190095 +LassScript_0x190095: ; 0x190095 jumptextfaceplayer UnknownText_0x1902f2 ; 0x190098 @@ -279,9 +279,9 @@ MahoganyTown_MapEventHeader: ; 0x1903d8 ; people-events db 4 - person_event $2d, 12, 23, $6, $0, 255, 255, $0, 0, UnknownScript_0x19002e, $0756 - person_event $2f, 13, 10, $5, $1, 255, 255, $0, 0, UnknownScript_0x19007e, $ffff - person_event $3a, 18, 10, $6, $0, 255, 255, $a0, 0, UnknownScript_0x190092, $0757 - person_event $28, 12, 16, $6, $0, 255, 255, $0, 0, UnknownScript_0x190095, $0736 + person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, $0756 + person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, $ffff + person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, $0757 + person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, $0736 ; 0x19044f diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index ce4d58b8e..f69abb947 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -6,7 +6,7 @@ ManiasHouse_MapScriptHeader: ; 0x9d276 db 0 ; 0x9d278 -UnknownScript_0x9d278: ; 0x9d278 +RockerScript_0x9d278: ; 0x9d278 faceplayer loadfont checkbit1 $0046 @@ -212,6 +212,6 @@ ManiasHouse_MapEventHeader: ; 0x9d5f0 ; people-events db 1 - person_event $2c, 8, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x9d278, $ffff + person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, $ffff ; 0x9d60d diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 9afe02013..44b3cf538 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -173,6 +173,6 @@ MountMoon_MapEventHeader: ; 0x74356 ; people-events db 1 - person_event $4, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a + person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, $077a ; 0x74391 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 913354f8c..0c75c6bd8 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -6,7 +6,7 @@ MountMoonGiftShop_MapScriptHeader: ; 0x771a6 db 0 ; 0x771a8 -UnknownScript_0x771a8: ; 0x771a8 +GrampsScript_0x771a8: ; 0x771a8 faceplayer loadfont pokemart $0, $001f @@ -14,7 +14,7 @@ UnknownScript_0x771a8: ; 0x771a8 end ; 0x771b0 -UnknownScript_0x771b0: ; 0x771b0 +LassScript_0x771b0: ; 0x771b0 jumptextfaceplayer UnknownText_0x771b3 ; 0x771b3 @@ -41,9 +41,9 @@ MountMoonGiftShop_MapEventHeader: ; 0x771e7 ; people-events db 4 - person_event $2f, 7, 8, $6, $0, 255, 1, $0, 0, UnknownScript_0x771a8, $ffff - person_event $2f, 6, 5, $9, $0, 255, 2, $0, 0, UnknownScript_0x771a8, $ffff - person_event $28, 10, 5, $5, $1, 255, 1, $0, 0, UnknownScript_0x771b0, $ffff - person_event $28, 8, 9, $4, $10, 255, 2, $0, 0, UnknownScript_0x771b0, $ffff + person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, $ffff + person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, $ffff + person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, $ffff + person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, $ffff ; 0x7722b diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 7937653f2..9ab259580 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -91,7 +91,7 @@ MapMountMoonSquareSignpost1Script: ; 0x7711b jumptext UnknownText_0x7713b ; 0x7711e -UnknownScript_0x7711e: ; 0x7711e +RockScript_0x7711e: ; 0x7711e jumpstd $000f ; 0x77121 @@ -174,8 +174,8 @@ MountMoonSquare_MapEventHeader: ; 0x77158 ; people-events db 3 - person_event $4d, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event $4d, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 - person_event $59, 11, 11, $18, $0, 255, 255, $0, 0, UnknownScript_0x7711e, $0778 + person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 + person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, $0779 + person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, RockScript_0x7711e, $0778 ; 0x771a6 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index ab4726527..2f9d0b5d8 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -64,7 +64,7 @@ SupernerdMarkusScript: ; 0x7de71 end ; 0x7de79 -UnknownScript_0x7de79: ; 0x7de79 +BoulderScript_0x7de79: ; 0x7de79 jumpstd $000e ; 0x7de7c @@ -167,15 +167,15 @@ MountMortar1FInside_MapEventHeader: ; 0x7e01d ; people-events db 10 - person_event $5a, 47, 25, $19, $0, 255, 255, $0, 0, UnknownScript_0x7de79, $ffff - person_event $54, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, $067d - person_event $54, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, $067e - person_event $54, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, $067f - person_event $54, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, $07a6 - person_event $54, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, $07a7 - person_event $2b, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, $ffff - person_event $2b, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, $ffff - person_event $54, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8 - person_event $54, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9 + person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, BoulderScript_0x7de79, $ffff + person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, $067d + person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, $067e + person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, $067f + person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, $07a6 + person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, $07a7 + person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, $ffff + person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, $ffff + person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8 + person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9 ; 0x7e0c8 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index d467bcb4c..0cf0adb43 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -45,7 +45,7 @@ MountMortar1FOutside_MapEventHeader: ; 0x7ddfd ; people-events db 2 - person_event $54, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, $067b - person_event $54, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, $067c + person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, $067b + person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, $067c ; 0x7de4f diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index b0548d4af..17527c951 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -101,12 +101,12 @@ MountMortar2FInside_MapEventHeader: ; 0x7e184 ; people-events db 7 - person_event $54, 26, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0de, $0680 - person_event $54, 37, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e0, $0681 - person_event $54, 21, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e2, $0682 - person_event $54, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, $0683 - person_event $54, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, $0684 - person_event $54, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, $0685 - person_event $2b, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, $ffff + person_event SPRITE_POKE_BALL, 26, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0de, $0680 + person_event SPRITE_POKE_BALL, 37, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e0, $0681 + person_event SPRITE_POKE_BALL, 21, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e2, $0682 + person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, $0683 + person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, $0684 + person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, $0685 + person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, $ffff ; 0x7e1f4 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 988ba4fb5..c316904c3 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -6,7 +6,7 @@ MountMortarB1F_MapScriptHeader: ; 0x7e1f4 db 0 ; 0x7e1f6 -UnknownScript_0x7e1f6: ; 0x7e1f6 +BlackBeltScript_0x7e1f6: ; 0x7e1f6 faceplayer loadfont checkbit1 $0061 @@ -47,7 +47,7 @@ UnknownScript_0x7e237: ; 0x7e237 end ; 0x7e23d -UnknownScript_0x7e23d: ; 0x7e23d +BoulderScript_0x7e23d: ; 0x7e23d jumpstd $000e ; 0x7e240 @@ -144,12 +144,12 @@ MountMortarB1F_MapEventHeader: ; 0x7e400 ; people-events db 7 - person_event $54, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, $0686 - person_event $54, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, $0687 - person_event $5a, 14, 13, $19, $0, 255, 255, $0, 0, UnknownScript_0x7e23d, $ffff - person_event $41, 8, 20, $6, $0, 255, 255, $b0, 0, UnknownScript_0x7e1f6, $ffff - person_event $54, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, $07ca - person_event $54, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb - person_event $54, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc + person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, $0686 + person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, $0687 + person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, BoulderScript_0x7e23d, $ffff + person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, $ffff + person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, $07ca + person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, $07cb + person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, $07cc ; 0x7e470 diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index a2f678563..975a003aa 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -6,7 +6,7 @@ MoveDeletersHouse_MapScriptHeader: ; 0x195cb2 db 0 ; 0x195cb4 -UnknownScript_0x195cb4: ; 0x195cb4 +SuperNerdScript_0x195cb4: ; 0x195cb4 faceplayer loadfont special $0021 @@ -38,6 +38,6 @@ MoveDeletersHouse_MapEventHeader: ; 0x195cbf ; people-events db 1 - person_event $2b, 7, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x195cb4, $ffff + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x195cb4, $ffff ; 0x195ce6 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index ca61b2914..11115d5c2 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -6,15 +6,15 @@ MrFujisHouse_MapScriptHeader: ; 0x7e8c8 db 0 ; 0x7e8ca -UnknownScript_0x7e8ca: ; 0x7e8ca +SuperNerdScript_0x7e8ca: ; 0x7e8ca jumptextfaceplayer UnknownText_0x7e8f1 ; 0x7e8cd -UnknownScript_0x7e8cd: ; 0x7e8cd +LassScript_0x7e8cd: ; 0x7e8cd jumptextfaceplayer UnknownText_0x7e940 ; 0x7e8d0 -UnknownScript_0x7e8d0: ; 0x7e8d0 +RhydonScript_0x7e8d0: ; 0x7e8d0 loadfont 2writetext UnknownText_0x7e9b6 cry PSYDUCK @@ -23,7 +23,7 @@ UnknownScript_0x7e8d0: ; 0x7e8d0 end ; 0x7e8da -UnknownScript_0x7e8da: ; 0x7e8da +GrowlitheScript_0x7e8da: ; 0x7e8da loadfont 2writetext UnknownText_0x7e9c9 cry NIDORINO @@ -32,7 +32,7 @@ UnknownScript_0x7e8da: ; 0x7e8da end ; 0x7e8e4 -UnknownScript_0x7e8e4: ; 0x7e8e4 +MoltresScript_0x7e8e4: ; 0x7e8e4 loadfont 2writetext UnknownText_0x7e9da cry PIDGEY @@ -94,10 +94,10 @@ MrFujisHouse_MapEventHeader: ; 0x7e9ea ; people-events db 5 - person_event $2b, 5, 8, $6, $0, 255, 255, $a0, 0, UnknownScript_0x7e8ca, $ffff - person_event $28, 8, 7, $2, $11, 255, 255, $0, 0, UnknownScript_0x7e8cd, $ffff - person_event $9d, 8, 11, $16, $0, 255, 255, $0, 0, UnknownScript_0x7e8d0, $ffff - person_event $82, 9, 9, $16, $0, 255, 255, $90, 0, UnknownScript_0x7e8da, $ffff - person_event $9e, 7, 5, $16, $0, 255, 255, $b0, 0, UnknownScript_0x7e8e4, $ffff + person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, $ffff + person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, $ffff + person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, RhydonScript_0x7e8d0, $ffff + person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x7e8da, $ffff + person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MoltresScript_0x7e8e4, $ffff ; 0x7ea45 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index d90c7003b..8b80af737 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -51,7 +51,7 @@ UnknownScript_0x196e56: ; 0x196e56 2jump UnknownScript_0x196ec9 ; 0x196e97 -UnknownScript_0x196e97: ; 0x196e97 +GentlemanScript_0x196e97: ; 0x196e97 faceplayer loadfont checkitem RED_SCALE @@ -374,7 +374,7 @@ MrPokemonsHouse_MapEventHeader: ; 0x1975ef ; people-events db 2 - person_event $40, 9, 7, $9, $0, 255, 255, $0, 0, UnknownScript_0x196e97, $ffff - person_event $5, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c9 + person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, $ffff + person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c9 ; 0x197632 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 66ad69584..64f3fbfda 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -6,7 +6,7 @@ MrPsychicsHouse_MapScriptHeader: ; 0x18a778 db 0 ; 0x18a77a -UnknownScript_0x18a77a: ; 0x18a77a +FishingGuruScript_0x18a77a: ; 0x18a77a faceplayer loadfont checkbit1 $00e3 @@ -61,6 +61,6 @@ MrPsychicsHouse_MapEventHeader: ; 0x18a7f0 ; people-events db 1 - person_event $3b, 7, 9, $8, $0, 255, 255, $a0, 0, UnknownScript_0x18a77a, $ffff + person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, FishingGuruScript_0x18a77a, $ffff ; 0x18a817 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 1267668e5..8a6c6335d 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -6,15 +6,15 @@ NationalPark_MapScriptHeader: ; 0x5c000 db 0 ; 0x5c002 -UnknownScript_0x5c002: ; 0x5c002 +LassScript_0x5c002: ; 0x5c002 jumptextfaceplayer UnknownText_0x5c1d3 ; 0x5c005 -UnknownScript_0x5c005: ; 0x5c005 +PokefanFScript_0x5c005: ; 0x5c005 jumptextfaceplayer UnknownText_0x5c22e ; 0x5c008 -UnknownScript_0x5c008: ; 0x5c008 +TeacherScript_0x5c008: ; 0x5c008 faceplayer loadfont checkbit1 $0057 @@ -32,19 +32,19 @@ UnknownScript_0x5c021: ; 0x5c021 end ; 0x5c023 -UnknownScript_0x5c023: ; 0x5c023 +YoungsterScript_0x5c023: ; 0x5c023 jumptextfaceplayer UnknownText_0x5c35d ; 0x5c026 -UnknownScript_0x5c026: ; 0x5c026 +YoungsterScript_0x5c026: ; 0x5c026 jumptextfaceplayer UnknownText_0x5c38f ; 0x5c029 -UnknownScript_0x5c029: ; 0x5c029 +TeacherScript_0x5c029: ; 0x5c029 jumptextfaceplayer UnknownText_0x5c3bc ; 0x5c02c -UnknownScript_0x5c02c: ; 0x5c02c +GrowlitheScript_0x5c02c: ; 0x5c02c faceplayer loadfont 2writetext UnknownText_0x5c416 @@ -54,7 +54,7 @@ UnknownScript_0x5c02c: ; 0x5c02c end ; 0x5c037 -UnknownScript_0x5c037: ; 0x5c037 +GameboyKidScript_0x5c037: ; 0x5c037 faceplayer loadfont 2writetext UnknownText_0x5c42a @@ -608,19 +608,19 @@ NationalPark_MapEventHeader: ; 0x5c806 ; people-events db 14 - person_event $28, 28, 19, $5, $1, 255, 255, $a0, 0, UnknownScript_0x5c002, $ffff - person_event $2e, 8, 18, $6, $0, 255, 255, $0, 0, UnknownScript_0x5c005, $ffff - person_event $29, 44, 31, $6, $0, 255, 255, $a0, 0, UnknownScript_0x5c008, $ffff - person_event $27, 45, 15, $8, $0, 255, 255, $0, 0, UnknownScript_0x5c023, $ffff - person_event $27, 45, 14, $6, $0, 255, 255, $80, 0, UnknownScript_0x5c026, $ffff - person_event $29, 45, 21, $2, $21, 255, 255, $0, 0, UnknownScript_0x5c029, $ffff - person_event $82, 44, 30, $16, $0, 255, 255, $0, 0, UnknownScript_0x5c02c, $ffff - person_event $27, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, $ffff - person_event $2e, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, $ffff - person_event $2d, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, $ffff - person_event $28, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, $ffff - person_event $54, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, $0658 - person_event $3, 10, 30, $6, $0, 255, 255, $0, 0, UnknownScript_0x5c037, $ffff - person_event $54, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, $0659 + person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, $ffff + person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, $ffff + person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, $ffff + person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, $ffff + person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, $ffff + person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, $ffff + person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, $ffff + person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, $ffff + person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, $ffff + person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, $ffff + person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, $ffff + person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, $0658 + person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, $ffff + person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, $0659 ; 0x5c8ea diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index b248d6ff7..2c7540882 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -6,7 +6,7 @@ NationalParkBugContest_MapScriptHeader: ; 0x5c8ea db 0 ; 0x5c8ec -UnknownScript_0x5c8ec: ; 0x5c8ec +YoungsterScript_0x5c8ec: ; 0x5c8ec faceplayer loadfont 2writetext UnknownText_0x5c94c @@ -15,7 +15,7 @@ UnknownScript_0x5c8ec: ; 0x5c8ec end ; 0x5c8f4 -UnknownScript_0x5c8f4: ; 0x5c8f4 +YoungsterScript_0x5c8f4: ; 0x5c8f4 faceplayer loadfont 2writetext UnknownText_0x5c973 @@ -24,7 +24,7 @@ UnknownScript_0x5c8f4: ; 0x5c8f4 end ; 0x5c8fc -UnknownScript_0x5c8fc: ; 0x5c8fc +RockerScript_0x5c8fc: ; 0x5c8fc faceplayer loadfont 2writetext UnknownText_0x5c9a3 @@ -33,7 +33,7 @@ UnknownScript_0x5c8fc: ; 0x5c8fc end ; 0x5c904 -UnknownScript_0x5c904: ; 0x5c904 +PokefanMScript_0x5c904: ; 0x5c904 faceplayer loadfont 2writetext UnknownText_0x5c9cc @@ -42,7 +42,7 @@ UnknownScript_0x5c904: ; 0x5c904 end ; 0x5c90c -UnknownScript_0x5c90c: ; 0x5c90c +YoungsterScript_0x5c90c: ; 0x5c90c faceplayer loadfont 2writetext UnknownText_0x5ca15 @@ -51,7 +51,7 @@ UnknownScript_0x5c90c: ; 0x5c90c end ; 0x5c914 -UnknownScript_0x5c914: ; 0x5c914 +YoungsterScript_0x5c914: ; 0x5c914 faceplayer loadfont 2writetext UnknownText_0x5ca52 @@ -60,7 +60,7 @@ UnknownScript_0x5c914: ; 0x5c914 end ; 0x5c91c -UnknownScript_0x5c91c: ; 0x5c91c +LassScript_0x5c91c: ; 0x5c91c faceplayer loadfont 2writetext UnknownText_0x5ca8f @@ -69,7 +69,7 @@ UnknownScript_0x5c91c: ; 0x5c91c end ; 0x5c924 -UnknownScript_0x5c924: ; 0x5c924 +YoungsterScript_0x5c924: ; 0x5c924 faceplayer loadfont 2writetext UnknownText_0x5cac8 @@ -78,7 +78,7 @@ UnknownScript_0x5c924: ; 0x5c924 end ; 0x5c92c -UnknownScript_0x5c92c: ; 0x5c92c +YoungsterScript_0x5c92c: ; 0x5c92c faceplayer loadfont 2writetext UnknownText_0x5cb25 @@ -87,7 +87,7 @@ UnknownScript_0x5c92c: ; 0x5c92c end ; 0x5c934 -UnknownScript_0x5c934: ; 0x5c934 +YoungsterScript_0x5c934: ; 0x5c934 faceplayer loadfont 2writetext UnknownText_0x5cb64 @@ -237,17 +237,17 @@ NationalParkBugContest_MapEventHeader: ; 0x5cc5d ; people-events db 12 - person_event $27, 33, 23, $2, $22, 255, 255, $80, 0, UnknownScript_0x5c8ec, $0716 - person_event $27, 26, 32, $2, $22, 255, 255, $a0, 0, UnknownScript_0x5c8f4, $0717 - person_event $2c, 22, 13, $7, $0, 255, 255, $90, 0, UnknownScript_0x5c8fc, $0718 - person_event $2d, 17, 11, $4, $1, 255, 255, $b0, 0, UnknownScript_0x5c904, $0719 - person_event $27, 13, 27, $3, $0, 255, 255, $80, 0, UnknownScript_0x5c90c, $071a - person_event $27, 17, 31, $2, $33, 255, 255, $a0, 0, UnknownScript_0x5c914, $071b - person_event $28, 27, 11, $5, $2, 255, 255, $90, 0, UnknownScript_0x5c91c, $071c - person_event $27, 31, 15, $2, $11, 255, 255, $80, 0, UnknownScript_0x5c924, $071d - person_event $27, 12, 20, $2, $11, 255, 255, $a0, 0, UnknownScript_0x5c92c, $071e - person_event $27, 38, 21, $2, $33, 255, 255, $90, 0, UnknownScript_0x5c934, $071f - person_event $54, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, $0658 - person_event $54, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, $0659 + person_event SPRITE_YOUNGSTER, 33, 23, $2, $22, 255, 255, $80, 0, YoungsterScript_0x5c8ec, $0716 + person_event SPRITE_YOUNGSTER, 26, 32, $2, $22, 255, 255, $a0, 0, YoungsterScript_0x5c8f4, $0717 + person_event SPRITE_ROCKER, 22, 13, $7, $0, 255, 255, $90, 0, RockerScript_0x5c8fc, $0718 + person_event SPRITE_POKEFAN_M, 17, 11, $4, $1, 255, 255, $b0, 0, PokefanMScript_0x5c904, $0719 + person_event SPRITE_YOUNGSTER, 13, 27, $3, $0, 255, 255, $80, 0, YoungsterScript_0x5c90c, $071a + person_event SPRITE_YOUNGSTER, 17, 31, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x5c914, $071b + person_event SPRITE_LASS, 27, 11, $5, $2, 255, 255, $90, 0, LassScript_0x5c91c, $071c + person_event SPRITE_YOUNGSTER, 31, 15, $2, $11, 255, 255, $80, 0, YoungsterScript_0x5c924, $071d + person_event SPRITE_YOUNGSTER, 12, 20, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x5c92c, $071e + person_event SPRITE_YOUNGSTER, 38, 21, $2, $33, 255, 255, $90, 0, YoungsterScript_0x5c934, $071f + person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, $0658 + person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, $0659 ; 0x5cd27 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 0c420983b..5d9afe0d2 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -77,7 +77,7 @@ UnknownScript_0x1a8041: ; 0x1a8041 end ; 0x1a806f -UnknownScript_0x1a806f: ; 0x1a806f +TeacherScript_0x1a806f: ; 0x1a806f faceplayer loadfont checkbit1 $0040 @@ -113,11 +113,11 @@ UnknownScript_0x1a8095: ; 0x1a8095 end ; 0x1a809b -UnknownScript_0x1a809b: ; 0x1a809b +FisherScript_0x1a809b: ; 0x1a809b jumptextfaceplayer UnknownText_0x1a8274 ; 0x1a809e -UnknownScript_0x1a809e: ; 0x1a809e +SilverScript_0x1a809e: ; 0x1a809e loadfont 2writetext UnknownText_0x1a82a6 closetext @@ -321,8 +321,8 @@ NewBarkTown_MapEventHeader: ; 0x1a834d ; people-events db 3 - person_event $29, 12, 10, $3, $1, 255, 255, $0, 0, UnknownScript_0x1a806f, $ffff - person_event $3a, 13, 16, $4, $10, 255, 255, $a0, 0, UnknownScript_0x1a809b, $ffff - person_event $4, 6, 7, $9, $0, 255, 255, $0, 0, UnknownScript_0x1a809e, $06bd + person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, $ffff + person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, $ffff + person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, $06bd ; 0x1a83b2 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 04bde0c01..9a21e8935 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -10,7 +10,7 @@ UnknownScript_0x19b3c7: ; 0x19b3c7 end ; 0x19b3c8 -UnknownScript_0x19b3c8: ; 0x19b3c8 +OakScript_0x19b3c8: ; 0x19b3c8 faceplayer loadfont checkbit1 $074f @@ -56,15 +56,15 @@ UnknownScript_0x19b408: ; 0x19b408 2jump UnknownScript_0x19b3ea ; 0x19b40f -UnknownScript_0x19b40f: ; 0x19b40f +ScientistScript_0x19b40f: ; 0x19b40f jumptextfaceplayer UnknownText_0x19b7fb ; 0x19b412 -UnknownScript_0x19b412: ; 0x19b412 +ScientistScript_0x19b412: ; 0x19b412 jumptextfaceplayer UnknownText_0x19b859 ; 0x19b415 -UnknownScript_0x19b415: ; 0x19b415 +ScientistScript_0x19b415: ; 0x19b415 jumptextfaceplayer UnknownText_0x19b8a7 ; 0x19b418 @@ -263,10 +263,10 @@ OaksLab_MapEventHeader: ; 0x19ba33 ; people-events db 4 - person_event $5, 6, 8, $6, $0, 255, 255, $0, 0, UnknownScript_0x19b3c8, $ffff - person_event $3c, 12, 5, $5, $1, 255, 255, $90, 0, UnknownScript_0x19b40f, $ffff - person_event $3c, 13, 12, $4, $10, 255, 255, $90, 0, UnknownScript_0x19b412, $ffff - person_event $3c, 8, 5, $2, $11, 255, 255, $90, 0, UnknownScript_0x19b415, $ffff + person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, OakScript_0x19b3c8, $ffff + person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, $ffff + person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, $ffff + person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, $ffff ; 0x19bac7 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 5a0aeb3c2..417df164f 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -6,7 +6,7 @@ OlivineCafe_MapScriptHeader: ; 0x9c8bf db 0 ; 0x9c8c1 -UnknownScript_0x9c8c1: ; 0x9c8c1 +SailorScript_0x9c8c1: ; 0x9c8c1 faceplayer loadfont checkbit1 $0013 @@ -22,11 +22,11 @@ UnknownScript_0x9c8d3: ; 0x9c8d3 end ; 0x9c8d9 -UnknownScript_0x9c8d9: ; 0x9c8d9 +FishingGuruScript_0x9c8d9: ; 0x9c8d9 jumptextfaceplayer UnknownText_0x9c9c5 ; 0x9c8dc -UnknownScript_0x9c8dc: ; 0x9c8dc +SailorScript_0x9c8dc: ; 0x9c8dc jumptextfaceplayer UnknownText_0x9ca09 ; 0x9c8df @@ -86,8 +86,8 @@ OlivineCafe_MapEventHeader: ; 0x9ca8e ; people-events db 3 - person_event $49, 7, 8, $8, $0, 255, 255, $0, 0, UnknownScript_0x9c8c1, $ffff - person_event $3b, 7, 11, $4, $10, 255, 255, $0, 0, UnknownScript_0x9c8d9, $ffff - person_event $49, 10, 10, $7, $0, 255, 255, $0, 0, UnknownScript_0x9c8dc, $ffff + person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, $ffff + person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, $ffff + person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, $ffff ; 0x9cac5 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 32dfbf2ee..183e3288b 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -77,11 +77,11 @@ UnknownScript_0x1a886b: ; 0x1a886b end ; 0x1a88a3 -UnknownScript_0x1a88a3: ; 0x1a88a3 +SailorScript_0x1a88a3: ; 0x1a88a3 jumptextfaceplayer UnknownText_0x1a8a58 ; 0x1a88a6 -UnknownScript_0x1a88a6: ; 0x1a88a6 +StandingYoungsterScript_0x1a88a6: ; 0x1a88a6 faceplayer loadfont random $2 @@ -99,7 +99,7 @@ UnknownScript_0x1a88b4: ; 0x1a88b4 end ; 0x1a88ba -UnknownScript_0x1a88ba: ; 0x1a88ba +SailorScript_0x1a88ba: ; 0x1a88ba jumptextfaceplayer UnknownText_0x1a8b71 ; 0x1a88bd @@ -324,9 +324,9 @@ OlivineCity_MapEventHeader: ; 0x1a8cce ; people-events db 4 - person_event $49, 31, 30, $4, $10, 255, 255, $0, 0, UnknownScript_0x1a88a3, $ffff - person_event $66, 17, 24, $3, $0, 255, 255, $80, 0, UnknownScript_0x1a88a6, $ffff - person_event $49, 25, 21, $2, $11, 255, 255, $0, 0, UnknownScript_0x1a88ba, $ffff - person_event $f5, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c3 + person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, $ffff + person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, $ffff + person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c3 ; 0x1a8d72 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 3cb39a054..181ec09b3 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -6,7 +6,7 @@ OlivineGoodRodHouse_MapScriptHeader: ; 0x9c719 db 0 ; 0x9c71b -UnknownScript_0x9c71b: ; 0x9c71b +FishingGuruScript_0x9c71b: ; 0x9c71b faceplayer loadfont checkbit1 $0018 @@ -96,6 +96,6 @@ OlivineGoodRodHouse_MapEventHeader: ; 0x9c8a2 ; people-events db 1 - person_event $3b, 7, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x9c71b, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x9c71b, $ffff ; 0x9c8bf diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 9ee7de020..fad06da3f 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -6,7 +6,7 @@ OlivineGym_MapScriptHeader: ; 0x9c12d db 0 ; 0x9c12f -UnknownScript_0x9c12f: ; 0x9c12f +JasmineScript_0x9c12f: ; 0x9c12f faceplayer loadfont checkbit1 $04c1 @@ -209,7 +209,7 @@ OlivineGym_MapEventHeader: ; 0x9c526 ; people-events db 2 - person_event $17, 7, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x9c12f, $06d3 - person_event $48, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, $ffff + person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, $06d3 + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, $ffff ; 0x9c55a diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 5c1b596fc..840b53409 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -6,11 +6,11 @@ OlivineHouseBeta_MapScriptHeader: ; 0x9c58d db 0 ; 0x9c58f -UnknownScript_0x9c58f: ; 0x9c58f +TeacherScript_0x9c58f: ; 0x9c58f jumptextfaceplayer UnknownText_0x9c5a2 ; 0x9c592 -UnknownScript_0x9c592: ; 0x9c592 +RhydonScript_0x9c592: ; 0x9c592 loadfont 2writetext UnknownText_0x9c5f0 cry RHYDON @@ -58,7 +58,7 @@ OlivineHouseBeta_MapEventHeader: ; 0x9c601 ; people-events db 2 - person_event $29, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x9c58f, $ffff - person_event $9d, 8, 10, $4, $20, 255, 255, $0, 0, UnknownScript_0x9c592, $ffff + person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, $ffff + person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, $ffff ; 0x9c635 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 75f5c1d06..1b5ba3467 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -6,11 +6,11 @@ OlivineLighthouse1F_MapScriptHeader: ; 0x5ae65 db 0 ; 0x5ae67 -UnknownScript_0x5ae67: ; 0x5ae67 +SailorScript_0x5ae67: ; 0x5ae67 jumptextfaceplayer UnknownText_0x5ae6d ; 0x5ae6a -UnknownScript_0x5ae6a: ; 0x5ae6a +PokefanFScript_0x5ae6a: ; 0x5ae6a jumptextfaceplayer UnknownText_0x5aec2 ; 0x5ae6d @@ -52,7 +52,7 @@ OlivineLighthouse1F_MapEventHeader: ; 0x5af36 ; people-events db 2 - person_event $49, 6, 12, $6, $0, 255, 255, $0, 0, UnknownScript_0x5ae67, $ffff - person_event $2e, 13, 20, $4, $20, 255, 255, $0, 0, UnknownScript_0x5ae6a, $ffff + person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, $ffff + person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, $ffff ; 0x5af6f diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 8555ba671..af121bc9d 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -270,7 +270,7 @@ OlivineLighthouse2F_MapEventHeader: ; 0x5b1fd ; people-events db 2 - person_event $49, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, $ffff - person_event $40, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff + person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, $ffff + person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff ; 0x5b23b diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 5961e3ef8..93b21dcf1 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -181,9 +181,9 @@ OlivineLighthouse3F_MapEventHeader: ; 0x5b481 ; people-events db 4 - person_event $49, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, $ffff - person_event $40, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, $ffff - person_event $27, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff - person_event $54, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664 + person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, $ffff + person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, $ffff + person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff + person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664 ; 0x5b4e8 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 53775d1e9..c375b8408 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -133,8 +133,8 @@ OlivineLighthouse4F_MapEventHeader: ; 0x5b6c0 ; people-events db 2 - person_event $49, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, $ffff - person_event $28, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie1, $ffff + person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, $ffff + person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie1, $ffff ; 0x5b712 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 376f1c118..d6c9c6f1d 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -145,10 +145,10 @@ OlivineLighthouse5F_MapEventHeader: ; 0x60b20 ; people-events db 5 - person_event $49, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, $ffff - person_event $27, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, $ffff - person_event $54, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, $0665 - person_event $54, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, $0666 - person_event $54, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, $0667 + person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, $ffff + person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, $ffff + person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, $0665 + person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, $0666 + person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, $0667 ; 0x60b8f diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 123f22756..a6551b84f 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -6,7 +6,7 @@ OlivineLighthouse6F_MapScriptHeader: ; 0x60b8f db 0 ; 0x60b91 -UnknownScript_0x60b91: ; 0x60b91 +JasmineScript_0x60b91: ; 0x60b91 faceplayer loadfont checkitem SECRETPOTION @@ -104,7 +104,7 @@ UnknownScript_0x60c39: ; 0x60c39 end ; 0x60c3a -UnknownScript_0x60c3a: ; 0x60c3a +MonsterScript_0x60c3a: ; 0x60c3a faceplayer loadfont checkbit1 $0020 @@ -272,8 +272,8 @@ OlivineLighthouse6F_MapEventHeader: ; 0x60f53 ; people-events db 3 - person_event $17, 12, 12, $6, $0, 255, 255, $80, 0, UnknownScript_0x60b91, $06d2 - person_event $4c, 12, 13, $6, $0, 255, 255, $b0, 0, UnknownScript_0x60c3a, $ffff - person_event $54, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, $0668 + person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, $06d2 + person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, $ffff + person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, $0668 ; 0x60f8f diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b19227d69..3e8f8e864 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -6,18 +6,18 @@ OlivineMart_MapScriptHeader: ; 0x9cac5 db 0 ; 0x9cac7 -UnknownScript_0x9cac7: ; 0x9cac7 +ClerkScript_0x9cac7: ; 0x9cac7 loadfont pokemart $0, $000d loadmovesprites end ; 0x9cace -UnknownScript_0x9cace: ; 0x9cace +CooltrainerFScript_0x9cace: ; 0x9cace jumptextfaceplayer UnknownText_0x9cad4 ; 0x9cad1 -UnknownScript_0x9cad1: ; 0x9cad1 +LassScript_0x9cad1: ; 0x9cad1 jumptextfaceplayer UnknownText_0x9cb16 ; 0x9cad4 @@ -57,8 +57,8 @@ OlivineMart_MapEventHeader: ; 0x9cb9e ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x9cac7, $ffff - person_event $24, 6, 10, $5, $2, 255, 255, $a0, 0, UnknownScript_0x9cace, $ffff - person_event $28, 10, 5, $8, $0, 255, 255, $0, 0, UnknownScript_0x9cad1, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, $ffff + person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, $ffff ; 0x9cbd5 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index eb3544726..27cec3da2 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -6,19 +6,19 @@ OlivinePokeCenter1F_MapScriptHeader: ; 0x9c000 db 0 ; 0x9c002 -UnknownScript_0x9c002: ; 0x9c002 +NurseScript_0x9c002: ; 0x9c002 jumpstd $0000 ; 0x9c005 -UnknownScript_0x9c005: ; 0x9c005 +FishingGuruScript_0x9c005: ; 0x9c005 jumpstd $0033 ; 0x9c008 -UnknownScript_0x9c008: ; 0x9c008 +FisherScript_0x9c008: ; 0x9c008 jumptextfaceplayer UnknownText_0x9c00e ; 0x9c00b -UnknownScript_0x9c00b: ; 0x9c00b +TeacherScript_0x9c00b: ; 0x9c00b jumptextfaceplayer UnknownText_0x9c086 ; 0x9c00e @@ -60,9 +60,9 @@ OlivinePokeCenter1F_MapEventHeader: ; 0x9c0e4 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x9c002, $ffff - person_event $3b, 8, 12, $5, $1, 255, 255, $0, 0, UnknownScript_0x9c005, $ffff - person_event $3a, 7, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x9c008, $ffff - person_event $29, 5, 11, $6, $0, 255, 255, $0, 0, UnknownScript_0x9c00b, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, $ffff + person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, $ffff + person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, $ffff + person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, $ffff ; 0x9c12d diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 091738ff6..c07301471 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -28,7 +28,7 @@ UnknownScript_0x748b1: ; 0x748b1 end ; 0x748c0 -UnknownScript_0x748c0: ; 0x748c0 +SailorScript_0x748c0: ; 0x748c0 faceplayer loadfont checkbit1 $0000 @@ -102,7 +102,7 @@ UnknownScript_0x7494e: ; 0x7494e loadmovesprites setbit1 $0001 applymovement $0, MovementData_0x74a37 - 2jump UnknownScript_0x748c0 + 2jump SailorScript_0x748c0 ; 0x7496d UnknownScript_0x7496d: ; 0x7496d @@ -148,7 +148,7 @@ UnknownScript_0x74992: ; 0x74992 end ; 0x7499c -UnknownScript_0x7499c: ; 0x7499c +SailorScript_0x7499c: ; 0x7499c faceplayer loadfont checkbit1 $0000 @@ -176,12 +176,12 @@ UnknownScript_0x749c0: ; 0x749c0 checkcode $9 if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f - 2jump UnknownScript_0x748c0 + 2jump SailorScript_0x748c0 ; 0x749e5 UnknownScript_0x749e5: ; 0x749e5 applymovement $0, MovementData_0x74a49 - 2jump UnknownScript_0x748c0 + 2jump SailorScript_0x748c0 ; 0x749ec UnknownScript_0x749ec: ; 0x749ec @@ -205,11 +205,11 @@ UnknownScript_0x749f8: ; 0x749f8 end ; 0x749fe -UnknownScript_0x749fe: ; 0x749fe +SailorScript_0x749fe: ; 0x749fe jumptextfaceplayer UnknownText_0x74cd7 ; 0x74a01 -UnknownScript_0x74a01: ; 0x74a01 +FishingGuruScript_0x74a01: ; 0x74a01 faceplayer loadfont 2writetext UnknownText_0x74bf4 @@ -219,7 +219,7 @@ UnknownScript_0x74a01: ; 0x74a01 end ; 0x74a0c -UnknownScript_0x74a0c: ; 0x74a0c +FishingGuruScript_0x74a0c: ; 0x74a0c faceplayer loadfont 2writetext UnknownText_0x74c35 @@ -229,7 +229,7 @@ UnknownScript_0x74a0c: ; 0x74a0c end ; 0x74a17 -UnknownScript_0x74a17: ; 0x74a17 +YoungsterScript_0x74a17: ; 0x74a17 faceplayer loadfont 2writetext UnknownText_0x74c76 @@ -239,7 +239,7 @@ UnknownScript_0x74a17: ; 0x74a17 end ; 0x74a22 -UnknownScript_0x74a22: ; 0x74a22 +CooltrainerFScript_0x74a22: ; 0x74a22 faceplayer loadfont 2writetext UnknownText_0x74ca2 @@ -419,12 +419,12 @@ OlivinePort_MapEventHeader: ; 0x74d18 ; people-events db 7 - person_event $49, 27, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x748c0, $072a - person_event $49, 19, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x749fe, $0737 - person_event $49, 19, 10, $9, $0, 255, 255, $0, 0, UnknownScript_0x7499c, $0738 - person_event $3b, 18, 8, $7, $0, 255, 255, $0, 0, UnknownScript_0x74a01, $0737 - person_event $3b, 18, 17, $7, $0, 255, 255, $0, 0, UnknownScript_0x74a0c, $0737 - person_event $27, 19, 8, $6, $0, 255, 255, $0, 0, UnknownScript_0x74a17, $0738 - person_event $24, 19, 15, $6, $0, 255, 255, $0, 0, UnknownScript_0x74a22, $0738 + person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, $072a + person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, $0737 + person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, $0738 + person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, $0737 + person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, $0737 + person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, $0738 + person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, $0738 ; 0x74d90 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 795ab2da9..d572f3bd1 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -6,7 +6,7 @@ OlivinePortPassage_MapScriptHeader: ; 0x76faa db 0 ; 0x76fac -UnknownScript_0x76fac: ; 0x76fac +PokefanMScript_0x76fac: ; 0x76fac jumptextfaceplayer UnknownText_0x76faf ; 0x76faf @@ -37,6 +37,6 @@ OlivinePortPassage_MapEventHeader: ; 0x76fec ; people-events db 1 - person_event $2d, 5, 21, $8, $0, 255, 255, $0, 0, UnknownScript_0x76fac, $0733 + person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, $0733 ; 0x77018 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 38345b14a..e66cd8fe3 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -6,11 +6,11 @@ OlivinePunishmentSpeechHouse_MapScriptHeader: ; 0x9c635 db 0 ; 0x9c637 -UnknownScript_0x9c637: ; 0x9c637 +PokefanMScript_0x9c637: ; 0x9c637 jumptextfaceplayer UnknownText_0x9c643 ; 0x9c63a -UnknownScript_0x9c63a: ; 0x9c63a +LassScript_0x9c63a: ; 0x9c63a jumptextfaceplayer UnknownText_0x9c6b1 ; 0x9c63d @@ -57,7 +57,7 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; 0x9c6e5 ; people-events db 2 - person_event $2d, 6, 5, $3, $0, 255, 255, $0, 0, UnknownScript_0x9c637, $ffff - person_event $28, 9, 9, $5, $2, 255, 255, $0, 0, UnknownScript_0x9c63a, $ffff + person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, PokefanMScript_0x9c637, $ffff + person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, LassScript_0x9c63a, $ffff ; 0x9c719 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index b89523d49..50d4cff50 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -6,7 +6,7 @@ OlivineVoltorbHouse_MapScriptHeader: ; 0x9c55a db 0 ; 0x9c55c -UnknownScript_0x9c55c: ; 0x9c55c +FishingGuruScript_0x9c55c: ; 0x9c55c faceplayer loadfont trade $2 @@ -38,6 +38,6 @@ OlivineVoltorbHouse_MapEventHeader: ; 0x9c566 ; people-events db 1 - person_event $3b, 7, 6, $3, $0, 255, 255, $80, 0, UnknownScript_0x9c55c, $ffff + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, FishingGuruScript_0x9c55c, $ffff ; 0x9c58d diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index fd8038691..bf1bfc539 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -15,11 +15,11 @@ UnknownScript_0x1ac6d1: ; 0x1ac6d1 return ; 0x1ac6d5 -UnknownScript_0x1ac6d5: ; 0x1ac6d5 +TeacherScript_0x1ac6d5: ; 0x1ac6d5 jumptextfaceplayer UnknownText_0x1ac6e7 ; 0x1ac6d8 -UnknownScript_0x1ac6d8: ; 0x1ac6d8 +FisherScript_0x1ac6d8: ; 0x1ac6d8 jumptextfaceplayer UnknownText_0x1ac720 ; 0x1ac6db @@ -95,7 +95,7 @@ PalletTown_MapEventHeader: ; 0x1ac7cf ; people-events db 2 - person_event $29, 12, 7, $2, $22, 255, 255, $0, 0, UnknownScript_0x1ac6d5, $ffff - person_event $3a, 18, 16, $5, $2, 255, 255, $a0, 0, UnknownScript_0x1ac6d8, $ffff + person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, $ffff + person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, $ffff ; 0x1ac812 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 8dbcba84b..1db609539 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -15,15 +15,15 @@ UnknownScript_0x18c005: ; 0x18c005 return ; 0x18c009 -UnknownScript_0x18c009: ; 0x18c009 +CooltrainerFScript_0x18c009: ; 0x18c009 jumptextfaceplayer UnknownText_0x18c042 ; 0x18c00c -UnknownScript_0x18c00c: ; 0x18c00c +BugCatcherScript_0x18c00c: ; 0x18c00c jumptextfaceplayer UnknownText_0x18c080 ; 0x18c00f -UnknownScript_0x18c00f: ; 0x18c00f +GrampsScript_0x18c00f: ; 0x18c00f faceplayer loadfont checkbit1 $0079 @@ -71,11 +71,11 @@ MapPewterCitySignpost6Script: ; 0x18c03b jumpstd $0011 ; 0x18c03e -UnknownScript_0x18c03e: ; 0x18c03e +FruitTreeScript_0x18c03e: ; 0x18c03e fruittree $1c ; 0x18c040 -UnknownScript_0x18c040: ; 0x18c040 +FruitTreeScript_0x18c040: ; 0x18c040 fruittree $1d ; 0x18c042 @@ -179,10 +179,10 @@ PewterCity_MapEventHeader: ; 0x18c2f5 ; people-events db 5 - person_event $24, 15, 23, $2, $22, 255, 255, $a0, 0, UnknownScript_0x18c009, $ffff - person_event $25, 33, 18, $2, $22, 255, 255, $80, 0, UnknownScript_0x18c00c, $ffff - person_event $2f, 21, 33, $5, $2, 255, 255, $90, 0, UnknownScript_0x18c00f, $ffff - person_event $5d, 7, 36, $1, $0, 255, 255, $0, 0, UnknownScript_0x18c03e, $ffff - person_event $5d, 7, 34, $1, $0, 255, 255, $0, 0, UnknownScript_0x18c040, $ffff + person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, $ffff + person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, $ffff + person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, $ffff + person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, $ffff + person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, $ffff ; 0x18c378 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index fd85cbecf..608c6886c 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -6,7 +6,7 @@ PewterGym_MapScriptHeader: ; 0x1a2862 db 0 ; 0x1a2864 -UnknownScript_0x1a2864: ; 0x1a2864 +BrockScript_0x1a2864: ; 0x1a2864 faceplayer loadfont checkbit2 $0023 @@ -221,8 +221,8 @@ PewterGym_MapEventHeader: ; 0x1a2d88 ; people-events db 3 - person_event $1a, 5, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1a2864, $ffff - person_event $27, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff - person_event $48, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff + person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, $ffff + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, $ffff + person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, $ffff ; 0x1a2dc9 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index d066de36a..0c51f080f 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -6,18 +6,18 @@ PewterMart_MapScriptHeader: ; 0x1a2dc9 db 0 ; 0x1a2dcb -UnknownScript_0x1a2dcb: ; 0x1a2dcb +ClerkScript_0x1a2dcb: ; 0x1a2dcb loadfont pokemart $0, $0013 loadmovesprites end ; 0x1a2dd2 -UnknownScript_0x1a2dd2: ; 0x1a2dd2 +YoungsterScript_0x1a2dd2: ; 0x1a2dd2 jumptextfaceplayer UnknownText_0x1a2dd8 ; 0x1a2dd5 -UnknownScript_0x1a2dd5: ; 0x1a2dd5 +SuperNerdScript_0x1a2dd5: ; 0x1a2dd5 jumptextfaceplayer UnknownText_0x1a2e3a ; 0x1a2dd8 @@ -57,8 +57,8 @@ PewterMart_MapEventHeader: ; 0x1a2eae ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x1a2dcb, $ffff - person_event $27, 6, 13, $5, $2, 255, 255, $0, 0, UnknownScript_0x1a2dd2, $ffff - person_event $2b, 10, 10, $3, $0, 255, 255, $80, 0, UnknownScript_0x1a2dd5, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, $ffff + person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, $ffff + person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, $ffff ; 0x1a2ee5 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index ef6b40053..ffc5f32db 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -6,11 +6,11 @@ PewterNidoranSpeechHouse_MapScriptHeader: ; 0x1a2805 db 0 ; 0x1a2807 -UnknownScript_0x1a2807: ; 0x1a2807 +SuperNerdScript_0x1a2807: ; 0x1a2807 jumptextfaceplayer UnknownText_0x1a2814 ; 0x1a280a -UnknownScript_0x1a280a: ; 0x1a280a +GrowlitheScript_0x1a280a: ; 0x1a280a loadfont 2writetext UnknownText_0x1a2825 cry NIDORAN_M @@ -44,7 +44,7 @@ PewterNidoranSpeechHouse_MapEventHeader: ; 0x1a2838 ; people-events db 2 - person_event $2b, 9, 7, $9, $0, 255, 255, $a0, 0, UnknownScript_0x1a2807, $ffff - person_event $82, 9, 8, $16, $0, 255, 255, $90, 0, UnknownScript_0x1a280a, $ffff + person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, $ffff + person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, $ffff ; 0x1a2862 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index ffae46714..b8db4a884 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -6,15 +6,15 @@ PewterPokeCenter1F_MapScriptHeader: ; 0x1a2ee5 db 0 ; 0x1a2ee7 -UnknownScript_0x1a2ee7: ; 0x1a2ee7 +NurseScript_0x1a2ee7: ; 0x1a2ee7 jumpstd $0000 ; 0x1a2eea -UnknownScript_0x1a2eea: ; 0x1a2eea +TeacherScript_0x1a2eea: ; 0x1a2eea jumptextfaceplayer UnknownText_0x1a2f01 ; 0x1a2eed -UnknownScript_0x1a2eed: ; 0x1a2eed +JigglypuffScript_0x1a2eed: ; 0x1a2eed loadfont 2writetext UnknownText_0x1a2f5d cry JIGGLYPUFF @@ -23,11 +23,11 @@ UnknownScript_0x1a2eed: ; 0x1a2eed end ; 0x1a2ef7 -UnknownScript_0x1a2ef7: ; 0x1a2ef7 +BugCatcherScript_0x1a2ef7: ; 0x1a2ef7 jumptextfaceplayer UnknownText_0x1a2f75 ; 0x1a2efa -UnknownScript_0x1a2efa: ; 0x1a2efa +PokefanMScript_0x1a2efa: ; 0x1a2efa faceplayer loadfont trade $4 @@ -79,10 +79,10 @@ PewterPokeCenter1F_MapEventHeader: ; 0x1a2ff4 ; people-events db 5 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a2ee7, $ffff - person_event $29, 10, 12, $6, $0, 255, 255, $a0, 0, UnknownScript_0x1a2eea, $ffff - person_event $94, 7, 5, $16, $0, 255, 255, $0, 0, UnknownScript_0x1a2eed, $ffff - person_event $25, 7, 6, $6, $0, 255, 255, $90, 0, UnknownScript_0x1a2ef7, $ffff - person_event $2d, 6, 11, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a2efa, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, $ffff + person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, $ffff + person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, $ffff + person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, $ffff + person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, $ffff ; 0x1a304a diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 36084baaa..575dd9eed 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -6,7 +6,7 @@ PewterSnoozeSpeechHouse_MapScriptHeader: ; 0x1a3057 db 0 ; 0x1a3059 -UnknownScript_0x1a3059: ; 0x1a3059 +GrampsScript_0x1a3059: ; 0x1a3059 jumptextfaceplayer UnknownText_0x1a305f ; 0x1a305c @@ -39,7 +39,7 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; 0x1a308a ; people-events db 1 - person_event $2f, 7, 9, $8, $0, 255, 255, $90, 0, UnknownScript_0x1a3059, $ffff + person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, $ffff ; 0x1a30b1 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 5f3b88709..63aa75f5c 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -76,7 +76,7 @@ UnknownScript_0x192895: ; 0x192895 end ; 0x19289d -UnknownScript_0x19289d: ; 0x19289d +LinkReceptionistScript_0x19289d: ; 0x19289d checkbit1 $001f iffalse UnknownScript_0x19288d loadfont @@ -189,7 +189,7 @@ UnknownScript_0x19294a: ; 0x19294a end ; 0x192952 -UnknownScript_0x192952: ; 0x192952 +LinkReceptionistScript_0x192952: ; 0x192952 checkbit1 $001f iffalse UnknownScript_0x192895 loadfont @@ -330,7 +330,7 @@ UnknownScript_0x192a25: ; 0x192a25 end ; 0x192a2d -UnknownScript_0x192a2d: ; 0x192a2d +LinkReceptionistScript_0x192a2d: ; 0x192a2d checkbit1 $0712 iftrue UnknownScript_0x192a25 checkbit2 $0053 @@ -650,7 +650,7 @@ MapPokeCenter2FSignpost0Script: ; 0x192c93 end ; 0x192c9a -UnknownScript_0x192c9a: ; 0x192c9a +OfficerScript_0x192c9a: ; 0x192c9a faceplayer loadfont checkbit1 $0711 @@ -1124,9 +1124,9 @@ PokeCenter2F_MapEventHeader: ; 0x19337f ; people-events db 4 - person_event $38, 6, 9, $6, $0, 255, 255, $a0, 0, UnknownScript_0x19289d, $ffff - person_event $38, 6, 13, $6, $0, 255, 255, $a0, 0, UnknownScript_0x192952, $ffff - person_event $38, 7, 17, $6, $0, 255, 255, $a0, 0, UnknownScript_0x192a2d, $ffff - person_event $43, 5, 5, $6, $0, 255, 255, $0, 0, UnknownScript_0x192c9a, $0711 + person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, $ffff + person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, $ffff + person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, $ffff + person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, $0711 ; 0x1933dc diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 1e5bbdb88..9751610fa 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -6,7 +6,7 @@ PokeSeersHouse_MapScriptHeader: ; 0x9e36c db 0 ; 0x9e36e -UnknownScript_0x9e36e: ; 0x9e36e +GrannyScript_0x9e36e: ; 0x9e36e faceplayer loadfont special $0091 @@ -32,6 +32,6 @@ PokeSeersHouse_MapEventHeader: ; 0x9e376 ; people-events db 1 - person_event $30, 7, 6, $6, $0, 255, 255, $80, 0, UnknownScript_0x9e36e, $ffff + person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, GrannyScript_0x9e36e, $ffff ; 0x9e393 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 11b37f921..ba8b2fe06 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -6,7 +6,7 @@ PokemonFanClub_MapScriptHeader: ; 0x1917e7 db 0 ; 0x1917e9 -UnknownScript_0x1917e9: ; 0x1917e9 +GentlemanScript_0x1917e9: ; 0x1917e9 faceplayer loadfont checkbit1 $00d4 @@ -45,11 +45,11 @@ UnknownScript_0x19181f: ; 0x19181f end ; 0x191821 -UnknownScript_0x191821: ; 0x191821 +ReceptionistScript_0x191821: ; 0x191821 jumptextfaceplayer UnknownText_0x191b6d ; 0x191824 -UnknownScript_0x191824: ; 0x191824 +FisherScript_0x191824: ; 0x191824 faceplayer loadfont checkbit1 $00d2 @@ -102,15 +102,15 @@ UnknownScript_0x191865: ; 0x191865 end ; 0x19186b -UnknownScript_0x19186b: ; 0x19186b +TeacherScript_0x19186b: ; 0x19186b jumptextfaceplayer UnknownText_0x191d73 ; 0x19186e -UnknownScript_0x19186e: ; 0x19186e +FairyScript_0x19186e: ; 0x19186e jumptext UnknownText_0x191db1 ; 0x191871 -UnknownScript_0x191871: ; 0x191871 +OddishScript_0x191871: ; 0x191871 loadfont 2writetext UnknownText_0x191de9 cry BAYLEEF @@ -299,11 +299,11 @@ PokemonFanClub_MapEventHeader: ; 0x191e4d ; people-events db 6 - person_event $40, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x1917e9, $ffff - person_event $42, 5, 8, $6, $0, 255, 255, $a0, 0, UnknownScript_0x191821, $ffff - person_event $3a, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x191824, $ffff - person_event $29, 6, 11, $8, $0, 255, 255, $0, 0, UnknownScript_0x19186b, $ffff - person_event $4d, 8, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x19186e, $0774 - person_event $85, 7, 11, $16, $0, 255, 255, $a0, 0, UnknownScript_0x191871, $ffff + person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, $ffff + person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, $ffff + person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, $ffff + person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, $ffff + person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, $0774 + person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, $ffff ; 0x191eb5 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 9ae6484b8..8fe259a32 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -42,7 +42,7 @@ UnknownScript_0x188dc5: ; 0x188dc5 end ; 0x188df5 -UnknownScript_0x188df5: ; 0x188df5 +OfficerScript_0x188df5: ; 0x188df5 faceplayer loadfont checkbit1 $00c9 @@ -69,7 +69,7 @@ UnknownScript_0x188e0f: ; 0x188e0f end ; 0x188e15 -UnknownScript_0x188e15: ; 0x188e15 +GymGuyScript_0x188e15: ; 0x188e15 faceplayer loadfont checkbit1 $00c9 @@ -87,7 +87,7 @@ UnknownScript_0x188e23: ; 0x188e23 end ; 0x188e29 -UnknownScript_0x188e29: ; 0x188e29 +GymGuyScript_0x188e29: ; 0x188e29 faceplayer loadfont checkbit1 $00c9 @@ -105,7 +105,7 @@ UnknownScript_0x188e37: ; 0x188e37 end ; 0x188e3d -UnknownScript_0x188e3d: ; 0x188e3d +OfficerScript_0x188e3d: ; 0x188e3d faceplayer loadfont checkbit1 $00c9 @@ -123,7 +123,7 @@ UnknownScript_0x188e4b: ; 0x188e4b end ; 0x188e51 -UnknownScript_0x188e51: ; 0x188e51 +GymGuyScript_0x188e51: ; 0x188e51 faceplayer loadfont checkbit1 $00c9 @@ -141,7 +141,7 @@ UnknownScript_0x188e5f: ; 0x188e5f end ; 0x188e65 -UnknownScript_0x188e65: ; 0x188e65 +FisherScript_0x188e65: ; 0x188e65 faceplayer loadfont checkbit1 $00c9 @@ -200,7 +200,7 @@ UnknownScript_0x188ec5: ; 0x188ec5 end ; 0x188ecb -UnknownScript_0x188ecb: ; 0x188ecb +GymGuyScript_0x188ecb: ; 0x188ecb faceplayer loadfont trade $6 @@ -399,12 +399,12 @@ PowerPlant_MapEventHeader: ; 0x1894b9 ; people-events db 7 - person_event $43, 18, 8, $6, $0, 255, 255, $a0, 0, UnknownScript_0x188df5, $ffff - person_event $48, 13, 6, $3, $0, 255, 255, $90, 0, UnknownScript_0x188e15, $ffff - person_event $48, 15, 10, $7, $0, 255, 255, $90, 0, UnknownScript_0x188e29, $ffff - person_event $43, 7, 13, $8, $0, 255, 255, $a0, 0, UnknownScript_0x188e3d, $ffff - person_event $48, 6, 11, $5, $1, 255, 255, $90, 0, UnknownScript_0x188e51, $ffff - person_event $3a, 14, 18, $7, $0, 255, 255, $80, 0, UnknownScript_0x188e65, $ffff - person_event $48, 9, 9, $7, $0, 255, 255, $90, 0, UnknownScript_0x188ecb, $ffff + person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, $ffff + person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, $ffff + person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, $ffff + person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, $ffff + person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, $ffff + person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, FisherScript_0x188e65, $ffff + person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, $ffff ; 0x189536 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 7a8e71776..ab26e2ca7 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -6,7 +6,7 @@ RadioTower1F_MapScriptHeader: ; 0x5cd27 db 0 ; 0x5cd29 -UnknownScript_0x5cd29: ; 0x5cd29 +ReceptionistScript_0x5cd29: ; 0x5cd29 faceplayer loadfont checkbit2 $0013 @@ -24,7 +24,7 @@ UnknownScript_0x5cd37: ; 0x5cd37 end ; 0x5cd3d -UnknownScript_0x5cd3d: ; 0x5cd3d +GentlemanScript_0x5cd3d: ; 0x5cd3d faceplayer loadfont 2writetext UnknownText_0x5ceba @@ -115,7 +115,7 @@ UnknownScript_0x5cdcf: ; 0x5cdcf end ; 0x5cdd5 -UnknownScript_0x5cdd5: ; 0x5cdd5 +CooltrainerFScript_0x5cdd5: ; 0x5cdd5 faceplayer loadfont checkbit2 $0000 @@ -186,11 +186,11 @@ UnknownScript_0x5ce4b: ; 0x5ce4b end ; 0x5ce51 -UnknownScript_0x5ce51: ; 0x5ce51 +LassScript_0x5ce51: ; 0x5ce51 jumptextfaceplayer UnknownText_0x5d476 ; 0x5ce54 -UnknownScript_0x5ce54: ; 0x5ce54 +YoungsterScript_0x5ce54: ; 0x5ce54 jumptextfaceplayer UnknownText_0x5d4ac ; 0x5ce57 @@ -492,11 +492,11 @@ RadioTower1F_MapEventHeader: ; 0x5d68e ; people-events db 6 - person_event $42, 10, 9, $8, $0, 255, 255, $80, 0, UnknownScript_0x5cd29, $ffff - person_event $28, 8, 20, $8, $0, 255, 255, $80, 0, UnknownScript_0x5ce51, $06cf - person_event $27, 8, 19, $9, $0, 255, 255, $90, 0, UnknownScript_0x5ce54, $06cf - person_event $35, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, $06ce - person_event $40, 10, 12, $7, $0, 255, 255, $90, 0, UnknownScript_0x5cd3d, $06cf - person_event $24, 10, 16, $7, $0, 255, 255, $a0, 0, UnknownScript_0x5cdd5, $06cf + person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, $ffff + person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, $06cf + person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, $06cf + person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, $06ce + person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, $06cf + person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, $06cf ; 0x5d6fb diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 3e2205818..97c295dc4 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -10,11 +10,11 @@ UnknownScript_0x5d6fd: ; 0x5d6fd end ; 0x5d6fe -UnknownScript_0x5d6fe: ; 0x5d6fe +SuperNerdScript_0x5d6fe: ; 0x5d6fe jumptextfaceplayer UnknownText_0x5d924 ; 0x5d701 -UnknownScript_0x5d701: ; 0x5d701 +TeacherScript_0x5d701: ; 0x5d701 faceplayer loadfont checkbit2 $0013 @@ -32,7 +32,7 @@ UnknownScript_0x5d70f: ; 0x5d70f end ; 0x5d715 -UnknownScript_0x5d715: ; 0x5d715 +JigglypuffScript_0x5d715: ; 0x5d715 loadfont 2writetext UnknownText_0x5d9b6 cry JIGGLYPUFF @@ -41,11 +41,11 @@ UnknownScript_0x5d715: ; 0x5d715 end ; 0x5d71f -UnknownScript_0x5d71f: ; 0x5d71f +BlackBeltScript_0x5d71f: ; 0x5d71f jumptextfaceplayer UnknownText_0x5d9cb ; 0x5d722 -UnknownScript_0x5d722: ; 0x5d722 +BlackBeltScript_0x5d722: ; 0x5d722 jumptextfaceplayer UnknownText_0x5da44 ; 0x5d725 @@ -165,7 +165,7 @@ GruntF2Script: ; 0x5d76d end ; 0x5d775 -UnknownScript_0x5d775: ; 0x5d775 +BuenaScript_0x5d775: ; 0x5d775 faceplayer loadfont checkbit2 $0013 @@ -389,7 +389,7 @@ UnknownScript_0x5d8fe: ; 0x5d8fe end ; 0x5d8ff -UnknownScript_0x5d8ff: ; 0x5d8ff +ReceptionistScript_0x5d8ff: ; 0x5d8ff faceplayer loadfont checkitem BLUE_CARD @@ -773,16 +773,16 @@ RadioTower2F_MapEventHeader: ; 0x5e481 ; people-events db 11 - person_event $2b, 10, 10, $8, $0, 255, 255, $a0, 0, UnknownScript_0x5d6fe, $06cf - person_event $29, 6, 21, $5, $1, 255, 255, $80, 0, UnknownScript_0x5d701, $ffff - person_event $35, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, $06ce - person_event $35, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, $06ce - person_event $35, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, $06ce - person_event $36, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, $06ce - person_event $41, 5, 4, $6, $0, 255, 255, $0, 0, UnknownScript_0x5d71f, $06d1 - person_event $41, 5, 5, $6, $0, 255, 255, $0, 0, UnknownScript_0x5d722, $06d0 - person_event $94, 5, 16, $16, $0, 255, 255, $0, 0, UnknownScript_0x5d715, $ffff - person_event $2a, 9, 18, $9, $0, 255, 255, $80, 0, UnknownScript_0x5d775, $ffff - person_event $42, 11, 16, $9, $0, 255, 255, $a0, 0, UnknownScript_0x5d8ff, $06cf + person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, $06cf + person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, $ffff + person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, $06ce + person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, $06ce + person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, $06ce + person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, $06ce + person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, $06d1 + person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, $06d0 + person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, $ffff + person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, BuenaScript_0x5d775, $ffff + person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, $06cf ; 0x5e53e diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index db46ca4fa..4d6b7b71f 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -22,11 +22,11 @@ UnknownScript_0x5e54a: ; 0x5e54a return ; 0x5e553 -UnknownScript_0x5e553: ; 0x5e553 +SuperNerdScript_0x5e553: ; 0x5e553 jumptextfaceplayer UnknownText_0x5e621 ; 0x5e556 -UnknownScript_0x5e556: ; 0x5e556 +GymGuyScript_0x5e556: ; 0x5e556 faceplayer loadfont checkbit1 $0021 @@ -44,7 +44,7 @@ UnknownScript_0x5e564: ; 0x5e564 end ; 0x5e56a -UnknownScript_0x5e56a: ; 0x5e56a +CooltrainerFScript_0x5e56a: ; 0x5e56a faceplayer loadfont checkbit1 $0047 @@ -412,12 +412,12 @@ RadioTower3F_MapEventHeader: ; 0x5eb01 ; people-events db 7 - person_event $2b, 8, 11, $7, $0, 255, 255, $90, 0, UnknownScript_0x5e553, $06d0 - person_event $48, 8, 7, $a, $0, 255, 255, $80, 0, UnknownScript_0x5e556, $ffff - person_event $24, 7, 15, $2, $11, 255, 255, $a0, 0, UnknownScript_0x5e56a, $ffff - person_event $35, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, $06ce - person_event $35, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, $06ce - person_event $35, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, $06ce - person_event $3c, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, $06ce + person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, $06d0 + person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, $ffff + person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, $06ce + person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, $06ce + person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, $06ce + person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, $06ce ; 0x5eb80 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 94c244586..85443e0f7 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -6,11 +6,11 @@ RadioTower4F_MapScriptHeader: ; 0x5eb80 db 0 ; 0x5eb82 -UnknownScript_0x5eb82: ; 0x5eb82 +FisherScript_0x5eb82: ; 0x5eb82 jumptextfaceplayer UnknownText_0x5ec12 ; 0x5eb85 -UnknownScript_0x5eb85: ; 0x5eb85 +TeacherScript_0x5eb85: ; 0x5eb85 faceplayer loadfont checkbit1 $0048 @@ -43,7 +43,7 @@ UnknownScript_0x5ebb0: ; 0x5ebb0 end ; 0x5ebb2 -UnknownScript_0x5ebb2: ; 0x5ebb2 +GrowlitheScript_0x5ebb2: ; 0x5ebb2 loadfont 2writetext UnknownText_0x5ed66 cry MEOWTH @@ -324,13 +324,13 @@ RadioTower4F_MapEventHeader: ; 0x5f01a ; people-events db 7 - person_event $3a, 8, 10, $7, $0, 255, 255, $80, 0, UnknownScript_0x5eb82, $06d0 - person_event $29, 10, 18, $3, $0, 255, 255, $a0, 0, UnknownScript_0x5eb85, $ffff - person_event $82, 11, 16, $16, $0, 255, 255, $80, 0, UnknownScript_0x5ebb2, $ffff - person_event $35, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, $06ce - person_event $35, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, $06ce - person_event $36, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, $06ce - person_event $3c, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, $06ce + person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, $06d0 + person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, $ffff + person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, $ffff + person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, $06ce + person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, $06ce + person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, $06ce + person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, $06ce ; 0x5f099 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 6f1b6baad..4f95cc170 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -51,7 +51,7 @@ UnknownScript_0x60011: ; 0x60011 end ; 0x60046 -UnknownScript_0x60046: ; 0x60046 +GentlemanScript_0x60046: ; 0x60046 faceplayer loadfont checkbit1 $0021 @@ -160,7 +160,7 @@ UnknownScript_0x600f1: ; 0x600f1 end ; 0x600fb -UnknownScript_0x600fb: ; 0x600fb +RockerScript_0x600fb: ; 0x600fb jumptextfaceplayer UnknownText_0x608be ; 0x600fe @@ -428,10 +428,10 @@ RadioTower5F_MapEventHeader: ; 0x60906 ; people-events db 5 - person_event $40, 10, 7, $3, $0, 255, 255, $0, 0, UnknownScript_0x60046, $ffff - person_event $35, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, $06ce - person_event $36, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, $06ce - person_event $2c, 9, 17, $8, $0, 255, 255, $80, 0, UnknownScript_0x600fb, $06d0 - person_event $54, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd + person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, GentlemanScript_0x60046, $ffff + person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, $06ce + person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, $06ce + person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, RockerScript_0x600fb, $06d0 + person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, $07cd ; 0x60980 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 96000e13f..c52c06ffa 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -13,7 +13,7 @@ UnknownScript_0x19aea2: ; 0x19aea2 end ; 0x19aea3 -UnknownScript_0x19aea3: ; 0x19aea3 +RedsMomScript_0x19aea3: ; 0x19aea3 faceplayer loadfont checkbit1 $00cc @@ -93,6 +93,6 @@ RedsHouse1F_MapEventHeader: ; 0x19b017 ; people-events db 1 - person_event $e, 7, 9, $8, $0, 255, 255, $0, 0, UnknownScript_0x19aea3, $ffff + person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMomScript_0x19aea3, $ffff ; 0x19b048 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index ea663fb55..f13e64145 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -49,7 +49,7 @@ RockTunnel1F_MapEventHeader: ; 0x743bf ; people-events db 2 - person_event $54, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e - person_event $54, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f + person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, $077e + person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, $077f ; 0x74407 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 8ba8d43b2..1c0d4e396 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -44,8 +44,8 @@ RockTunnelB1F_MapEventHeader: ; 0x74412 ; people-events db 3 - person_event $54, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, $0780 - person_event $54, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781 - person_event $54, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782 + person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, $0780 + person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, $0781 + person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, $0782 ; 0x74458 diff --git a/maps/Route1.asm b/maps/Route1.asm index 706f7d0f4..7344fec3c 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -68,7 +68,7 @@ MapRoute1Signpost0Script: ; 0x1ac57e jumptext UnknownText_0x1ac675 ; 0x1ac581 -UnknownScript_0x1ac581: ; 0x1ac581 +FruitTreeScript_0x1ac581: ; 0x1ac581 fruittree $1a ; 0x1ac583 @@ -127,8 +127,8 @@ Route1_MapEventHeader: ; 0x1ac69a ; people-events db 3 - person_event $27, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, $ffff - person_event $24, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff - person_event $5d, 11, 7, $1, $0, 255, 255, $0, 0, UnknownScript_0x1ac581, $ffff + person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, $ffff + person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, $ffff + person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, $ffff ; 0x1ac6cc diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index f1dcf1523..177781e77 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -6,15 +6,15 @@ Route10PokeCenter1F_MapScriptHeader: ; 0x188bd2 db 0 ; 0x188bd4 -UnknownScript_0x188bd4: ; 0x188bd4 +NurseScript_0x188bd4: ; 0x188bd4 jumpstd $0000 ; 0x188bd7 -UnknownScript_0x188bd7: ; 0x188bd7 +GentlemanScript_0x188bd7: ; 0x188bd7 jumptextfaceplayer UnknownText_0x188bf1 ; 0x188bda -UnknownScript_0x188bda: ; 0x188bda +GymGuyScript_0x188bda: ; 0x188bda faceplayer loadfont checkbit1 $00c9 @@ -32,7 +32,7 @@ UnknownScript_0x188be8: ; 0x188be8 end ; 0x188bee -UnknownScript_0x188bee: ; 0x188bee +CooltrainerFScript_0x188bee: ; 0x188bee jumptextfaceplayer UnknownText_0x188d0c ; 0x188bf1 @@ -90,9 +90,9 @@ Route10PokeCenter1F_MapEventHeader: ; 0x188d63 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x188bd4, $ffff - person_event $40, 10, 11, $5, $1, 255, 255, $80, 0, UnknownScript_0x188bd7, $ffff - person_event $48, 6, 11, $3, $0, 255, 255, $a0, 0, UnknownScript_0x188bda, $ffff - person_event $24, 7, 5, $6, $0, 255, 255, $0, 0, UnknownScript_0x188bee, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, $ffff + person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, $ffff + person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, $ffff ; 0x188dac diff --git a/maps/Route10South.asm b/maps/Route10South.asm index cc63751ba..c6c2703df 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -123,7 +123,7 @@ Route10South_MapEventHeader: ; 0x1ae504 ; people-events db 2 - person_event $2d, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff - person_event $2d, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff + person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff + person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff ; 0x1ae52e diff --git a/maps/Route11.asm b/maps/Route11.asm index 0731e5030..1c09bc081 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -126,7 +126,7 @@ MapRoute11Signpost0Script: ; 0x68052 jumptext UnknownText_0x68238 ; 0x68055 -UnknownScript_0x68055: ; 0x68055 +FruitTreeScript_0x68055: ; 0x68055 fruittree $18 ; 0x68057 @@ -227,10 +227,10 @@ Route11_MapEventHeader: ; 0x68242 ; people-events db 5 - person_event $27, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, $ffff - person_event $27, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, $ffff - person_event $27, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff - person_event $27, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff - person_event $5d, 6, 36, $1, $0, 255, 255, $0, 0, UnknownScript_0x68055, $ffff + person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, $ffff + person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, $ffff + person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, $ffff + person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, $ffff + person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, $ffff ; 0x68293 diff --git a/maps/Route12.asm b/maps/Route12.asm index bf91511e6..64251ea5e 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -249,12 +249,12 @@ Route12_MapEventHeader: ; 0x1a72cf ; people-events db 6 - person_event $3a, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, $ffff - person_event $3a, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, $ffff - person_event $3a, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, $ffff - person_event $3a, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, $ffff - person_event $54, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788 - person_event $54, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789 + person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, $ffff + person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, $ffff + person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, $ffff + person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, $ffff + person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, $0788 + person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, $0789 ; 0x1a7337 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 9e999d22a..063aece9a 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -6,7 +6,7 @@ Route12SuperRodHouse_MapScriptHeader: ; 0x7f482 db 0 ; 0x7f484 -UnknownScript_0x7f484: ; 0x7f484 +FishingGuruScript_0x7f484: ; 0x7f484 faceplayer loadfont checkbit1 $0019 @@ -90,6 +90,6 @@ Route12SuperRodHouse_MapEventHeader: ; 0x7f60b ; people-events db 1 - person_event $3b, 7, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x7f484, $ffff + person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, $ffff ; 0x7f628 diff --git a/maps/Route13.asm b/maps/Route13.asm index ae32dda0c..44a7c0d3a 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -294,10 +294,10 @@ Route13_MapEventHeader: ; 0x1a27aa ; people-events db 5 - person_event $27, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, $ffff - person_event $27, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, $ffff - person_event $2d, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, $ffff - person_event $2d, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff - person_event $2d, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff + person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, $ffff + person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, $ffff + person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, $ffff + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, $ffff + person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, $ffff ; 0x1a2805 diff --git a/maps/Route14.asm b/maps/Route14.asm index e8801ab89..6f22784f0 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -6,7 +6,7 @@ Route14_MapScriptHeader: ; 0x1ad47d db 0 ; 0x1ad47f -UnknownScript_0x1ad47f: ; 0x1ad47f +TeacherScript_0x1ad47f: ; 0x1ad47f faceplayer loadfont trade $5 @@ -174,9 +174,9 @@ Route14_MapEventHeader: ; 0x1ad6a1 ; people-events db 4 - person_event $2d, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, $ffff - person_event $27, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, $ffff - person_event $2d, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff - person_event $29, 9, 11, $5, $1, 255, 255, $a0, 4, UnknownScript_0x1ad47f, $ffff + person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, $ffff + person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, $ffff + person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, $ffff + person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, $ffff ; 0x1ad6db diff --git a/maps/Route15.asm b/maps/Route15.asm index 5f7af097c..5eba0baf5 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -315,12 +315,12 @@ Route15_MapEventHeader: ; 0x1aa90a ; people-events db 7 - person_event $27, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, $ffff - person_event $27, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, $ffff - person_event $27, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, $ffff - person_event $27, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, $ffff - person_event $29, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff - person_event $29, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff - person_event $54, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a + person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, $ffff + person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, $ffff + person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, $ffff + person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, $ffff + person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, $ffff + person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, $ffff + person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, $078a ; 0x1aa97a diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 406a32e6b..b4993d161 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -6,7 +6,7 @@ Route15FuchsiaGate_MapScriptHeader: ; 0x19679c db 0 ; 0x19679e -UnknownScript_0x19679e: ; 0x19679e +OfficerScript_0x19679e: ; 0x19679e jumptextfaceplayer UnknownText_0x1967a1 ; 0x1967a1 @@ -36,6 +36,6 @@ Route15FuchsiaGate_MapEventHeader: ; 0x1967e1 ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x19679e, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, $ffff ; 0x196808 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 7356dccdd..3a273621e 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -6,7 +6,7 @@ Route16FuchsiaSpeechHouse_MapScriptHeader: ; 0x73371 db 0 ; 0x73373 -UnknownScript_0x73373: ; 0x73373 +SuperNerdScript_0x73373: ; 0x73373 jumptextfaceplayer UnknownText_0x73379 ; 0x73376 @@ -40,6 +40,6 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; 0x733bc ; people-events db 1 - person_event $2b, 7, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x73373, $ffff + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, $ffff ; 0x733e3 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 91287d138..a8cfef36c 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -13,7 +13,7 @@ UnknownScript_0x733e9: ; 0x733e9 end ; 0x733ea -UnknownScript_0x733ea: ; 0x733ea +OfficerScript_0x733ea: ; 0x733ea jumptextfaceplayer UnknownText_0x73408 ; 0x733ed @@ -81,6 +81,6 @@ Route16Gate_MapEventHeader: ; 0x734df ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x733ea, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, $ffff ; 0x73516 diff --git a/maps/Route17.asm b/maps/Route17.asm index 51036b33e..8c7e001a9 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -227,9 +227,9 @@ Route17_MapEventHeader: ; 0x1ad2c5 ; people-events db 4 - person_event $4a, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, $ffff - person_event $4a, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, $ffff - person_event $4a, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, $ffff - person_event $4a, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, $ffff + person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, $ffff + person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, $ffff + person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, $ffff + person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, $ffff ; 0x1ad313 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index dff48d7d3..55c9cb438 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -13,7 +13,7 @@ UnknownScript_0x7360d: ; 0x7360d end ; 0x7360e -UnknownScript_0x7360e: ; 0x7360e +OfficerScript_0x7360e: ; 0x7360e jumptextfaceplayer UnknownText_0x7362c ; 0x73611 @@ -75,7 +75,7 @@ Route1718Gate_MapEventHeader: ; 0x736b6 ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x7360e, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, $ffff ; 0x736ed diff --git a/maps/Route18.asm b/maps/Route18.asm index 6551bdb8f..f0cd4b135 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -126,7 +126,7 @@ Route18_MapEventHeader: ; 0x1ad077 ; people-events db 2 - person_event $27, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, $ffff - person_event $27, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, $ffff + person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, $ffff + person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, $ffff ; 0x1ad0a6 diff --git a/maps/Route19.asm b/maps/Route19.asm index 275c72114..304a4a029 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -139,7 +139,7 @@ SwimmermTuckerScript: ; 0x19ea45 end ; 0x19ea4d -UnknownScript_0x19ea4d: ; 0x19ea4d +FisherScript_0x19ea4d: ; 0x19ea4d faceplayer loadfont checkbit1 $00d7 @@ -157,7 +157,7 @@ UnknownScript_0x19ea5b: ; 0x19ea5b end ; 0x19ea61 -UnknownScript_0x19ea61: ; 0x19ea61 +FisherScript_0x19ea61: ; 0x19ea61 faceplayer loadfont checkbit1 $00d7 @@ -316,11 +316,11 @@ Route19_MapEventHeader: ; 0x19ee31 ; people-events db 6 - person_event $32, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, $ffff - person_event $31, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, $ffff - person_event $31, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, $ffff - person_event $31, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, $ffff - person_event $3a, 9, 13, $6, $0, 255, 255, $80, 1, UnknownScript_0x19ea4d, $ffff - person_event $3a, 9, 15, $5, $1, 255, 255, $90, 1, UnknownScript_0x19ea61, $ffff + person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, $ffff + person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, $ffff + person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, $ffff + person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, $ffff + person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, $ffff + person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, $ffff ; 0x19ee94 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 40a1b3e61..acb1fc761 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -6,7 +6,7 @@ Route19FuchsiaGate_MapScriptHeader: ; 0x1ab3f4 db 0 ; 0x1ab3f6 -UnknownScript_0x1ab3f6: ; 0x1ab3f6 +OfficerScript_0x1ab3f6: ; 0x1ab3f6 faceplayer loadfont checkbit1 $00d7 @@ -61,6 +61,6 @@ Route19FuchsiaGate_MapEventHeader: ; 0x1ab4cd ; people-events db 1 - person_event $43, 8, 4, $9, $0, 255, 255, $90, 0, UnknownScript_0x1ab3f6, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, $ffff ; 0x1ab4f4 diff --git a/maps/Route2.asm b/maps/Route2.asm index 9b081c47f..60ec7a805 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -117,7 +117,7 @@ ItemFragment_0x1ac304: ; 0x1ac304 db ELIXER, 1 ; 0x1ac306 -UnknownScript_0x1ac306: ; 0x1ac306 +FruitTreeScript_0x1ac306: ; 0x1ac306 fruittree $19 ; 0x1ac308 @@ -232,13 +232,13 @@ Route2_MapEventHeader: ; 0x1ac4af ; people-events db 8 - person_event $25, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, $ffff - person_event $25, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, $ffff - person_event $25, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, $ffff - person_event $54, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, $0783 - person_event $54, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, $0784 - person_event $54, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785 - person_event $54, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 - person_event $5d, 18, 14, $1, $0, 255, 255, $0, 0, UnknownScript_0x1ac306, $ffff + person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, $ffff + person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, $ffff + person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, $ffff + person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, $0783 + person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, $0784 + person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, $0785 + person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, $0786 + person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, $ffff ; 0x1ac554 diff --git a/maps/Route20.asm b/maps/Route20.asm index b1def1cc2..74ac03422 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -180,8 +180,8 @@ Route20_MapEventHeader: ; 0x1acef8 ; people-events db 3 - person_event $32, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, $ffff - person_event $32, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff - person_event $31, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff + person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, $ffff + person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff + person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff ; 0x1acf2f diff --git a/maps/Route21.asm b/maps/Route21.asm index 2a5fc1e68..247e87fbb 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -154,8 +154,8 @@ Route21_MapEventHeader: ; 0x1ac97a ; people-events db 3 - person_event $32, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff - person_event $31, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff - person_event $3a, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff + person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff + person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff + person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff ; 0x1ac9a7 diff --git a/maps/Route24.asm b/maps/Route24.asm index c2f1d0127..466a8d835 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -6,7 +6,7 @@ Route24_MapScriptHeader: ; 0x1adbf8 db 0 ; 0x1adbfa -UnknownScript_0x1adbfa: ; 0x1adbfa +RocketScript_0x1adbfa: ; 0x1adbfa faceplayer playmusic $0039 loadfont @@ -113,6 +113,6 @@ Route24_MapEventHeader: ; 0x1adf50 ; people-events db 1 - person_event $35, 11, 12, $3, $0, 255, 255, $0, 0, UnknownScript_0x1adbfa, $076c + person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c ; 0x1adf63 diff --git a/maps/Route25.asm b/maps/Route25.asm index b47b8e985..4b4b87435 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -275,7 +275,7 @@ SupernerdPatScript: ; 0x19efa4 end ; 0x19efac -UnknownScript_0x19efac: ; 0x19efac +CooltrainerMScript_0x19efac: ; 0x19efac faceplayer loadfont checkbit1 $0558 @@ -564,17 +564,17 @@ Route25_MapEventHeader: ; 0x19f58f ; people-events db 11 - person_event $1d, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, $076e - person_event $23, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, $076e - person_event $27, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, $ffff - person_event $28, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, $ffff - person_event $27, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, $ffff - person_event $28, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, $ffff - person_event $27, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, $ffff - person_event $28, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, $ffff - person_event $2b, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, $ffff - person_event $23, 12, 41, $8, $0, 255, 255, $80, 0, UnknownScript_0x19efac, $ffff - person_event $54, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b + person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, $076e + person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, $076e + person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, $ffff + person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, $ffff + person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, $ffff + person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, $ffff + person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, $ffff + person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, $ffff + person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, $ffff + person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, $ffff + person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, $078b ; 0x19f643 diff --git a/maps/Route26.asm b/maps/Route26.asm index 2c8f8d29f..d6507166c 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -370,7 +370,7 @@ MapRoute26Signpost0Script: ; 0x1a4ebf jumptext UnknownText_0x1a5364 ; 0x1a4ec2 -UnknownScript_0x1a4ec2: ; 0x1a4ec2 +FruitTreeScript_0x1a4ec2: ; 0x1a4ec2 fruittree $e ; 0x1a4ec4 @@ -536,13 +536,13 @@ Route26_MapEventHeader: ; 0x1a5389 ; people-events db 8 - person_event $23, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, $ffff - person_event $23, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, $ffff - person_event $24, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, $ffff - person_event $24, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, $ffff - person_event $27, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, $ffff - person_event $3a, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, $ffff - person_event $5d, 58, 18, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a4ec2, $ffff - person_event $54, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, $06aa + person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, $ffff + person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, $ffff + person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, $ffff + person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, $ffff + person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, $ffff + person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, $ffff + person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, $ffff + person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, $06aa ; 0x1a540b diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 2e8f458db..d0adda0fe 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -6,7 +6,7 @@ Route26DayofWeekSiblingsHouse_MapScriptHeader: ; 0x7b1e2 db 0 ; 0x7b1e4 -UnknownScript_0x7b1e4: ; 0x7b1e4 +PokedexScript_0x7b1e4: ; 0x7b1e4 loadfont 2writetext UnknownText_0x7b1f9 yesorno @@ -75,6 +75,6 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; 0x7b375 ; people-events db 1 - person_event $55, 7, 7, $1, $0, 255, 255, $0, 0, UnknownScript_0x7b1e4, $ffff + person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, $ffff ; 0x7b392 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index b54f75851..c5700e84f 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -6,7 +6,7 @@ Route26HealSpeechHouse_MapScriptHeader: ; 0x7b123 db 0 ; 0x7b125 -UnknownScript_0x7b125: ; 0x7b125 +TeacherScript_0x7b125: ; 0x7b125 faceplayer loadfont 2writetext UnknownText_0x7b14d @@ -64,6 +64,6 @@ Route26HealSpeechHouse_MapEventHeader: ; 0x7b1bb ; people-events db 1 - person_event $29, 7, 6, $6, $0, 255, 255, $90, 0, UnknownScript_0x7b125, $ffff + person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, $ffff ; 0x7b1e2 diff --git a/maps/Route27.asm b/maps/Route27.asm index 9857cbd3f..a90d87176 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -41,7 +41,7 @@ UnknownScript_0x1a088c: ; 0x1a088c end ; 0x1a089c -UnknownScript_0x1a089c: ; 0x1a089c +FisherScript_0x1a089c: ; 0x1a089c jumptextfaceplayer UnknownText_0x1a0a71 ; 0x1a089f @@ -609,14 +609,14 @@ Route27_MapEventHeader: ; 0x1a0ead ; people-events db 9 - person_event $23, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, $ffff - person_event $23, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, $ffff - person_event $24, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena1, $ffff - person_event $24, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, $ffff - person_event $27, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, $ffff - person_event $27, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, $ffff - person_event $54, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, $06ab - person_event $54, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac - person_event $3a, 14, 25, $3, $0, 255, 255, $0, 3, UnknownScript_0x1a089c, $ffff + person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, $ffff + person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena1, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, $ffff + person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, $ffff + person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, $ffff + person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, $06ab + person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, $06ac + person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, $ffff ; 0x1a0f4c diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 0aab70d22..2a2072d32 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -6,7 +6,7 @@ Route27SandstormHouse_MapScriptHeader: ; 0x7b392 db 0 ; 0x7b394 -UnknownScript_0x7b394: ; 0x7b394 +GrannyScript_0x7b394: ; 0x7b394 faceplayer loadfont checkbit1 $0075 @@ -104,6 +104,6 @@ Route27SandstormHouse_MapEventHeader: ; 0x7b592 ; people-events db 1 - person_event $30, 8, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x7b394, $ffff + person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, GrannyScript_0x7b394, $ffff ; 0x7b5b9 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index be6787bc8..fe897806b 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -13,7 +13,7 @@ UnknownScript_0x1ae657: ; 0x1ae657 end ; 0x1ae658 -UnknownScript_0x1ae658: ; 0x1ae658 +CooltrainerFScript_0x1ae658: ; 0x1ae658 faceplayer loadfont checkbit1 $0074 @@ -35,7 +35,7 @@ UnknownScript_0x1ae66f: ; 0x1ae66f end ; 0x1ae675 -UnknownScript_0x1ae675: ; 0x1ae675 +MoltresScript_0x1ae675: ; 0x1ae675 loadfont 2writetext UnknownText_0x1ae752 cry FEAROW @@ -90,8 +90,8 @@ Route28FamousSpeechHouse_MapEventHeader: ; 0x1ae762 ; people-events db 2 - person_event $24, 7, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x1ae658, $ffff - person_event $9e, 9, 10, $16, $0, 255, 255, $b0, 0, UnknownScript_0x1ae675, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1ae658, $ffff + person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, MoltresScript_0x1ae675, $ffff ; 0x1ae796 diff --git a/maps/Route29.asm b/maps/Route29.asm index f943d047f..14ee63449 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -107,7 +107,7 @@ UnknownScript_0x1a0fe5: ; 0x1a0fe5 end ; 0x1a0ff1 -UnknownScript_0x1a0ff1: ; 0x1a0ff1 +CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 faceplayer loadfont checkcode $10 @@ -144,19 +144,19 @@ UnknownScript_0x1a1022: ; 0x1a1022 end ; 0x1a1028 -UnknownScript_0x1a1028: ; 0x1a1028 +YoungsterScript_0x1a1028: ; 0x1a1028 jumptextfaceplayer UnknownText_0x1a1214 ; 0x1a102b -UnknownScript_0x1a102b: ; 0x1a102b +TeacherScript_0x1a102b: ; 0x1a102b jumptextfaceplayer UnknownText_0x1a126c ; 0x1a102e -UnknownScript_0x1a102e: ; 0x1a102e +FisherScript_0x1a102e: ; 0x1a102e jumptextfaceplayer UnknownText_0x1a12d9 ; 0x1a1031 -UnknownScript_0x1a1031: ; 0x1a1031 +CooltrainerMScript_0x1a1031: ; 0x1a1031 faceplayer loadfont checktime $2 @@ -177,7 +177,7 @@ UnknownScript_0x1a1043: ; 0x1a1043 end ; 0x1a1049 -UnknownScript_0x1a1049: ; 0x1a1049 +TeacherScript_0x1a1049: ; 0x1a1049 faceplayer loadfont checkbit1 $0065 @@ -224,7 +224,7 @@ MapRoute29Signpost1Script: ; 0x1a1086 jumptext UnknownText_0x1a15b9 ; 0x1a1089 -UnknownScript_0x1a1089: ; 0x1a1089 +FruitTreeScript_0x1a1089: ; 0x1a1089 fruittree $1 ; 0x1a108b @@ -433,13 +433,13 @@ Route29_MapEventHeader: ; 0x1a15e4 ; people-events db 8 - person_event $23, 16, 54, $3, $0, 255, 255, $80, 0, UnknownScript_0x1a0ff1, $ffff - person_event $27, 20, 31, $4, $10, 255, 255, $a0, 0, UnknownScript_0x1a1028, $ffff - person_event $29, 15, 19, $5, $1, 255, 255, $a0, 0, UnknownScript_0x1a102b, $ffff - person_event $5d, 6, 16, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a1089, $ffff - person_event $3a, 7, 29, $7, $0, 255, 255, $90, 0, UnknownScript_0x1a102e, $ffff - person_event $23, 8, 17, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a1031, $ffff - person_event $29, 16, 33, $3, $0, 255, 255, $0, 0, UnknownScript_0x1a1049, $0759 - person_event $54, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, $06ad + person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, $ffff + person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, $ffff + person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, $ffff + person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, $ffff + person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, $ffff + person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, $ffff + person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TeacherScript_0x1a1049, $0759 + person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, $06ad ; 0x1a1671 diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 1e394dd86..0c676451d 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -6,11 +6,11 @@ Route2946Gate_MapScriptHeader: ; 0x7b5b9 db 0 ; 0x7b5bb -UnknownScript_0x7b5bb: ; 0x7b5bb +OfficerScript_0x7b5bb: ; 0x7b5bb jumptextfaceplayer UnknownText_0x7b5c1 ; 0x7b5be -UnknownScript_0x7b5be: ; 0x7b5be +YoungsterScript_0x7b5be: ; 0x7b5be jumptextfaceplayer UnknownText_0x7b60d ; 0x7b5c1 @@ -51,8 +51,8 @@ Route2946Gate_MapEventHeader: ; 0x7b674 ; people-events db 2 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x7b5bb, $ffff - person_event $27, 8, 10, $4, $10, 255, 255, $a0, 0, UnknownScript_0x7b5be, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, $ffff + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, $ffff ; 0x7b6a8 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 4d416de8e..d582543a0 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -6,7 +6,7 @@ Route2Gate_MapScriptHeader: ; 0x9b950 db 0 ; 0x9b952 -UnknownScript_0x9b952: ; 0x9b952 +ScientistScript_0x9b952: ; 0x9b952 jumptextfaceplayer UnknownText_0x9b955 ; 0x9b955 @@ -40,6 +40,6 @@ Route2Gate_MapEventHeader: ; 0x9b9ca ; people-events db 1 - person_event $3c, 8, 10, $4, $20, 255, 255, $90, 0, UnknownScript_0x9b952, $ffff + person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff ; 0x9b9f1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 16dbeecd6..e4824f529 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -6,7 +6,7 @@ Route2NuggetSpeechHouse_MapScriptHeader: ; 0x9b845 db 0 ; 0x9b847 -UnknownScript_0x9b847: ; 0x9b847 +FisherScript_0x9b847: ; 0x9b847 faceplayer loadfont checkbit1 $00c8 @@ -64,6 +64,6 @@ Route2NuggetSpeechHouse_MapEventHeader: ; 0x9b933 ; people-events db 1 - person_event $3a, 8, 6, $4, $20, 255, 255, $90, 0, UnknownScript_0x9b847, $ffff + person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, $ffff ; 0x9b950 diff --git a/maps/Route3.asm b/maps/Route3.asm index 94b330dc2..f03c56f46 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -213,9 +213,9 @@ Route3_MapEventHeader: ; 0x1ae18a ; people-events db 4 - person_event $3a, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, $ffff - person_event $27, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff - person_event $27, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff - person_event $3a, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff + person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, $ffff + person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff + person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff + person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff ; 0x1ae1ce diff --git a/maps/Route30.asm b/maps/Route30.asm index 7a3cadbe3..58eb0d93f 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -6,7 +6,7 @@ Route30_MapScriptHeader: ; 0x1a1671 db 0 ; 0x1a1673 -UnknownScript_0x1a1673: ; 0x1a1673 +YoungsterScript_0x1a1673: ; 0x1a1673 waitbutton playmusic $002a loadfont @@ -267,7 +267,7 @@ Bug_catcherDonScript: ; 0x1a17ca end ; 0x1a17d2 -UnknownScript_0x1a17d2: ; 0x1a17d2 +YoungsterScript_0x1a17d2: ; 0x1a17d2 faceplayer loadfont checkbit1 $001f @@ -285,7 +285,7 @@ UnknownScript_0x1a17e0: ; 0x1a17e0 end ; 0x1a17e6 -UnknownScript_0x1a17e6: ; 0x1a17e6 +CooltrainerFScript_0x1a17e6: ; 0x1a17e6 jumptextfaceplayer UnknownText_0x1a1ac4 ; 0x1a17e9 @@ -309,11 +309,11 @@ ItemFragment_0x1a17f5: ; 0x1a17f5 db ANTIDOTE, 1 ; 0x1a17f7 -UnknownScript_0x1a17f7: ; 0x1a17f7 +FruitTreeScript_0x1a17f7: ; 0x1a17f7 fruittree $2 ; 0x1a17f9 -UnknownScript_0x1a17f9: ; 0x1a17f9 +FruitTreeScript_0x1a17f9: ; 0x1a17f9 fruittree $5 ; 0x1a17fb @@ -489,16 +489,16 @@ Route30_MapEventHeader: ; 0x1a1c54 ; people-events db 11 - person_event $27, 30, 9, $7, $0, 255, 255, $90, 0, UnknownScript_0x1a1673, $0714 - person_event $27, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey1, $0715 - person_event $27, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, $ffff - person_event $25, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, $ffff - person_event $27, 34, 11, $5, $1, 255, 255, $80, 0, UnknownScript_0x1a17d2, $ffff - person_event $4c, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, $0714 - person_event $4c, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, $0714 - person_event $5d, 43, 9, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a17f7, $ffff - person_event $5d, 9, 15, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a17f9, $ffff - person_event $24, 17, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a17e6, $ffff - person_event $54, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, $07b8 + person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, $0714 + person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey1, $0715 + person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, $ffff + person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, $ffff + person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, $ffff + person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, $0714 + person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, $0714 + person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, $ffff + person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, $ffff + person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, $ffff + person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, $07b8 ; 0x1a1d0c diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 9cac15bae..0c9c59b5e 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -6,7 +6,7 @@ Route30BerrySpeechHouse_MapScriptHeader: ; 0x196d62 db 0 ; 0x196d64 -UnknownScript_0x196d64: ; 0x196d64 +PokefanMScript_0x196d64: ; 0x196d64 faceplayer loadfont checkbit1 $0027 @@ -63,6 +63,6 @@ Route30BerrySpeechHouse_MapEventHeader: ; 0x196e20 ; people-events db 1 - person_event $2d, 7, 6, $6, $0, 255, 255, $b0, 0, UnknownScript_0x196d64, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, $ffff ; 0x196e47 diff --git a/maps/Route31.asm b/maps/Route31.asm index bb4f1b6b1..34f03fc6d 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -221,7 +221,7 @@ UnknownScript_0x1a556c: ; 0x1a556c end ; 0x1a5570 -UnknownScript_0x1a5570: ; 0x1a5570 +FisherScript_0x1a5570: ; 0x1a5570 faceplayer loadfont checkbit1 $0053 @@ -289,7 +289,7 @@ ReceivedSpearowMailText: ; 0x1a55cd db "DARK CAVE leads",$4E db "to another road@" -UnknownScript_0x1a55ed: ; 0x1a55ed +YoungsterScript_0x1a55ed: ; 0x1a55ed jumptextfaceplayer UnknownText_0x1a59d5 ; 0x1a55f0 @@ -301,11 +301,11 @@ MapRoute31Signpost1Script: ; 0x1a55f3 jumptext UnknownText_0x1a5a6e ; 0x1a55f6 -UnknownScript_0x1a55f6: ; 0x1a55f6 +CooltrainerMScript_0x1a55f6: ; 0x1a55f6 jumptextfaceplayer UnknownText_0x1a55ff ; 0x1a55f9 -UnknownScript_0x1a55f9: ; 0x1a55f9 +FruitTreeScript_0x1a55f9: ; 0x1a55f9 fruittree $7 ; 0x1a55fb @@ -464,12 +464,12 @@ Route31_MapEventHeader: ; 0x1a5a79 ; people-events db 7 - person_event $3a, 11, 21, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a5570, $ffff - person_event $27, 9, 13, $2, $11, 255, 255, $0, 0, UnknownScript_0x1a55ed, $ffff - person_event $25, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, $ffff - person_event $23, 12, 37, $2, $11, 255, 255, $0, 0, UnknownScript_0x1a55f6, $ffff - person_event $5d, 11, 20, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a55f9, $ffff - person_event $54, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, $06ae - person_event $54, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, $06af + person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, $ffff + person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, $ffff + person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, $ffff + person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, $ffff + person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, $ffff + person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, $06ae + person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, $06af ; 0x1a5af3 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index e5b7dbc1c..20bf5bb49 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -6,11 +6,11 @@ Route31VioletGate_MapScriptHeader: ; 0x197632 db 0 ; 0x197634 -UnknownScript_0x197634: ; 0x197634 +OfficerScript_0x197634: ; 0x197634 jumptextfaceplayer UnknownText_0x19763a ; 0x197637 -UnknownScript_0x197637: ; 0x197637 +CooltrainerFScript_0x197637: ; 0x197637 jumptextfaceplayer UnknownText_0x197661 ; 0x19763a @@ -45,8 +45,8 @@ Route31VioletGate_MapEventHeader: ; 0x19768c ; people-events db 2 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x197634, $ffff - person_event $24, 6, 5, $3, $0, 255, 255, $90, 0, UnknownScript_0x197637, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff ; 0x1976c0 diff --git a/maps/Route32.asm b/maps/Route32.asm index f08dedbc9..2651777e9 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -39,7 +39,7 @@ UnknownScript_0x19046c: ; 0x19046c return ; 0x19046f -UnknownScript_0x19046f: ; 0x19046f +CooltrainerMScript_0x19046f: ; 0x19046f faceplayer UnknownScript_0x190470: ; 0x190470 loadfont @@ -103,7 +103,7 @@ UnknownScript_0x1904ab: ; 0x1904ab end ; 0x1904ce -UnknownScript_0x1904ce: ; 0x1904ce +FisherScript_0x1904ce: ; 0x1904ce faceplayer loadfont checkbit1 $004e @@ -127,7 +127,7 @@ UnknownScript_0x1904e9: ; 0x1904e9 2jump UnknownScript_0x1904f3 ; 0x1904f2 -UnknownScript_0x1904f2: ; 0x1904f2 +FisherScript_0x1904f2: ; 0x1904f2 faceplayer UnknownScript_0x1904f3: ; 0x1904f3 dotrigger $2 @@ -627,7 +627,7 @@ Bird_keeperPeterScript: ; 0x190731 end ; 0x190739 -UnknownScript_0x190739: ; 0x190739 +LassScript_0x190739: ; 0x190739 faceplayer loadfont checkbit1 $0063 @@ -1104,19 +1104,19 @@ Route32_MapEventHeader: ; 0x19138d ; people-events db 14 - person_event $3a, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, $ffff - person_event $3a, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, $ffff - person_event $3a, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, $ffff - person_event $27, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, $ffff - person_event $27, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, $ffff - person_event $27, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, $ffff - person_event $28, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, $ffff - person_event $23, 12, 23, $8, $0, 255, 255, $0, 0, UnknownScript_0x19046f, $ffff - person_event $27, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, $ffff - person_event $3a, 74, 11, $6, $0, 255, 255, $0, 0, UnknownScript_0x1904f2, $06fc - person_event $54, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, $06b0 - person_event $3a, 17, 19, $9, $0, 255, 255, $0, 0, UnknownScript_0x1904ce, $ffff - person_event $28, 71, 16, $8, $0, 255, 255, $0, 0, UnknownScript_0x190739, $0758 - person_event $54, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, $06b1 + person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, $ffff + person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, $ffff + person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, $ffff + person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, $ffff + person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, $ffff + person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, $ffff + person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, $ffff + person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, $ffff + person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, $ffff + person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, $06fc + person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, $06b0 + person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, $ffff + person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, LassScript_0x190739, $0758 + person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, $06b1 ; 0x19148b diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 8d0a4a913..59adccc64 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -6,11 +6,11 @@ Route32PokeCenter1F_MapScriptHeader: ; 0x69b50 db 0 ; 0x69b52 -UnknownScript_0x69b52: ; 0x69b52 +NurseScript_0x69b52: ; 0x69b52 jumpstd $0000 ; 0x69b55 -UnknownScript_0x69b55: ; 0x69b55 +FishingGuruScript_0x69b55: ; 0x69b55 faceplayer loadfont checkbit1 $0017 @@ -42,7 +42,7 @@ UnknownScript_0x69b7a: ; 0x69b7a end ; 0x69b80 -UnknownScript_0x69b80: ; 0x69b80 +CooltrainerFScript_0x69b80: ; 0x69b80 jumptextfaceplayer UnknownText_0x69cac ; 0x69b83 @@ -107,8 +107,8 @@ Route32PokeCenter1F_MapEventHeader: ; 0x69cf9 ; people-events db 3 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x69b52, $ffff - person_event $3b, 8, 5, $6, $0, 255, 255, $a0, 0, UnknownScript_0x69b55, $ffff - person_event $24, 6, 10, $6, $0, 255, 255, $80, 0, UnknownScript_0x69b80, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, $ffff + person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, $ffff ; 0x69d35 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index d197d10b2..7300507d3 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -6,15 +6,15 @@ Route32RuinsofAlphGate_MapScriptHeader: ; 0x69a2b db 0 ; 0x69a2d -UnknownScript_0x69a2d: ; 0x69a2d +OfficerScript_0x69a2d: ; 0x69a2d jumptextfaceplayer UnknownText_0x69a36 ; 0x69a30 -UnknownScript_0x69a30: ; 0x69a30 +PokefanMScript_0x69a30: ; 0x69a30 jumptextfaceplayer UnknownText_0x69a81 ; 0x69a33 -UnknownScript_0x69a33: ; 0x69a33 +YoungsterScript_0x69a33: ; 0x69a33 jumptextfaceplayer UnknownText_0x69abd ; 0x69a36 @@ -60,8 +60,8 @@ Route32RuinsofAlphGate_MapEventHeader: ; 0x69b0f ; people-events db 3 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x69a2d, $ffff - person_event $2d, 6, 12, $4, $10, 255, 255, $b0, 0, UnknownScript_0x69a30, $ffff - person_event $27, 10, 5, $7, $0, 255, 255, $a0, 0, UnknownScript_0x69a33, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, $ffff + person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, $ffff + person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, $ffff ; 0x69b50 diff --git a/maps/Route33.asm b/maps/Route33.asm index f6184d043..cd81e5d19 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -6,7 +6,7 @@ Route33_MapScriptHeader: ; 0x1ac000 db 0 ; 0x1ac002 -UnknownScript_0x1ac002: ; 0x1ac002 +LassScript_0x1ac002: ; 0x1ac002 jumptextfaceplayer UnknownText_0x1ac1e7 ; 0x1ac005 @@ -171,7 +171,7 @@ MapRoute33Signpost0Script: ; 0x1ac0e7 jumptext UnknownText_0x1ac279 ; 0x1ac0ea -UnknownScript_0x1ac0ea: ; 0x1ac0ea +FruitTreeScript_0x1ac0ea: ; 0x1ac0ea fruittree $6 ; 0x1ac0ec @@ -235,8 +235,8 @@ Route33_MapEventHeader: ; 0x1ac283 ; people-events db 3 - person_event $2d, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony2, $ffff - person_event $28, 20, 17, $2, $11, 255, 255, $90, 0, UnknownScript_0x1ac002, $ffff - person_event $5d, 20, 18, $1, $0, 255, 255, $0, 0, UnknownScript_0x1ac0ea, $ffff + person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony2, $ffff + person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, $ffff + person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, $ffff ; 0x1ac2ba diff --git a/maps/Route34.asm b/maps/Route34.asm index 10859e35c..4eee05525 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -48,7 +48,7 @@ UnknownScript_0x78039: ; 0x78039 return ; 0x7803d -UnknownScript_0x7803d: ; 0x7803d +GrampsScript_0x7803d: ; 0x7803d faceplayer loadfont special $0020 @@ -72,14 +72,14 @@ UnknownScript_0x7805b: ; 0x7805b end ; 0x78065 -UnknownScript_0x78065: ; 0x78065 +DaycareMon1Script_0x78065: ; 0x78065 loadfont special $0045 loadmovesprites end ; 0x7806b -UnknownScript_0x7806b: ; 0x7806b +DaycareMon2Script_0x7806b: ; 0x7806b loadfont special $0046 loadmovesprites @@ -416,7 +416,7 @@ UnknownScript_0x78248: ; 0x78248 end ; 0x7824c -UnknownScript_0x7824c: ; 0x7824c +OfficerScript_0x7824c: ; 0x7824c faceplayer loadfont checktime $4 @@ -958,18 +958,18 @@ Route34_MapEventHeader: ; 0x78a7c ; people-events db 13 - person_event $27, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, $ffff - person_event $27, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, $ffff - person_event $27, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, $ffff - person_event $28, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, $ffff - person_event $43, 15, 13, $6, $0, 255, 255, $90, 0, UnknownScript_0x7824c, $ffff - person_event $2d, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, $ffff - person_event $2f, 20, 19, $6, $0, 255, 255, $0, 0, UnknownScript_0x7803d, $06e6 - person_event $e0, 22, 18, $16, $22, 255, 255, $0, 0, UnknownScript_0x78065, $06e7 - person_event $e1, 23, 21, $16, $22, 255, 255, $0, 0, UnknownScript_0x7806b, $06e8 - person_event $24, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, $ffff - person_event $24, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, $ffff - person_event $24, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, $ffff - person_event $54, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, $07bc + person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, $ffff + person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, $ffff + person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, $ffff + person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, $ffff + person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, $ffff + person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, $ffff + person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, $06e6 + person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, $06e7 + person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, $06e8 + person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, $ffff + person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, $ffff + person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, $ffff + person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, $07bc ; 0x78b5d diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index b707ac3bd..60da81b17 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -43,7 +43,7 @@ UnknownScript_0x62d62: ; 0x62d62 end ; 0x62d63 -UnknownScript_0x62d63: ; 0x62d63 +TeacherScript_0x62d63: ; 0x62d63 faceplayer loadfont checkbit1 $00c0 @@ -70,7 +70,7 @@ UnknownScript_0x62d84: ; 0x62d84 end ; 0x62d8a -UnknownScript_0x62d8a: ; 0x62d8a +ButterfreeScript_0x62d8a: ; 0x62d8a loadfont 2writetext UnknownText_0x62e83 cry BUTTERFREE @@ -79,7 +79,7 @@ UnknownScript_0x62d8a: ; 0x62d8a end ; 0x62d94 -UnknownScript_0x62d94: ; 0x62d94 +LassScript_0x62d94: ; 0x62d94 jumptextfaceplayer UnknownText_0x62e97 ; 0x62d97 @@ -155,9 +155,9 @@ Route34IlexForestGate_MapEventHeader: ; 0x62f20 ; people-events db 4 - person_event $29, 7, 13, $8, $0, 255, 255, $90, 0, UnknownScript_0x62d63, $06ea - person_event $8b, 8, 13, $16, $0, 255, 255, $80, 0, UnknownScript_0x62d8a, $ffff - person_event $28, 8, 7, $4, $10, 255, 255, $a0, 0, UnknownScript_0x62d94, $06eb - person_event $29, 11, 9, $7, $0, 255, 255, $90, 0, UnknownScript_0x62d63, $06ec + person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ea + person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, $ffff + person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, $06eb + person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, $06ec ; 0x62f76 diff --git a/maps/Route35.asm b/maps/Route35.asm index 8d9d8ac5e..74f8d8741 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -383,7 +383,7 @@ FirebreatherWaltScript: ; 0x19ca41 end ; 0x19ca49 -UnknownScript_0x19ca49: ; 0x19ca49 +OfficerScript_0x19ca49: ; 0x19ca49 faceplayer loadfont checktime $4 @@ -425,7 +425,7 @@ ItemFragment_0x19ca7c: ; 0x19ca7c db TM_04, 1 ; 0x19ca7e -UnknownScript_0x19ca7e: ; 0x19ca7e +FruitTreeScript_0x19ca7e: ; 0x19ca7e fruittree $b ; 0x19ca80 @@ -626,16 +626,16 @@ Route35_MapEventHeader: ; 0x19cf9e ; people-events db 11 - person_event $27, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, $ffff - person_event $27, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, $ffff - person_event $28, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, $ffff - person_event $28, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, $ffff - person_event $27, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, $ffff - person_event $3a, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, $ffff - person_event $25, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, $ffff - person_event $2b, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin1, $ffff - person_event $43, 10, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x19ca49, $ffff - person_event $5d, 29, 6, $1, $0, 255, 255, $0, 0, UnknownScript_0x19ca7e, $ffff - person_event $54, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, $06b2 + person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, $ffff + person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, $ffff + person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, $ffff + person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, $ffff + person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, $ffff + person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, $ffff + person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, $ffff + person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin1, $ffff + person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, $ffff + person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, $ffff + person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, $06b2 ; 0x19d04c diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 1490d0723..b67f859a5 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -6,7 +6,7 @@ Route35Goldenrodgate_MapScriptHeader: ; 0x69d35 db 0 ; 0x69d37 -UnknownScript_0x69d37: ; 0x69d37 +OfficerScript_0x69d37: ; 0x69d37 faceplayer loadfont checkbit1 $0052 @@ -74,7 +74,7 @@ GiftSpearowOTName: ; 0x69dbf db 0 ; 0x69dc5 XXX is there a reason for this? -UnknownScript_0x69dc6: ; 0x69dc6 +PokefanFScript_0x69dc6: ; 0x69dc6 faceplayer loadfont checkbit1 $002a @@ -92,7 +92,7 @@ UnknownScript_0x69dd4: ; 0x69dd4 end ; 0x69dda -UnknownScript_0x69dda: ; 0x69dda +FisherScript_0x69dda: ; 0x69dda jumptextfaceplayer UnknownText_0x6a0cb ; 0x69ddd @@ -203,8 +203,8 @@ Route35Goldenrodgate_MapEventHeader: ; 0x6a148 ; people-events db 3 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x69d37, $ffff - person_event $2e, 8, 10, $4, $10, 255, 255, $90, 0, UnknownScript_0x69dc6, $ffff - person_event $3a, 6, 7, $3, $0, 255, 255, $a0, 0, UnknownScript_0x69dda, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, $ffff + person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, $ffff + person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, $ffff ; 0x6a189 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 6ddffb9cd..b691588ec 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -90,7 +90,7 @@ UnknownScript_0x6a1ee: ; 0x6a1ee end ; 0x6a204 -UnknownScript_0x6a204: ; 0x6a204 +OfficerScript_0x6a204: ; 0x6a204 checkcode $b if_equal SUNDAY, UnknownScript_0x6a2c7 if_equal MONDAY, UnknownScript_0x6a2c7 @@ -209,7 +209,7 @@ UnknownScript_0x6a2c7: ; 0x6a2c7 jumptextfaceplayer UnknownText_0x6a894 ; 0x6a2ca -UnknownScript_0x6a2ca: ; 0x6a2ca +OfficerScript_0x6a2ca: ; 0x6a2ca faceplayer loadfont checkbit2 $0051 @@ -220,7 +220,7 @@ UnknownScript_0x6a2ca: ; 0x6a2ca end ; 0x6a2d8 -UnknownScript_0x6a2d8: ; 0x6a2d8 +YoungsterScript_0x6a2d8: ; 0x6a2d8 jumptextfaceplayer UnknownText_0x6a8d8 ; 0x6a2db @@ -450,8 +450,8 @@ Route35NationalParkgate_MapEventHeader: ; 0x6a9d2 ; people-events db 3 - person_event $43, 5, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x6a204, $0745 - person_event $27, 9, 10, $2, $11, 255, 255, $80, 0, UnknownScript_0x6a2d8, $0734 - person_event $43, 7, 4, $9, $0, 255, 255, $a0, 0, UnknownScript_0x6a2ca, $0746 + person_event SPRITE_OFFICER, 5, 6, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6a204, $0745 + person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, $0734 + person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, $0746 ; 0x6aa18 diff --git a/maps/Route36.asm b/maps/Route36.asm index 03b4c3a58..4a7783fb8 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -49,7 +49,7 @@ UnknownScript_0x19401b: ; 0x19401b end ; 0x19403c -UnknownScript_0x19403c: ; 0x19403c +WeirdTreeScript_0x19403c: ; 0x19403c checkitem SQUIRTBOTTLE iftrue UnknownScript_0x19404a waitbutton @@ -100,7 +100,7 @@ UnknownScript_0x19407b: ; 0x19407b end ; 0x19408c -UnknownScript_0x19408c: ; 0x19408c +LassScript_0x19408c: ; 0x19408c faceplayer loadfont checkbit1 $00ba @@ -130,7 +130,7 @@ UnknownScript_0x1940b3: ; 0x1940b3 end ; 0x1940b9 -UnknownScript_0x1940b9: ; 0x1940b9 +FisherScript_0x1940b9: ; 0x1940b9 faceplayer loadfont checkbit1 $004b @@ -157,7 +157,7 @@ UnknownScript_0x1940de: ; 0x1940de end ; 0x1940e0 -UnknownScript_0x1940e0: ; 0x1940e0 +LassScript_0x1940e0: ; 0x1940e0 faceplayer loadfont checkbit1 $002a @@ -377,7 +377,7 @@ PsychicMarkScript: ; 0x1941f9 end ; 0x194201 -UnknownScript_0x194201: ; 0x194201 +YoungsterScript_0x194201: ; 0x194201 faceplayer loadfont checkbit1 $0067 @@ -432,7 +432,7 @@ MapRoute36Signpost0Script: ; 0x194244 jumptext UnknownText_0x1949ee ; 0x194247 -UnknownScript_0x194247: ; 0x194247 +FruitTreeScript_0x194247: ; 0x194247 fruittree $d ; 0x194249 @@ -723,14 +723,14 @@ Route36_MapEventHeader: ; 0x194a66 ; people-events db 9 - person_event $27, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, $ffff - person_event $27, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, $ffff - person_event $f4, 13, 39, $17, $0, 255, 255, $0, 0, UnknownScript_0x19403c, $06f8 - person_event $28, 12, 55, $5, $2, 255, 255, $0, 0, UnknownScript_0x1940e0, $ffff - person_event $3a, 13, 48, $8, $0, 255, 255, $0, 0, UnknownScript_0x1940b9, $ffff - person_event $5d, 8, 25, $1, $0, 255, 255, $0, 0, UnknownScript_0x194247, $ffff - person_event $27, 10, 50, $2, $11, 255, 255, $0, 0, UnknownScript_0x194201, $075a - person_event $28, 16, 37, $6, $0, 255, 255, $90, 0, UnknownScript_0x19408c, $0769 - person_event $63, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b0 + person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, $ffff + person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, $ffff + person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, $06f8 + person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, $ffff + person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, $ffff + person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, $ffff + person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, YoungsterScript_0x194201, $075a + person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, $0769 + person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b0 ; 0x194b19 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index f5d258496..f294de452 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -143,7 +143,7 @@ UnknownScript_0x6abdc: ; 0x6abdc end ; 0x6abe0 -UnknownScript_0x6abe0: ; 0x6abe0 +OfficerScript_0x6abe0: ; 0x6abe0 checkcode $b if_equal SUNDAY, UnknownScript_0x6acf1 if_equal MONDAY, UnknownScript_0x6acf1 @@ -308,7 +308,7 @@ UnknownScript_0x6acf1: ; 0x6acf1 jumptextfaceplayer UnknownText_0x6b370 ; 0x6acf4 -UnknownScript_0x6acf4: ; 0x6acf4 +OfficerScript_0x6acf4: ; 0x6acf4 faceplayer loadfont checkbit2 $0051 @@ -324,7 +324,7 @@ UnknownScript_0x6ad02: ; 0x6ad02 end ; 0x6ad06 -UnknownScript_0x6ad06: ; 0x6ad06 +YoungsterScript_0x6ad06: ; 0x6ad06 faceplayer loadfont checkbit1 $0000 @@ -342,7 +342,7 @@ UnknownScript_0x6ad14: ; 0x6ad14 end ; 0x6ad1a -UnknownScript_0x6ad1a: ; 0x6ad1a +YoungsterScript_0x6ad1a: ; 0x6ad1a faceplayer loadfont checkbit1 $0000 @@ -360,7 +360,7 @@ UnknownScript_0x6ad28: ; 0x6ad28 end ; 0x6ad2e -UnknownScript_0x6ad2e: ; 0x6ad2e +RockerScript_0x6ad2e: ; 0x6ad2e faceplayer loadfont checkbit1 $0000 @@ -378,7 +378,7 @@ UnknownScript_0x6ad3c: ; 0x6ad3c end ; 0x6ad42 -UnknownScript_0x6ad42: ; 0x6ad42 +PokefanMScript_0x6ad42: ; 0x6ad42 faceplayer loadfont checkbit1 $0000 @@ -396,7 +396,7 @@ UnknownScript_0x6ad50: ; 0x6ad50 end ; 0x6ad56 -UnknownScript_0x6ad56: ; 0x6ad56 +YoungsterScript_0x6ad56: ; 0x6ad56 faceplayer loadfont checkbit1 $0000 @@ -414,7 +414,7 @@ UnknownScript_0x6ad64: ; 0x6ad64 end ; 0x6ad6a -UnknownScript_0x6ad6a: ; 0x6ad6a +YoungsterScript_0x6ad6a: ; 0x6ad6a faceplayer loadfont checkbit1 $0000 @@ -432,7 +432,7 @@ UnknownScript_0x6ad78: ; 0x6ad78 end ; 0x6ad7e -UnknownScript_0x6ad7e: ; 0x6ad7e +LassScript_0x6ad7e: ; 0x6ad7e faceplayer loadfont checkbit1 $0000 @@ -450,7 +450,7 @@ UnknownScript_0x6ad8c: ; 0x6ad8c end ; 0x6ad92 -UnknownScript_0x6ad92: ; 0x6ad92 +YoungsterScript_0x6ad92: ; 0x6ad92 faceplayer loadfont checkbit1 $0000 @@ -468,7 +468,7 @@ UnknownScript_0x6ada0: ; 0x6ada0 end ; 0x6ada6 -UnknownScript_0x6ada6: ; 0x6ada6 +YoungsterScript_0x6ada6: ; 0x6ada6 faceplayer loadfont checkbit1 $0000 @@ -486,7 +486,7 @@ UnknownScript_0x6adb4: ; 0x6adb4 end ; 0x6adba -UnknownScript_0x6adba: ; 0x6adba +YoungsterScript_0x6adba: ; 0x6adba faceplayer loadfont checkbit1 $0000 @@ -865,18 +865,18 @@ Route36NationalParkgate_MapEventHeader: ; 0x6b9ac ; people-events db 12 - person_event $43, 7, 4, $6, $0, 255, 255, $a0, 0, UnknownScript_0x6abe0, $0747 - person_event $27, 9, 6, $7, $0, 255, 255, $80, 0, UnknownScript_0x6ad06, $0720 - person_event $27, 9, 8, $7, $0, 255, 255, $a0, 0, UnknownScript_0x6ad1a, $0721 - person_event $2c, 10, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x6ad2e, $0722 - person_event $2d, 9, 10, $7, $0, 255, 255, $b0, 0, UnknownScript_0x6ad42, $0723 - person_event $27, 11, 6, $7, $0, 255, 255, $80, 0, UnknownScript_0x6ad56, $0724 - person_event $27, 10, 9, $7, $0, 255, 255, $a0, 0, UnknownScript_0x6ad6a, $0725 - person_event $28, 10, 7, $7, $0, 255, 255, $90, 0, UnknownScript_0x6ad7e, $0726 - person_event $27, 11, 8, $7, $0, 255, 255, $80, 0, UnknownScript_0x6ad92, $0727 - person_event $27, 11, 10, $7, $0, 255, 255, $a0, 0, UnknownScript_0x6ada6, $0728 - person_event $27, 10, 10, $7, $0, 255, 255, $90, 0, UnknownScript_0x6adba, $0729 - person_event $43, 6, 7, $6, $0, 255, 255, $a0, 0, UnknownScript_0x6acf4, $0748 + person_event SPRITE_OFFICER, 7, 4, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6abe0, $0747 + person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad06, $0720 + person_event SPRITE_YOUNGSTER, 9, 8, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad1a, $0721 + person_event SPRITE_ROCKER, 10, 6, $7, $0, 255, 255, $90, 0, RockerScript_0x6ad2e, $0722 + person_event SPRITE_POKEFAN_M, 9, 10, $7, $0, 255, 255, $b0, 0, PokefanMScript_0x6ad42, $0723 + person_event SPRITE_YOUNGSTER, 11, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad56, $0724 + person_event SPRITE_YOUNGSTER, 10, 9, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad6a, $0725 + person_event SPRITE_LASS, 10, 7, $7, $0, 255, 255, $90, 0, LassScript_0x6ad7e, $0726 + person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad92, $0727 + person_event SPRITE_YOUNGSTER, 11, 10, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ada6, $0728 + person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, $0729 + person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, $0748 ; 0x6ba67 diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index b19aacbc0..aed24de5e 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -6,11 +6,11 @@ Route36RuinsofAlphgate_MapScriptHeader: ; 0x6aa18 db 0 ; 0x6aa1a -UnknownScript_0x6aa1a: ; 0x6aa1a +OfficerScript_0x6aa1a: ; 0x6aa1a jumptextfaceplayer UnknownText_0x6aa20 ; 0x6aa1d -UnknownScript_0x6aa1d: ; 0x6aa1d +GrampsScript_0x6aa1d: ; 0x6aa1d jumptextfaceplayer UnknownText_0x6aa5b ; 0x6aa20 @@ -50,7 +50,7 @@ Route36RuinsofAlphgate_MapEventHeader: ; 0x6aac9 ; people-events db 2 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x6aa1a, $ffff - person_event $2f, 9, 11, $2, $21, 255, 255, $b0, 0, UnknownScript_0x6aa1d, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, $ffff + person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, $ffff ; 0x6aafd diff --git a/maps/Route37.asm b/maps/Route37.asm index aab3fd69f..f3ede525c 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -109,7 +109,7 @@ PsychicGregScript: ; 0x1a8db7 end ; 0x1a8dbf -UnknownScript_0x1a8dbf: ; 0x1a8dbf +BugCatcherScript_0x1a8dbf: ; 0x1a8dbf faceplayer loadfont checkbit1 $0069 @@ -161,15 +161,15 @@ MapRoute37Signpost0Script: ; 0x1a8e06 jumptext UnknownText_0x1a9197 ; 0x1a8e09 -UnknownScript_0x1a8e09: ; 0x1a8e09 +FruitTreeScript_0x1a8e09: ; 0x1a8e09 fruittree $11 ; 0x1a8e0b -UnknownScript_0x1a8e0b: ; 0x1a8e0b +FruitTreeScript_0x1a8e0b: ; 0x1a8e0b fruittree $12 ; 0x1a8e0d -UnknownScript_0x1a8e0d: ; 0x1a8e0d +FruitTreeScript_0x1a8e0d: ; 0x1a8e0d fruittree $13 ; 0x1a8e0f @@ -306,12 +306,12 @@ Route37_MapEventHeader: ; 0x1a91a1 ; people-events db 7 - person_event $f4, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, $ffff - person_event $f4, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, $ffff - person_event $27, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, $ffff - person_event $5d, 9, 17, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a8e09, $ffff - person_event $25, 12, 20, $2, $11, 255, 255, $0, 0, UnknownScript_0x1a8dbf, $075b - person_event $5d, 9, 20, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a8e0b, $ffff - person_event $5d, 11, 19, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a8e0d, $ffff + person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, $ffff + person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, $ffff + person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, $ffff + person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, $ffff + person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, BugCatcherScript_0x1a8dbf, $075b + person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, $ffff + person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, $ffff ; 0x1a920c diff --git a/maps/Route38.asm b/maps/Route38.asm index 88cb9ff01..b22c26417 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -451,7 +451,7 @@ MapRoute38Signpost1Script: ; 0x1a1f30 jumptext UnknownText_0x1a2324 ; 0x1a1f33 -UnknownScript_0x1a1f33: ; 0x1a1f33 +FruitTreeScript_0x1a1f33: ; 0x1a1f33 fruittree $3 ; 0x1a1f35 @@ -610,12 +610,12 @@ Route38_MapEventHeader: ; 0x1a23bb ; people-events db 7 - person_event $66, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, $ffff - person_event $28, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, $ffff - person_event $66, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, $ffff - person_event $2a, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, $ffff - person_event $49, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, $ffff - person_event $5d, 14, 16, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a1f33, $ffff - person_event $2a, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, $ffff + person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, $ffff + person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, $ffff + person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, $ffff + person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, $ffff + person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, $ffff ; 0x1a2430 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 66f7148c3..4d6c23d19 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -6,7 +6,7 @@ Route38EcruteakGate_MapScriptHeader: ; 0x9cbd5 db 0 ; 0x9cbd7 -UnknownScript_0x9cbd7: ; 0x9cbd7 +OfficerScript_0x9cbd7: ; 0x9cbd7 jumptextfaceplayer UnknownText_0x9cbda ; 0x9cbda @@ -39,6 +39,6 @@ Route38EcruteakGate_MapEventHeader: ; 0x9cc4d ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x9cbd7, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, $ffff ; 0x9cc74 diff --git a/maps/Route39.asm b/maps/Route39.asm index 332ec2d19..e454282af 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -6,7 +6,7 @@ Route39_MapScriptHeader: ; 0x1a5af3 db 0 ; 0x1a5af5 -UnknownScript_0x1a5af5: ; 0x1a5af5 +TaurosScript_0x1a5af5: ; 0x1a5af5 loadfont 2writetext UnknownText_0x1a5bf9 cry MILTANK @@ -211,7 +211,7 @@ PsychicNormanScript: ; 0x1a5bb6 end ; 0x1a5bbe -UnknownScript_0x1a5bbe: ; 0x1a5bbe +PokefanFScript_0x1a5bbe: ; 0x1a5bbe faceplayer loadfont checktime $4 @@ -256,7 +256,7 @@ MapRoute39Signpost0Script: ; 0x1a5bf1 jumptext UnknownText_0x1a6036 ; 0x1a5bf4 -UnknownScript_0x1a5bf4: ; 0x1a5bf4 +FruitTreeScript_0x1a5bf4: ; 0x1a5bf4 fruittree $f ; 0x1a5bf6 @@ -431,15 +431,15 @@ Route39_MapEventHeader: ; 0x1a60ba ; people-events db 10 - person_event $49, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, $ffff - person_event $2d, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, $ffff - person_event $2e, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, $ffff - person_event $99, 16, 7, $16, $0, 255, 255, $0, 0, UnknownScript_0x1a5af5, $ffff - person_event $99, 15, 10, $16, $0, 255, 255, $0, 0, UnknownScript_0x1a5af5, $ffff - person_event $99, 19, 8, $16, $0, 255, 255, $0, 0, UnknownScript_0x1a5af5, $ffff - person_event $99, 17, 12, $16, $0, 255, 255, $0, 0, UnknownScript_0x1a5af5, $ffff - person_event $66, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, $ffff - person_event $5d, 7, 13, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a5bf4, $ffff - person_event $2e, 26, 8, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a5bbe, $ffff + person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, $ffff + person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, $ffff + person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, $ffff + person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff + person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff + person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff + person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, $ffff + person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, $ffff + person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, $ffff ; 0x1a6160 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 751e8756c..af20dd5c3 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -6,7 +6,7 @@ Route39Barn_MapScriptHeader: ; 0x9cc74 db 0 ; 0x9cc76 -UnknownScript_0x9cc76: ; 0x9cc76 +TwinScript_0x9cc76: ; 0x9cc76 faceplayer loadfont checkbit1 $003d @@ -26,7 +26,7 @@ UnknownScript_0x9cc87: ; 0x9cc87 end ; 0x9cc90 -UnknownScript_0x9cc90: ; 0x9cc90 +TwinScript_0x9cc90: ; 0x9cc90 faceplayer loadfont checkbit1 $003d @@ -46,7 +46,7 @@ UnknownScript_0x9cca1: ; 0x9cca1 end ; 0x9ccaa -UnknownScript_0x9ccaa: ; 0x9ccaa +TaurosScript_0x9ccaa: ; 0x9ccaa loadfont checkbit1 $003d iftrue UnknownScript_0x9cd25 @@ -211,8 +211,8 @@ Route39Barn_MapEventHeader: ; 0x9ce7b ; people-events db 3 - person_event $26, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x9cc76, $ffff - person_event $26, 7, 8, $8, $0, 255, 255, $a0, 0, UnknownScript_0x9cc90, $ffff - person_event $99, 7, 7, $16, $0, 255, 255, $0, 0, UnknownScript_0x9ccaa, $ffff + person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, $ffff + person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, $ffff + person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, $ffff ; 0x9ceb2 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 06e3eb839..546f714c7 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -6,7 +6,7 @@ Route39Farmhouse_MapScriptHeader: ; 0x9ceb2 db 0 ; 0x9ceb4 -UnknownScript_0x9ceb4: ; 0x9ceb4 +PokefanMScript_0x9ceb4: ; 0x9ceb4 faceplayer loadfont checkbit1 $003d @@ -68,7 +68,7 @@ UnknownScript_0x9cf08: ; 0x9cf08 end ; 0x9cf0e -UnknownScript_0x9cf0e: ; 0x9cf0e +PokefanFScript_0x9cf0e: ; 0x9cf0e faceplayer loadfont checkbit1 $003e @@ -203,7 +203,7 @@ Route39Farmhouse_MapEventHeader: ; 0x9d242 ; people-events db 2 - person_event $2d, 6, 7, $6, $0, 255, 255, $90, 0, UnknownScript_0x9ceb4, $ffff - person_event $2e, 8, 9, $8, $0, 255, 255, $b0, 0, UnknownScript_0x9cf0e, $ffff + person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, $ffff + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, $ffff ; 0x9d276 diff --git a/maps/Route4.asm b/maps/Route4.asm index 0de2cb95c..0ff3de23a 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -186,9 +186,9 @@ Route4_MapEventHeader: ; 0x1ae3ab ; people-events db 4 - person_event $27, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, $ffff - person_event $28, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, $ffff - person_event $28, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff - person_event $54, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787 + person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, $ffff + person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, $ffff + person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, $ffff + person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, $0787 ; 0x1ae3f4 diff --git a/maps/Route40.asm b/maps/Route40.asm index 60d8a575c..eb5b5e82f 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -139,11 +139,11 @@ SwimmermRandallScript: ; 0x1a61bc end ; 0x1a61c4 -UnknownScript_0x1a61c4: ; 0x1a61c4 +LassScript_0x1a61c4: ; 0x1a61c4 jumptextfaceplayer UnknownText_0x1a6429 ; 0x1a61c7 -UnknownScript_0x1a61c7: ; 0x1a61c7 +PokefanMScript_0x1a61c7: ; 0x1a61c7 special $00a0 iftrue UnknownScript_0x1a61d0 jumptextfaceplayer UnknownText_0x1a646a @@ -153,15 +153,15 @@ UnknownScript_0x1a61d0: ; 0x1a61d0 jumptextfaceplayer UnknownText_0x1a649b ; 0x1a61d3 -UnknownScript_0x1a61d3: ; 0x1a61d3 +LassScript_0x1a61d3: ; 0x1a61d3 jumptextfaceplayer UnknownText_0x1a64e6 ; 0x1a61d6 -UnknownScript_0x1a61d6: ; 0x1a61d6 +StandingYoungsterScript_0x1a61d6: ; 0x1a61d6 jumptextfaceplayer UnknownText_0x1a6564 ; 0x1a61d9 -UnknownScript_0x1a61d9: ; 0x1a61d9 +BuenaScript_0x1a61d9: ; 0x1a61d9 faceplayer loadfont checkbit1 $006f @@ -204,7 +204,7 @@ MapRoute40Signpost0Script: ; 0x1a6213 jumptext UnknownText_0x1a6767 ; 0x1a6216 -UnknownScript_0x1a6216: ; 0x1a6216 +RockScript_0x1a6216: ; 0x1a6216 jumpstd $000f ; 0x1a6219 @@ -415,17 +415,17 @@ Route40_MapEventHeader: ; 0x1a678e ; people-events db 12 - person_event $f5, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, $ffff - person_event $f5, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, $ffff - person_event $32, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, $ffff - person_event $32, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, $ffff - person_event $59, 15, 11, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a6216, $ffff - person_event $59, 13, 10, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a6216, $ffff - person_event $59, 12, 11, $18, $0, 255, 255, $0, 0, UnknownScript_0x1a6216, $ffff - person_event $28, 17, 15, $6, $0, 255, 255, $0, 0, UnknownScript_0x1a61c4, $ffff - person_event $2a, 14, 12, $3, $0, 255, 255, $0, 0, UnknownScript_0x1a61d9, $075e - person_event $2d, 10, 11, $9, $0, 255, 255, $0, 0, UnknownScript_0x1a61c7, $ffff - person_event $28, 8, 17, $3, $0, 255, 255, $a0, 0, UnknownScript_0x1a61d3, $ffff - person_event $66, 13, 20, $3, $0, 255, 255, $90, 0, UnknownScript_0x1a61d6, $07cf + person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, $ffff + person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, $ffff + person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, $ffff + person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, $ffff + person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff + person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff + person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, RockScript_0x1a6216, $ffff + person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, $ffff + person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, BuenaScript_0x1a61d9, $075e + person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, $ffff + person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, $ffff + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, $07cf ; 0x1a683f diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 720f3f903..6ea576cbd 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -15,11 +15,11 @@ UnknownScript_0x9f665: ; 0x9f665 return ; 0x9f669 -UnknownScript_0x9f669: ; 0x9f669 +RockerScript_0x9f669: ; 0x9f669 jumptextfaceplayer UnknownText_0x9f716 ; 0x9f66c -UnknownScript_0x9f66c: ; 0x9f66c +TwinScript_0x9f66c: ; 0x9f66c jumptextfaceplayer UnknownText_0x9f7c8 ; 0x9f66f @@ -84,7 +84,7 @@ Route40BattleTowerGate_MapEventHeader: ; 0x9f81e ; people-events db 2 - person_event $2c, 7, 7, $3, $0, 255, 255, $a0, 0, UnknownScript_0x9f669, $07cf - person_event $26, 9, 11, $4, $10, 255, 255, $80, 0, UnknownScript_0x9f66c, $ffff + person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf + person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff ; 0x9f852 diff --git a/maps/Route41.asm b/maps/Route41.asm index 0160c4628..c6116dbfe 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -517,15 +517,15 @@ Route41_MapEventHeader: ; 0x1a6f12 ; people-events db 10 - person_event $f5, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, $ffff - person_event $f5, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, $ffff - person_event $f5, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, $ffff - person_event $f5, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, $ffff - person_event $f5, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, $ffff - person_event $32, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, $ffff - person_event $32, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, $ffff - person_event $32, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, $ffff - person_event $32, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff - person_event $32, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff + person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, $ffff + person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, $ffff + person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, $ffff + person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, $ffff + person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, $ffff + person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, $ffff + person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, $ffff + person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, $ffff + person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, $ffff + person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, $ffff ; 0x1a6fb3 diff --git a/maps/Route42.asm b/maps/Route42.asm index 0dfa1115a..0e48522fe 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -273,15 +273,15 @@ ItemFragment_0x1a934b: ; 0x1a934b db SUPER_POTION, 1 ; 0x1a934d -UnknownScript_0x1a934d: ; 0x1a934d +FruitTreeScript_0x1a934d: ; 0x1a934d fruittree $15 ; 0x1a934f -UnknownScript_0x1a934f: ; 0x1a934f +FruitTreeScript_0x1a934f: ; 0x1a934f fruittree $16 ; 0x1a9351 -UnknownScript_0x1a9351: ; 0x1a9351 +FruitTreeScript_0x1a9351: ; 0x1a9351 fruittree $17 ; 0x1a9353 @@ -412,14 +412,14 @@ Route42_MapEventHeader: ; 0x1a95c9 ; people-events db 9 - person_event $3a, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, $ffff - person_event $2d, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, $ffff - person_event $2b, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, $ffff - person_event $5d, 20, 31, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a934d, $ffff - person_event $5d, 20, 32, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a934f, $ffff - person_event $5d, 20, 33, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a9351, $ffff - person_event $54, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, $06b3 - person_event $54, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, $06b4 - person_event $63, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, $07af + person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, $ffff + person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, $ffff + person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, $ffff + person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, $ffff + person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, $ffff + person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, $ffff + person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, $06b3 + person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, $06b4 + person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, $07af ; 0x1a967e diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 26091b96f..c5ff8b5d5 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -6,7 +6,7 @@ Route42EcruteakGate_MapScriptHeader: ; 0x19a4b3 db 0 ; 0x19a4b5 -UnknownScript_0x19a4b5: ; 0x19a4b5 +OfficerScript_0x19a4b5: ; 0x19a4b5 jumptextfaceplayer UnknownText_0x19a4b8 ; 0x19a4b8 @@ -36,6 +36,6 @@ Route42EcruteakGate_MapEventHeader: ; 0x19a4fe ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x19a4b5, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, $ffff ; 0x19a525 diff --git a/maps/Route43.asm b/maps/Route43.asm index e8d15ead3..6ccc95809 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -454,7 +454,7 @@ MapRoute43Signpost2Script: ; 0x19d263 jumptext UnknownText_0x19d6c9 ; 0x19d266 -UnknownScript_0x19d266: ; 0x19d266 +FruitTreeScript_0x19d266: ; 0x19d266 fruittree $8 ; 0x19d268 @@ -639,13 +639,13 @@ Route43_MapEventHeader: ; 0x19d78c ; people-events db 8 - person_event $2b, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, $ffff - person_event $2b, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, $ffff - person_event $2b, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, $ffff - person_event $3a, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, $ffff - person_event $28, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, $ffff - person_event $27, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, $ffff - person_event $5d, 30, 5, $1, $0, 255, 255, $0, 0, UnknownScript_0x19d266, $ffff - person_event $54, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, $06b5 + person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, $ffff + person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, $ffff + person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, $ffff + person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, $ffff + person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, $ffff + person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, $ffff + person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, $ffff + person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, $06b5 ; 0x19d822 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 7feff412b..d70a8fdf8 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -117,11 +117,11 @@ UnknownScript_0x19ac72: ; 0x19ac72 end ; 0x19ac82 -UnknownScript_0x19ac82: ; 0x19ac82 +RocketScript_0x19ac82: ; 0x19ac82 jumptextfaceplayer UnknownText_0x19ad41 ; 0x19ac85 -UnknownScript_0x19ac85: ; 0x19ac85 +OfficerScript_0x19ac85: ; 0x19ac85 faceplayer loadfont checkbit1 $0059 @@ -285,8 +285,8 @@ Route43Gate_MapEventHeader: ; 0x19ae5b ; people-events db 3 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x19ac85, $0735 - person_event $35, 8, 6, $6, $0, 255, 255, $0, 0, UnknownScript_0x19ac82, $06dc - person_event $35, 8, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x19ac82, $06dc + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, $0735 + person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc + person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, $06dc ; 0x19ae9c diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index f57144df0..d7ae9dbb9 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -6,7 +6,7 @@ Route43MahoganyGate_MapScriptHeader: ; 0x19ab09 db 0 ; 0x19ab0b -UnknownScript_0x19ab0b: ; 0x19ab0b +OfficerScript_0x19ab0b: ; 0x19ab0b faceplayer loadfont checkbit1 $0022 @@ -56,6 +56,6 @@ Route43MahoganyGate_MapEventHeader: ; 0x19ab91 ; people-events db 1 - person_event $43, 8, 4, $9, $0, 255, 255, $80, 0, UnknownScript_0x19ab0b, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, $ffff ; 0x19abb8 diff --git a/maps/Route44.asm b/maps/Route44.asm index e4bd73319..b4af61ca6 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -446,7 +446,7 @@ MapRoute44Signpost1Script: ; 0x19da3d jumptext UnknownText_0x19dfcc ; 0x19da40 -UnknownScript_0x19da40: ; 0x19da40 +FruitTreeScript_0x19da40: ; 0x19da40 fruittree $10 ; 0x19da42 @@ -654,16 +654,16 @@ Route44_MapEventHeader: ; 0x19dff6 ; people-events db 11 - person_event $3a, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, $ffff - person_event $3a, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, $ffff - person_event $27, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, $ffff - person_event $2b, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, $ffff - person_event $27, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, $ffff - person_event $23, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, $ffff - person_event $24, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, $ffff - person_event $5d, 9, 13, $1, $0, 255, 255, $0, 0, UnknownScript_0x19da40, $ffff - person_event $54, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, $06b6 - person_event $54, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 - person_event $54, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd + person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, $ffff + person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, $ffff + person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, $ffff + person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, $ffff + person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, $ffff + person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, $ffff + person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, $ffff + person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, $ffff + person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, $06b6 + person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, $06b7 + person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, $07bd ; 0x19e09f diff --git a/maps/Route45.asm b/maps/Route45.asm index b34ef63da..a42c05485 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -399,7 +399,7 @@ CooltrainerfKellyScript: ; 0x19e261 end ; 0x19e269 -UnknownScript_0x19e269: ; 0x19e269 +YoungsterScript_0x19e269: ; 0x19e269 faceplayer loadfont checkbit1 $05c3 @@ -434,7 +434,7 @@ MapRoute45Signpost0Script: ; 0x19e291 jumptext UnknownText_0x19e8fe ; 0x19e294 -UnknownScript_0x19e294: ; 0x19e294 +FruitTreeScript_0x19e294: ; 0x19e294 fruittree $c ; 0x19e296 @@ -673,18 +673,18 @@ Route45_MapEventHeader: ; 0x19e91b ; people-events db 13 - person_event $2d, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, $ffff - person_event $2d, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, $ffff - person_event $2d, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry3, $ffff - person_event $2d, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, $ffff - person_event $41, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji3, $ffff - person_event $23, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, $ffff - person_event $24, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, $ffff - person_event $5d, 86, 20, $1, $0, 255, 255, $0, 0, UnknownScript_0x19e294, $ffff - person_event $54, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, $06b8 - person_event $54, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, $06b9 - person_event $54, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, $06ba - person_event $54, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, $06bb - person_event $27, 74, 8, $3, $0, 255, 255, $a0, 0, UnknownScript_0x19e269, $ffff + person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, $ffff + person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, $ffff + person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry3, $ffff + person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, $ffff + person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji3, $ffff + person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, $ffff + person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, $ffff + person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, $ffff + person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, $06b8 + person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, $06b9 + person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, $06ba + person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, $06bb + person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, $ffff ; 0x19e9d9 diff --git a/maps/Route46.asm b/maps/Route46.asm index 5e558be40..d192a2275 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -228,11 +228,11 @@ ItemFragment_0x1a978d: ; 0x1a978d db X_SPEED, 1 ; 0x1a978f -UnknownScript_0x1a978f: ; 0x1a978f +FruitTreeScript_0x1a978f: ; 0x1a978f fruittree $4 ; 0x1a9791 -UnknownScript_0x1a9791: ; 0x1a9791 +FruitTreeScript_0x1a9791: ; 0x1a9791 fruittree $a ; 0x1a9793 @@ -327,11 +327,11 @@ Route46_MapEventHeader: ; 0x1a99db ; people-events db 6 - person_event $2d, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, $ffff - person_event $27, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, $ffff - person_event $28, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, $ffff - person_event $5d, 9, 11, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a978f, $ffff - person_event $5d, 10, 12, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a9791, $ffff - person_event $54, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc + person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, $ffff + person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, $ffff + person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, $ffff + person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, $ffff + person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, $ffff + person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, $06bc ; 0x1a9a43 diff --git a/maps/Route5.asm b/maps/Route5.asm index cbc7356a7..212beb4ad 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -6,7 +6,7 @@ Route5_MapScriptHeader: ; 0x1adb17 db 0 ; 0x1adb19 -UnknownScript_0x1adb19: ; 0x1adb19 +PokefanMScript_0x1adb19: ; 0x1adb19 jumptextfaceplayer UnknownText_0x1adb22 ; 0x1adb1c @@ -58,6 +58,6 @@ Route5_MapEventHeader: ; 0x1adbc7 ; people-events db 1 - person_event $2d, 20, 21, $6, $0, 255, 255, $80, 0, UnknownScript_0x1adb19, $0771 + person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, $0771 ; 0x1adbf8 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index e842a0fd6..535fe4d6e 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -6,7 +6,7 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: ; 0x18b632 db 0 ; 0x18b634 -UnknownScript_0x18b634: ; 0x18b634 +GrannyScript_0x18b634: ; 0x18b634 faceplayer loadfont checkbit1 $00db @@ -24,7 +24,7 @@ UnknownScript_0x18b64d: ; 0x18b64d end ; 0x18b64f -UnknownScript_0x18b64f: ; 0x18b64f +TeacherScript_0x18b64f: ; 0x18b64f jumptextfaceplayer UnknownText_0x18b6de ; 0x18b652 @@ -75,8 +75,8 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; 0x18b744 ; people-events db 2 - person_event $30, 9, 6, $1f, $0, 255, 255, $b0, 0, UnknownScript_0x18b634, $ffff - person_event $29, 7, 9, $8, $0, 255, 255, $80, 0, UnknownScript_0x18b64f, $ffff + person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, $ffff + person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, $ffff ; 0x18b778 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 23d95f98f..fa2c6387b 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -6,7 +6,7 @@ Route5SaffronCityGate_MapScriptHeader: ; 0x18b5b7 db 0 ; 0x18b5b9 -UnknownScript_0x18b5b9: ; 0x18b5b9 +OfficerScript_0x18b5b9: ; 0x18b5b9 jumptextfaceplayer UnknownText_0x18b5bc ; 0x18b5bc @@ -37,6 +37,6 @@ Route5SaffronCityGate_MapEventHeader: ; 0x18b60b ; people-events db 1 - person_event $43, 8, 4, $9, $0, 255, 255, $90, 0, UnknownScript_0x18b5b9, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, $ffff ; 0x18b632 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index 3e37e46ad..f7f373acd 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -6,7 +6,7 @@ Route5UndergroundEntrance_MapScriptHeader: ; 0x18b553 db 0 ; 0x18b555 -UnknownScript_0x18b555: ; 0x18b555 +TeacherScript_0x18b555: ; 0x18b555 jumptextfaceplayer UnknownText_0x18b558 ; 0x18b558 @@ -35,6 +35,6 @@ Route5UndergroundEntrance_MapEventHeader: ; 0x18b595 ; people-events db 1 - person_event $29, 6, 6, $2, $11, 255, 255, $a0, 0, UnknownScript_0x18b555, $ffff + person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, $ffff ; 0x18b5b7 diff --git a/maps/Route6.asm b/maps/Route6.asm index f1cdf3973..dc3f78a49 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -64,7 +64,7 @@ PokefanmAllanScript: ; 0x1ad949 end ; 0x1ad951 -UnknownScript_0x1ad951: ; 0x1ad951 +PokefanMScript_0x1ad951: ; 0x1ad951 jumptextfaceplayer UnknownText_0x1ad957 ; 0x1ad954 @@ -139,8 +139,8 @@ Route6_MapEventHeader: ; 0x1adadb ; people-events db 3 - person_event $2d, 8, 21, $6, $0, 255, 255, $b0, 2, UnknownScript_0x1ad951, $0771 - person_event $2d, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff - person_event $2d, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff + person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, $0771 + person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, $ffff + person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, $ffff ; 0x1adb17 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 0b73cf3d7..7ebb3b07e 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -13,7 +13,7 @@ UnknownScript_0x1926e9: ; 0x1926e9 end ; 0x1926ea -UnknownScript_0x1926ea: ; 0x1926ea +OfficerScript_0x1926ea: ; 0x1926ea faceplayer loadfont checkbit1 $00c9 @@ -73,6 +73,6 @@ Route6SaffronGate_MapEventHeader: ; 0x192807 ; people-events db 1 - person_event $43, 8, 4, $9, $0, 255, 255, $90, 0, UnknownScript_0x1926ea, $ffff + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, $ffff ; 0x19282e diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 01e7d0387..127cd2d32 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -6,7 +6,7 @@ Route7SaffronGate_MapScriptHeader: ; 0x73516 db 0 ; 0x73518 -UnknownScript_0x73518: ; 0x73518 +OfficerScript_0x73518: ; 0x73518 faceplayer loadfont checkbit1 $00c9 @@ -61,6 +61,6 @@ Route7SaffronGate_MapEventHeader: ; 0x735e0 ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x73518, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, $ffff ; 0x73607 diff --git a/maps/Route8.asm b/maps/Route8.asm index 6f2ecef11..2643df004 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -159,7 +159,7 @@ MapRoute8Signpost0Script: ; 0x6c069 jumptext UnknownText_0x6c2b7 ; 0x6c06c -UnknownScript_0x6c06c: ; 0x6c06c +FruitTreeScript_0x6c06c: ; 0x6c06c fruittree $1b ; 0x6c06e @@ -274,11 +274,11 @@ Route8_MapEventHeader: ; 0x6c2e1 ; people-events db 6 - person_event $4a, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, $ffff - person_event $4a, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, $ffff - person_event $4a, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, $ffff - person_event $2b, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, $ffff - person_event $2b, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff - person_event $5d, 9, 37, $1, $0, 255, 255, $0, 0, UnknownScript_0x6c06c, $ffff + person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, $ffff + person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, $ffff + person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, $ffff + person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, $ffff + person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, $ffff + person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, $ffff ; 0x6c349 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 5b617979b..f96a3a424 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -6,7 +6,7 @@ Route8SaffronGate_MapScriptHeader: ; 0x7f414 db 0 ; 0x7f416 -UnknownScript_0x7f416: ; 0x7f416 +OfficerScript_0x7f416: ; 0x7f416 jumptextfaceplayer UnknownText_0x7f419 ; 0x7f419 @@ -36,6 +36,6 @@ Route8SaffronGate_MapEventHeader: ; 0x7f45b ; people-events db 1 - person_event $43, 6, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x7f416, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, $ffff ; 0x7f482 diff --git a/maps/Route9.asm b/maps/Route9.asm index 8460b7365..e546a6f65 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -320,11 +320,11 @@ Route9_MapEventHeader: ; 0x1ab2c7 ; people-events db 6 - person_event $27, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, $ffff - person_event $28, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, $ffff - person_event $27, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, $ffff - person_event $28, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, $ffff - person_event $2d, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, $ffff - person_event $2d, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, $ffff + person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, $ffff + person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, $ffff + person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, $ffff + person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, $ffff + person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, $ffff + person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, $ffff ; 0x1ab32a diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 4b0dfb93f..717f66b82 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -53,9 +53,9 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; 0x59ae6 ; people-events db 4 - person_event $54, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab6, $07a0 - person_event $54, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, $07a1 - person_event $54, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, $07a2 - person_event $54, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, $07a3 + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab6, $07a0 + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, $07a1 + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, $07a2 + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, $07a3 ; 0x59b3e diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 393a8a516..b63576508 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -53,9 +53,9 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; 0x59948 ; people-events db 4 - person_event $54, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59918, $0794 - person_event $54, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, $0795 - person_event $54, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, $0796 - person_event $54, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, $0797 + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59918, $0794 + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, $0795 + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, $0796 + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, $0797 ; 0x599a0 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 3928c6481..eae1298a5 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -33,15 +33,15 @@ UnknownScript_0x58f6e: ; 0x58f6e end ; 0x58f7d -UnknownScript_0x58f7d: ; 0x58f7d +FisherScript_0x58f7d: ; 0x58f7d jumptextfaceplayer UnknownText_0x58fac ; 0x58f80 -UnknownScript_0x58f80: ; 0x58f80 +TeacherScript_0x58f80: ; 0x58f80 jumptextfaceplayer UnknownText_0x58fda ; 0x58f83 -UnknownScript_0x58f83: ; 0x58f83 +GrampsScript_0x58f83: ; 0x58f83 jumptextfaceplayer UnknownText_0x59024 ; 0x58f86 @@ -132,8 +132,8 @@ RuinsofAlphInnerChamber_MapEventHeader: ; 0x59097 ; people-events db 3 - person_event $3a, 11, 7, $3, $0, 255, 255, $a0, 0, UnknownScript_0x58f7d, $0705 - person_event $29, 17, 18, $2, $11, 255, 255, $0, 0, UnknownScript_0x58f80, $0705 - person_event $2f, 23, 15, $7, $0, 255, 255, $b0, 0, UnknownScript_0x58f83, $0705 + person_event SPRITE_FISHER, 11, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x58f7d, $0705 + person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, $0705 + person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, $0705 ; 0x59173 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 7bebd6d5e..bfe05a7a0 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -62,7 +62,7 @@ UnknownScript_0x58751: ; 0x58751 end ; 0x58769 -UnknownScript_0x58769: ; 0x58769 +ReceptionistScript_0x58769: ; 0x58769 jumptextfaceplayer UnknownText_0x58800 ; 0x5876c @@ -96,7 +96,7 @@ UnknownScript_0x58778: ; 0x58778 end ; 0x587a8 -UnknownScript_0x587a8: ; 0x587a8 +ScientistScript_0x587a8: ; 0x587a8 faceplayer loadfont checkcode $e @@ -289,7 +289,7 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; 0x58b85 ; people-events db 2 - person_event $42, 9, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x58769, $074e - person_event $3c, 5, 7, $7, $0, 255, 255, $90, 0, UnknownScript_0x587a8, $ffff + person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, $074e + person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, $ffff ; 0x58bdc diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 5ff64d597..77cb4a200 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -53,9 +53,9 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; 0x599d2 ; people-events db 4 - person_event $54, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a2, $0798 - person_event $54, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, $0799 - person_event $54, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, $079a - person_event $54, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, $079b + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a2, $0798 + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, $0799 + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, $079a + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, $079b ; 0x59a2a diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index e3b11dac9..3b3200649 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -53,9 +53,9 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; 0x59a5c ; people-events db 4 - person_event $54, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2c, $079c - person_event $54, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, $079d - person_event $54, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, $079e - person_event $54, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, $079f + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2c, $079c + person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, $079d + person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, $079e + person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, $079f ; 0x59ab4 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index daa5f07e7..088f0dda9 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -60,7 +60,7 @@ UnknownScript_0x5803a: ; 0x5803a 2jump UnknownScript_0x58044 ; 0x58043 -UnknownScript_0x58043: ; 0x58043 +ScientistScript_0x58043: ; 0x58043 faceplayer UnknownScript_0x58044: ; 0x58044 loadfont @@ -78,7 +78,7 @@ UnknownScript_0x58044: ; 0x58044 end ; 0x58061 -UnknownScript_0x58061: ; 0x58061 +FisherScript_0x58061: ; 0x58061 faceplayer loadfont checkbit1 $00bc @@ -93,7 +93,7 @@ UnknownScript_0x58070: ;0x58070 end ; 0x58076 -UnknownScript_0x58076: ; 0x58076 +YoungsterScript_0x58076: ; 0x58076 faceplayer loadfont 2writetext UnknownText_0x58449 @@ -102,7 +102,7 @@ UnknownScript_0x58076: ; 0x58076 end ; 0x5807e -UnknownScript_0x5807e: ; 0x5807e +YoungsterScript_0x5807e: ; 0x5807e faceplayer loadfont 2writetext UnknownText_0x5848e @@ -346,10 +346,10 @@ RuinsofAlphOutside_MapEventHeader: ; 0x584c3 ; people-events db 5 - person_event $27, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, $ffff - person_event $3c, 19, 15, $7, $0, 255, 255, $0, 0, UnknownScript_0x58043, $0703 - person_event $3a, 21, 17, $3, $0, 255, 255, $a0, 0, UnknownScript_0x58061, $078e - person_event $27, 15, 18, $2, $11, 255, 255, $b0, 0, UnknownScript_0x58076, $078f - person_event $27, 12, 16, $7, $0, 255, 255, $80, 0, UnknownScript_0x5807e, $078f + person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, $ffff + person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, $0703 + person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, $078e + person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, $078f + person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, $078f ; 0x58560 diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index c8ac6f660..b7dca96d7 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -65,7 +65,7 @@ UnknownScript_0x59192: ; 0x59192 end ; 0x591d1 -UnknownScript_0x591d1: ; 0x591d1 +ScientistScript_0x591d1: ; 0x591d1 faceplayer loadfont checkcode $e @@ -83,7 +83,7 @@ UnknownScript_0x591df: ; 0x591df end ; 0x591e5 -UnknownScript_0x591e5: ; 0x591e5 +ScientistScript_0x591e5: ; 0x591e5 faceplayer loadfont checkcode $e @@ -120,7 +120,7 @@ UnknownScript_0x5920b: ; 0x5920b end ; 0x59214 -UnknownScript_0x59214: ; 0x59214 +ScientistScript_0x59214: ; 0x59214 faceplayer loadfont checkcode $e @@ -404,8 +404,8 @@ RuinsofAlphResearchCenter_MapEventHeader: ; 0x598d0 ; people-events db 3 - person_event $3c, 9, 8, $7, $0, 255, 255, $90, 0, UnknownScript_0x591e5, $ffff - person_event $3c, 6, 9, $2, $12, 255, 255, $90, 0, UnknownScript_0x59214, $ffff - person_event $3c, 9, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x591d1, $0704 + person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, $ffff + person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, $ffff + person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, $0704 ; 0x59916 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 7eea4193c..b912a31da 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -6,7 +6,7 @@ SafariZoneWardensHome_MapScriptHeader: ; 0x1965c4 db 0 ; 0x1965c6 -UnknownScript_0x1965c6: ; 0x1965c6 +LassScript_0x1965c6: ; 0x1965c6 faceplayer loadfont checkbit1 $00d9 @@ -94,6 +94,6 @@ SafariZoneWardensHome_MapEventHeader: ; 0x19676b ; people-events db 1 - person_event $28, 8, 6, $9, $0, 255, 255, $a0, 0, UnknownScript_0x1965c6, $ffff + person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, LassScript_0x1965c6, $ffff ; 0x19679c diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 03d59109e..265101997 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -15,7 +15,7 @@ UnknownScript_0x199326: ; 0x199326 return ; 0x19932a -UnknownScript_0x19932a: ; 0x19932a +LassScript_0x19932a: ; 0x19932a faceplayer loadfont checkbit1 $00c9 @@ -33,7 +33,7 @@ UnknownScript_0x199338: ; 0x199338 end ; 0x19933e -UnknownScript_0x19933e: ; 0x19933e +PokefanMScript_0x19933e: ; 0x19933e faceplayer loadfont checkbit1 $00c9 @@ -51,15 +51,15 @@ UnknownScript_0x19934c: ; 0x19934c end ; 0x199352 -UnknownScript_0x199352: ; 0x199352 +CooltrainerMScript_0x199352: ; 0x199352 jumptextfaceplayer UnknownText_0x1994fe ; 0x199355 -UnknownScript_0x199355: ; 0x199355 +CooltrainerFScript_0x199355: ; 0x199355 jumptextfaceplayer UnknownText_0x19958e ; 0x199358 -UnknownScript_0x199358: ; 0x199358 +FisherScript_0x199358: ; 0x199358 faceplayer loadfont checkbit1 $00c9 @@ -77,15 +77,15 @@ UnknownScript_0x199366: ; 0x199366 end ; 0x19936c -UnknownScript_0x19936c: ; 0x19936c +YoungsterScript_0x19936c: ; 0x19936c jumptextfaceplayer UnknownText_0x1996a5 ; 0x19936f -UnknownScript_0x19936f: ; 0x19936f +YoungsterScript_0x19936f: ; 0x19936f jumptextfaceplayer UnknownText_0x1996e5 ; 0x199372 -UnknownScript_0x199372: ; 0x199372 +LassScript_0x199372: ; 0x199372 jumptextfaceplayer UnknownText_0x199745 ; 0x199375 @@ -295,13 +295,13 @@ SaffronCity_MapEventHeader: ; 0x19989c ; people-events db 8 - person_event $28, 18, 11, $5, $2, 255, 255, $80, 0, UnknownScript_0x19932a, $ffff - person_event $2d, 34, 23, $5, $2, 255, 255, $b0, 0, UnknownScript_0x19933e, $ffff - person_event $23, 11, 36, $5, $1, 255, 255, $a0, 0, UnknownScript_0x199352, $ffff - person_event $24, 28, 24, $5, $2, 255, 255, $80, 0, UnknownScript_0x199355, $ffff - person_event $3a, 16, 31, $6, $0, 255, 255, $a0, 0, UnknownScript_0x199358, $ffff - person_event $27, 23, 19, $4, $10, 255, 255, $90, 0, UnknownScript_0x19936c, $ffff - person_event $27, 26, 39, $2, $11, 255, 255, $80, 0, UnknownScript_0x19936f, $ffff - person_event $28, 12, 23, $3, $0, 255, 255, $a0, 0, UnknownScript_0x199372, $ffff + person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, $ffff + person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, $ffff + person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, $ffff + person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, $ffff + person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, $ffff + person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, $ffff + person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, $ffff + person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, $ffff ; 0x19997d diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 6efabb80f..f2ce9daa5 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -6,7 +6,7 @@ SaffronGym_MapScriptHeader: ; 0x189c2c db 0 ; 0x189c2e -UnknownScript_0x189c2e: ; 0x189c2e +SabrinaScript_0x189c2e: ; 0x189c2e faceplayer loadfont checkbit2 $0028 @@ -386,11 +386,11 @@ SaffronGym_MapEventHeader: ; 0x18a2c4 ; people-events db 6 - person_event $22, 12, 13, $6, $0, 255, 255, $80, 0, UnknownScript_0x189c2e, $ffff - person_event $30, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, $ffff - person_event $27, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, $ffff - person_event $30, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff - person_event $27, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff - person_event $48, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff + person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, $ffff + person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, $ffff + person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, $ffff + person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff + person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff + person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff ; 0x18a3bd diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 81e1ff33f..9f1826bf0 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -6,18 +6,18 @@ SaffronMart_MapScriptHeader: ; 0x18a3bd db 0 ; 0x18a3bf -UnknownScript_0x18a3bf: ; 0x18a3bf +ClerkScript_0x18a3bf: ; 0x18a3bf loadfont pokemart $0, $001e loadmovesprites end ; 0x18a3c6 -UnknownScript_0x18a3c6: ; 0x18a3c6 +CooltrainerMScript_0x18a3c6: ; 0x18a3c6 jumptextfaceplayer UnknownText_0x18a3cc ; 0x18a3c9 -UnknownScript_0x18a3c9: ; 0x18a3c9 +CooltrainerFScript_0x18a3c9: ; 0x18a3c9 jumptextfaceplayer UnknownText_0x18a3f3 ; 0x18a3cc @@ -52,8 +52,8 @@ SaffronMart_MapEventHeader: ; 0x18a444 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x18a3bf, $ffff - person_event $23, 6, 11, $3, $0, 255, 255, $b0, 0, UnknownScript_0x18a3c6, $ffff - person_event $24, 10, 11, $5, $1, 255, 255, $a0, 0, UnknownScript_0x18a3c9, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, $ffff + person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, $ffff + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, $ffff ; 0x18a47b diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 9170d1df3..f2ac5defa 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -6,11 +6,11 @@ SaffronPokeCenter1F_MapScriptHeader: ; 0x18a47b db 0 ; 0x18a47d -UnknownScript_0x18a47d: ; 0x18a47d +NurseScript_0x18a47d: ; 0x18a47d jumpstd $0000 ; 0x18a480 -UnknownScript_0x18a480: ; 0x18a480 +TeacherScript_0x18a480: ; 0x18a480 special $00a0 iftrue UnknownScript_0x18a489 jumptextfaceplayer UnknownText_0x18a4a3 @@ -20,7 +20,7 @@ UnknownScript_0x18a489: ; 0x18a489 jumptextfaceplayer UnknownText_0x18a532 ; 0x18a48c -UnknownScript_0x18a48c: ; 0x18a48c +FisherScript_0x18a48c: ; 0x18a48c faceplayer loadfont checkbit1 $00c9 @@ -38,7 +38,7 @@ UnknownScript_0x18a49a: ; 0x18a49a end ; 0x18a4a0 -UnknownScript_0x18a4a0: ; 0x18a4a0 +YoungsterScript_0x18a4a0: ; 0x18a4a0 jumptextfaceplayer UnknownText_0x18a6c5 ; 0x18a4a3 @@ -117,9 +117,9 @@ SaffronPokeCenter1F_MapEventHeader: ; 0x18a722 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x18a47d, $ffff - person_event $29, 6, 11, $2, $11, 255, 255, $a0, 0, UnknownScript_0x18a480, $ffff - person_event $3a, 10, 12, $8, $0, 255, 255, $80, 0, UnknownScript_0x18a48c, $ffff - person_event $27, 8, 5, $3, $0, 255, 255, $90, 0, UnknownScript_0x18a4a0, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, $ffff + person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, $ffff + person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, $ffff + person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, $ffff ; 0x18a76b diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 8d2d3a634..3208e63b7 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -13,7 +13,7 @@ UnknownScript_0x18a81d: ; 0x18a81d end ; 0x18a81e -UnknownScript_0x18a81e: ; 0x18a81e +OfficerScript_0x18a81e: ; 0x18a81e faceplayer loadfont checkbit1 $00cd @@ -74,7 +74,7 @@ UnknownScript_0x18a862: ; 0x18a862 end ; 0x18a875 -UnknownScript_0x18a875: ; 0x18a875 +GymGuyScript_0x18a875: ; 0x18a875 faceplayer loadfont checkbit1 $00c9 @@ -92,11 +92,11 @@ UnknownScript_0x18a883: ; 0x18a883 end ; 0x18a889 -UnknownScript_0x18a889: ; 0x18a889 +TeacherScript_0x18a889: ; 0x18a889 jumptextfaceplayer UnknownText_0x18aaab ; 0x18a88c -UnknownScript_0x18a88c: ; 0x18a88c +LassScript_0x18a88c: ; 0x18a88c jumptextfaceplayer UnknownText_0x18ab20 ; 0x18a88f @@ -235,9 +235,9 @@ SaffronTrainStation_MapEventHeader: ; 0x18ab8d ; people-events db 4 - person_event $43, 13, 13, $6, $0, 255, 255, $0, 0, UnknownScript_0x18a81e, $ffff - person_event $48, 18, 14, $2, $11, 255, 255, $0, 0, UnknownScript_0x18a875, $ffff - person_event $29, 15, 10, $9, $0, 255, 255, $0, 0, UnknownScript_0x18a889, $0772 - person_event $28, 14, 10, $7, $0, 255, 255, $a0, 0, UnknownScript_0x18a88c, $0772 + person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, $ffff + person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, $ffff + person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, $0772 + person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, $0772 ; 0x18abe3 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index c03e5f9d5..618707efb 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -13,7 +13,7 @@ UnknownScript_0x1ab4fa: ; 0x1ab4fa end ; 0x1ab4fb -UnknownScript_0x1ab4fb: ; 0x1ab4fb +BlaineScript_0x1ab4fb: ; 0x1ab4fb faceplayer loadfont checkbit2 $0029 @@ -155,8 +155,8 @@ SeafoamGym_MapEventHeader: ; 0x1ab865 ; people-events db 2 - person_event $d, 6, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1ab4fb, $ffff - person_event $48, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, $0777 + person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, $ffff + person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, $0777 ; 0x1ab88a diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 01d02f502..72c5e2f88 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -6,11 +6,11 @@ SilphCo1F_MapScriptHeader: ; 0x18abe3 db 0 ; 0x18abe5 -UnknownScript_0x18abe5: ; 0x18abe5 +ReceptionistScript_0x18abe5: ; 0x18abe5 jumptextfaceplayer UnknownText_0x18ac03 ; 0x18abe8 -UnknownScript_0x18abe8: ; 0x18abe8 +OfficerScript_0x18abe8: ; 0x18abe8 faceplayer loadfont checkbit1 $00de @@ -68,7 +68,7 @@ SilphCo1F_MapEventHeader: ; 0x18ace7 ; people-events db 2 - person_event $42, 6, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x18abe5, $ffff - person_event $43, 5, 17, $6, $0, 255, 255, $90, 0, UnknownScript_0x18abe8, $ffff + person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, $ffff + person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, $ffff ; 0x18ad11 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index d72938faa..3e28f7e8c 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -31,7 +31,7 @@ SilverCaveItemRooms_MapEventHeader: ; 0x18c662 ; people-events db 2 - person_event $54, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, $069c - person_event $54, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, $069d + person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, $069c + person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, $069d ; 0x18c68c diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 4e1e82bae..8aae02653 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -6,11 +6,11 @@ SilverCavePokeCenter1F_MapScriptHeader: ; 0x1ae598 db 0 ; 0x1ae59a -UnknownScript_0x1ae59a: ; 0x1ae59a +NurseScript_0x1ae59a: ; 0x1ae59a jumpstd $0000 ; 0x1ae59d -UnknownScript_0x1ae59d: ; 0x1ae59d +GrannyScript_0x1ae59d: ; 0x1ae59d jumptextfaceplayer UnknownText_0x1ae5a0 ; 0x1ae5a0 @@ -43,7 +43,7 @@ SilverCavePokeCenter1F_MapEventHeader: ; 0x1ae622 ; people-events db 2 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x1ae59a, $ffff - person_event $30, 9, 5, $8, $12, 255, 255, $0, 0, UnknownScript_0x1ae59d, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, $ffff + person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, $ffff ; 0x1ae651 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 9fe4f9892..9a0b419b1 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -53,9 +53,9 @@ SilverCaveRoom1_MapEventHeader: ; 0x18c562 ; people-events db 4 - person_event $54, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, $0699 - person_event $54, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, $069a - person_event $54, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, $069b - person_event $54, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, $07c1 + person_event SPRITE_POKE_BALL, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, $0699 + person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, $069a + person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, $069b + person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, $07c1 ; 0x18c5b0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index da683d64b..637a750d6 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -44,8 +44,8 @@ SilverCaveRoom2_MapEventHeader: ; 0x18c5bb ; people-events db 3 - person_event $54, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, $07c2 - person_event $54, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3 - person_event $54, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4 + person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, $07c2 + person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, $07c3 + person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, $07c4 ; 0x18c601 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 134a3879d..c54b97bba 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -6,7 +6,7 @@ SilverCaveRoom3_MapScriptHeader: ; 0x18c601 db 0 ; 0x18c603 -UnknownScript_0x18c603: ; 0x18c603 +RedScript_0x18c603: ; 0x18c603 special $006a faceplayer loadfont @@ -65,6 +65,6 @@ SilverCaveRoom3_MapEventHeader: ; 0x18c644 ; people-events db 1 - person_event $6, 14, 13, $7, $0, 255, 255, $80, 0, UnknownScript_0x18c603, $0762 + person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, $0762 ; 0x18c65c diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 66bd36a02..0c3cda606 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -6,7 +6,7 @@ SlowpokeWellB1F_MapScriptHeader: ; 0x5a5d3 db 0 ; 0x5a5d5 -UnknownScript_0x5a5d5: ; 0x5a5d5 +KurtScript_0x5a5d5: ; 0x5a5d5 jumptextfaceplayer UnknownText_0x5a6b5 ; 0x5a5d8 @@ -158,7 +158,7 @@ GruntF1Script: ; 0x5a679 end ; 0x5a681 -UnknownScript_0x5a681: ; 0x5a681 +SlowpokeScript_0x5a681: ; 0x5a681 faceplayer loadfont cry SLOWPOKE @@ -176,7 +176,7 @@ UnknownScript_0x5a68f: ; 0x5a68f end ; 0x5a695 -UnknownScript_0x5a695: ; 0x5a695 +SlowpokeScript_0x5a695: ; 0x5a695 faceplayer loadfont 2writetext UnknownText_0x5ac61 @@ -186,7 +186,7 @@ UnknownScript_0x5a695: ; 0x5a695 end ; 0x5a6a0 -UnknownScript_0x5a6a0: ; 0x5a6a0 +BoulderScript_0x5a6a0: ; 0x5a6a0 jumpstd $000e ; 0x5a6a3 @@ -379,14 +379,14 @@ SlowpokeWellB1F_MapEventHeader: ; 0x5ac84 ; people-events db 9 - person_event $35, 11, 19, $6, $0, 255, 255, $2, 3, TrainerGruntM29, $06fc - person_event $35, 6, 9, $6, $0, 255, 255, $2, 1, TrainerGruntM1, $06fc - person_event $35, 10, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM2, $06fc - person_event $36, 8, 14, $9, $0, 255, 255, $82, 4, TrainerGruntF1, $06fc - person_event $45, 8, 11, $1, $0, 255, 255, $80, 0, UnknownScript_0x5a681, $06fb - person_event $45, 6, 10, $1, $0, 255, 255, $80, 0, UnknownScript_0x5a695, $06fb - person_event $b, 18, 20, $7, $0, 255, 255, $0, 0, UnknownScript_0x5a5d5, $0740 - person_event $5a, 6, 7, $19, $0, 255, 255, $0, 0, UnknownScript_0x5a6a0, $ffff - person_event $54, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662 + person_event SPRITE_ROCKET, 11, 19, $6, $0, 255, 255, $2, 3, TrainerGruntM29, $06fc + person_event SPRITE_ROCKET, 6, 9, $6, $0, 255, 255, $2, 1, TrainerGruntM1, $06fc + person_event SPRITE_ROCKET, 10, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM2, $06fc + person_event SPRITE_ROCKET_GIRL, 8, 14, $9, $0, 255, 255, $82, 4, TrainerGruntF1, $06fc + person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, $06fb + person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, $06fb + person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, $0740 + person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a6a0, $ffff + person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, $0662 ; 0x5ad09 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index e0f4cf7ef..9c6bb4bbf 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -6,7 +6,7 @@ SlowpokeWellB2F_MapScriptHeader: ; 0x5ad09 db 0 ; 0x5ad0b -UnknownScript_0x5ad0b: ; 0x5ad0b +GymGuyScript_0x5ad0b: ; 0x5ad0b faceplayer loadfont checkbit1 $0073 @@ -72,7 +72,7 @@ SlowpokeWellB2F_MapEventHeader: ; 0x5ae40 ; people-events db 2 - person_event $48, 8, 9, $2, $21, 255, 255, $0, 1, UnknownScript_0x5ad0b, $ffff - person_event $54, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, $0663 + person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, $ffff + person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, $0663 ; 0x5ae65 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index da0e747fb..23682dd4b 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -6,19 +6,19 @@ SoulHouse_MapScriptHeader: ; 0x7ec45 db 0 ; 0x7ec47 -UnknownScript_0x7ec47: ; 0x7ec47 +GrampsScript_0x7ec47: ; 0x7ec47 jumptextfaceplayer UnknownText_0x7ec53 ; 0x7ec4a -UnknownScript_0x7ec4a: ; 0x7ec4a +TeacherScript_0x7ec4a: ; 0x7ec4a jumptextfaceplayer UnknownText_0x7ed4d ; 0x7ec4d -UnknownScript_0x7ec4d: ; 0x7ec4d +LassScript_0x7ec4d: ; 0x7ec4d jumptextfaceplayer UnknownText_0x7edb1 ; 0x7ec50 -UnknownScript_0x7ec50: ; 0x7ec50 +GrannyScript_0x7ec50: ; 0x7ec50 jumptextfaceplayer UnknownText_0x7eddb ; 0x7ec53 @@ -79,9 +79,9 @@ SoulHouse_MapEventHeader: ; 0x7ee1d ; people-events db 4 - person_event $2f, 6, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x7ec47, $ffff - person_event $29, 7, 11, $5, $1, 255, 255, $90, 0, UnknownScript_0x7ec4a, $ffff - person_event $28, 9, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x7ec4d, $ffff - person_event $30, 7, 5, $7, $0, 255, 255, $90, 0, UnknownScript_0x7ec50, $ffff + person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, $ffff + person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, $ffff + person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, $ffff + person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, $ffff ; 0x7ee61 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 1b703fa5a..c7b98d39e 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -6,19 +6,19 @@ SproutTower1F_MapScriptHeader: ; 0x1844fc db 0 ; 0x1844fe -UnknownScript_0x1844fe: ; 0x1844fe +SageScript_0x1844fe: ; 0x1844fe jumptextfaceplayer UnknownText_0x1845d8 ; 0x184501 -UnknownScript_0x184501: ; 0x184501 +SageScript_0x184501: ; 0x184501 jumptextfaceplayer UnknownText_0x18460a ; 0x184504 -UnknownScript_0x184504: ; 0x184504 +GrannyScript_0x184504: ; 0x184504 jumptextfaceplayer UnknownText_0x184649 ; 0x184507 -UnknownScript_0x184507: ; 0x184507 +TeacherScript_0x184507: ; 0x184507 jumptextfaceplayer UnknownText_0x18469d ; 0x18450a @@ -135,11 +135,11 @@ SproutTower1F_MapEventHeader: ; 0x184703 ; people-events db 6 - person_event $3e, 8, 11, $6, $0, 255, 255, $90, 0, UnknownScript_0x1844fe, $ffff - person_event $3e, 11, 10, $2, $11, 255, 255, $90, 0, UnknownScript_0x184501, $ffff - person_event $30, 16, 15, $8, $0, 255, 255, $0, 0, UnknownScript_0x184504, $ffff - person_event $29, 13, 13, $7, $0, 255, 255, $0, 0, UnknownScript_0x184507, $ffff - person_event $3e, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, $ffff - person_event $54, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, $0647 + person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, $ffff + person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, $ffff + person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, $ffff + person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, $ffff + person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, $ffff + person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, $0647 ; 0x18477a diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 8cf6617f9..889e57bc7 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -134,8 +134,8 @@ SproutTower2F_MapEventHeader: ; 0x1848f5 ; people-events db 3 - person_event $3e, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, $ffff - person_event $3e, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, $ffff - person_event $54, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, $0648 + person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, $ffff + person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, $ffff + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, $0648 ; 0x18493b diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index a77cfddbf..df943fa56 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -388,12 +388,12 @@ SproutTower3F_MapEventHeader: ; 0x184f8e ; people-events db 7 - person_event $3e, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, $ffff - person_event $3e, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, $ffff - person_event $3e, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, $ffff - person_event $3e, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, $ffff - person_event $54, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, $0649 - person_event $54, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, $064a - person_event $4, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c4 + person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, $ffff + person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, $ffff + person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, $ffff + person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, $ffff + person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, $0649 + person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, $064a + person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c4 ; 0x18501a diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index a8f2d591d..8039cd4d5 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -847,11 +847,11 @@ TeamRocketBaseB1F_MapEventHeader: ; 0x6cdeb ; people-events db 6 - person_event $35, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d9 - person_event $35, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, $06da - person_event $3c, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, $06da - person_event $54, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, $0669 - person_event $54, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a - person_event $54, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b + person_event SPRITE_ROCKET, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d9 + person_event SPRITE_ROCKET, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, $06da + person_event SPRITE_SCIENTIST, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, $06da + person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, $0669 + person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, $066a + person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, $066b ; 0x6cf70 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index b319a31f5..c0ef3fa76 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -278,7 +278,7 @@ GruntM19Script: ; 0x6d0f9 end ; 0x6d101 -UnknownScript_0x6d101: ; 0x6d101 +VoltorbScript_0x6d101: ; 0x6d101 cry ELECTRODE loadpokedata ELECTRODE, 23 startbattle @@ -297,7 +297,7 @@ UnknownScript_0x6d101: ; 0x6d101 2jump UnknownScript_0x6d184 ; 0x6d12c -UnknownScript_0x6d12c: ; 0x6d12c +VoltorbScript_0x6d12c: ; 0x6d12c cry ELECTRODE loadpokedata ELECTRODE, 23 startbattle @@ -316,7 +316,7 @@ UnknownScript_0x6d12c: ; 0x6d12c 2jump UnknownScript_0x6d184 ; 0x6d157 -UnknownScript_0x6d157: ; 0x6d157 +VoltorbScript_0x6d157: ; 0x6d157 cry ELECTRODE loadpokedata ELECTRODE, 23 startbattle @@ -990,19 +990,19 @@ TeamRocketBaseB2F_MapEventHeader: ; 0x6de44 ; people-events db 14 - person_event $35, 20, 24, $7, $0, 255, 255, $0, 0, ObjectEvent, $06de - person_event $36, 20, 24, $7, $0, 255, 255, $80, 0, ObjectEvent, $06dd - person_event $1e, 17, 9, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d6 - person_event $4f, 17, 13, $9, $0, 255, 255, $0, 0, ObjectEvent, $06df - person_event $9b, 9, 11, $16, $0, 255, 255, $0, 0, UnknownScript_0x6d101, $06e0 - person_event $9b, 11, 11, $16, $0, 255, 255, $0, 0, UnknownScript_0x6d12c, $06e1 - person_event $9b, 13, 11, $16, $0, 255, 255, $0, 0, UnknownScript_0x6d157, $06e2 - person_event $9b, 9, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e0 - person_event $9b, 11, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e1 - person_event $9b, 13, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e2 - person_event $35, 17, 29, $6, $0, 255, 255, $2, 3, TrainerGruntM17, $06da - person_event $35, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, $06da - person_event $35, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, $06da - person_event $54, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, $066c + person_event SPRITE_ROCKET, 20, 24, $7, $0, 255, 255, $0, 0, ObjectEvent, $06de + person_event SPRITE_ROCKET_GIRL, 20, 24, $7, $0, 255, 255, $80, 0, ObjectEvent, $06dd + person_event SPRITE_LANCE, 17, 9, $6, $0, 255, 255, $0, 0, ObjectEvent, $06d6 + person_event SPRITE_DRAGON, 17, 13, $9, $0, 255, 255, $0, 0, ObjectEvent, $06df + person_event SPRITE_VOLTORB, 9, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d101, $06e0 + person_event SPRITE_VOLTORB, 11, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d12c, $06e1 + person_event SPRITE_VOLTORB, 13, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d157, $06e2 + person_event SPRITE_VOLTORB, 9, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e0 + person_event SPRITE_VOLTORB, 11, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e1 + person_event SPRITE_VOLTORB, 13, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, $06e2 + person_event SPRITE_ROCKET, 17, 29, $6, $0, 255, 255, $2, 3, TrainerGruntM17, $06da + person_event SPRITE_ROCKET, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, $06da + person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, $06da + person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, $066c ; 0x6dfd4 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 8abd0083b..0fd031fdc 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -17,7 +17,7 @@ TeamRocketBaseB3F_MapScriptHeader: ; 0x6dfd4 ; 0x6dfe9 UnknownScript_0x6dfe9: ; 0x6dfe9 - priorityjump UnknownScript_0x6dffc + priorityjump LanceScript_0x6dffc end ; 0x6dfed @@ -44,7 +44,7 @@ UnknownScript_0x6dff7: ; 0x6dff7 return ; 0x6dffc -UnknownScript_0x6dffc: ; 0x6dffc +LanceScript_0x6dffc: ; 0x6dffc spriteface $0, $2 pause 5 spriteface $4, $3 @@ -81,7 +81,7 @@ UnknownScript_0x6e019: ; 0x6e019 end ; 0x6e048 -UnknownScript_0x6e048: ; 0x6e048 +RocketScript_0x6e048: ; 0x6e048 jumptextfaceplayer UnknownText_0x6e235 ; 0x6e04b @@ -120,7 +120,7 @@ UnknownScript_0x6e056: ; 0x6e056 end ; 0x6e091 -UnknownScript_0x6e091: ; 0x6e091 +MoltresScript_0x6e091: ; 0x6e091 loadfont 2writetext UnknownText_0x6e585 closetext @@ -646,19 +646,19 @@ TeamRocketBaseB3F_MapEventHeader: ; 0x6e9e4 ; people-events db 14 - person_event $1e, 18, 29, $6, $0, 255, 255, $0, 0, UnknownScript_0x6dffc, $06d7 - person_event $35, 7, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, $06db - person_event $9e, 6, 11, $16, $0, 255, 255, $90, 0, UnknownScript_0x6e091, $06da - person_event $36, 11, 25, $7, $0, 255, 255, $82, 0, TrainerGruntF5, $06da - person_event $35, 18, 9, $a, $0, 255, 255, $2, 3, TrainerGruntM28, $06da - person_event $3c, 15, 27, $7, $0, 255, 255, $92, 0, TrainerScientistRoss, $06da - person_event $3c, 19, 15, $9, $0, 255, 255, $92, 3, TrainerScientistMitch, $06da - person_event $35, 18, 28, $6, $0, 255, 255, $0, 0, UnknownScript_0x6e048, $06da - person_event $4, 9, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c0 - person_event $54, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e120, $066d - person_event $54, 16, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e122, $066e - person_event $54, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, $066f - person_event $54, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, $0670 - person_event $54, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, $0654 + person_event SPRITE_LANCE, 18, 29, $6, $0, 255, 255, $0, 0, LanceScript_0x6dffc, $06d7 + person_event SPRITE_ROCKET, 7, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, $06db + person_event SPRITE_MOLTRES, 6, 11, $16, $0, 255, 255, $90, 0, MoltresScript_0x6e091, $06da + person_event SPRITE_ROCKET_GIRL, 11, 25, $7, $0, 255, 255, $82, 0, TrainerGruntF5, $06da + person_event SPRITE_ROCKET, 18, 9, $a, $0, 255, 255, $2, 3, TrainerGruntM28, $06da + person_event SPRITE_SCIENTIST, 15, 27, $7, $0, 255, 255, $92, 0, TrainerScientistRoss, $06da + person_event SPRITE_SCIENTIST, 19, 15, $9, $0, 255, 255, $92, 3, TrainerScientistMitch, $06da + person_event SPRITE_ROCKET, 18, 28, $6, $0, 255, 255, $0, 0, RocketScript_0x6e048, $06da + person_event SPRITE_SILVER, 9, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c0 + person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e120, $066d + person_event SPRITE_POKE_BALL, 16, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e122, $066e + person_event SPRITE_POKE_BALL, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, $066f + person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, $0670 + person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, $0654 ; 0x6eafe diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 715504f42..2426ee0d1 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -49,7 +49,7 @@ MapTimeCapsuleSignpost1Script: ; 0x193514 end ; 0x19351a -UnknownScript_0x19351a: ; 0x19351a +ChrisScript_0x19351a: ; 0x19351a loadfont 2writetext UnknownText_0x193521 closetext @@ -81,7 +81,7 @@ TimeCapsule_MapEventHeader: ; 0x193538 ; people-events db 2 - person_event $1, 8, 7, $9, $0, 255, 255, $0, 0, UnknownScript_0x19351a, $0000 - person_event $1, 8, 10, $8, $0, 255, 255, $0, 0, UnknownScript_0x19351a, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, $0001 ; 0x19356c diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index afbf54015..2eb1a5a98 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -173,19 +173,19 @@ UnknownScript_0x1850d7: ; 0x1850d7 end ; 0x185173 -UnknownScript_0x185173: ; 0x185173 +SageScript_0x185173: ; 0x185173 jumptextfaceplayer UnknownText_0x185386 ; 0x185176 -UnknownScript_0x185176: ; 0x185176 +SageScript_0x185176: ; 0x185176 jumptextfaceplayer UnknownText_0x185433 ; 0x185179 -UnknownScript_0x185179: ; 0x185179 +SageScript_0x185179: ; 0x185179 jumptextfaceplayer UnknownText_0x185544 ; 0x18517c -UnknownScript_0x18517c: ; 0x18517c +SageScript_0x18517c: ; 0x18517c checkbit1 $0317 iftrue UnknownScript_0x185185 jumptextfaceplayer UnknownText_0x1855ee @@ -195,7 +195,7 @@ UnknownScript_0x185185: ; 0x185185 jumptextfaceplayer UnknownText_0x185765 ; 0x185188 -UnknownScript_0x185188: ; 0x185188 +SageScript_0x185188: ; 0x185188 faceplayer loadfont checkbit1 $0317 @@ -229,7 +229,7 @@ UnknownScript_0x1851b6: ; 0x1851b6 end ; 0x1851bc -UnknownScript_0x1851bc: ; 0x1851bc +SageScript_0x1851bc: ; 0x1851bc checkbit1 $0317 iftrue UnknownScript_0x1851c5 jumptextfaceplayer UnknownText_0x185654 @@ -239,7 +239,7 @@ UnknownScript_0x1851c5: ; 0x1851c5 jumptextfaceplayer UnknownText_0x1858d0 ; 0x1851c8 -UnknownScript_0x1851c8: ; 0x1851c8 +SuperNerdScript_0x1851c8: ; 0x1851c8 jumptextfaceplayer UnknownText_0x1856a3 ; 0x1851cb @@ -514,15 +514,15 @@ TinTower1F_MapEventHeader: ; 0x18598c ; people-events db 10 - person_event $63, 13, 13, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b2 - person_event $65, 13, 11, $1, $0, 255, 255, $b0, 0, ObjectEvent, $07b4 - person_event $64, 13, 16, $1, $0, 255, 255, $80, 0, ObjectEvent, $07b3 - person_event $2b, 7, 12, $3, $0, 255, 255, $90, 0, UnknownScript_0x1851c8, $07b5 - person_event $3e, 13, 9, $3, $0, 255, 255, $0, 0, UnknownScript_0x185173, $07b6 - person_event $3e, 15, 15, $3, $0, 255, 255, $0, 0, UnknownScript_0x185176, $07b6 - person_event $3e, 10, 18, $3, $0, 255, 255, $0, 0, UnknownScript_0x185179, $07b6 - person_event $3e, 6, 8, $4, $10, 255, 255, $0, 0, UnknownScript_0x18517c, $07c5 - person_event $3e, 5, 13, $6, $0, 255, 255, $0, 0, UnknownScript_0x185188, $07c5 - person_event $3e, 6, 18, $5, $1, 255, 255, $0, 0, UnknownScript_0x1851bc, $07c5 + person_event SPRITE_SUICUNE, 13, 13, $1, $0, 255, 255, $90, 0, ObjectEvent, $07b2 + person_event SPRITE_RAIKOU, 13, 11, $1, $0, 255, 255, $b0, 0, ObjectEvent, $07b4 + person_event SPRITE_ENTEI, 13, 16, $1, $0, 255, 255, $80, 0, ObjectEvent, $07b3 + person_event SPRITE_SUPER_NERD, 7, 12, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x1851c8, $07b5 + person_event SPRITE_SAGE, 13, 9, $3, $0, 255, 255, $0, 0, SageScript_0x185173, $07b6 + person_event SPRITE_SAGE, 15, 15, $3, $0, 255, 255, $0, 0, SageScript_0x185176, $07b6 + person_event SPRITE_SAGE, 10, 18, $3, $0, 255, 255, $0, 0, SageScript_0x185179, $07b6 + person_event SPRITE_SAGE, 6, 8, $4, $10, 255, 255, $0, 0, SageScript_0x18517c, $07c5 + person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, $07c5 + person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, $07c5 ; 0x185a23 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 72fe37b99..2eb79a55e 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -27,6 +27,6 @@ TinTower3F_MapEventHeader: ; 0x185a39 ; people-events db 1 - person_event $54, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b + person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, $064b ; 0x185a56 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 98e28823e..0db1463b5 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -44,8 +44,8 @@ TinTower4F_MapEventHeader: ; 0x185a61 ; people-events db 3 - person_event $54, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, $064c - person_event $54, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, $064d - person_event $54, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, $064e + person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, $064c + person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, $064d + person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, $064e ; 0x185aa7 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index d7da82b96..4fccbdf04 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -43,6 +43,6 @@ TinTower5F_MapEventHeader: ; 0x185ab1 ; people-events db 1 - person_event $54, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f + person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, $064f ; 0x185ae2 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index d9bd188d7..6db5548c2 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -27,6 +27,6 @@ TinTower6F_MapEventHeader: ; 0x185ae6 ; people-events db 1 - person_event $54, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6 + person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, $07c6 ; 0x185b03 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index a7e8cdadd..ae20c4b01 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -30,6 +30,6 @@ TinTower7F_MapEventHeader: ; 0x185b07 ; people-events db 1 - person_event $54, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650 + person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, $0650 ; 0x185b33 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 1e1705d19..11a11b045 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -39,8 +39,8 @@ TinTower8F_MapEventHeader: ; 0x185b3b ; people-events db 3 - person_event $54, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, $0651 - person_event $54, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, $0652 - person_event $54, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, $0653 + person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, $0651 + person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, $0652 + person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, $0653 ; 0x185b86 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 001471df5..9e038db07 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -40,6 +40,6 @@ TinTower9F_MapEventHeader: ; 0x185bab ; people-events db 1 - person_event $54, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7 + person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, $07c7 ; 0x185be1 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index eedf48861..409ffaa98 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -28,7 +28,7 @@ UnknownScript_0x77241: ; 0x77241 return ; 0x77244 -UnknownScript_0x77244: ; 0x77244 +HoOhScript_0x77244: ; 0x77244 faceplayer loadfont 2writetext UnknownText_0x77260 @@ -65,7 +65,7 @@ TinTowerRoof_MapEventHeader: ; 0x7726a ; people-events db 1 - person_event $a2, 9, 13, $16, $0, 255, 255, $80, 0, UnknownScript_0x77244, $073c + person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, $073c ; 0x77282 diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 098b9e75c..3aff0fdf6 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -27,6 +27,6 @@ TohjoFalls_MapEventHeader: ; 0x18db04 ; people-events db 1 - person_event $54, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9 + person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, $06a9 ; 0x18db21 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index d19e6d278..2a90323fe 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -81,7 +81,7 @@ TradeCenter_MapEventHeader: ; 0x193429 ; people-events db 2 - person_event $1, 8, 7, $9, $0, 255, 255, $0, 0, UnknownScript_0x193499, $0000 - person_event $1, 8, 10, $8, $0, 255, 255, $0, 0, UnknownScript_0x193499, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x19345d diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index b93542ff4..9f01a0457 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -6,23 +6,23 @@ TrainerHouse1F_MapScriptHeader: ; 0x9af65 db 0 ; 0x9af67 -UnknownScript_0x9af67: ; 0x9af67 +ReceptionistScript_0x9af67: ; 0x9af67 jumptextfaceplayer UnknownText_0x9af7f ; 0x9af6a -UnknownScript_0x9af6a: ; 0x9af6a +CooltrainerMScript_0x9af6a: ; 0x9af6a jumptextfaceplayer UnknownText_0x9b025 ; 0x9af6d -UnknownScript_0x9af6d: ; 0x9af6d +CooltrainerFScript_0x9af6d: ; 0x9af6d jumptextfaceplayer UnknownText_0x9b0b5 ; 0x9af70 -UnknownScript_0x9af70: ; 0x9af70 +YoungsterScript_0x9af70: ; 0x9af70 jumptextfaceplayer UnknownText_0x9b11d ; 0x9af73 -UnknownScript_0x9af73: ; 0x9af73 +GentlemanScript_0x9af73: ; 0x9af73 jumptextfaceplayer UnknownText_0x9b1c9 ; 0x9af76 @@ -141,10 +141,10 @@ TrainerHouse1F_MapEventHeader: ; 0x9b31f ; people-events db 5 - person_event $42, 15, 4, $9, $0, 255, 255, $a0, 0, UnknownScript_0x9af67, $ffff - person_event $23, 15, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x9af6a, $ffff - person_event $24, 6, 10, $6, $2, 255, 255, $80, 0, UnknownScript_0x9af6d, $ffff - person_event $27, 12, 8, $5, $2, 255, 255, $80, 0, UnknownScript_0x9af70, $ffff - person_event $40, 8, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x9af73, $ffff + person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, $ffff + person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, $ffff + person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, $ffff + person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, $ffff ; 0x9b384 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index d9964742c..9c3c910c3 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -188,7 +188,7 @@ TrainerHouseB1F_MapEventHeader: ; 0x9b5b8 ; people-events db 2 - person_event $42, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff - person_event $1, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff + person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff + person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff ; 0x9b5e5 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 011edd2c0..8b9dbed3c 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -75,11 +75,11 @@ UnknownScript_0x7ca79: ; 0x7ca79 return ; 0x7ca7a -UnknownScript_0x7ca7a: ; 0x7ca7a +SuperNerdScript_0x7ca7a: ; 0x7ca7a jumptextfaceplayer UnknownText_0x7d176 ; 0x7ca7d -UnknownScript_0x7ca7d: ; 0x7ca7d +TeacherScript_0x7ca7d: ; 0x7ca7d jumptextfaceplayer UnknownText_0x7d1d0 ; 0x7ca80 @@ -1055,16 +1055,16 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; 0x7d689 ; people-events db 11 - person_event $4b, 16, 13, $9, $0, 255, 255, $a2, 2, TrainerBurglarDuncan, $06ce - person_event $4b, 12, 8, $8, $0, 255, 255, $a2, 2, TrainerBurglarEddie, $06ce - person_event $35, 6, 21, $6, $0, 255, 255, $2, 3, TrainerGruntM13, $06ce - person_event $35, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, $06ce - person_event $35, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, $06ce - person_event $36, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, $06ce - person_event $29, 31, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x7ca7d, $ffff - person_event $2b, 31, 23, $6, $0, 255, 255, $0, 0, UnknownScript_0x7ca7a, $ffff - person_event $54, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, $0673 - person_event $54, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, $0674 - person_event $4, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c1 + person_event SPRITE_PHARMACIST, 16, 13, $9, $0, 255, 255, $a2, 2, TrainerBurglarDuncan, $06ce + person_event SPRITE_PHARMACIST, 12, 8, $8, $0, 255, 255, $a2, 2, TrainerBurglarEddie, $06ce + person_event SPRITE_ROCKET, 6, 21, $6, $0, 255, 255, $2, 3, TrainerGruntM13, $06ce + person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, $06ce + person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, $06ce + person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, $06ce + person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, $ffff + person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, $ffff + person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, $0673 + person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, $0674 + person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, $06c1 ; 0x7d779 diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 4bddb8cb8..43420ee05 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -118,7 +118,7 @@ GruntM15Script: ; 0x7d9b7 end ; 0x7d9bf -UnknownScript_0x7d9bf: ; 0x7d9bf +GentlemanScript_0x7d9bf: ; 0x7d9bf faceplayer loadfont checkbit1 $004a @@ -265,12 +265,12 @@ UndergroundWarehouse_MapEventHeader: ; 0x7dd84 ; people-events db 7 - person_event $35, 12, 13, $7, $0, 255, 255, $2, 3, TrainerGruntM24, $06ce - person_event $35, 19, 12, $7, $0, 255, 255, $2, 3, TrainerGruntM14, $06ce - person_event $35, 7, 18, $9, $0, 255, 255, $2, 4, TrainerGruntM15, $06ce - person_event $40, 12, 16, $3, $0, 255, 255, $0, 0, UnknownScript_0x7d9bf, $06ce - person_event $54, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, $0679 - person_event $54, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a - person_event $54, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655 + person_event SPRITE_ROCKET, 12, 13, $7, $0, 255, 255, $2, 3, TrainerGruntM24, $06ce + person_event SPRITE_ROCKET, 19, 12, $7, $0, 255, 255, $2, 3, TrainerGruntM14, $06ce + person_event SPRITE_ROCKET, 7, 18, $9, $0, 255, 255, $2, 4, TrainerGruntM15, $06ce + person_event SPRITE_GENTLEMAN, 12, 16, $3, $0, 255, 255, $0, 0, GentlemanScript_0x7d9bf, $06ce + person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, $0679 + person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a + person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655 ; 0x7ddf4 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 7ff15e5f0..fd180ad0a 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -293,14 +293,14 @@ UnionCave1F_MapEventHeader: ; 0x59f35 ; people-events db 9 - person_event $2d, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, $ffff - person_event $2b, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, $ffff - person_event $2d, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, $ffff - person_event $3a, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, $ffff - person_event $3a, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, $ffff - person_event $54, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, $065a - person_event $54, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, $065b - person_event $54, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, $065c - person_event $54, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, $065d + person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, $ffff + person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, $ffff + person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, $ffff + person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, $ffff + person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, $ffff + person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, $065a + person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, $065b + person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, $065c + person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, $065d ; 0x59fc4 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 5f11169c0..8cf182ce0 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -130,7 +130,7 @@ ItemFragment_0x5a018: ; 0x5a018 db X_DEFEND, 1 ; 0x5a01a -UnknownScript_0x5a01a: ; 0x5a01a +BoulderScript_0x5a01a: ; 0x5a01a jumpstd $000e ; 0x5a01d @@ -232,12 +232,12 @@ UnionCaveB1F_MapEventHeader: ; 0x5a28e ; people-events db 7 - person_event $2d, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, $ffff - person_event $2d, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, $ffff - person_event $2b, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, $ffff - person_event $2b, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, $ffff - person_event $54, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, $065e - person_event $5a, 14, 11, $19, $0, 255, 255, $0, 0, UnknownScript_0x5a01a, $ffff - person_event $54, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f + person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, $ffff + person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, $ffff + person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, $ffff + person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, $ffff + person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, $065e + person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, BoulderScript_0x5a01a, $ffff + person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, $065f ; 0x5a308 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 1dbf4a1c9..5649f3d2b 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -25,7 +25,7 @@ UnknownScript_0x5a31c: ; 0x5a31c return ; 0x5a31f -UnknownScript_0x5a31f: ; 0x5a31f +SurfScript_0x5a31f: ; 0x5a31f faceplayer cry LAPRAS loadpokedata LAPRAS, 20 @@ -207,11 +207,11 @@ UnionCaveB2F_MapEventHeader: ; 0x5a57a ; people-events db 6 - person_event $2c, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, $ffff - person_event $24, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, $ffff - person_event $24, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, $ffff - person_event $54, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, $0660 - person_event $54, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661 - person_event $53, 35, 15, $24, $11, 255, 255, $90, 0, UnknownScript_0x5a31f, $0760 + person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, $ffff + person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, $ffff + person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, $ffff + person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, $0660 + person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, $0661 + person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, $0760 ; 0x5a5d3 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index fe11cde2a..ef2aff882 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -15,15 +15,15 @@ UnknownScript_0x1aa97f: ; 0x1aa97f return ; 0x1aa983 -UnknownScript_0x1aa983: ; 0x1aa983 +TeacherScript_0x1aa983: ; 0x1aa983 jumptextfaceplayer UnknownText_0x1aaa15 ; 0x1aa986 -UnknownScript_0x1aa986: ; 0x1aa986 +GrampsScript_0x1aa986: ; 0x1aa986 jumptextfaceplayer UnknownText_0x1aaa6f ; 0x1aa989 -UnknownScript_0x1aa989: ; 0x1aa989 +MachopScript_0x1aa989: ; 0x1aa989 loadfont 2writetext UnknownText_0x1aaaca cry MACHOP @@ -37,11 +37,11 @@ UnknownScript_0x1aa989: ; 0x1aa989 end ; 0x1aa99b -UnknownScript_0x1aa99b: ; 0x1aa99b +SuperNerdScript_0x1aa99b: ; 0x1aa99b jumptextfaceplayer UnknownText_0x1aab1a ; 0x1aa99e -UnknownScript_0x1aa99e: ; 0x1aa99e +BigSnorlaxScript_0x1aa99e: ; 0x1aa99e loadfont special $0060 iftrue UnknownScript_0x1aa9ab @@ -65,7 +65,7 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab end ; 0x1aa9c2 -UnknownScript_0x1aa9c2: ; 0x1aa9c2 +PokefanMScript_0x1aa9c2: ; 0x1aa9c2 faceplayer loadfont checkbit1 $00e2 @@ -300,11 +300,11 @@ VermilionCity_MapEventHeader: ; 0x1aae77 ; people-events db 6 - person_event $29, 13, 22, $2, $11, 255, 255, $0, 0, UnknownScript_0x1aa983, $ffff - person_event $2f, 10, 27, $9, $0, 255, 255, $0, 0, UnknownScript_0x1aa986, $ffff - person_event $9a, 11, 30, $16, $0, 255, 255, $90, 0, UnknownScript_0x1aa989, $ffff - person_event $2b, 20, 18, $2, $11, 255, 255, $a0, 0, UnknownScript_0x1aa99b, $ffff - person_event $33, 12, 38, $15, $0, 255, 255, $0, 0, UnknownScript_0x1aa99e, $0770 - person_event $2d, 16, 35, $6, $0, 255, 255, $80, 0, UnknownScript_0x1aa9c2, $ffff + person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, $ffff + person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, $ffff + person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, MachopScript_0x1aa989, $ffff + person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, $ffff + person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, BigSnorlaxScript_0x1aa99e, $0770 + person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1aa9c2, $ffff ; 0x1aaf25 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index a6d259764..c671d3571 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -6,7 +6,7 @@ VermilionGym_MapScriptHeader: ; 0x1920a3 db 0 ; 0x1920a5 -UnknownScript_0x1920a5: ; 0x1920a5 +SurgeScript_0x1920a5: ; 0x1920a5 faceplayer loadfont checkbit2 $0025 @@ -328,10 +328,10 @@ VermilionGym_MapEventHeader: ; 0x19263d ; people-events db 5 - person_event $1f, 6, 9, $6, $0, 255, 255, $b0, 0, UnknownScript_0x1920a5, $ffff - person_event $40, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, $ffff - person_event $2c, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, $ffff - person_event $2b, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, $ffff - person_event $48, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, $ffff + person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, $ffff + person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, $ffff + person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, $ffff + person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, $ffff + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, $ffff ; 0x1926e3 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index a6a0ef137..3bf60f6f8 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -6,7 +6,7 @@ VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: ; 0x19202f db 0 ; 0x192031 -UnknownScript_0x192031: ; 0x192031 +GentlemanScript_0x192031: ; 0x192031 jumptextfaceplayer UnknownText_0x192034 ; 0x192034 @@ -35,6 +35,6 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; 0x192086 ; people-events db 1 - person_event $40, 7, 5, $4, $10, 255, 255, $80, 0, UnknownScript_0x192031, $ffff + person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, $ffff ; 0x1920a3 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 3a7b45f70..f49058468 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -6,7 +6,7 @@ VermilionHouseFishingSpeechHouse_MapScriptHeader: ; 0x19148b db 0 ; 0x19148d -UnknownScript_0x19148d: ; 0x19148d +FishingGuruScript_0x19148d: ; 0x19148d jumptextfaceplayer UnknownText_0x191496 ; 0x191490 @@ -62,6 +62,6 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; 0x1915df ; people-events db 1 - person_event $3b, 8, 6, $6, $0, 255, 255, $a0, 0, UnknownScript_0x19148d, $ffff + person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x19148d, $ffff ; 0x191601 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 4735dfac0..b042d93f8 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -6,11 +6,11 @@ VermilionMagnetTrainSpeechHouse_MapScriptHeader: ; 0x191eb5 db 0 ; 0x191eb7 -UnknownScript_0x191eb7: ; 0x191eb7 +PokefanFScript_0x191eb7: ; 0x191eb7 jumptextfaceplayer UnknownText_0x191ec0 ; 0x191eba -UnknownScript_0x191eba: ; 0x191eba +YoungsterScript_0x191eba: ; 0x191eba jumptextfaceplayer UnknownText_0x191f16 ; 0x191ebd @@ -51,7 +51,7 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; 0x191f48 ; people-events db 2 - person_event $2e, 7, 6, $8, $0, 255, 255, $0, 0, UnknownScript_0x191eb7, $ffff - person_event $27, 7, 4, $a, $0, 255, 255, $a0, 0, UnknownScript_0x191eba, $ffff + person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, $ffff + person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, $ffff ; 0x191f7c diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 779738810..21057f947 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -6,18 +6,18 @@ VermilionMart_MapScriptHeader: ; 0x191f7c db 0 ; 0x191f7e -UnknownScript_0x191f7e: ; 0x191f7e +ClerkScript_0x191f7e: ; 0x191f7e loadfont pokemart $0, $0016 loadmovesprites end ; 0x191f85 -UnknownScript_0x191f85: ; 0x191f85 +SuperNerdScript_0x191f85: ; 0x191f85 jumptextfaceplayer UnknownText_0x191f8b ; 0x191f88 -UnknownScript_0x191f88: ; 0x191f88 +BuenaScript_0x191f88: ; 0x191f88 jumptextfaceplayer UnknownText_0x191fca ; 0x191f8b @@ -51,8 +51,8 @@ VermilionMart_MapEventHeader: ; 0x191ff8 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x191f7e, $ffff - person_event $2b, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x191f85, $ffff - person_event $2a, 10, 12, $5, $1, 255, 255, $a0, 0, UnknownScript_0x191f88, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, $ffff + person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, $ffff + person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, $ffff ; 0x19202f diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 7280c0329..0a10c04dc 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -6,11 +6,11 @@ VermilionPokeCenter1F_MapScriptHeader: ; 0x191601 db 0 ; 0x191603 -UnknownScript_0x191603: ; 0x191603 +NurseScript_0x191603: ; 0x191603 jumpstd $0000 ; 0x191606 -UnknownScript_0x191606: ; 0x191606 +FishingGuruScript_0x191606: ; 0x191606 faceplayer loadfont checkbit1 $0750 @@ -28,11 +28,11 @@ UnknownScript_0x191614: ; 0x191614 end ; 0x19161a -UnknownScript_0x19161a: ; 0x19161a +SailorScript_0x19161a: ; 0x19161a jumptextfaceplayer UnknownText_0x1916fe ; 0x19161d -UnknownScript_0x19161d: ; 0x19161d +BugCatcherScript_0x19161d: ; 0x19161d jumptextfaceplayer UnknownText_0x19173b ; 0x191620 @@ -88,9 +88,9 @@ VermilionPokeCenter1F_MapEventHeader: ; 0x191791 ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x191603, $ffff - person_event $3b, 6, 11, $6, $0, 255, 255, $80, 0, UnknownScript_0x191606, $ffff - person_event $49, 9, 10, $4, $10, 255, 255, $90, 0, UnknownScript_0x19161a, $ffff - person_event $25, 9, 5, $3, $0, 255, 255, $a0, 0, UnknownScript_0x19161d, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, $ffff + person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, $ffff + person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, $ffff + person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, $ffff ; 0x1917da diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 79bec8a40..86a55a1b8 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -42,7 +42,7 @@ UnknownScript_0x74da6: ; 0x74da6 end ; 0x74dc4 -UnknownScript_0x74dc4: ; 0x74dc4 +SailorScript_0x74dc4: ; 0x74dc4 faceplayer loadfont checkbit1 $0000 @@ -111,7 +111,7 @@ UnknownScript_0x74e20: ; 0x74e20 loadmovesprites setbit1 $0001 applymovement $0, MovementData_0x74ef8 - 2jump UnknownScript_0x74dc4 + 2jump SailorScript_0x74dc4 ; 0x74e68 UnknownScript_0x74e68: ; 0x74e68 @@ -157,7 +157,7 @@ UnknownScript_0x74e8d: ; 0x74e8d end ; 0x74e97 -UnknownScript_0x74e97: ; 0x74e97 +SailorScript_0x74e97: ; 0x74e97 faceplayer loadfont checkbit1 $0000 @@ -180,7 +180,7 @@ UnknownScript_0x74e97: ; 0x74e97 loadmovesprites setbit1 $0001 applymovement $0, MovementData_0x74efe - 2jump UnknownScript_0x74dc4 + 2jump SailorScript_0x74dc4 ; 0x74ed4 UnknownScript_0x74ed4: ; 0x74ed4 @@ -204,7 +204,7 @@ UnknownScript_0x74ee0: ; 0x74ee0 end ; 0x74ee6 -UnknownScript_0x74ee6: ; 0x74ee6 +SuperNerdScript_0x74ee6: ; 0x74ee6 faceplayer loadfont 2writetext UnknownText_0x750a6 @@ -338,8 +338,8 @@ VermilionPort_MapEventHeader: ; 0x750e3 ; people-events db 3 - person_event $49, 21, 11, $7, $0, 255, 255, $0, 0, UnknownScript_0x74dc4, $072b - person_event $49, 15, 10, $9, $0, 255, 255, $0, 0, UnknownScript_0x74e97, $ffff - person_event $2b, 15, 15, $5, $2, 255, 255, $0, 0, UnknownScript_0x74ee6, $ffff + person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, $072b + person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, $ffff + person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, $ffff ; 0x75127 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 590c7db52..625290fce 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -6,7 +6,7 @@ VermilionPortPassage_MapScriptHeader: ; 0x77018 db 0 ; 0x7701a -UnknownScript_0x7701a: ; 0x7701a +TeacherScript_0x7701a: ; 0x7701a jumptextfaceplayer UnknownText_0x7701d ; 0x7701d @@ -37,6 +37,6 @@ VermilionPortPassage_MapEventHeader: ; 0x7705a ; people-events db 1 - person_event $29, 5, 21, $8, $0, 255, 255, $0, 0, UnknownScript_0x7701a, $ffff + person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, $ffff ; 0x77086 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 1ce3daa44..0109fcc92 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -267,11 +267,11 @@ VictoryRoad_MapEventHeader: ; 0x74802 ; people-events db 6 - person_event $4, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c2 - person_event $54, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, $06a3 - person_event $54, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, $06a4 - person_event $54, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, $06a5 - person_event $54, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 - person_event $54, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 + person_event SPRITE_SILVER, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, $06c2 + person_event SPRITE_POKE_BALL, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, $06a3 + person_event SPRITE_POKE_BALL, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, $06a4 + person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, $06a5 + person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, $06a6 + person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, $06a7 ; 0x748a2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 21d009722..f2e689ceb 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -23,7 +23,7 @@ UnknownScript_0x9b9fd: ; 0x9b9fd 2jump UnknownScript_0x9ba04 ; 0x9ba03 -UnknownScript_0x9ba03: ; 0x9ba03 +OfficerScript_0x9ba03: ; 0x9ba03 faceplayer UnknownScript_0x9ba04: ; 0x9ba04 loadfont @@ -46,11 +46,11 @@ UnknownScript_0x9ba19: ; 0x9ba19 end ; 0x9ba21 -UnknownScript_0x9ba21: ; 0x9ba21 +BlackBeltScript_0x9ba21: ; 0x9ba21 jumptextfaceplayer UnknownText_0x9baf1 ; 0x9ba24 -UnknownScript_0x9ba24: ; 0x9ba24 +BlackBeltScript_0x9ba24: ; 0x9ba24 jumptextfaceplayer UnknownText_0x9bb37 ; 0x9ba27 @@ -122,9 +122,9 @@ VictoryRoadGate_MapEventHeader: ; 0x9bb9b ; people-events db 3 - person_event $43, 15, 12, $9, $0, 255, 255, $0, 0, UnknownScript_0x9ba03, $ffff - person_event $41, 9, 11, $9, $0, 255, 255, $0, 0, UnknownScript_0x9ba21, $074f - person_event $41, 9, 16, $8, $0, 255, 255, $0, 0, UnknownScript_0x9ba24, $0750 + person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, $ffff + person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, $074f + person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, $0750 ; 0x9bbf8 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index b38325c15..92e105ffa 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -15,7 +15,7 @@ UnknownScript_0x1a83b7: ; 0x1a83b7 return ; 0x1a83bb -UnknownScript_0x1a83bb: ; 0x1a83bb +FisherScript_0x1a83bb: ; 0x1a83bb applymovement $2, MovementData_0x1a8465 faceplayer loadfont @@ -56,19 +56,19 @@ UnknownScript_0x1a83d1: ; 0x1a83d1 end ; 0x1a8403 -UnknownScript_0x1a8403: ; 0x1a8403 +LassScript_0x1a8403: ; 0x1a8403 jumptextfaceplayer UnknownText_0x1a8529 ; 0x1a8406 -UnknownScript_0x1a8406: ; 0x1a8406 +SuperNerdScript_0x1a8406: ; 0x1a8406 jumptextfaceplayer UnknownText_0x1a8593 ; 0x1a8409 -UnknownScript_0x1a8409: ; 0x1a8409 +GrampsScript_0x1a8409: ; 0x1a8409 jumptextfaceplayer UnknownText_0x1a85ef ; 0x1a840c -UnknownScript_0x1a840c: ; 0x1a840c +YoungsterScript_0x1a840c: ; 0x1a840c jumptextfaceplayer UnknownText_0x1a8665 ; 0x1a840f @@ -104,7 +104,7 @@ ItemFragment_0x1a8423: ; 0x1a8423 db RARE_CANDY, 1 ; 0x1a8425 -UnknownScript_0x1a8425: ; 0x1a8425 +FruitTreeScript_0x1a8425: ; 0x1a8425 fruittree $9 ; 0x1a8427 @@ -314,13 +314,13 @@ VioletCity_MapEventHeader: ; 0x1a8762 ; people-events db 8 - person_event $3a, 20, 17, $3, $0, 255, 255, $a0, 0, UnknownScript_0x1a83bb, $06ca - person_event $28, 32, 32, $2, $22, 255, 255, $a0, 0, UnknownScript_0x1a8403, $ffff - person_event $2b, 18, 28, $2, $21, 255, 255, $80, 0, UnknownScript_0x1a8406, $ffff - person_event $2f, 24, 21, $5, $1, 255, 255, $0, 0, UnknownScript_0x1a8409, $ffff - person_event $27, 22, 9, $3, $0, 255, 255, $a0, 0, UnknownScript_0x1a840c, $ffff - person_event $5d, 33, 18, $1, $0, 255, 255, $0, 0, UnknownScript_0x1a8425, $ffff - person_event $54, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, $0643 - person_event $54, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, $0644 + person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, $06ca + person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, $ffff + person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, $ffff + person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, $ffff + person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, $ffff + person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, $ffff + person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, $0643 + person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, $0644 ; 0x1a8820 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 555e0b15e..502daee05 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -6,7 +6,7 @@ VioletGym_MapScriptHeader: ; 0x683c0 db 0 ; 0x683c2 -UnknownScript_0x683c2: ; 0x683c2 +FalknerScript_0x683c2: ; 0x683c2 faceplayer loadfont checkbit1 $04bd @@ -311,9 +311,9 @@ VioletGym_MapEventHeader: ; 0x68a0c ; people-events db 4 - person_event $12, 5, 9, $6, $0, 255, 255, $90, 0, UnknownScript_0x683c2, $ffff - person_event $27, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, $ffff - person_event $27, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, $ffff - person_event $48, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, $ffff + person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, $ffff + person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, $ffff + person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, $ffff + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, $ffff ; 0x68a5a diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ac5b39a81..dc76ba391 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -6,18 +6,18 @@ VioletMart_MapScriptHeader: ; 0x68293 db 0 ; 0x68295 -UnknownScript_0x68295: ; 0x68295 +ClerkScript_0x68295: ; 0x68295 loadfont pokemart $0, $0002 loadmovesprites end ; 0x6829c -UnknownScript_0x6829c: ; 0x6829c +GrannyScript_0x6829c: ; 0x6829c jumptextfaceplayer UnknownText_0x682a2 ; 0x6829f -UnknownScript_0x6829f: ; 0x6829f +CooltrainerMScript_0x6829f: ; 0x6829f jumptextfaceplayer UnknownText_0x68323 ; 0x682a2 @@ -60,8 +60,8 @@ VioletMart_MapEventHeader: ; 0x68389 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x68295, $ffff - person_event $30, 10, 11, $5, $1, 255, 255, $0, 0, UnknownScript_0x6829c, $ffff - person_event $23, 6, 9, $3, $0, 255, 255, $80, 0, UnknownScript_0x6829f, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, $ffff + person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, $ffff + person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, $ffff ; 0x683c0 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index cf5a5acf2..8b087ea82 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -6,15 +6,15 @@ VioletNicknameSpeechHouse_MapScriptHeader: ; 0x693e7 db 0 ; 0x693e9 -UnknownScript_0x693e9: ; 0x693e9 +TeacherScript_0x693e9: ; 0x693e9 jumptextfaceplayer UnknownText_0x693fa ; 0x693ec -UnknownScript_0x693ec: ; 0x693ec +LassScript_0x693ec: ; 0x693ec jumptextfaceplayer UnknownText_0x6945e ; 0x693ef -UnknownScript_0x693ef: ; 0x693ef +BirdScript_0x693ef: ; 0x693ef faceplayer loadfont 2writetext UnknownText_0x6947c @@ -59,8 +59,8 @@ VioletNicknameSpeechHouse_MapEventHeader: ; 0x69490 ; people-events db 3 - person_event $29, 7, 6, $9, $0, 255, 255, $0, 0, UnknownScript_0x693e9, $ffff - person_event $28, 8, 10, $7, $0, 255, 255, $a0, 0, UnknownScript_0x693ec, $ffff - person_event $4e, 6, 9, $5, $1, 255, 255, $b0, 0, UnknownScript_0x693ef, $ffff + person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, $ffff + person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, $ffff + person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, $ffff ; 0x694c7 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 5a8fc7452..70a236a6f 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -6,11 +6,11 @@ VioletOnixTradeHouse_MapScriptHeader: ; 0x6998b db 0 ; 0x6998d -UnknownScript_0x6998d: ; 0x6998d +PokefanMScript_0x6998d: ; 0x6998d jumptextfaceplayer UnknownText_0x69997 ; 0x69990 -UnknownScript_0x69990: ; 0x69990 +YoungsterScript_0x69990: ; 0x69990 faceplayer loadfont trade $1 @@ -46,7 +46,7 @@ VioletOnixTradeHouse_MapEventHeader: ; 0x69a01 ; people-events db 2 - person_event $2d, 7, 6, $3, $0, 255, 255, $0, 0, UnknownScript_0x6998d, $ffff - person_event $27, 9, 10, $4, $20, 255, 255, $80, 0, UnknownScript_0x69990, $ffff + person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, $ffff + person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, $ffff ; 0x69a2b diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 7f36f7ed9..0ed13e26b 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -6,11 +6,11 @@ VioletPokeCenter1F_MapScriptHeader: ; 0x694c7 db 0 ; 0x694c9 -UnknownScript_0x694c9: ; 0x694c9 +NurseScript_0x694c9: ; 0x694c9 jumpstd $0000 ; 0x694cc -UnknownScript_0x694cc: ; 0x694cc +ScientistScript_0x694cc: ; 0x694cc faceplayer loadfont checkbit1 $002c @@ -79,15 +79,15 @@ UnknownScript_0x6953a: ; 0x6953a 2jump UnknownScript_0x694d7 ; 0x69540 -UnknownScript_0x69540: ; 0x69540 +GameboyKidScript_0x69540: ; 0x69540 jumptextfaceplayer UnknownText_0x69809 ; 0x69543 -UnknownScript_0x69543: ; 0x69543 +GentlemanScript_0x69543: ; 0x69543 jumptextfaceplayer UnknownText_0x6983c ; 0x69546 -UnknownScript_0x69546: ; 0x69546 +YoungsterScript_0x69546: ; 0x69546 jumptextfaceplayer UnknownText_0x698b8 ; 0x69549 @@ -223,10 +223,10 @@ VioletPokeCenter1F_MapEventHeader: ; 0x69935 ; people-events db 5 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x694c9, $ffff - person_event $3, 10, 11, $6, $0, 255, 255, $a0, 0, UnknownScript_0x69540, $ffff - person_event $40, 8, 5, $3, $0, 255, 255, $0, 0, UnknownScript_0x69543, $ffff - person_event $27, 5, 12, $6, $0, 255, 255, $80, 0, UnknownScript_0x69546, $ffff - person_event $3c, 7, 8, $6, $0, 255, 255, $90, 0, UnknownScript_0x694cc, $0700 + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, $ffff + person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, $ffff + person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, $ffff + person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, $ffff + person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, $0700 ; 0x6998b diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 949e4ac84..489208241 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -15,7 +15,7 @@ UnknownScript_0x1a9a48: ; 0x1a9a48 return ; 0x1a9a4c -UnknownScript_0x1a9a4c: ; 0x1a9a4c +GrampsScript_0x1a9a4c: ; 0x1a9a4c faceplayer loadfont 2writetext UnknownText_0x1a9aa5 @@ -34,7 +34,7 @@ UnknownScript_0x1a9a5b: ; 0x1a9a5b end ; 0x1a9a61 -UnknownScript_0x1a9a61: ; 0x1a9a61 +GrampsScript_0x1a9a61: ; 0x1a9a61 faceplayer loadfont checkbit1 $0775 @@ -52,7 +52,7 @@ UnknownScript_0x1a9a6f: ; 0x1a9a6f end ; 0x1a9a75 -UnknownScript_0x1a9a75: ; 0x1a9a75 +FisherScript_0x1a9a75: ; 0x1a9a75 faceplayer loadfont checkbit1 $00e0 @@ -70,7 +70,7 @@ UnknownScript_0x1a9a8e: ; 0x1a9a8e end ; 0x1a9a90 -UnknownScript_0x1a9a90: ; 0x1a9a90 +YoungsterScript_0x1a9a90: ; 0x1a9a90 jumptextfaceplayer UnknownText_0x1a9daa ; 0x1a9a93 @@ -229,9 +229,9 @@ ViridianCity_MapEventHeader: ; 0x1a9ec9 ; people-events db 4 - person_event $2f, 9, 22, $2, $22, 255, 255, $0, 0, UnknownScript_0x1a9a4c, $ffff - person_event $2f, 12, 34, $6, $0, 255, 255, $90, 0, UnknownScript_0x1a9a61, $ffff - person_event $3a, 27, 10, $6, $0, 255, 255, $80, 0, UnknownScript_0x1a9a75, $ffff - person_event $27, 25, 21, $2, $33, 255, 255, $a0, 0, UnknownScript_0x1a9a90, $ffff + person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, $ffff + person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, $ffff + person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, $ffff + person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, $ffff ; 0x1a9f3a diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 85ad2b563..393940f7b 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -6,7 +6,7 @@ ViridianGym_MapScriptHeader: ; 0x9aa24 db 0 ; 0x9aa26 -UnknownScript_0x9aa26: ; 0x9aa26 +BlueScript_0x9aa26: ; 0x9aa26 faceplayer loadfont checkbit2 $002a @@ -166,7 +166,7 @@ ViridianGym_MapEventHeader: ; 0x9ae04 ; people-events db 2 - person_event $7, 7, 9, $6, $0, 255, 255, $0, 0, UnknownScript_0x9aa26, $0776 - person_event $48, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, $0776 + person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, $0776 + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, $0776 ; 0x9ae38 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 4c287a754..7a6db12d4 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -6,18 +6,18 @@ ViridianMart_MapScriptHeader: ; 0x9b5e5 db 0 ; 0x9b5e7 -UnknownScript_0x9b5e7: ; 0x9b5e7 +ClerkScript_0x9b5e7: ; 0x9b5e7 loadfont pokemart $0, $0012 loadmovesprites end ; 0x9b5ee -UnknownScript_0x9b5ee: ; 0x9b5ee +LassScript_0x9b5ee: ; 0x9b5ee jumptextfaceplayer UnknownText_0x9b5f4 ; 0x9b5f1 -UnknownScript_0x9b5f1: ; 0x9b5f1 +CooltrainerMScript_0x9b5f1: ; 0x9b5f1 jumptextfaceplayer UnknownText_0x9b61a ; 0x9b5f4 @@ -51,8 +51,8 @@ ViridianMart_MapEventHeader: ; 0x9b657 ; people-events db 3 - person_event $39, 7, 5, $9, $0, 255, 255, $0, 0, UnknownScript_0x9b5e7, $ffff - person_event $28, 6, 11, $5, $2, 255, 255, $0, 0, UnknownScript_0x9b5ee, $ffff - person_event $23, 10, 5, $7, $0, 255, 255, $0, 0, UnknownScript_0x9b5f1, $ffff + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, $ffff + person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, $ffff + person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, $ffff ; 0x9b68e diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 43feecea0..278202421 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -6,15 +6,15 @@ ViridianNicknameSpeechHouse_MapScriptHeader: ; 0x9ae38 db 0 ; 0x9ae3a -UnknownScript_0x9ae3a: ; 0x9ae3a +PokefanMScript_0x9ae3a: ; 0x9ae3a jumptextfaceplayer UnknownText_0x9ae54 ; 0x9ae3d -UnknownScript_0x9ae3d: ; 0x9ae3d +LassScript_0x9ae3d: ; 0x9ae3d jumptextfaceplayer UnknownText_0x9aecb ; 0x9ae40 -UnknownScript_0x9ae40: ; 0x9ae40 +MoltresScript_0x9ae40: ; 0x9ae40 loadfont 2writetext UnknownText_0x9aefe cry SPEAROW @@ -23,7 +23,7 @@ UnknownScript_0x9ae40: ; 0x9ae40 end ; 0x9ae4a -UnknownScript_0x9ae4a: ; 0x9ae4a +GrowlitheScript_0x9ae4a: ; 0x9ae4a loadfont 2writetext UnknownText_0x9af10 cry RATTATA @@ -74,9 +74,9 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; 0x9af21 ; people-events db 4 - person_event $2d, 8, 6, $9, $0, 255, 255, $80, 0, UnknownScript_0x9ae3a, $ffff - person_event $28, 8, 9, $7, $0, 255, 255, $a0, 0, UnknownScript_0x9ae3d, $ffff - person_event $9e, 6, 9, $16, $2, 255, 255, $b0, 0, UnknownScript_0x9ae40, $ffff - person_event $82, 7, 10, $16, $2, 255, 255, $90, 0, UnknownScript_0x9ae4a, $ffff + person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, $ffff + person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, $ffff + person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, $ffff + person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, $ffff ; 0x9af65 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index b864b5009..a38fdb34d 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -6,11 +6,11 @@ ViridianPokeCenter1F_MapScriptHeader: ; 0x9b68e db 0 ; 0x9b690 -UnknownScript_0x9b690: ; 0x9b690 +NurseScript_0x9b690: ; 0x9b690 jumpstd $0000 ; 0x9b693 -UnknownScript_0x9b693: ; 0x9b693 +CooltrainerMScript_0x9b693: ; 0x9b693 faceplayer loadfont checkbit1 $0775 @@ -28,11 +28,11 @@ UnknownScript_0x9b6a1: ; 0x9b6a1 end ; 0x9b6a7 -UnknownScript_0x9b6a7: ; 0x9b6a7 +CooltrainerFScript_0x9b6a7: ; 0x9b6a7 jumptextfaceplayer UnknownText_0x9b76b ; 0x9b6aa -UnknownScript_0x9b6aa: ; 0x9b6aa +BugCatcherScript_0x9b6aa: ; 0x9b6aa jumptextfaceplayer UnknownText_0x9b7c8 ; 0x9b6ad @@ -85,9 +85,9 @@ ViridianPokeCenter1F_MapEventHeader: ; 0x9b7ef ; people-events db 4 - person_event $37, 5, 7, $6, $0, 255, 255, $0, 0, UnknownScript_0x9b690, $ffff - person_event $23, 8, 12, $5, $1, 255, 255, $80, 0, UnknownScript_0x9b693, $ffff - person_event $24, 7, 9, $7, $0, 255, 255, $90, 0, UnknownScript_0x9b6a7, $ffff - person_event $25, 10, 5, $9, $0, 255, 255, $a0, 0, UnknownScript_0x9b6aa, $ffff + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, $ffff + person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, $ffff + person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, $ffff + person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, $ffff ; 0x9b838 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 7bf2c4098..ad83746d1 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -229,7 +229,7 @@ PokemaniacDonaldScript: ; 0x7c12a end ; 0x7c132 -UnknownScript_0x7c132: ; 0x7c132 +GrannyScript_0x7c132: ; 0x7c132 loadfont checkcode $b if_equal SUNDAY, UnknownScript_0x7c140 @@ -243,7 +243,7 @@ UnknownScript_0x7c140: ; 0x7c140 end ; 0x7c146 -UnknownScript_0x7c146: ; 0x7c146 +GrampsScript_0x7c146: ; 0x7c146 loadfont checkbit2 $0056 iftrue UnknownScript_0x7c300 @@ -260,7 +260,7 @@ UnknownScript_0x7c156: ; 0x7c156 end ; 0x7c161 -UnknownScript_0x7c161: ; 0x7c161 +SuperNerdScript_0x7c161: ; 0x7c161 loadfont checkcode $b if_equal TUESDAY, UnknownScript_0x7c173 @@ -352,7 +352,7 @@ UnknownScript_0x7c208: ; 0x7c208 end ; 0x7c20e -UnknownScript_0x7c20e: ; 0x7c20e +SuperNerdScript_0x7c20e: ; 0x7c20e loadfont checkcode $b if_equal SUNDAY, UnknownScript_0x7c220 @@ -770,14 +770,14 @@ WarehouseEntrance_MapEventHeader: ; 0x7c936 ; people-events db 9 - person_event $2b, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, $ffff - person_event $2b, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, $ffff - person_event $2b, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, $ffff - person_event $2b, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, $ffff - person_event $54, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, $0672 - person_event $2f, 15, 11, $8, $0, 255, 255, $b0, 0, UnknownScript_0x7c146, $0753 - person_event $2b, 18, 11, $8, $0, 255, 255, $90, 0, UnknownScript_0x7c161, $0754 - person_event $2b, 19, 11, $8, $0, 255, 255, $a0, 0, UnknownScript_0x7c20e, $0755 - person_event $30, 25, 11, $8, $0, 255, 255, $b0, 0, UnknownScript_0x7c132, $0752 + person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, $ffff + person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, $ffff + person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, $ffff + person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, $ffff + person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, $0672 + person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, $0753 + person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, $0754 + person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, $0755 + person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, $0752 ; 0x7c9e8 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 1307afd09..362871fcc 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -26,7 +26,7 @@ ItemFragment_0x18c418: ; 0x18c418 db ESCAPE_ROPE, 1 ; 0x18c41a -UnknownScript_0x18c41a: ; 0x18c41a +BoulderScript_0x18c41a: ; 0x18c41a jumpstd $000e ; 0x18c41d @@ -75,11 +75,11 @@ WhirlIslandB1F_MapEventHeader: ; 0x18c426 ; people-events db 6 - person_event $54, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c410, $0691 - person_event $54, 22, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c412, $0692 - person_event $54, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, $0693 - person_event $54, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, $0694 - person_event $54, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, $0695 - person_event $5a, 30, 27, $19, $0, 255, 255, $0, 0, UnknownScript_0x18c41a, $ffff + person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c410, $0691 + person_event SPRITE_POKE_BALL, 22, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c412, $0692 + person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, $0693 + person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, $0694 + person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, $0695 + person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, BoulderScript_0x18c41a, $ffff ; 0x18c4b6 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 42ea1d3e5..ae3960bcd 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -37,8 +37,8 @@ WhirlIslandB2F_MapEventHeader: ; 0x18c4be ; people-events db 3 - person_event $54, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, $0696 - person_event $54, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697 - person_event $54, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698 + person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, $0696 + person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, $0697 + person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, $0698 ; 0x18c4ff diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 0437f865d..8b394ea22 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -28,7 +28,7 @@ UnknownScript_0x18c515: ; 0x18c515 return ; 0x18c518 -UnknownScript_0x18c518: ; 0x18c518 +LugiaScript_0x18c518: ; 0x18c518 faceplayer loadfont 2writetext UnknownText_0x18c531 @@ -64,6 +64,6 @@ WhirlIslandLugiaChamber_MapEventHeader: ; 0x18c53a ; people-events db 1 - person_event $a1, 9, 13, $16, $0, 255, 255, $90, 0, UnknownScript_0x18c518, $073d + person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, $073d ; 0x18c552 diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 33d5838d3..8d51b6595 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -28,6 +28,6 @@ WhirlIslandNE_MapEventHeader: ; 0x18c398 ; people-events db 1 - person_event $54, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f + person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, $068f ; 0x18c3ba diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 0a43486bb..6f877d8c7 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -30,6 +30,6 @@ WhirlIslandSW_MapEventHeader: ; 0x18c3be ; people-events db 1 - person_event $54, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690 + person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, $0690 ; 0x18c3ea diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 7fdfd8126..e59a1ac62 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1804e0: ; 0x1804e0 end ; 0x1804f8 -UnknownScript_0x1804f8: ; 0x1804f8 +WillScript_0x1804f8: ; 0x1804f8 faceplayer loadfont checkbit1 $05b8 @@ -146,6 +146,6 @@ WillsRoom_MapEventHeader: ; 0x1806f9 ; people-events db 1 - person_event $11, 11, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x1804f8, $ffff + person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, $ffff ; 0x18071b diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 5c10b7004..79dce2d5e 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -46,15 +46,15 @@ UnknownScript_0x98593: ; 0x98593 return ; 0x9859a -UnknownScript_0x9859a: ; 0x9859a +SageScript_0x9859a: ; 0x9859a jumptextfaceplayer UnknownText_0x9862b ; 0x9859d -UnknownScript_0x9859d: ; 0x9859d +SageScript_0x9859d: ; 0x9859d jumptextfaceplayer UnknownText_0x9868b ; 0x985a0 -UnknownScript_0x985a0: ; 0x985a0 +SageScript_0x985a0: ; 0x985a0 jumptextfaceplayer UnknownText_0x987af ; 0x985a3 @@ -383,11 +383,11 @@ WiseTriosRoom_MapEventHeader: ; 0x98dea ; people-events db 6 - person_event $3e, 6, 10, $3, $0, 255, 255, $0, 0, UnknownScript_0x9859a, $07ab - person_event $3e, 11, 10, $5, $1, 255, 255, $0, 0, UnknownScript_0x9859d, $07ab - person_event $3e, 9, 11, $8, $0, 255, 255, $0, 0, UnknownScript_0x985a0, $07ab - person_event $3e, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, $07ac - person_event $3e, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, $07ac - person_event $3e, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, $07ac + person_event SPRITE_SAGE, 6, 10, $3, $0, 255, 255, $0, 0, SageScript_0x9859a, $07ab + person_event SPRITE_SAGE, 11, 10, $5, $1, 255, 255, $0, 0, SageScript_0x9859d, $07ab + person_event SPRITE_SAGE, 9, 11, $8, $0, 255, 255, $0, 0, SageScript_0x985a0, $07ab + person_event SPRITE_SAGE, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, $07ac + person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, $07ac + person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, $07ac ; 0x98e55 diff --git a/wram.asm b/wram.asm index 928ed33a4..f40e8d551 100644 --- a/wram.asm +++ b/wram.asm @@ -1079,6 +1079,10 @@ CurPartyLevel: ; d143 ds 1 +SECTION "UsedSprites",WRAMX[$d154],BANK[1] +UsedSprites: ; d154 + ds 32 + SECTION "connections",WRAMX[$d1a9],BANK[1] MapConnections: @@ -1655,6 +1659,11 @@ OBJECT_LENGTH EQU $10 ds OBJECT_LENGTH * NUM_OBJECTS +SECTION "VariableSprites",WRAMX[$d82e],BANK[1] +VariableSprites: ; d82e + ds $10 + + SECTION "Status",WRAMX[$d841],BANK[1] TimeOfDayPal: ; d841 ds 1 @@ -1982,7 +1991,7 @@ BreedMon1Nick: ; def6 BreedMon1OT: ; df01 ds 11 BreedMon1Stats: -Breedmon1Species: ; df0c +BreedMon1Species: ; df0c ds 1 ds 31