From 699495bfcb732559114ad1450e704844a86308a1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 13:37:15 -0500 Subject: [PATCH 01/35] Consistent capitalization for map names, matching their constants --- audio/sfx.asm | 28 ++--- audio/sfx_pointers.asm | 4 +- constants/engine_flags.asm | 10 +- constants/event_flags.asm | 8 +- constants/map_constants.asm | 2 +- constants/sfx_constants.asm | 4 +- constants/sprite_constants.asm | 4 +- constants/wram_constants.asm | 10 +- engine/breeding/egg.asm | 4 +- engine/engine_flags.asm | 12 +- engine/events.asm | 2 +- engine/move_mon.asm | 26 ++--- engine/npctrade.asm | 2 +- engine/overworld.asm | 8 +- engine/party_menu.asm | 2 +- engine/std_scripts.asm | 2 +- event/daycare.asm | 40 +++---- event/happiness_egg.asm | 22 ++-- event/unown.asm | 8 +- maps.asm | 46 ++++---- ...nHouse.blk => BetaPokeCenterMainHouse.blk} | 0 ...ion.blk => BetaPokeCenterTradeStation.blk} | 0 ... => BetaRuinsOfAlphUnsolvedPuzzleRoom.blk} | 0 ...eCutOut.blk => BetaSSAquaInsideCutOut.blk} | 0 maps/DayCare.asm | 18 +-- maps/{LakeofRage.asm => LakeOfRage.asm} | 32 +++--- maps/{LakeofRage.blk => LakeOfRage.blk} | 0 ...use.asm => LakeOfRageHiddenPowerHouse.asm} | 4 +- ...pHouse.asm => LakeOfRageMagikarpHouse.asm} | 4 +- ...lphGate.asm => Route32RuinsOfAlphGate.asm} | 4 +- maps/Route34.asm | 48 ++++---- ...enrodgate.asm => Route35GoldenrodGate.asm} | 4 +- ...rkgate.asm => Route35NationalParkGate.asm} | 108 +++++++++--------- ...rkgate.blk => Route35NationalParkGate.blk} | 0 ...rkgate.asm => Route36NationalParkGate.asm} | 10 +- ...rkgate.blk => Route36NationalParkGate.blk} | 0 ...lphgate.asm => Route36RuinsOfAlphGate.asm} | 4 +- ...r.asm => RuinsOfAlphAerodactylChamber.asm} | 26 ++--- ....asm => RuinsOfAlphAerodactylItemRoom.asm} | 26 ++--- ....asm => RuinsOfAlphAerodactylWordRoom.asm} | 4 +- ....blk => RuinsOfAlphAerodactylWordRoom.blk} | 0 ...Chamber.asm => RuinsOfAlphHoOhChamber.asm} | 26 ++--- ...emRoom.asm => RuinsOfAlphHoOhItemRoom.asm} | 26 ++--- ...rdRoom.asm => RuinsOfAlphHoOhWordRoom.asm} | 4 +- ...rdRoom.blk => RuinsOfAlphHoOhWordRoom.blk} | 0 ...hamber.asm => RuinsOfAlphInnerChamber.asm} | 58 +++++----- ...hamber.blk => RuinsOfAlphInnerChamber.blk} | 0 ...phItemRoom.blk => RuinsOfAlphItemRoom.blk} | 0 ...amber.asm => RuinsOfAlphKabutoChamber.asm} | 26 ++--- ...Room.asm => RuinsOfAlphKabutoItemRoom.asm} | 26 ++--- ...Room.asm => RuinsOfAlphKabutoWordRoom.asm} | 4 +- ...Room.blk => RuinsOfAlphKabutoWordRoom.blk} | 0 ...mber.asm => RuinsOfAlphOmanyteChamber.asm} | 26 ++--- ...oom.asm => RuinsOfAlphOmanyteItemRoom.asm} | 26 ++--- ...oom.asm => RuinsOfAlphOmanyteWordRoom.asm} | 4 +- ...oom.blk => RuinsOfAlphOmanyteWordRoom.blk} | 0 ...AlphOutside.asm => RuinsOfAlphOutside.asm} | 16 +-- ...AlphOutside.blk => RuinsOfAlphOutside.blk} | 0 ...amber.blk => RuinsOfAlphPuzzleChamber.blk} | 0 ...nter.asm => RuinsOfAlphResearchCenter.asm} | 16 +-- ...nter.blk => RuinsOfAlphResearchCenter.blk} | 0 maps/blockdata_1.asm | 14 +-- maps/blockdata_2.asm | 30 ++--- maps/blockdata_3.asm | 42 +++---- maps/map_headers.asm | 46 ++++---- maps/second_map_headers.asm | 50 ++++---- wram.asm | 12 +- 67 files changed, 494 insertions(+), 494 deletions(-) rename maps/{BetaPokecenterMainHouse.blk => BetaPokeCenterMainHouse.blk} (100%) rename maps/{BetaPokecenterTradeStation.blk => BetaPokeCenterTradeStation.blk} (100%) rename maps/{BetaAlphRuinUnsolvedPuzzleRoom.blk => BetaRuinsOfAlphUnsolvedPuzzleRoom.blk} (100%) rename maps/{BetaSsAquaInsideCutOut.blk => BetaSSAquaInsideCutOut.blk} (100%) rename maps/{LakeofRage.asm => LakeOfRage.asm} (94%) rename maps/{LakeofRage.blk => LakeOfRage.blk} (100%) rename maps/{LakeofRageHiddenPowerHouse.asm => LakeOfRageHiddenPowerHouse.asm} (94%) rename maps/{LakeofRageMagikarpHouse.asm => LakeOfRageMagikarpHouse.asm} (98%) rename maps/{Route32RuinsofAlphGate.asm => Route32RuinsOfAlphGate.asm} (94%) rename maps/{Route35Goldenrodgate.asm => Route35GoldenrodGate.asm} (98%) rename maps/{Route35NationalParkgate.asm => Route35NationalParkGate.asm} (74%) rename maps/{Route35NationalParkgate.blk => Route35NationalParkGate.blk} (100%) rename maps/{Route36NationalParkgate.asm => Route36NationalParkGate.asm} (98%) rename maps/{Route36NationalParkgate.blk => Route36NationalParkGate.blk} (100%) rename maps/{Route36RuinsofAlphgate.asm => Route36RuinsOfAlphGate.asm} (93%) rename maps/{RuinsofAlphAerodactylChamber.asm => RuinsOfAlphAerodactylChamber.asm} (80%) rename maps/{RuinsofAlphAerodactylItemRoom.asm => RuinsOfAlphAerodactylItemRoom.asm} (66%) rename maps/{RuinsofAlphAerodactylWordRoom.asm => RuinsOfAlphAerodactylWordRoom.asm} (76%) rename maps/{RuinsofAlphAerodactylWordRoom.blk => RuinsOfAlphAerodactylWordRoom.blk} (100%) rename maps/{RuinsofAlphHoOhChamber.asm => RuinsOfAlphHoOhChamber.asm} (80%) rename maps/{RuinsofAlphHoOhItemRoom.asm => RuinsOfAlphHoOhItemRoom.asm} (65%) rename maps/{RuinsofAlphHoOhWordRoom.asm => RuinsOfAlphHoOhWordRoom.asm} (78%) rename maps/{RuinsofAlphHoOhWordRoom.blk => RuinsOfAlphHoOhWordRoom.blk} (100%) rename maps/{RuinsofAlphInnerChamber.asm => RuinsOfAlphInnerChamber.asm} (54%) rename maps/{RuinsofAlphInnerChamber.blk => RuinsOfAlphInnerChamber.blk} (100%) rename maps/{RuinsofAlphItemRoom.blk => RuinsOfAlphItemRoom.blk} (100%) rename maps/{RuinsofAlphKabutoChamber.asm => RuinsOfAlphKabutoChamber.asm} (89%) rename maps/{RuinsofAlphKabutoItemRoom.asm => RuinsOfAlphKabutoItemRoom.asm} (65%) rename maps/{RuinsofAlphKabutoWordRoom.asm => RuinsOfAlphKabutoWordRoom.asm} (77%) rename maps/{RuinsofAlphKabutoWordRoom.blk => RuinsOfAlphKabutoWordRoom.blk} (100%) rename maps/{RuinsofAlphOmanyteChamber.asm => RuinsOfAlphOmanyteChamber.asm} (80%) rename maps/{RuinsofAlphOmanyteItemRoom.asm => RuinsOfAlphOmanyteItemRoom.asm} (65%) rename maps/{RuinsofAlphOmanyteWordRoom.asm => RuinsOfAlphOmanyteWordRoom.asm} (77%) rename maps/{RuinsofAlphOmanyteWordRoom.blk => RuinsOfAlphOmanyteWordRoom.blk} (100%) rename maps/{RuinsofAlphOutside.asm => RuinsOfAlphOutside.asm} (94%) rename maps/{RuinsofAlphOutside.blk => RuinsOfAlphOutside.blk} (100%) rename maps/{RuinsofAlphPuzzleChamber.blk => RuinsOfAlphPuzzleChamber.blk} (100%) rename maps/{RuinsofAlphResearchCenter.asm => RuinsOfAlphResearchCenter.asm} (94%) rename maps/{RuinsofAlphResearchCenter.blk => RuinsOfAlphResearchCenter.blk} (100%) diff --git a/audio/sfx.asm b/audio/sfx.asm index 0a13717e2..7347bc84f 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1211,16 +1211,16 @@ Sfx_3RdPlace_Ch7: ; f0e56 togglesfx -Sfx_GetEggFromDaycareLady: ; f0e66 -Sfx_GetEggFromDaycareMan: ; f0e66 - musicheader 4, 5, Sfx_GetEggFromDaycareLady_Ch5 - musicheader 1, 6, Sfx_GetEggFromDaycareLady_Ch6 - musicheader 1, 7, Sfx_GetEggFromDaycareLady_Ch7 - musicheader 1, 8, Sfx_GetEggFromDaycareLady_Ch8 +Sfx_GetEggFromDayCareLady: ; f0e66 +Sfx_GetEggFromDayCareMan: ; f0e66 + musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5 + musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6 + musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7 + musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8 ; f0e72 -Sfx_GetEggFromDaycareLady_Ch5: ; f0e72 -Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 +Sfx_GetEggFromDayCareLady_Ch5: ; f0e72 +Sfx_GetEggFromDayCareMan_Ch5: ; f0e72 togglesfx tempo 120 volume $77 @@ -1253,8 +1253,8 @@ Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 togglesfx -Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b -Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b +Sfx_GetEggFromDayCareLady_Ch6: ; f0e9b +Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b togglesfx vibrato $12, $34 dutycycle $3 @@ -1284,8 +1284,8 @@ Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b togglesfx -Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe -Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe +Sfx_GetEggFromDayCareLady_Ch7: ; f0ebe +Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe togglesfx notetype $8, $25 note __, 2 @@ -1305,8 +1305,8 @@ Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe togglesfx -Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0 -Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareLady_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0 togglesfx sfxtogglenoise $4 notetype $8 diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 270d4f94e..2c9f299fc 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -148,8 +148,8 @@ dba Sfx_Fanfare2 dba Sfx_RegisterPhoneNumber dba Sfx_3RdPlace - dba Sfx_GetEggFromDaycareMan - dba Sfx_GetEggFromDaycareLady + dba Sfx_GetEggFromDayCareMan + dba Sfx_GetEggFromDayCareLady dba Sfx_MoveDeleted dba Sfx_2ndPlace dba Sfx_1stPlace diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 080939f2c..19f0891a0 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -6,11 +6,11 @@ const ENGINE_PHONE_CARD const ENGINE_EXPN_CARD const ENGINE_POKEGEAR -; wDaycareMan - const ENGINE_DAYCARE_MAN_HAS_EGG - const ENGINE_DAYCARE_MAN_HAS_MON -; wDaycareLady - const ENGINE_DAYCARE_LADY_HAS_MON +; wDayCareMan + const ENGINE_DAY_CARE_MAN_HAS_EGG + const ENGINE_DAY_CARE_MAN_HAS_MON +; wDayCareLady + const ENGINE_DAY_CARE_LADY_HAS_MON ; wMomSavingMoney const ENGINE_MOM_SAVING_MONEY const ENGINE_DST diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 8ec4f46d5..d1aa43610 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1836,10 +1836,10 @@ const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 const EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM const EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM - const EVENT_DAYCARE_MAN_IN_DAYCARE - const EVENT_DAYCARE_MAN_ON_ROUTE_34 - const EVENT_DAYCARE_MON_1 - const EVENT_DAYCARE_MON_2 + const EVENT_DAY_CARE_MAN_IN_DAY_CARE + const EVENT_DAY_CARE_MAN_ON_ROUTE_34 + const EVENT_DAY_CARE_MON_1 + const EVENT_DAY_CARE_MON_2 const EVENT_ILEX_FOREST_FARFETCHD const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER const EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS diff --git a/constants/map_constants.asm b/constants/map_constants.asm index b1b78551c..58dcf993f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -253,7 +253,7 @@ MAP_NONE EQU 0 mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 - mapgroup DAYCARE, 4, 5 ; 24 + mapgroup DAY_CARE, 4, 5 ; 24 newgroup ; 12 diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index f54235049..0dee70793 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -150,8 +150,8 @@ const SFX_FANFARE_2 ; 92 const SFX_REGISTER_PHONE_NUMBER ; 93 const SFX_3RD_PLACE ; 94 - const SFX_GET_EGG_FROM_DAYCARE_MAN ; 95 - const SFX_GET_EGG_FROM_DAYCARE_LADY ; 96 + const SFX_GET_EGG_FROM_DAY_CARE_MAN ; 95 + const SFX_GET_EGG_FROM_DAY_CARE_LADY ; 96 const SFX_MOVE_DELETED ; 97 const SFX_2ND_PLACE ; 98 const SFX_1ST_PLACE ; 99 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 8dc63402a..b0e20fd15 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -146,8 +146,8 @@ SPRITE_POKEMON EQU const_value ; special GetMonSprite values (see engine/overworld.asm) const_value SET $e0 - const SPRITE_DAYCARE_MON_1 ; e0 - const SPRITE_DAYCARE_MON_2 ; e1 + const SPRITE_DAY_CARE_MON_1 ; e0 + const SPRITE_DAY_CARE_MON_2 ; e1 ; VariableSprites indexes (see wram.asm) const_value SET $f0 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 5bb1013ac..424595ec4 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -95,13 +95,13 @@ NUM_OBJECT_STRUCTS EQU 13 ; After-Champion Spawn SPAWN_LANCE EQU 1 -SPAWN_RED EQU 2 +SPAWN_RED EQU 2 ; wPokemonWithdrawDepositParameter -PC_WITHDRAW EQU 0 -PC_DEPOSIT EQU 1 -DAYCARE_WITHDRAW EQU 2 -DAYCARE_DEPOSIT EQU 3 +PC_WITHDRAW EQU 0 +PC_DEPOSIT EQU 1 +DAY_CARE_WITHDRAW EQU 2 +DAY_CARE_DEPOSIT EQU 3 ; wCurrentDexMode const_def diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 5051083b2..b402f99f1 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -888,7 +888,7 @@ Special_DayCareMon1: ; 17421 call PrintText ld a, [wBreedMon1Species] call PlayCry - ld a, [wDaycareLady] + ld a, [wDayCareLady] bit 0, a jr z, DayCareMonCursor call ButtonSound @@ -901,7 +901,7 @@ Special_DayCareMon2: ; 17440 call PrintText ld a, [wBreedMon2Species] call PlayCry - ld a, [wDaycareMan] + ld a, [wDayCareMan] bit 0, a jr z, DayCareMonCursor call ButtonSound diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 3bca8dd87..943735ca6 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -97,13 +97,13 @@ ENDM engine_flag wPokegearFlags, 3 ; expn card engine_flag wPokegearFlags, 7 ; on/off - ; wDaycareMan, 7 ; daycare 1 on - engine_flag wDaycareMan, 6 ; egg is ready - ; wDaycareMan, 5 ; monster 1 and 2 are compatible - engine_flag wDaycareMan, 0 ; monster 1 in daycare + ; wDayCareMan, 7 ; day-care 1 on + engine_flag wDayCareMan, 6 ; egg is ready + ; wDayCareMan, 5 ; monster 1 and 2 are compatible + engine_flag wDayCareMan, 0 ; monster 1 in day-care - ; wDaycareLady, 7 = daycare 2 on - engine_flag wDaycareLady, 0 ; monster 2 in daycare + ; wDayCareLady, 7 = day-care 2 on + engine_flag wDayCareLady, 0 ; monster 2 in day-care engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 engine_flag wMomSavingMoney, 7 ; dst diff --git a/engine/events.asm b/engine/events.asm index b8d57118e..b78010d1d 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -964,7 +964,7 @@ CountStep: ; 96b79 .skip_egg ; Increase the EXP of (both) DayCare Pokemon by 1. - callba DaycareStep + callba DayCareStep ; Every four steps, deal damage to all Poisoned Pokemon ld hl, PoisonStepCount diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 21b6994ac..2a5baac50 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -446,9 +446,9 @@ SentGetPkmnIntoFromBox: ; db3f ld a, [wPokemonWithdrawDepositParameter] and a jr z, .check_IfPartyIsFull - cp DAYCARE_WITHDRAW + cp DAY_CARE_WITHDRAW jr z, .check_IfPartyIsFull - cp DAYCARE_DEPOSIT + cp DAY_CARE_DEPOSIT ld hl, wBreedMon1Species jr z, .breedmon @@ -473,7 +473,7 @@ SentGetPkmnIntoFromBox: ; db3f ld b, 0 add hl, bc ld a, [wPokemonWithdrawDepositParameter] - cp DAYCARE_WITHDRAW + cp DAY_CARE_WITHDRAW ld a, [wBreedMon1Species] jr z, .okay1 ld a, [CurPartySpecies] @@ -504,7 +504,7 @@ SentGetPkmnIntoFromBox: ; db3f ld hl, sBoxMon1Species ld bc, BOXMON_STRUCT_LENGTH jr z, .okay3 - cp DAYCARE_WITHDRAW + cp DAY_CARE_WITHDRAW ld hl, wBreedMon1Species jr z, .okay4 ld hl, PartyMon1Species @@ -518,7 +518,7 @@ SentGetPkmnIntoFromBox: ; db3f ld bc, BOXMON_STRUCT_LENGTH call CopyBytes ld a, [wPokemonWithdrawDepositParameter] - cp DAYCARE_DEPOSIT + cp DAY_CARE_DEPOSIT ld de, wBreedMon1OT jr z, .okay5 dec a @@ -540,7 +540,7 @@ SentGetPkmnIntoFromBox: ; db3f and a jr z, .okay7 ld hl, wBreedMon1OT - cp DAYCARE_WITHDRAW + cp DAY_CARE_WITHDRAW jr z, .okay8 ld hl, PartyMonOT @@ -552,7 +552,7 @@ SentGetPkmnIntoFromBox: ; db3f ld bc, NAME_LENGTH call CopyBytes ld a, [wPokemonWithdrawDepositParameter] - cp DAYCARE_DEPOSIT + cp DAY_CARE_DEPOSIT ld de, wBreedMon1Nick jr z, .okay9 dec a @@ -574,7 +574,7 @@ SentGetPkmnIntoFromBox: ; db3f and a jr z, .okay11 ld hl, wBreedMon1Nick - cp DAYCARE_WITHDRAW + cp DAY_CARE_WITHDRAW jr z, .okay12 ld hl, PartyMonNicknames @@ -590,7 +590,7 @@ SentGetPkmnIntoFromBox: ; db3f ld a, [wPokemonWithdrawDepositParameter] cp PC_DEPOSIT jr z, .took_out_of_box - cp DAYCARE_DEPOSIT + cp DAY_CARE_DEPOSIT jp z, .CloseSRAM_And_ClearCarryFlag push hl @@ -732,7 +732,7 @@ RestorePPofDepositedPokemon: ; dcb6 ret ; dd21 -RetrievePokemonFromDaycareMan: ; dd21 +RetrievePokemonFromDayCareMan: ; dd21 ld a, [wBreedMon1Species] ld [CurPartySpecies], a ld de, SFX_TRANSACTION @@ -748,7 +748,7 @@ RetrievePokemonFromDaycareMan: ; dd21 jp Functiondd64 ; dd42 -RetrievePokemonFromDaycareLady: ; dd42 +RetrievePokemonFromDayCareLady: ; dd42 ld a, [wBreedMon2Species] ld [CurPartySpecies], a ld de, SFX_TRANSACTION @@ -872,7 +872,7 @@ Functionde1a: ; de1a ret ; de2a -DepositMonWithDaycareMan: ; de2a +DepositMonWithDayCareMan: ; de2a ld de, wBreedMon1Nick call DepositBreedmon xor a @@ -880,7 +880,7 @@ DepositMonWithDaycareMan: ; de2a jp RemoveMonFromPartyOrBox ; de37 -DepositMonWithDaycareLady: ; de37 +DepositMonWithDayCareLady: ; de37 ld de, wBreedMon2Nick call DepositBreedmon xor a diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 01631d051..fa1be880e 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -40,7 +40,7 @@ NPCTrade:: ; fcba8 ; Select givemon from party ld b, PARTYMENUACTION_GIVE_MON - callba SelectTradeOrDaycareMon + callba SelectTradeOrDayCareMon ld a, TRADE_CANCEL jr c, .done diff --git a/engine/overworld.asm b/engine/overworld.asm index 5bbd70a85..1a49b1bfc 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -232,9 +232,9 @@ GetMonSprite: ; 14259 cp SPRITE_POKEMON jr c, .Normal - cp SPRITE_DAYCARE_MON_1 + cp SPRITE_DAY_CARE_MON_1 jr z, .wBreedMon1 - cp SPRITE_DAYCARE_MON_2 + cp SPRITE_DAY_CARE_MON_2 jr z, .wBreedMon2 cp SPRITE_VARS jr nc, .Variable @@ -1270,11 +1270,11 @@ Group11Sprites: ; 14673 db SPRITE_YOUNGSTER db SPRITE_OFFICER db SPRITE_POKEFAN_M - db SPRITE_DAYCARE_MON_1 + db SPRITE_DAY_CARE_MON_1 db SPRITE_COOLTRAINER_F db SPRITE_ROCKET db SPRITE_LASS - db SPRITE_DAYCARE_MON_2 + db SPRITE_DAY_CARE_MON_2 db SPRITE_FRUIT_TREE db SPRITE_SLOWPOKE ; 1468a diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 266451c37..94b0bb0a2 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -13,7 +13,7 @@ SelectMonFromParty: ; 50000 ; 5001d -SelectTradeOrDaycareMon: ; 5001d +SelectTradeOrDayCareMon: ; 5001d ld a, b ld [PartyMenuActionText], a call DisableSpriteUpdates diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 4b69a4de1..629f16fc0 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -1786,7 +1786,7 @@ ReceiveItemScript: ; 0xbcdb9 ReceiveTogepiEggScript: ; 0xbcdc3 waitsfx farwritetext ReceivedItemText - playsound SFX_GET_EGG_FROM_DAYCARE_LADY + playsound SFX_GET_EGG_FROM_DAY_CARE_LADY waitsfx end ; 0xbcdcd diff --git a/event/daycare.asm b/event/daycare.asm index b521deeff..128cf674a 100755 --- a/event/daycare.asm +++ b/event/daycare.asm @@ -21,17 +21,17 @@ const DAYCARETEXT_13 Special_DayCareMan: ; 166d6 - ld hl, wDaycareMan + ld hl, wDayCareMan bit 0, [hl] jr nz, .AskWithdrawMon - ld hl, wDaycareMan + ld hl, wDayCareMan ld a, DAYCARETEXT_MAN_INTRO call DayCareManIntroText jr c, .cancel call DayCareAskDepositPokemon jr c, .print_text - callba DepositMonWithDaycareMan - ld hl, wDaycareMan + callba DepositMonWithDayCareMan + ld hl, wDayCareMan set 0, [hl] call DayCare_DepositPokemonText call DayCare_InitBreeding @@ -43,9 +43,9 @@ Special_DayCareMan: ; 166d6 call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - callba RetrievePokemonFromDaycareMan + callba RetrievePokemonFromDayCareMan call DayCare_TakeMoney_PlayCry - ld hl, wDaycareMan + ld hl, wDayCareMan res 0, [hl] res 5, [hl] jr .cancel @@ -60,17 +60,17 @@ Special_DayCareMan: ; 166d6 ; 1672a Special_DayCareLady: ; 1672a - ld hl, wDaycareLady + ld hl, wDayCareLady bit 0, [hl] jr nz, .AskWithdrawMon - ld hl, wDaycareLady + ld hl, wDayCareLady ld a, DAYCARETEXT_LADY_INTRO call DayCareLadyIntroText jr c, .cancel call DayCareAskDepositPokemon jr c, .print_text - callba DepositMonWithDaycareLady - ld hl, wDaycareLady + callba DepositMonWithDayCareLady + ld hl, wDayCareLady set 0, [hl] call DayCare_DepositPokemonText call DayCare_InitBreeding @@ -82,11 +82,11 @@ Special_DayCareLady: ; 1672a call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - callba RetrievePokemonFromDaycareLady + callba RetrievePokemonFromDayCareLady call DayCare_TakeMoney_PlayCry - ld hl, wDaycareLady + ld hl, wDayCareLady res 0, [hl] - ld hl, wDaycareMan + ld hl, wDayCareMan res 5, [hl] jr .cancel @@ -124,7 +124,7 @@ DayCareAskDepositPokemon: ; 16798 ld a, DAYCARETEXT_WHICH_ONE call PrintDayCareText ld b, PARTYMENUACTION_GIVE_MON - callba SelectTradeOrDaycareMon + callba SelectTradeOrDayCareMon jr c, .Declined ld a, [CurPartySpecies] cp EGG @@ -426,7 +426,7 @@ PrintDayCareText: ; 1689b ; 0x16936 Special_DayCareManOutside: ; 16936 - ld hl, wDaycareMan + ld hl, wDayCareMan bit 6, [hl] jr nz, .AskGiveEgg ld hl, .NotYet @@ -448,12 +448,12 @@ Special_DayCareManOutside: ; 16936 cp PARTY_LENGTH jr nc, .PartyFull call DayCare_GiveEgg - ld hl, wDaycareMan + ld hl, wDayCareMan res 6, [hl] call DayCare_InitBreeding ld hl, .GotEggText call PrintText - ld de, SFX_GET_EGG_FROM_DAYCARE_LADY + ld de, SFX_GET_EGG_FROM_DAY_CARE_LADY call PlaySFX ld c, 120 call DelayFrames @@ -590,10 +590,10 @@ DayCare_GetCurrentPartyMember: ; 16a31 ; 16a3b DayCare_InitBreeding: ; 16a3b - ld a, [wDaycareLady] + ld a, [wDayCareLady] bit 0, a ret z - ld a, [wDaycareMan] + ld a, [wDayCareMan] bit 0, a ret z callab CheckBreedmonCompatibility @@ -602,7 +602,7 @@ DayCare_InitBreeding: ; 16a3b ret z inc a ret z - ld hl, wDaycareMan + ld hl, wDayCareMan set 5, [hl] .loop call Random diff --git a/event/happiness_egg.asm b/event/happiness_egg.asm index e7eece7c8..7588108bf 100755 --- a/event/happiness_egg.asm +++ b/event/happiness_egg.asm @@ -158,31 +158,31 @@ StepHappiness:: ; 725a jr nz, .loop ret -DaycareStep:: ; 7282 +DayCareStep:: ; 7282 - ld a, [wDaycareMan] + ld a, [wDayCareMan] bit 0, a - jr z, .daycare_lady + jr z, .day_care_lady ld a, [wBreedMon1Level] ; level cp 100 - jr nc, .daycare_lady + jr nc, .day_care_lady ld hl, wBreedMon1Exp + 2 ; exp inc [hl] - jr nz, .daycare_lady + jr nz, .day_care_lady dec hl inc [hl] - jr nz, .daycare_lady + jr nz, .day_care_lady dec hl inc [hl] ld a, [hl] cp 5242880 / $10000 - jr c, .daycare_lady + jr c, .day_care_lady ld a, 5242880 / $10000 ld [hl], a -.daycare_lady - ld a, [wDaycareLady] +.day_care_lady + ld a, [wDayCareLady] bit 0, a jr z, .check_egg @@ -204,7 +204,7 @@ DaycareStep:: ; 7282 ld [hl], a .check_egg - ld hl, wDaycareMan + ld hl, wDayCareMan bit 5, [hl] ; egg ret z ld hl, wStepsToEgg @@ -232,7 +232,7 @@ DaycareStep:: ; 7282 call Random cp b ret nc - ld hl, wDaycareMan + ld hl, wDayCareMan res 5, [hl] set 6, [hl] ret diff --git a/event/unown.asm b/event/unown.asm index 6b65877f9..c30c06bfc 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -61,10 +61,10 @@ SpecialAerodactylChamber: ; 8ae30 call GetSecondaryMapHeaderPointer ld a, h - cp RuinsofAlphAerodactylChamber_SecondMapHeader / $100 + cp RuinsOfAlphAerodactylChamber_SecondMapHeader / $100 jr nz, .nope ld a, l - cp RuinsofAlphAerodactylChamber_SecondMapHeader % $100 + cp RuinsOfAlphAerodactylChamber_SecondMapHeader % $100 jr nz, .nope ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER @@ -89,10 +89,10 @@ SpecialKabutoChamber: ; 8ae4e call GetSecondaryMapHeaderPointer ld a, h - cp RuinsofAlphKabutoChamber_SecondMapHeader / $100 + cp RuinsOfAlphKabutoChamber_SecondMapHeader / $100 jr nz, .done ld a, l - cp RuinsofAlphKabutoChamber_SecondMapHeader % $100 + cp RuinsOfAlphKabutoChamber_SecondMapHeader % $100 jr nz, .done ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER diff --git a/maps.asm b/maps.asm index f4957b920..5ca9cf0d5 100644 --- a/maps.asm +++ b/maps.asm @@ -47,21 +47,21 @@ INCLUDE "maps/GoldenrodGameCorner.asm" SECTION "Map Scripts 2", ROMX -INCLUDE "maps/RuinsofAlphOutside.asm" -INCLUDE "maps/RuinsofAlphHoOhChamber.asm" -INCLUDE "maps/RuinsofAlphKabutoChamber.asm" -INCLUDE "maps/RuinsofAlphOmanyteChamber.asm" -INCLUDE "maps/RuinsofAlphAerodactylChamber.asm" -INCLUDE "maps/RuinsofAlphInnerChamber.asm" -INCLUDE "maps/RuinsofAlphResearchCenter.asm" -INCLUDE "maps/RuinsofAlphHoOhItemRoom.asm" -INCLUDE "maps/RuinsofAlphKabutoItemRoom.asm" -INCLUDE "maps/RuinsofAlphOmanyteItemRoom.asm" -INCLUDE "maps/RuinsofAlphAerodactylItemRoom.asm" -INCLUDE "maps/RuinsofAlphHoOhWordRoom.asm" -INCLUDE "maps/RuinsofAlphKabutoWordRoom.asm" -INCLUDE "maps/RuinsofAlphOmanyteWordRoom.asm" -INCLUDE "maps/RuinsofAlphAerodactylWordRoom.asm" +INCLUDE "maps/RuinsOfAlphOutside.asm" +INCLUDE "maps/RuinsOfAlphHoOhChamber.asm" +INCLUDE "maps/RuinsOfAlphKabutoChamber.asm" +INCLUDE "maps/RuinsOfAlphOmanyteChamber.asm" +INCLUDE "maps/RuinsOfAlphAerodactylChamber.asm" +INCLUDE "maps/RuinsOfAlphInnerChamber.asm" +INCLUDE "maps/RuinsOfAlphResearchCenter.asm" +INCLUDE "maps/RuinsOfAlphHoOhItemRoom.asm" +INCLUDE "maps/RuinsOfAlphKabutoItemRoom.asm" +INCLUDE "maps/RuinsOfAlphOmanyteItemRoom.asm" +INCLUDE "maps/RuinsOfAlphAerodactylItemRoom.asm" +INCLUDE "maps/RuinsOfAlphHoOhWordRoom.asm" +INCLUDE "maps/RuinsOfAlphKabutoWordRoom.asm" +INCLUDE "maps/RuinsOfAlphOmanyteWordRoom.asm" +INCLUDE "maps/RuinsOfAlphAerodactylWordRoom.asm" INCLUDE "maps/UnionCave1F.asm" INCLUDE "maps/UnionCaveB1F.asm" INCLUDE "maps/UnionCaveB2F.asm" @@ -104,12 +104,12 @@ INCLUDE "maps/EarlsPokemonAcademy.asm" INCLUDE "maps/VioletNicknameSpeechHouse.asm" INCLUDE "maps/VioletPokeCenter1F.asm" INCLUDE "maps/VioletOnixTradeHouse.asm" -INCLUDE "maps/Route32RuinsofAlphGate.asm" +INCLUDE "maps/Route32RuinsOfAlphGate.asm" INCLUDE "maps/Route32PokeCenter1F.asm" -INCLUDE "maps/Route35Goldenrodgate.asm" -INCLUDE "maps/Route35NationalParkgate.asm" -INCLUDE "maps/Route36RuinsofAlphgate.asm" -INCLUDE "maps/Route36NationalParkgate.asm" +INCLUDE "maps/Route35GoldenrodGate.asm" +INCLUDE "maps/Route35NationalParkGate.asm" +INCLUDE "maps/Route36RuinsOfAlphGate.asm" +INCLUDE "maps/Route36NationalParkGate.asm" SECTION "Map Scripts 6", ROMX @@ -124,7 +124,7 @@ INCLUDE "maps/IlexForest.asm" SECTION "Map Scripts 7", ROMX -INCLUDE "maps/LakeofRage.asm" +INCLUDE "maps/LakeOfRage.asm" INCLUDE "maps/CeladonDeptStore1F.asm" INCLUDE "maps/CeladonDeptStore2F.asm" INCLUDE "maps/CeladonDeptStore3F.asm" @@ -411,8 +411,8 @@ INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm" INCLUDE "maps/MahoganyGym.asm" INCLUDE "maps/MahoganyPokeCenter1F.asm" INCLUDE "maps/Route42EcruteakGate.asm" -INCLUDE "maps/LakeofRageHiddenPowerHouse.asm" -INCLUDE "maps/LakeofRageMagikarpHouse.asm" +INCLUDE "maps/LakeOfRageHiddenPowerHouse.asm" +INCLUDE "maps/LakeOfRageMagikarpHouse.asm" INCLUDE "maps/Route43MahoganyGate.asm" INCLUDE "maps/Route43Gate.asm" INCLUDE "maps/RedsHouse1F.asm" diff --git a/maps/BetaPokecenterMainHouse.blk b/maps/BetaPokeCenterMainHouse.blk similarity index 100% rename from maps/BetaPokecenterMainHouse.blk rename to maps/BetaPokeCenterMainHouse.blk diff --git a/maps/BetaPokecenterTradeStation.blk b/maps/BetaPokeCenterTradeStation.blk similarity index 100% rename from maps/BetaPokecenterTradeStation.blk rename to maps/BetaPokeCenterTradeStation.blk diff --git a/maps/BetaAlphRuinUnsolvedPuzzleRoom.blk b/maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk similarity index 100% rename from maps/BetaAlphRuinUnsolvedPuzzleRoom.blk rename to maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk diff --git a/maps/BetaSsAquaInsideCutOut.blk b/maps/BetaSSAquaInsideCutOut.blk similarity index 100% rename from maps/BetaSsAquaInsideCutOut.blk rename to maps/BetaSSAquaInsideCutOut.blk diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 1eb84e034..8f2f6e5ac 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -14,15 +14,15 @@ DayCare_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: - checkflag ENGINE_DAYCARE_MAN_HAS_EGG - iftrue .PutDaycareManOutside - clearevent EVENT_DAYCARE_MAN_IN_DAYCARE - setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 + checkflag ENGINE_DAY_CARE_MAN_HAS_EGG + iftrue .PutDayCareManOutside + clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 return -.PutDaycareManOutside: - setevent EVENT_DAYCARE_MAN_IN_DAYCARE - clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 +.PutDayCareManOutside: + setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 return DayCareManScript_Inside: @@ -62,7 +62,7 @@ DayCareManScript_Inside: DayCareLadyScript: faceplayer opentext - checkflag ENGINE_DAYCARE_MAN_HAS_EGG + checkflag ENGINE_DAY_CARE_MAN_HAS_EGG iftrue .HusbandWasLookingForYou special Special_DayCareLady waitbutton @@ -179,5 +179,5 @@ DayCare_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAYCARE_MAN_IN_DAYCARE + person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/LakeofRage.asm b/maps/LakeOfRage.asm similarity index 94% rename from maps/LakeofRage.asm rename to maps/LakeOfRage.asm index 6f2a356b6..d741ec62e 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeOfRage.asm @@ -12,7 +12,7 @@ const_value set 2 const LAKEOFRAGE_POKE_BALL1 const LAKEOFRAGE_POKE_BALL2 -LakeofRage_MapScriptHeader: +LakeOfRage_MapScriptHeader: .MapTriggers: db 2 @@ -132,10 +132,10 @@ SuperNerdScript_0x700a2: CooltrainerFScript_0x700a5: jumptextfaceplayer UnknownText_0x704bb -MapLakeofRageSignpost0Script: +MapLakeOfRageSignpost0Script: jumptext UnknownText_0x708d7 -MapLakeofRageSignpost1Script: +MapLakeOfRageSignpost1Script: opentext writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT @@ -230,21 +230,21 @@ WesleyNotWednesdayScript: closetext end -LakeofRageElixer: +LakeOfRageElixer: itemball ELIXER -LakeofRageTMDetect: +LakeOfRageTMDetect: itemball TM_DETECT -LakeofRageHiddenFullRestore: +LakeOfRageHiddenFullRestore: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE -LakeofRageHiddenRareCandy: +LakeOfRageHiddenRareCandy: dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY -LakeofRageHiddenMaxPotion: +LakeOfRageHiddenMaxPotion: dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION @@ -501,7 +501,7 @@ UnknownText_0x70903: line "HOUSE" done -LakeofRage_MapEventHeader: +LakeOfRage_MapEventHeader: ; filler db 0, 0 @@ -515,11 +515,11 @@ LakeofRage_MapEventHeader: .Signposts: db 5 - signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script - signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEM, LakeofRageHiddenFullRestore - signpost 4, 4, SIGNPOST_ITEM, LakeofRageHiddenRareCandy - signpost 5, 35, SIGNPOST_ITEM, LakeofRageHiddenMaxPotion + signpost 27, 21, SIGNPOST_READ, MapLakeOfRageSignpost0Script + signpost 31, 25, SIGNPOST_READ, MapLakeOfRageSignpost1Script + signpost 28, 11, SIGNPOST_ITEM, LakeOfRageHiddenFullRestore + signpost 4, 4, SIGNPOST_ITEM, LakeOfRageHiddenRareCandy + signpost 5, 35, SIGNPOST_ITEM, LakeOfRageHiddenMaxPotion .PersonEvents: db 12 @@ -533,5 +533,5 @@ LakeofRage_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY - person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageElixer, EVENT_LAKE_OF_RAGE_ELIXER - person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeofRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT + person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER + person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeofRage.blk b/maps/LakeOfRage.blk similarity index 100% rename from maps/LakeofRage.blk rename to maps/LakeOfRage.blk diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm similarity index 94% rename from maps/LakeofRageHiddenPowerHouse.asm rename to maps/LakeOfRageHiddenPowerHouse.asm index 74e3b3062..0e8825e72 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER -LakeofRageHiddenPowerHouse_MapScriptHeader: +LakeOfRageHiddenPowerHouse_MapScriptHeader: .MapTriggers: db 0 @@ -67,7 +67,7 @@ HiddenPowerGuyText3: text "I am meditating…" done -LakeofRageHiddenPowerHouse_MapEventHeader: +LakeOfRageHiddenPowerHouse_MapEventHeader: ; filler db 0, 0 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm similarity index 98% rename from maps/LakeofRageMagikarpHouse.asm rename to maps/LakeOfRageMagikarpHouse.asm index 417af28d4..8c83a554a 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,7 +1,7 @@ const_value set 2 const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU -LakeofRageMagikarpHouse_MapScriptHeader: +LakeOfRageMagikarpHouse_MapScriptHeader: .MapTriggers: db 0 @@ -205,7 +205,7 @@ UnknownText_0x19aabc: text_from_ram StringBuffer4 db "@@" -LakeofRageMagikarpHouse_MapEventHeader: +LakeOfRageMagikarpHouse_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm similarity index 94% rename from maps/Route32RuinsofAlphGate.asm rename to maps/Route32RuinsOfAlphGate.asm index 404bb1a5f..efce725b2 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER -Route32RuinsofAlphGate_MapScriptHeader: +Route32RuinsOfAlphGate_MapScriptHeader: .MapTriggers: db 0 @@ -46,7 +46,7 @@ UnknownText_0x69abd: cont "what they are." done -Route32RuinsofAlphGate_MapEventHeader: +Route32RuinsOfAlphGate_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Route34.asm b/maps/Route34.asm index 607de8968..7aa242199 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -6,8 +6,8 @@ const_value set 2 const ROUTE34_OFFICER const ROUTE34_POKEFAN_M const ROUTE34_GRAMPS - const ROUTE34_DAYCARE_MON_1 - const ROUTE34_DAYCARE_MON_2 + const ROUTE34_DAY_CARE_MON_1 + const ROUTE34_DAY_CARE_MON_2 const ROUTE34_COOLTRAINER_F1 const ROUTE34_COOLTRAINER_F2 const ROUTE34_COOLTRAINER_F3 @@ -25,35 +25,35 @@ Route34_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: - checkflag ENGINE_DAYCARE_MAN_HAS_EGG - iftrue .PutDaycareManOutside - clearevent EVENT_DAYCARE_MAN_IN_DAYCARE - setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 + checkflag ENGINE_DAY_CARE_MAN_HAS_EGG + iftrue .PutDayCareManOutside + clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 jump .CheckMon1 -.PutDaycareManOutside: - setevent EVENT_DAYCARE_MAN_IN_DAYCARE - clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 +.PutDayCareManOutside: + setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE + clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 jump .CheckMon1 .CheckMon1: - checkflag ENGINE_DAYCARE_MAN_HAS_MON + checkflag ENGINE_DAY_CARE_MAN_HAS_MON iffalse .HideMon1 - clearevent EVENT_DAYCARE_MON_1 + clearevent EVENT_DAY_CARE_MON_1 jump .CheckMon2 .HideMon1: - setevent EVENT_DAYCARE_MON_1 + setevent EVENT_DAY_CARE_MON_1 jump .CheckMon2 .CheckMon2: - checkflag ENGINE_DAYCARE_LADY_HAS_MON + checkflag ENGINE_DAY_CARE_LADY_HAS_MON iffalse .HideMon2 - clearevent EVENT_DAYCARE_MON_2 + clearevent EVENT_DAY_CARE_MON_2 return .HideMon2: - setevent EVENT_DAYCARE_MON_2 + setevent EVENT_DAY_CARE_MON_2 return DayCareManScript_Outside: @@ -63,7 +63,7 @@ DayCareManScript_Outside: waitbutton closetext if_equal $1, .end_fail - clearflag ENGINE_DAYCARE_MAN_HAS_EGG + clearflag ENGINE_DAY_CARE_MAN_HAS_EGG checkcode VAR_FACING if_equal RIGHT, .walk_around_player applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside @@ -78,13 +78,13 @@ DayCareManScript_Outside: disappear ROUTE34_GRAMPS end -DaycareMon1Script: +DayCareMon1Script: opentext special Special_DayCareMon1 closetext end -DaycareMon2Script: +DayCareMon2Script: opentext special Special_DayCareMon2 closetext @@ -773,9 +773,9 @@ Route34_MapEventHeader: db 5 warp_def $25, $d, 1, ROUTE_34_ILEX_FOREST_GATE warp_def $25, $e, 2, ROUTE_34_ILEX_FOREST_GATE - warp_def $e, $b, 1, DAYCARE - warp_def $f, $b, 2, DAYCARE - warp_def $f, $d, 3, DAYCARE + warp_def $e, $b, 1, DAY_CARE + warp_def $f, $b, 2, DAY_CARE + warp_def $f, $d, 3, DAY_CARE .XYTriggers: db 0 @@ -796,9 +796,9 @@ Route34_MapEventHeader: person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1 person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAYCARE_MAN_ON_ROUTE_34 - person_event SPRITE_DAYCARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon1Script, EVENT_DAYCARE_MON_1 - person_event SPRITE_DAYCARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaycareMon2Script, EVENT_DAYCARE_MON_2 + person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 + person_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 + person_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35GoldenrodGate.asm similarity index 98% rename from maps/Route35Goldenrodgate.asm rename to maps/Route35GoldenrodGate.asm index 96d202f9d..0fd120473 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER -Route35Goldenrodgate_MapScriptHeader: +Route35GoldenrodGate_MapScriptHeader: .MapTriggers: db 0 @@ -195,7 +195,7 @@ UnknownText_0x6a0cb: line "different kinds." done -Route35Goldenrodgate_MapEventHeader: +Route35GoldenrodGate_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkGate.asm similarity index 74% rename from maps/Route35NationalParkgate.asm rename to maps/Route35NationalParkGate.asm index d2df78c46..bb88c55d6 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkGate.asm @@ -3,57 +3,57 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 -Route35NationalParkgate_MapScriptHeader: +Route35NationalParkGate_MapScriptHeader: .MapTriggers: db 3 ; triggers - dw Route35NationalParkgate_Trigger1, 0 - dw Route35NationalParkgate_Trigger2, 0 - dw Route35NationalParkgate_Trigger3, 0 + dw Route35NationalParkGate_Trigger1, 0 + dw Route35NationalParkGate_Trigger2, 0 + dw Route35NationalParkGate_Trigger3, 0 .MapCallbacks: db 2 ; callbacks - dbw MAPCALLBACK_NEWMAP, Route35NationalParkgate_CheckIfStillInContest + dbw MAPCALLBACK_NEWMAP, Route35NationalParkGate_CheckIfStillInContest - dbw MAPCALLBACK_OBJECTS, Route35NationalParkgate_CheckIfContestDay + dbw MAPCALLBACK_OBJECTS, Route35NationalParkGate_CheckIfContestDay -Route35NationalParkgate_Trigger1: +Route35NationalParkGate_Trigger1: end -Route35NationalParkgate_Trigger2: +Route35NationalParkGate_Trigger2: end -Route35NationalParkgate_Trigger3: +Route35NationalParkGate_Trigger3: priorityjump Route35NationalParkGate_LeavingContestEarly end -Route35NationalParkgate_CheckIfStillInContest: +Route35NationalParkGate_CheckIfStillInContest: checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkgate_Yes + iftrue Route35NationalParkGate_Yes dotrigger $0 return -Route35NationalParkgate_Yes: +Route35NationalParkGate_Yes: dotrigger $2 return -Route35NationalParkgate_CheckIfContestDay: +Route35NationalParkGate_CheckIfContestDay: checkcode VAR_WEEKDAY - if_equal TUESDAY, Route35NationalParkgate_IsContestDay - if_equal THURSDAY, Route35NationalParkgate_IsContestDay - if_equal SATURDAY, Route35NationalParkgate_IsContestDay + if_equal TUESDAY, Route35NationalParkGate_IsContestDay + if_equal THURSDAY, Route35NationalParkGate_IsContestDay + if_equal SATURDAY, Route35NationalParkGate_IsContestDay checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkgate_Yes + iftrue Route35NationalParkGate_Yes disappear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkgate_IsContestDay: +Route35NationalParkGate_IsContestDay: appear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_OFFICER2 @@ -68,17 +68,17 @@ Route35NationalParkGate_LeavingContestEarly: RAM2MEM $0 writetext UnknownText_0x6a79a yesorno - iffalse Route35NationalParkgate_GoBackIn + iffalse Route35NationalParkGate_GoBackIn writetext UnknownText_0x6a7db waitbutton closetext jumpstd bugcontestresultswarp -Route35NationalParkgate_GoBackIn: +Route35NationalParkGate_GoBackIn: writetext UnknownText_0x6a823 waitbutton closetext - scall Route35NationalParkgate_EnterContest + scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes waitsfx @@ -87,23 +87,23 @@ Route35NationalParkgate_GoBackIn: OfficerScript_0x6a204: checkcode VAR_WEEKDAY - if_equal SUNDAY, Route35NationalParkgate_NoContestToday - if_equal MONDAY, Route35NationalParkgate_NoContestToday - if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday - if_equal FRIDAY, Route35NationalParkgate_NoContestToday + if_equal SUNDAY, Route35NationalParkGate_NoContestToday + if_equal MONDAY, Route35NationalParkGate_NoContestToday + if_equal WEDNESDAY, Route35NationalParkGate_NoContestToday + if_equal FRIDAY, Route35NationalParkGate_NoContestToday faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST - iftrue Route35NationalParkgate_ContestIsOver - scall Route35NationalParkgate_GetDayOfWeek + iftrue Route35NationalParkGate_ContestIsOver + scall Route35NationalParkGate_GetDayOfWeek writetext UnknownText_0x6a2eb yesorno - iffalse Route35NationalParkgate_DeclinedToParticipate + iffalse Route35NationalParkGate_DeclinedToParticipate checkcode VAR_PARTYCOUNT - if_greater_than $1, Route35NationalParkgate_LeaveTheRestBehind + if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind special ContestDropOffMons clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER -Route35NationalParkgate_OkayToProceed: +Route35NationalParkGate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6a39d @@ -115,7 +115,7 @@ Route35NationalParkgate_OkayToProceed: waitbutton closetext special Special_GiveParkBalls - scall Route35NationalParkgate_EnterContest + scall Route35NationalParkGate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes waitsfx @@ -123,30 +123,30 @@ Route35NationalParkgate_OkayToProceed: warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end -Route35NationalParkgate_EnterContest: +Route35NationalParkGate_EnterContest: checkcode VAR_FACING - if_equal LEFT, Route35NationalParkgate_FacingLeft + if_equal LEFT, Route35NationalParkGate_FacingLeft applymovement PLAYER, MovementData_0x6a2e5 end -Route35NationalParkgate_FacingLeft: +Route35NationalParkGate_FacingLeft: applymovement PLAYER, MovementData_0x6a2e9 end -Route35NationalParkgate_LeaveTheRestBehind: +Route35NationalParkGate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than 6, Route35NationalParkgate_LessThanFullParty + if_less_than 6, Route35NationalParkGate_LessThanFullParty checkcode VAR_BOXSPACE - if_equal 0, Route35NationalParkgate_NoRoomInBox + if_equal 0, Route35NationalParkGate_NoRoomInBox -Route35NationalParkgate_LessThanFullParty: ; 6a27d +Route35NationalParkGate_LessThanFullParty: ; 6a27d special CheckFirstMonIsEgg - if_equal $1, Route35NationalParkgate_FirstMonIsEgg + if_equal $1, Route35NationalParkGate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno - iffalse Route35NationalParkgate_DeclinedToLeaveMonsBehind + iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind special ContestDropOffMons - iftrue Route35NationalParkgate_FirstMonIsFainted + iftrue Route35NationalParkGate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 buttonsound @@ -154,52 +154,52 @@ Route35NationalParkgate_LessThanFullParty: ; 6a27d playsound SFX_GOT_SAFARI_BALLS waitsfx buttonsound - jump Route35NationalParkgate_OkayToProceed + jump Route35NationalParkGate_OkayToProceed -Route35NationalParkgate_DeclinedToParticipate: +Route35NationalParkGate_DeclinedToParticipate: writetext UnknownText_0x6a5dc waitbutton closetext end -Route35NationalParkgate_DeclinedToLeaveMonsBehind: +Route35NationalParkGate_DeclinedToLeaveMonsBehind: writetext UnknownText_0x6a597 waitbutton closetext end -Route35NationalParkgate_FirstMonIsFainted: +Route35NationalParkGate_FirstMonIsFainted: writetext UnknownText_0x6a608 waitbutton closetext end -Route35NationalParkgate_NoRoomInBox: +Route35NationalParkGate_NoRoomInBox: writetext UnknownText_0x6a67c waitbutton closetext end -Route35NationalParkgate_FirstMonIsEgg: +Route35NationalParkGate_FirstMonIsEgg: writetext UnknownText_0x6a71f waitbutton closetext end -Route35NationalParkgate_ContestIsOver: +Route35NationalParkGate_ContestIsOver: writetext UnknownText_0x6a84f waitbutton closetext end -Route35NationalParkgate_NoContestToday: +Route35NationalParkGate_NoContestToday: jumptextfaceplayer UnknownText_0x6a894 OfficerScript_0x6a2ca: faceplayer opentext checkflag ENGINE_DAILY_BUG_CONTEST - iftrue Route35NationalParkgate_ContestIsOver + iftrue Route35NationalParkGate_ContestIsOver writetext UnknownText_0x6a894 waitbutton closetext @@ -208,10 +208,10 @@ OfficerScript_0x6a2ca: YoungsterScript_0x6a2d8: jumptextfaceplayer UnknownText_0x6a8d8 -MapRoute36NationalParkgateSignpost0Script: +MapRoute36NationalParkGateSignpost0Script: jumptext UnknownText_0x6a90e -Route35NationalParkgate_GetDayOfWeek: +Route35NationalParkGate_GetDayOfWeek: jumpstd daytotext end @@ -443,7 +443,7 @@ UnknownText_0x6a90e: line "the contest." done -Route35NationalParkgate_MapEventHeader: +Route35NationalParkGate_MapEventHeader: ; filler db 0, 0 @@ -459,7 +459,7 @@ Route35NationalParkgate_MapEventHeader: .Signposts: db 1 - signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script .PersonEvents: db 3 diff --git a/maps/Route35NationalParkgate.blk b/maps/Route35NationalParkGate.blk similarity index 100% rename from maps/Route35NationalParkgate.blk rename to maps/Route35NationalParkGate.blk diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkGate.asm similarity index 98% rename from maps/Route36NationalParkgate.asm rename to maps/Route36NationalParkGate.asm index d55cc48cf..a2cb753a1 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkGate.asm @@ -12,7 +12,7 @@ const_value set 2 const ROUTE36NATIONALPARKGATE_YOUNGSTER7 const ROUTE36NATIONALPARKGATE_OFFICER2 -Route36NationalParkgate_MapScriptHeader: +Route36NationalParkGate_MapScriptHeader: .MapTriggers: db 3 @@ -156,7 +156,7 @@ Route36OfficerScriptContest: opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded - scall Route36Parkgate_DayToText + scall Route36ParkGate_DayToText writetext UnknownText_0x6add5 yesorno iffalse .DecidedNotToJoinContest @@ -307,7 +307,7 @@ OfficerScript_0x6acf4: closetext end -Route36Parkgate_DayToText: +Route36ParkGate_DayToText: jumpstd daytotext end @@ -856,7 +856,7 @@ UnknownText_0x6b97f: cont "for you." done -Route36NationalParkgate_MapEventHeader: +Route36NationalParkGate_MapEventHeader: ; filler db 0, 0 @@ -872,7 +872,7 @@ Route36NationalParkgate_MapEventHeader: .Signposts: db 1 - signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script + signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script .PersonEvents: db 12 diff --git a/maps/Route36NationalParkgate.blk b/maps/Route36NationalParkGate.blk similarity index 100% rename from maps/Route36NationalParkgate.blk rename to maps/Route36NationalParkGate.blk diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsOfAlphGate.asm similarity index 93% rename from maps/Route36RuinsofAlphgate.asm rename to maps/Route36RuinsOfAlphGate.asm index 88ba737f4..b0bac8ca0 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -2,7 +2,7 @@ const_value set 2 const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS -Route36RuinsofAlphgate_MapScriptHeader: +Route36RuinsOfAlphGate_MapScriptHeader: .MapTriggers: db 0 @@ -34,7 +34,7 @@ UnknownText_0x6aa5b: line "RUINS OF ALPH." done -Route36RuinsofAlphgate_MapEventHeader: +Route36RuinsOfAlphGate_MapEventHeader: ; filler db 0, 0 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm similarity index 80% rename from maps/RuinsofAlphAerodactylChamber.asm rename to maps/RuinsOfAlphAerodactylChamber.asm index 2106a7504..f68d0302b 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,4 +1,4 @@ -RuinsofAlphAerodactylChamber_MapScriptHeader: +RuinsOfAlphAerodactylChamber_MapScriptHeader: .MapTriggers: db 2 @@ -52,7 +52,7 @@ UnknownScript_0x58dd3: closetext end -MapRuinsofAlphAerodactylChamberSignpost2Script: +MapRuinsOfAlphAerodactylChamberSignpost2Script: refreshscreen $0 writebyte $2 special Special_UnownPuzzle @@ -79,13 +79,13 @@ UnknownScript_0x58df7: warpcheck end -MapRuinsofAlphAerodactylChamberSignpost1Script: +MapRuinsOfAlphAerodactylChamberSignpost1Script: jumptext UnknownText_0x58ec2 -MapRuinsofAlphAerodactylChamberSignpost3Script: +MapRuinsOfAlphAerodactylChamberSignpost3Script: jumptext UnknownText_0x58ee7 -MapRuinsofAlphAerodactylChamberSignpost4Script: +MapRuinsOfAlphAerodactylChamberSignpost4Script: opentext writetext UnknownText_0x58e4f writebyte $1 @@ -93,7 +93,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: closetext end -MapRuinsofAlphAerodactylChamberSignpost5Script: +MapRuinsOfAlphAerodactylChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 opentext @@ -148,7 +148,7 @@ UnknownText_0x58ee7: line "fangs." done -RuinsofAlphAerodactylChamber_MapEventHeader: +RuinsOfAlphAerodactylChamber_MapEventHeader: ; filler db 0, 0 @@ -165,12 +165,12 @@ RuinsofAlphAerodactylChamber_MapEventHeader: .Signposts: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphAerodactylChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphAerodactylChamberSignpost5Script .PersonEvents: db 0 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm similarity index 66% rename from maps/RuinsofAlphAerodactylItemRoom.asm rename to maps/RuinsOfAlphAerodactylItemRoom.asm index 5f9d5c9f0..737249e1c 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -4,26 +4,26 @@ const_value set 2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 -RuinsofAlphAerodactylItemRoom_MapScriptHeader: +RuinsOfAlphAerodactylItemRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphAerodactylItemRoomGoldBerry: +RuinsOfAlphAerodactylItemRoomGoldBerry: itemball GOLD_BERRY -RuinsofAlphAerodactylItemRoomMoonStone: +RuinsOfAlphAerodactylItemRoomMoonStone: itemball MOON_STONE -RuinsofAlphAerodactylItemRoomHealPowder: +RuinsOfAlphAerodactylItemRoomHealPowder: itemball HEAL_POWDER -RuinsofAlphAerodactylItemRoomEnergyRoot: +RuinsOfAlphAerodactylItemRoomEnergyRoot: itemball ENERGY_ROOT -MapRuinsofAlphAerodactylItemRoomSignpost1Script: +MapRuinsOfAlphAerodactylItemRoomSignpost1Script: jumptext UnknownText_0x59ac1 UnknownText_0x59ac1: @@ -32,7 +32,7 @@ UnknownText_0x59ac1: cont "MON." done -RuinsofAlphAerodactylItemRoom_MapEventHeader: +RuinsOfAlphAerodactylItemRoom_MapEventHeader: ; filler db 0, 0 @@ -48,12 +48,12 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: .Signposts: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphAerodactylItemRoomSignpost1Script .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomMoonStone, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphAerodactylItemRoomEnergyRoot, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm similarity index 76% rename from maps/RuinsofAlphAerodactylWordRoom.asm rename to maps/RuinsOfAlphAerodactylWordRoom.asm index e79ca5c21..5178a960a 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphAerodactylWordRoom_MapScriptHeader: +RuinsOfAlphAerodactylWordRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphAerodactylWordRoom_MapEventHeader: +RuinsOfAlphAerodactylWordRoom_MapEventHeader: ; filler db 0, 0 diff --git a/maps/RuinsofAlphAerodactylWordRoom.blk b/maps/RuinsOfAlphAerodactylWordRoom.blk similarity index 100% rename from maps/RuinsofAlphAerodactylWordRoom.blk rename to maps/RuinsOfAlphAerodactylWordRoom.blk diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm similarity index 80% rename from maps/RuinsofAlphHoOhChamber.asm rename to maps/RuinsOfAlphHoOhChamber.asm index 7df42fad2..74e11cf4d 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,4 +1,4 @@ -RuinsofAlphHoOhChamber_MapScriptHeader: +RuinsOfAlphHoOhChamber_MapScriptHeader: .MapTriggers: db 2 @@ -53,7 +53,7 @@ UnknownScript_0x58596: closetext end -MapRuinsofAlphHoOhChamberSignpost2Script: +MapRuinsOfAlphHoOhChamberSignpost2Script: refreshscreen $0 writebyte $3 special Special_UnownPuzzle @@ -80,13 +80,13 @@ UnknownScript_0x585ba: warpcheck end -MapRuinsofAlphHoOhChamberSignpost1Script: +MapRuinsOfAlphHoOhChamberSignpost1Script: jumptext UnknownText_0x58685 -MapRuinsofAlphHoOhChamberSignpost3Script: +MapRuinsOfAlphHoOhChamberSignpost3Script: jumptext UnknownText_0x586aa -MapRuinsofAlphHoOhChamberSignpost4Script: +MapRuinsOfAlphHoOhChamberSignpost4Script: opentext writetext UnknownText_0x58612 writebyte $3 @@ -94,7 +94,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: closetext end -MapRuinsofAlphHoOhChamberSignpost5Script: +MapRuinsOfAlphHoOhChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 opentext @@ -149,7 +149,7 @@ UnknownText_0x586aa: line "wings." done -RuinsofAlphHoOhChamber_MapEventHeader: +RuinsOfAlphHoOhChamber_MapEventHeader: ; filler db 0, 0 @@ -166,12 +166,12 @@ RuinsofAlphHoOhChamber_MapEventHeader: .Signposts: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphHoOhChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphHoOhChamberSignpost5Script .PersonEvents: db 0 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm similarity index 65% rename from maps/RuinsofAlphHoOhItemRoom.asm rename to maps/RuinsOfAlphHoOhItemRoom.asm index 85e988ce5..0fe47d4b7 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -4,26 +4,26 @@ const_value set 2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 -RuinsofAlphHoOhItemRoom_MapScriptHeader: +RuinsOfAlphHoOhItemRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphHoOhItemRoomGoldBerry: +RuinsOfAlphHoOhItemRoomGoldBerry: itemball GOLD_BERRY -RuinsofAlphHoOhItemRoomMysteryberry: +RuinsOfAlphHoOhItemRoomMysteryberry: itemball MYSTERYBERRY -RuinsofAlphHoOhItemRoomRevivalHerb: +RuinsOfAlphHoOhItemRoomRevivalHerb: itemball REVIVAL_HERB -RuinsofAlphHoOhItemRoomCharcoal: +RuinsOfAlphHoOhItemRoomCharcoal: itemball CHARCOAL -MapRuinsofAlphHoOhItemRoomSignpost1Script: +MapRuinsOfAlphHoOhItemRoomSignpost1Script: jumptext UnknownText_0x59923 UnknownText_0x59923: @@ -32,7 +32,7 @@ UnknownText_0x59923: cont "MON." done -RuinsofAlphHoOhItemRoom_MapEventHeader: +RuinsOfAlphHoOhItemRoom_MapEventHeader: ; filler db 0, 0 @@ -48,12 +48,12 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: .Signposts: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphHoOhItemRoomSignpost1Script .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomGoldBerry, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomRevivalHerb, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphHoOhItemRoomCharcoal, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm similarity index 78% rename from maps/RuinsofAlphHoOhWordRoom.asm rename to maps/RuinsOfAlphHoOhWordRoom.asm index e0d35fa14..6db528779 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphHoOhWordRoom_MapScriptHeader: +RuinsOfAlphHoOhWordRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphHoOhWordRoom_MapEventHeader: +RuinsOfAlphHoOhWordRoom_MapEventHeader: ; filler db 0, 0 diff --git a/maps/RuinsofAlphHoOhWordRoom.blk b/maps/RuinsOfAlphHoOhWordRoom.blk similarity index 100% rename from maps/RuinsofAlphHoOhWordRoom.blk rename to maps/RuinsOfAlphHoOhWordRoom.blk diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm similarity index 54% rename from maps/RuinsofAlphInnerChamber.asm rename to maps/RuinsOfAlphInnerChamber.asm index 1f900da9e..1348995c3 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -3,7 +3,7 @@ const_value set 2 const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS -RuinsofAlphInnerChamber_MapScriptHeader: +RuinsOfAlphInnerChamber_MapScriptHeader: .MapTriggers: db 2 @@ -42,7 +42,7 @@ TeacherScript_0x58f80: GrampsScript_0x58f83: jumptextfaceplayer UnknownText_0x59024 -MapRuinsofAlphInnerChamberSignpost25Script: +RuinsOfAlphInnerChamberStatueScript: jumptext UnknownText_0x59072 UnknownText_0x58f89: @@ -80,7 +80,7 @@ UnknownText_0x59072: cont "MON." done -RuinsofAlphInnerChamber_MapEventHeader: +RuinsOfAlphInnerChamber_MapEventHeader: ; filler db 0, 0 @@ -101,32 +101,32 @@ RuinsofAlphInnerChamber_MapEventHeader: .Signposts: db 26 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript .PersonEvents: db 3 diff --git a/maps/RuinsofAlphInnerChamber.blk b/maps/RuinsOfAlphInnerChamber.blk similarity index 100% rename from maps/RuinsofAlphInnerChamber.blk rename to maps/RuinsOfAlphInnerChamber.blk diff --git a/maps/RuinsofAlphItemRoom.blk b/maps/RuinsOfAlphItemRoom.blk similarity index 100% rename from maps/RuinsofAlphItemRoom.blk rename to maps/RuinsOfAlphItemRoom.blk diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm similarity index 89% rename from maps/RuinsofAlphKabutoChamber.asm rename to maps/RuinsOfAlphKabutoChamber.asm index c46daa6f3..fdd7e0b3b 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -2,7 +2,7 @@ const_value set 2 const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST -RuinsofAlphKabutoChamber_MapScriptHeader: +RuinsOfAlphKabutoChamber_MapScriptHeader: .MapTriggers: db 2 @@ -61,7 +61,7 @@ UnknownScript_0x58751: ReceptionistScript_0x58769: jumptextfaceplayer UnknownText_0x58800 -MapRuinsofAlphKabutoChamberSignpost2Script: +MapRuinsOfAlphKabutoChamberSignpost2Script: refreshscreen $0 writebyte $0 special Special_UnownPuzzle @@ -119,13 +119,13 @@ UnknownScript_0x587cf: closetext end -MapRuinsofAlphKabutoChamberSignpost1Script: +MapRuinsOfAlphKabutoChamberSignpost1Script: jumptext UnknownText_0x58b1a -MapRuinsofAlphKabutoChamberSignpost3Script: +MapRuinsOfAlphKabutoChamberSignpost3Script: jumptext UnknownText_0x58b3f -MapRuinsofAlphKabutoChamberSignpost4Script: +MapRuinsOfAlphKabutoChamberSignpost4Script: opentext writetext UnknownText_0x58aa7 writebyte $0 @@ -133,7 +133,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: closetext end -MapRuinsofAlphKabutoChamberSignpost5Script: +MapRuinsOfAlphKabutoChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 opentext @@ -262,7 +262,7 @@ UnknownText_0x58b3f: line "scanned the area." done -RuinsofAlphKabutoChamber_MapEventHeader: +RuinsOfAlphKabutoChamber_MapEventHeader: ; filler db 0, 0 @@ -279,12 +279,12 @@ RuinsofAlphKabutoChamber_MapEventHeader: .Signposts: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphKabutoChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphKabutoChamberSignpost5Script .PersonEvents: db 2 diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm similarity index 65% rename from maps/RuinsofAlphKabutoItemRoom.asm rename to maps/RuinsOfAlphKabutoItemRoom.asm index 8b839efd9..2126b4ff3 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -4,26 +4,26 @@ const_value set 2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 -RuinsofAlphKabutoItemRoom_MapScriptHeader: +RuinsOfAlphKabutoItemRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphKabutoItemRoomBerry: +RuinsOfAlphKabutoItemRoomBerry: itemball BERRY -RuinsofAlphKabutoItemRoomPsncureberry: +RuinsOfAlphKabutoItemRoomPsncureberry: itemball PSNCUREBERRY -RuinsofAlphKabutoItemRoomHealPowder: +RuinsOfAlphKabutoItemRoomHealPowder: itemball HEAL_POWDER -RuinsofAlphKabutoItemRoomEnergypowder: +RuinsOfAlphKabutoItemRoomEnergypowder: itemball ENERGYPOWDER -MapRuinsofAlphKabutoItemRoomSignpost1Script: +MapRuinsOfAlphKabutoItemRoomSignpost1Script: jumptext UnknownText_0x599ad UnknownText_0x599ad: @@ -32,7 +32,7 @@ UnknownText_0x599ad: cont "MON." done -RuinsofAlphKabutoItemRoom_MapEventHeader: +RuinsOfAlphKabutoItemRoom_MapEventHeader: ; filler db 0, 0 @@ -48,12 +48,12 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: .Signposts: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphKabutoItemRoomSignpost1Script .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomBerry, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomPsncureberry, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomHealPowder, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphKabutoItemRoomEnergypowder, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm similarity index 77% rename from maps/RuinsofAlphKabutoWordRoom.asm rename to maps/RuinsOfAlphKabutoWordRoom.asm index 8d754f657..b212dde21 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphKabutoWordRoom_MapScriptHeader: +RuinsOfAlphKabutoWordRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphKabutoWordRoom_MapEventHeader: +RuinsOfAlphKabutoWordRoom_MapEventHeader: ; filler db 0, 0 diff --git a/maps/RuinsofAlphKabutoWordRoom.blk b/maps/RuinsOfAlphKabutoWordRoom.blk similarity index 100% rename from maps/RuinsofAlphKabutoWordRoom.blk rename to maps/RuinsOfAlphKabutoWordRoom.blk diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm similarity index 80% rename from maps/RuinsofAlphOmanyteChamber.asm rename to maps/RuinsOfAlphOmanyteChamber.asm index 5b5864d2f..09738ed3a 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,4 +1,4 @@ -RuinsofAlphOmanyteChamber_MapScriptHeader: +RuinsOfAlphOmanyteChamber_MapScriptHeader: .MapTriggers: db 2 @@ -53,7 +53,7 @@ UnknownScript_0x58c12: closetext end -MapRuinsofAlphOmanyteChamberSignpost2Script: +MapRuinsOfAlphOmanyteChamberSignpost2Script: refreshscreen $0 writebyte $1 special Special_UnownPuzzle @@ -80,13 +80,13 @@ UnknownScript_0x58c36: warpcheck end -MapRuinsofAlphOmanyteChamberSignpost1Script: +MapRuinsOfAlphOmanyteChamberSignpost1Script: jumptext UnknownText_0x58d01 -MapRuinsofAlphOmanyteChamberSignpost3Script: +MapRuinsOfAlphOmanyteChamberSignpost3Script: jumptext UnknownText_0x58d26 -MapRuinsofAlphOmanyteChamberSignpost4Script: +MapRuinsOfAlphOmanyteChamberSignpost4Script: opentext writetext UnknownText_0x58c8e writebyte $2 @@ -94,7 +94,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: closetext end -MapRuinsofAlphOmanyteChamberSignpost5Script: +MapRuinsOfAlphOmanyteChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 opentext @@ -149,7 +149,7 @@ UnknownText_0x58d26: line "its ten tentacles." done -RuinsofAlphOmanyteChamber_MapEventHeader: +RuinsOfAlphOmanyteChamber_MapEventHeader: ; filler db 0, 0 @@ -166,12 +166,12 @@ RuinsofAlphOmanyteChamber_MapEventHeader: .Signposts: db 6 - signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost2Script - signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost3Script - signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost4Script - signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsOfAlphOmanyteChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsOfAlphOmanyteChamberSignpost5Script .PersonEvents: db 0 diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm similarity index 65% rename from maps/RuinsofAlphOmanyteItemRoom.asm rename to maps/RuinsOfAlphOmanyteItemRoom.asm index 55d4cf9b4..df5db803b 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -4,26 +4,26 @@ const_value set 2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 -RuinsofAlphOmanyteItemRoom_MapScriptHeader: +RuinsOfAlphOmanyteItemRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphOmanyteItemRoomMysteryberry: +RuinsOfAlphOmanyteItemRoomMysteryberry: itemball MYSTERYBERRY -RuinsofAlphOmanyteItemRoomMysticWater: +RuinsOfAlphOmanyteItemRoomMysticWater: itemball MYSTIC_WATER -RuinsofAlphOmanyteItemRoomStardust: +RuinsOfAlphOmanyteItemRoomStardust: itemball STARDUST -RuinsofAlphOmanyteItemRoomStarPiece: +RuinsOfAlphOmanyteItemRoomStarPiece: itemball STAR_PIECE -MapRuinsofAlphOmanyteItemRoomSignpost1Script: +MapRuinsOfAlphOmanyteItemRoomSignpost1Script: jumptext UnknownText_0x59a37 UnknownText_0x59a37: @@ -32,7 +32,7 @@ UnknownText_0x59a37: cont "MON." done -RuinsofAlphOmanyteItemRoom_MapEventHeader: +RuinsOfAlphOmanyteItemRoom_MapEventHeader: ; filler db 0, 0 @@ -48,12 +48,12 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: .Signposts: db 2 - signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script - signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsOfAlphOmanyteItemRoomSignpost1Script .PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsofAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysteryberry, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 6, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomMysticWater, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStardust, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RuinsOfAlphOmanyteItemRoomStarPiece, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm similarity index 77% rename from maps/RuinsofAlphOmanyteWordRoom.asm rename to maps/RuinsOfAlphOmanyteWordRoom.asm index 7600f41d9..634ac16a1 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,11 +1,11 @@ -RuinsofAlphOmanyteWordRoom_MapScriptHeader: +RuinsOfAlphOmanyteWordRoom_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -RuinsofAlphOmanyteWordRoom_MapEventHeader: +RuinsOfAlphOmanyteWordRoom_MapEventHeader: ; filler db 0, 0 diff --git a/maps/RuinsofAlphOmanyteWordRoom.blk b/maps/RuinsOfAlphOmanyteWordRoom.blk similarity index 100% rename from maps/RuinsofAlphOmanyteWordRoom.blk rename to maps/RuinsOfAlphOmanyteWordRoom.blk diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsOfAlphOutside.asm similarity index 94% rename from maps/RuinsofAlphOutside.asm rename to maps/RuinsOfAlphOutside.asm index 8cad45e29..5159266ba 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -5,7 +5,7 @@ const_value set 2 const RUINSOFALPHOUTSIDE_YOUNGSTER2 const RUINSOFALPHOUTSIDE_YOUNGSTER3 -RuinsofAlphOutside_MapScriptHeader: +RuinsOfAlphOutside_MapScriptHeader: .MapTriggers: db 2 @@ -130,13 +130,13 @@ UnknownScript_0x580a9: end -MapRuinsofAlphOutsideSignpost0Script: +MapRuinsOfAlphOutsideSignpost0Script: jumptext UnknownText_0x58325 -MapRuinsofAlphOutsideSignpost1Script: +MapRuinsOfAlphOutsideSignpost1Script: jumptext UnknownText_0x58342 -MapRuinsofAlphOutsideSignpost2Script: +MapRuinsOfAlphOutsideSignpost2Script: jumptext UnknownText_0x58362 MovementData_0x580ba: @@ -287,7 +287,7 @@ UnknownText_0x5848e: line "message!" done -RuinsofAlphOutside_MapEventHeader: +RuinsOfAlphOutside_MapEventHeader: ; filler db 0, 0 @@ -312,9 +312,9 @@ RuinsofAlphOutside_MapEventHeader: .Signposts: db 3 - signpost 8, 16, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost0Script - signpost 16, 12, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost1Script - signpost 12, 18, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost2Script + signpost 8, 16, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost0Script + signpost 16, 12, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost1Script + signpost 12, 18, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost2Script .PersonEvents: db 5 diff --git a/maps/RuinsofAlphOutside.blk b/maps/RuinsOfAlphOutside.blk similarity index 100% rename from maps/RuinsofAlphOutside.blk rename to maps/RuinsOfAlphOutside.blk diff --git a/maps/RuinsofAlphPuzzleChamber.blk b/maps/RuinsOfAlphPuzzleChamber.blk similarity index 100% rename from maps/RuinsofAlphPuzzleChamber.blk rename to maps/RuinsOfAlphPuzzleChamber.blk diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm similarity index 94% rename from maps/RuinsofAlphResearchCenter.asm rename to maps/RuinsOfAlphResearchCenter.asm index b1d0f45c5..c81f5eef1 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -3,7 +3,7 @@ const_value set 2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 -RuinsofAlphResearchCenter_MapScriptHeader: +RuinsOfAlphResearchCenter_MapScriptHeader: .MapTriggers: db 2 @@ -137,7 +137,7 @@ UnknownScript_0x5922e: closetext end -MapRuinsofAlphResearchCenterSignpost1Script: +MapRuinsOfAlphResearchCenterSignpost1Script: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 @@ -155,7 +155,7 @@ UnknownScript_0x59247: closetext end -MapRuinsofAlphResearchCenterSignpost2Script: +MapRuinsOfAlphResearchCenterSignpost2Script: opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a @@ -177,7 +177,7 @@ UnknownScript_0x59260: UnknownScript_0x59269: jumptext UnknownText_0x59848 -MapRuinsofAlphResearchCenterSignpost0Script: +MapRuinsOfAlphResearchCenterSignpost0Script: jumptext UnknownText_0x59886 MovementData_0x5926f: @@ -397,7 +397,7 @@ UnknownText_0x59886: cont "Ancients…" done -RuinsofAlphResearchCenter_MapEventHeader: +RuinsOfAlphResearchCenter_MapEventHeader: ; filler db 0, 0 @@ -411,9 +411,9 @@ RuinsofAlphResearchCenter_MapEventHeader: .Signposts: db 3 - signpost 5, 6, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost0Script - signpost 4, 3, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost1Script - signpost 1, 7, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost2Script + signpost 5, 6, SIGNPOST_READ, MapRuinsOfAlphResearchCenterSignpost0Script + signpost 4, 3, SIGNPOST_READ, MapRuinsOfAlphResearchCenterSignpost1Script + signpost 1, 7, SIGNPOST_READ, MapRuinsOfAlphResearchCenterSignpost2Script .PersonEvents: db 3 diff --git a/maps/RuinsofAlphResearchCenter.blk b/maps/RuinsOfAlphResearchCenter.blk similarity index 100% rename from maps/RuinsofAlphResearchCenter.blk rename to maps/RuinsOfAlphResearchCenter.blk diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm index be9abbcc1..c3f363940 100644 --- a/maps/blockdata_1.asm +++ b/maps/blockdata_1.asm @@ -119,8 +119,8 @@ Route20_BlockData: BetaSproutTower6_BlockData: INCBIN "maps/BetaSproutTower6.blk" -BetaPokecenterMainHouse_BlockData: - INCBIN "maps/BetaPokecenterMainHouse.blk" +BetaPokeCenterMainHouse_BlockData: + INCBIN "maps/BetaPokeCenterMainHouse.blk" Route30_BlockData: INCBIN "maps/Route30.blk" @@ -160,8 +160,8 @@ CeruleanPoliceStation_BlockData: CeruleanTradeSpeechHouse_BlockData: BillsHouse_BlockData: CharcoalKiln_BlockData: -LakeofRageHiddenPowerHouse_BlockData: -LakeofRageMagikarpHouse_BlockData: +LakeOfRageHiddenPowerHouse_BlockData: +LakeOfRageMagikarpHouse_BlockData: GoldenrodHappinessRater_BlockData: GoldenrodBillsHouse_BlockData: GoldenrodPPSpeechHouse_BlockData: @@ -202,8 +202,8 @@ SafariZoneFuchsiaGateBeta_BlockData: Route19FuchsiaGate_BlockData: Route43MahoganyGate_BlockData: Route43Gate_BlockData: -Route35Goldenrodgate_BlockData: -Route36RuinsofAlphgate_BlockData: +Route35GoldenrodGate_BlockData: +Route36RuinsOfAlphGate_BlockData: Route34IlexForestGate_BlockData: Route6SaffronGate_BlockData: Route40BattleTowerGate_BlockData: @@ -268,7 +268,7 @@ KrissHouse1F_BlockData: Route38EcruteakGate_BlockData: Route42EcruteakGate_BlockData: -Route32RuinsofAlphGate_BlockData: +Route32RuinsOfAlphGate_BlockData: IlexForestAzaleaGate_BlockData: Route15FuchsiaGate_BlockData: Route8SaffronGate_BlockData: diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm index a5e567e9f..f88ac4c69 100644 --- a/maps/blockdata_2.asm +++ b/maps/blockdata_2.asm @@ -151,8 +151,8 @@ Route6UndergroundEntrance_BlockData: Route5UndergroundEntrance_BlockData: INCBIN "maps/UndergroundPathEntrance.blk" -BetaPokecenterTradeStation_BlockData: - INCBIN "maps/BetaPokecenterTradeStation.blk" +BetaPokeCenterTradeStation_BlockData: + INCBIN "maps/BetaPokeCenterTradeStation.blk" KurtsHouse_BlockData: INCBIN "maps/KurtsHouse.blk" @@ -160,20 +160,20 @@ KurtsHouse_BlockData: GoldenrodMagnetTrainStation_BlockData: INCBIN "maps/GoldenrodMagnetTrainStation.blk" -RuinsofAlphOutside_BlockData: - INCBIN "maps/RuinsofAlphOutside.blk" +RuinsOfAlphOutside_BlockData: + INCBIN "maps/RuinsOfAlphOutside.blk" -BetaAlphRuinUnsolvedPuzzleRoom_BlockData: - INCBIN "maps/BetaAlphRuinUnsolvedPuzzleRoom.blk" +BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData: + INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" -RuinsofAlphInnerChamber_BlockData: - INCBIN "maps/RuinsofAlphInnerChamber.blk" +RuinsOfAlphInnerChamber_BlockData: + INCBIN "maps/RuinsOfAlphInnerChamber.blk" -RuinsofAlphHoOhChamber_BlockData: -RuinsofAlphKabutoChamber_BlockData: -RuinsofAlphOmanyteChamber_BlockData: -RuinsofAlphAerodactylChamber_BlockData: - INCBIN "maps/RuinsofAlphPuzzleChamber.blk" +RuinsOfAlphHoOhChamber_BlockData: +RuinsOfAlphKabutoChamber_BlockData: +RuinsOfAlphOmanyteChamber_BlockData: +RuinsOfAlphAerodactylChamber_BlockData: + INCBIN "maps/RuinsOfAlphPuzzleChamber.blk" SproutTower1F_BlockData: INCBIN "maps/SproutTower1F.blk" @@ -235,8 +235,8 @@ EcruteakCity_BlockData: MahoganyTown_BlockData: INCBIN "maps/MahoganyTown.blk" -LakeofRage_BlockData: - INCBIN "maps/LakeofRage.blk" +LakeOfRage_BlockData: + INCBIN "maps/LakeOfRage.blk" BlackthornCity_BlockData: INCBIN "maps/BlackthornCity.blk" diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm index 9a64caf5c..5175f9ce6 100644 --- a/maps/blockdata_3.asm +++ b/maps/blockdata_3.asm @@ -16,8 +16,8 @@ DarkCaveVioletEntrance_BlockData: DarkCaveBlackthornEntrance_BlockData: INCBIN "maps/DarkCaveBlackthornEntrance.blk" -RuinsofAlphResearchCenter_BlockData: - INCBIN "maps/RuinsofAlphResearchCenter.blk" +RuinsOfAlphResearchCenter_BlockData: + INCBIN "maps/RuinsOfAlphResearchCenter.blk" GoldenrodBikeShop_BlockData: INCBIN "maps/GoldenrodBikeShop.blk" @@ -31,11 +31,11 @@ EcruteakHouse_BlockData: GoldenrodGameCorner_BlockData: INCBIN "maps/GoldenrodGameCorner.blk" -Route35NationalParkgate_BlockData: - INCBIN "maps/Route35NationalParkgate.blk" +Route35NationalParkGate_BlockData: + INCBIN "maps/Route35NationalParkGate.blk" -Route36NationalParkgate_BlockData: - INCBIN "maps/Route36NationalParkgate.blk" +Route36NationalParkGate_BlockData: + INCBIN "maps/Route36NationalParkGate.blk" FastShip1F_BlockData: INCBIN "maps/FastShip1F.blk" @@ -43,8 +43,8 @@ FastShip1F_BlockData: FastShipB1F_BlockData: INCBIN "maps/FastShipB1F.blk" -BetaSsAquaInsideCutOut_BlockData: - INCBIN "maps/BetaSsAquaInsideCutOut.blk" +BetaSSAquaInsideCutOut_BlockData: + INCBIN "maps/BetaSSAquaInsideCutOut.blk" FastShipCabins_NNW_NNE_NE_BlockData: INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" @@ -214,23 +214,23 @@ DragonsDenB1F_BlockData: TohjoFalls_BlockData: INCBIN "maps/TohjoFalls.blk" -RuinsofAlphHoOhItemRoom_BlockData: -RuinsofAlphKabutoItemRoom_BlockData: -RuinsofAlphOmanyteItemRoom_BlockData: -RuinsofAlphAerodactylItemRoom_BlockData: - INCBIN "maps/RuinsofAlphItemRoom.blk" +RuinsOfAlphHoOhItemRoom_BlockData: +RuinsOfAlphKabutoItemRoom_BlockData: +RuinsOfAlphOmanyteItemRoom_BlockData: +RuinsOfAlphAerodactylItemRoom_BlockData: + INCBIN "maps/RuinsOfAlphItemRoom.blk" -RuinsofAlphHoOhWordRoom_BlockData: - INCBIN "maps/RuinsofAlphHoOhWordRoom.blk" +RuinsOfAlphHoOhWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk" -RuinsofAlphKabutoWordRoom_BlockData: - INCBIN "maps/RuinsofAlphKabutoWordRoom.blk" +RuinsOfAlphKabutoWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk" -RuinsofAlphOmanyteWordRoom_BlockData: - INCBIN "maps/RuinsofAlphOmanyteWordRoom.blk" +RuinsOfAlphOmanyteWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk" -RuinsofAlphAerodactylWordRoom_BlockData: - INCBIN "maps/RuinsofAlphAerodactylWordRoom.blk" +RuinsOfAlphAerodactylWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk" DragonShrine_BlockData: INCBIN "maps/DragonShrine.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 27fbd4166..529ec7e05 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -77,21 +77,21 @@ MapGroup3: map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header RuinsofAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RuinsofAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, FISHGROUP_POND + map_header RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE map_header UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_LAKE map_header UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, 1, PALETTE_NITE, FISHGROUP_SHORE @@ -216,12 +216,12 @@ MapGroup8: MapGroup9: - map_header LakeofRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LakeofRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND - map_header LakeofRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_GYARADOS + map_header LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_GYARADOS MapGroup10: @@ -236,12 +236,12 @@ MapGroup10: map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletPokeCenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route32RuinsofAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route35Goldenrodgate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route35NationalParkgate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route36RuinsofAlphgate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route36NationalParkgate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE MapGroup11: diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 1bf8b80a2..3f4bcbac0 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -36,7 +36,7 @@ connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN - map_header_2 LakeofRage, LAKE_OF_RAGE, $5, SOUTH + map_header_2 LakeOfRage, LAKE_OF_RAGE, $5, SOUTH connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE map_header_2 BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST @@ -115,7 +115,7 @@ connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42 map_header_2 Route43, ROUTE_43, $5, NORTH | SOUTH - connection north, LAKE_OF_RAGE, LakeofRage, -3, 2, 16, ROUTE_43 + connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43 connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43 map_header_2 Route44, ROUTE_44, $71, WEST | EAST @@ -298,21 +298,21 @@ map_header_2 RadioTower3F, RADIO_TOWER_3F, $0, 0 map_header_2 RadioTower4F, RADIO_TOWER_4F, $0, 0 map_header_2 RadioTower5F, RADIO_TOWER_5F, $0, 0 - map_header_2 RuinsofAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0 - map_header_2 RuinsofAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0 - map_header_2 RuinsofAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0 - map_header_2 RuinsofAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0 - map_header_2 RuinsofAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0 - map_header_2 RuinsofAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0 - map_header_2 RuinsofAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0 - map_header_2 RuinsofAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0 - map_header_2 RuinsofAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0 - map_header_2 RuinsofAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0 - map_header_2 RuinsofAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0 - map_header_2 RuinsofAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $5, 0 + map_header_2 RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $0, 0 + map_header_2 RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $0, 0 + map_header_2 RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $0, 0 + map_header_2 RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $0, 0 + map_header_2 RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $0, 0 map_header_2 UnionCave1F, UNION_CAVE_1F, $9, 0 map_header_2 UnionCaveB1F, UNION_CAVE_B1F, $9, 0 map_header_2 UnionCaveB2F, UNION_CAVE_B2F, $9, 0 @@ -418,8 +418,8 @@ map_header_2 AzaleaMart, AZALEA_MART, $0, 0 map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0 map_header_2 AzaleaGym, AZALEA_GYM, $0, 0 - map_header_2 LakeofRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0 - map_header_2 LakeofRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0 + map_header_2 LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $0, 0 + map_header_2 LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $0, 0 map_header_2 Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $0, 0 map_header_2 Route43Gate, ROUTE_43_GATE, $0, 0 map_header_2 VioletMart, VIOLET_MART, $0, 0 @@ -428,12 +428,12 @@ map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, 0 map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 - map_header_2 Route32RuinsofAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 + map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, 0 - map_header_2 Route35Goldenrodgate, ROUTE_35_GOLDENROD_GATE, $0, 0 - map_header_2 Route35NationalParkgate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 - map_header_2 Route36RuinsofAlphgate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 - map_header_2 Route36NationalParkgate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0 + map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 + map_header_2 Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 + map_header_2 Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 + map_header_2 Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $0, 0 map_header_2 GoldenrodGym, GOLDENROD_GYM, $0, 0 map_header_2 GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $0, 0 map_header_2 GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $0, 0 @@ -455,7 +455,7 @@ map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0 map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0 map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0 - map_header_2 DayCare, DAYCARE, $0, 0 + map_header_2 DayCare, DAY_CARE, $0, 0 map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0 map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, 0 map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 diff --git a/wram.asm b/wram.asm index ee0bcbbde..9b96f2bb6 100644 --- a/wram.asm +++ b/wram.asm @@ -1862,8 +1862,8 @@ wWhichHPBar:: wPokemonWithdrawDepositParameter:: ; 0: Take from PC ; 1: Put into PC -; 2: Take from Daycare -; 3: Put into Daycare +; 2: Take from Day-Care +; 3: Put into Day-Care db wItemQuantityChangeBuffer:: db @@ -2749,11 +2749,11 @@ UnownDex:: ds NUM_UNOWN ; ded9 UnlockedUnowns:: db ; def3 wFirstUnownSeen:: db -wDaycareMan:: ; def5 +wDayCareMan:: ; def5 ; bit 7: active ; bit 6: monsters are compatible ; bit 5: egg ready -; bit 0: monster 1 in daycare +; bit 0: monster 1 in day-care db wBreedMon1:: @@ -2761,9 +2761,9 @@ wBreedMon1Nick:: ds PKMN_NAME_LENGTH ; def6 wBreedMon1OT:: ds NAME_LENGTH ; df01 wBreedMon1Stats:: box_struct wBreedMon1 ; df0c -wDaycareLady:: ; df2c +wDayCareLady:: ; df2c ; bit 7: active -; bit 0: monster 2 in daycare +; bit 0: monster 2 in day-care db wStepsToEgg:: ; df2d From fba44a592995501b8923060aea385e4c6bc80b8c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 13:53:02 -0500 Subject: [PATCH 02/35] Single files for tilesets/data.asm and maps/blockdata.asm --- main.asm | 34 +- maps.asm | 16 +- maps/blockdata.asm | 1047 ++++++++++++++++++++++++++++++++++++++++++ maps/blockdata_1.asm | 309 ------------- maps/blockdata_2.asm | 462 ------------------- maps/blockdata_3.asm | 266 ----------- tilesets/data.asm | 434 +++++++++++++++++ tilesets/data_1.asm | 50 -- tilesets/data_2.asm | 61 --- tilesets/data_3.asm | 64 --- tilesets/data_4.asm | 59 --- tilesets/data_5.asm | 60 --- tilesets/data_6.asm | 75 --- tilesets/data_7.asm | 16 - tilesets/data_8.asm | 15 - 15 files changed, 1483 insertions(+), 1485 deletions(-) create mode 100644 maps/blockdata.asm delete mode 100644 maps/blockdata_1.asm delete mode 100644 maps/blockdata_2.asm delete mode 100644 maps/blockdata_3.asm create mode 100644 tilesets/data.asm delete mode 100644 tilesets/data_1.asm delete mode 100644 tilesets/data_2.asm delete mode 100644 tilesets/data_3.asm delete mode 100644 tilesets/data_4.asm delete mode 100644 tilesets/data_5.asm delete mode 100644 tilesets/data_6.asm delete mode 100644 tilesets/data_7.asm delete mode 100644 tilesets/data_8.asm diff --git a/main.asm b/main.asm index ca2c141a4..5ff629015 100644 --- a/main.asm +++ b/main.asm @@ -620,26 +620,14 @@ INCLUDE "event/daycare.asm" INCLUDE "event/photo.asm" INCLUDE "engine/breeding/egg.asm" -SECTION "Tileset Data 1", ROMX -INCLUDE "tilesets/data_1.asm" +INCLUDE "tilesets/data.asm" -SECTION "Roofs", ROMX - -INCLUDE "tilesets/roofs.asm" - -SECTION "Tileset Data 2", ROMX - -INCLUDE "tilesets/data_2.asm" SECTION "bank8", ROMX INCLUDE "engine/clock_reset.asm" -SECTION "Tileset Data 3", ROMX - -INCLUDE "tilesets/data_3.asm" - SECTION "bank9", ROMX StringBufferPointers:: ; 24000 @@ -1618,10 +1606,6 @@ PlaceGraphic: ; 2ef6e jr nz, .x2 ret -SECTION "Tileset Data 4", ROMX - -INCLUDE "tilesets/data_4.asm" - SECTION "Effect Commands", ROMX INCLUDE "battle/effect_commands.asm" @@ -5032,10 +5016,6 @@ INCLUDE "text/phone/kenji_overworld.asm" INCLUDE "text/phone/parry_overworld.asm" INCLUDE "text/phone/erin_overworld.asm" -SECTION "Tileset Data 5", ROMX - -INCLUDE "tilesets/data_5.asm" - SECTION "bank2E", ROMX INCLUDE "engine/events_3.asm" @@ -5318,10 +5298,6 @@ INCLUDE "gfx/pics/johto_frames.asm" INCLUDE "gfx/pics/unown_frame_pointers.asm" INCLUDE "gfx/pics/unown_frames.asm" -SECTION "Tileset Data 6", ROMX - -INCLUDE "tilesets/data_6.asm" - SECTION "bank38", ROMX RotateUnownFrontpic: ; e0000 @@ -5605,10 +5581,6 @@ INCBIN "gfx/mobile/hp.1bpp" MobileLvIcon: ; 1dc599 INCBIN "gfx/mobile/lv.1bpp" -SECTION "Tileset Data 7", ROMX - -INCLUDE "tilesets/data_7.asm" - SECTION "bank77_2", ROMX Function1dd6a9: ; 1dd6a9 @@ -6040,10 +6012,6 @@ LeggiPostaInglese: jr nz, .loop ret -SECTION "Tileset Data 8", ROMX - -INCLUDE "tilesets/data_8.asm" - SECTION "bank7B", ROMX INCLUDE "text/battle_tower.asm" diff --git a/maps.asm b/maps.asm index 5ca9cf0d5..ed36ef4cc 100644 --- a/maps.asm +++ b/maps.asm @@ -7,21 +7,7 @@ INCLUDE "maps/map_headers.asm" INCLUDE "maps/second_map_headers.asm" - -SECTION "Map Blockdata 1", ROMX - -INCLUDE "maps/blockdata_1.asm" - - -SECTION "Map Blockdata 2", ROMX - -INCLUDE "maps/blockdata_2.asm" - - -SECTION "Map Blockdata 3", ROMX - -INCLUDE "maps/blockdata_3.asm" - +INCLUDE "maps/blockdata.asm" SECTION "Map Scripts 1", ROMX diff --git a/maps/blockdata.asm b/maps/blockdata.asm new file mode 100644 index 000000000..d1e7b39b7 --- /dev/null +++ b/maps/blockdata.asm @@ -0,0 +1,1047 @@ +SECTION "Map Blockdata 1", ROMX + +Route32_BlockData: + INCBIN "maps/Route32.blk" + +Route40_BlockData: + INCBIN "maps/Route40.blk" + +Route36_BlockData: + INCBIN "maps/Route36.blk" + +Route44_BlockData: + INCBIN "maps/Route44.blk" + +Route28_BlockData: + INCBIN "maps/Route28.blk" + +BetaHerosHouse_BlockData: + INCBIN "maps/BetaHerosHouse.blk" + +CeladonCity_BlockData: + INCBIN "maps/CeladonCity.blk" + +SaffronCity_BlockData: + INCBIN "maps/SaffronCity.blk" + +Route2_BlockData: + INCBIN "maps/Route2.blk" + +ElmsHouse_BlockData: + INCBIN "maps/ElmsHouse.blk" + +BetaSproutTower1_BlockData: + INCBIN "maps/BetaSproutTower1.blk" + +Route11_BlockData: + INCBIN "maps/Route11.blk" + +BetaSproutTower5_BlockData: + INCBIN "maps/BetaSproutTower5.blk" + +Route15_BlockData: + INCBIN "maps/Route15.blk" + +BetaSproutTower9_BlockData: + INCBIN "maps/BetaSproutTower9.blk" + +Route19_BlockData: + INCBIN "maps/Route19.blk" + +BetaBlackthornCity_BlockData: + INCBIN "maps/BetaBlackthornCity.blk" + +Route10South_BlockData: + INCBIN "maps/Route10South.blk" + +PokeCenter2F_BlockData: +CinnabarPokeCenter2FBeta_BlockData: +CeruleanPokeCenter2FBeta_BlockData: +Route10PokeCenter2FBeta_BlockData: +VermilionPokeCenter2FBeta_BlockData: +PewterPokeCenter2FBeta_BlockData: +FuchsiaPokeCenter2FBeta_BlockData: +LavenderPokeCenter2FBeta_BlockData: +CeladonPokeCenter2FBeta_BlockData: +ViridianPokeCenter2FBeta_BlockData: +SaffronPokeCenter2FBeta_BlockData: + INCBIN "maps/PokeCenter2F.blk" + +Route41_BlockData: + INCBIN "maps/Route41.blk" + +Route33_BlockData: + INCBIN "maps/Route33.blk" + +Route45_BlockData: + INCBIN "maps/Route45.blk" + +Route29_BlockData: + INCBIN "maps/Route29.blk" + +Route37_BlockData: + INCBIN "maps/Route37.blk" + +LavenderTown_BlockData: + INCBIN "maps/LavenderTown.blk" + +PalletTown_BlockData: + INCBIN "maps/PalletTown.blk" + +Route25_BlockData: + INCBIN "maps/Route25.blk" + +Route24_BlockData: + INCBIN "maps/Route24.blk" + +BetaVioletCity_BlockData: + INCBIN "maps/BetaVioletCity.blk" + +Route3_BlockData: + INCBIN "maps/Route3.blk" + +PewterCity_BlockData: + INCBIN "maps/PewterCity.blk" + +BetaIlexForest_BlockData: + INCBIN "maps/BetaIlexForest.blk" + +BetaSproutTower2_BlockData: + INCBIN "maps/BetaSproutTower2.blk" + +Route12_BlockData: + INCBIN "maps/Route12.blk" + +BetaGoldenrodCity_BlockData: + INCBIN "maps/BetaGoldenrodCity.blk" + +Route20_BlockData: + INCBIN "maps/Route20.blk" + +BetaSproutTower6_BlockData: + INCBIN "maps/BetaSproutTower6.blk" + +BetaPokeCenterMainHouse_BlockData: + INCBIN "maps/BetaPokeCenterMainHouse.blk" + +Route30_BlockData: + INCBIN "maps/Route30.blk" + +Route26_BlockData: + INCBIN "maps/Route26.blk" + +Route42_BlockData: + INCBIN "maps/Route42.blk" + +Route34_BlockData: + INCBIN "maps/Route34.blk" + +Route46_BlockData: + INCBIN "maps/Route46.blk" + +FuchsiaCity_BlockData: + INCBIN "maps/FuchsiaCity.blk" + +Route38_BlockData: + INCBIN "maps/Route38.blk" + +BetaCianwoodCity_BlockData: + INCBIN "maps/BetaCianwoodCity.blk" + +OlivineTimsHouse_BlockData: +OlivineHouseBeta_BlockData: +OlivinePunishmentSpeechHouse_BlockData: +OlivineGoodRodHouse_BlockData: +Route39Farmhouse_BlockData: +MahoganyRedGyaradosSpeechHouse_BlockData: +BlackthornDragonSpeechHouse_BlockData: +BlackthornEmysHouse_BlockData: +MoveDeletersHouse_BlockData: +CeruleanGymBadgeSpeechHouse_BlockData: +CeruleanPoliceStation_BlockData: +CeruleanTradeSpeechHouse_BlockData: +BillsHouse_BlockData: +CharcoalKiln_BlockData: +LakeOfRageHiddenPowerHouse_BlockData: +LakeOfRageMagikarpHouse_BlockData: +GoldenrodHappinessRater_BlockData: +GoldenrodBillsHouse_BlockData: +GoldenrodPPSpeechHouse_BlockData: +GoldenrodNameRater_BlockData: +VermilionHouseFishingSpeechHouse_BlockData: +VermilionMagnetTrainSpeechHouse_BlockData: +VermilionHouseDiglettsCaveSpeechHouse_BlockData: +BluesHouse_BlockData: +PewterNidoranSpeechHouse_BlockData: +PewterSnoozeSpeechHouse_BlockData: +FuchsiaBillSpeechHouse_BlockData: +LavenderTownSpeechHouse_BlockData: +LavenderNameRater_BlockData: +Route12SuperRodHouse_BlockData: +Route28FamousSpeechHouse_BlockData: +CeladonMansionRoofHouse_BlockData: +Route16FuchsiaSpeechHouse_BlockData: +ManiasHouse_BlockData: +CianwoodPharmacy_BlockData: +CianwoodCityPhotoStudio_BlockData: +CianwoodLugiaSpeechHouse_BlockData: +PokeSeersHouse_BlockData: +ViridianNicknameSpeechHouse_BlockData: +Route2NuggetSpeechHouse_BlockData: +KrissNeighborsHouse_BlockData: +Route26HealSpeechHouse_BlockData: +Route26DayofWeekSiblingsHouse_BlockData: +Route27SandstormHouse_BlockData: +MrPsychicsHouse_BlockData: +Route5CleanseTagSpeechHouse_BlockData: +CherrygroveGymSpeechHouse_BlockData: +GuideGentsHouse_BlockData: +CherrygroveEvolutionSpeechHouse_BlockData: +Route30BerrySpeechHouse_BlockData: + INCBIN "maps/House1.blk" + +SafariZoneFuchsiaGateBeta_BlockData: +Route19FuchsiaGate_BlockData: +Route43MahoganyGate_BlockData: +Route43Gate_BlockData: +Route35GoldenrodGate_BlockData: +Route36RuinsOfAlphGate_BlockData: +Route34IlexForestGate_BlockData: +Route6SaffronGate_BlockData: +Route40BattleTowerGate_BlockData: +Route2Gate_BlockData: +Route2946Gate_BlockData: +Route5SaffronCityGate_BlockData: + INCBIN "maps/NorthSouthGate.blk" + +BetaTeakCity_BlockData: + INCBIN "maps/BetaTeakCity.blk" + +BetaCherrygroveCity_BlockData: + INCBIN "maps/BetaCherrygroveCity.blk" + +CinnabarIsland_BlockData: + INCBIN "maps/CinnabarIsland.blk" + +Route4_BlockData: + INCBIN "maps/Route4.blk" + +Route8_BlockData: + INCBIN "maps/Route8.blk" + +BetaSproutTower3_BlockData: + INCBIN "maps/BetaSproutTower3.blk" + +ViridianCity_BlockData: + INCBIN "maps/ViridianCity.blk" + +Route13_BlockData: + INCBIN "maps/Route13.blk" + +Route21_BlockData: + INCBIN "maps/Route21.blk" + +BetaSproutTower7_BlockData: + INCBIN "maps/BetaSproutTower7.blk" + +Route17_BlockData: + INCBIN "maps/Route17.blk" + +BetaMahoganyTown_BlockData: + INCBIN "maps/BetaMahoganyTown.blk" + +Route31_BlockData: + INCBIN "maps/Route31.blk" + +Route27_BlockData: + INCBIN "maps/Route27.blk" + +Route35_BlockData: + INCBIN "maps/Route35.blk" + +Route43_BlockData: + INCBIN "maps/Route43.blk" + +Route39_BlockData: + INCBIN "maps/Route39.blk" + +KrissHouse1F_BlockData: + INCBIN "maps/KrissHouse1F.blk" + +Route38EcruteakGate_BlockData: +Route42EcruteakGate_BlockData: +Route32RuinsOfAlphGate_BlockData: +IlexForestAzaleaGate_BlockData: +Route15FuchsiaGate_BlockData: +Route8SaffronGate_BlockData: +Route16Gate_BlockData: +Route7SaffronGate_BlockData: +Route1718Gate_BlockData: +Route31VioletGate_BlockData: + INCBIN "maps/EastWestGate.blk" + +BetaAzaleaTown_BlockData: + INCBIN "maps/BetaAzaleaTown.blk" + +VermilionCity_BlockData: + INCBIN "maps/VermilionCity.blk" + +BetaOlivineCity_BlockData: + INCBIN "maps/BetaOlivineCity.blk" + +BetaNewBarkTown_BlockData: + INCBIN "maps/BetaNewBarkTown.blk" + +ElmsLab_BlockData: + INCBIN "maps/ElmsLab.blk" + +CeruleanCity_BlockData: + INCBIN "maps/CeruleanCity.blk" + +Route1_BlockData: + INCBIN "maps/Route1.blk" + +Route5_BlockData: + INCBIN "maps/Route5.blk" + +Route9_BlockData: + INCBIN "maps/Route9.blk" + +Route22_BlockData: + INCBIN "maps/Route22.blk" + + +SECTION "Map Blockdata 2", ROMX + +Route14_BlockData: + INCBIN "maps/Route14.blk" + +BetaSproutTower8_BlockData: + INCBIN "maps/BetaSproutTower8.blk" + +OlivineMart_BlockData: +EcruteakMart_BlockData: +BlackthornMart_BlockData: +CeruleanMart_BlockData: +AzaleaMart_BlockData: +VioletMart_BlockData: +VermilionMart_BlockData: +PewterMart_BlockData: +FuchsiaMart_BlockData: +LavenderMart_BlockData: +ViridianMart_BlockData: +SaffronMart_BlockData: +CherrygroveMart_BlockData: + INCBIN "maps/Mart.blk" + +Route10North_BlockData: + INCBIN "maps/Route10North.blk" + +BetaLakeOfRage_BlockData: + INCBIN "maps/BetaLakeOfRage.blk" + +OlivinePokeCenter1F_BlockData: +MahoganyPokeCenter1F_BlockData: +EcruteakPokeCenter1F_BlockData: +BlackthornPokeCenter1F_BlockData: +CinnabarPokeCenter1F_BlockData: +CeruleanPokeCenter1F_BlockData: +Route10PokeCenter1F_BlockData: +AzaleaPokeCenter1F_BlockData: +VioletPokeCenter1F_BlockData: +Route32PokeCenter1F_BlockData: +GoldenrodPokeCenter1F_BlockData: +VermilionPokeCenter1F_BlockData: +PewterPokeCenter1F_BlockData: +FuchsiaPokeCenter1F_BlockData: +LavenderPokeCenter1F_BlockData: +SilverCavePokeCenter1F_BlockData: +CeladonPokeCenter1F_BlockData: +CianwoodPokeCenter1F_BlockData: +ViridianPokeCenter1F_BlockData: +SaffronPokeCenter1F_BlockData: +CherrygrovePokeCenter1F_BlockData: + INCBIN "maps/PokeCenter1F.blk" + +BetaPewterMuseumOfScience1F_BlockData: + INCBIN "maps/BetaPewterMuseumOfScience1F.blk" + +BetaPewterMuseumOfScience2F_BlockData: + INCBIN "maps/BetaPewterMuseumOfScience2F.blk" + +EarlsPokemonAcademy_BlockData: + INCBIN "maps/EarlsPokemonAcademy.blk" + +BetaCinnabarIslandPokemonLabHallway_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" + +BetaCinnabarIslandPokemonLabRoom1_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" + +BetaCinnabarIslandPokemonLabRoom2_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" + +BetaCinnabarIslandPokemonLabRoom3_BlockData: + INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" + +GoldenrodDeptStore1F_BlockData: +CeladonDeptStore1F_BlockData: + INCBIN "maps/DeptStore1F.blk" + +GoldenrodDeptStore2F_BlockData: +CeladonDeptStore2F_BlockData: + INCBIN "maps/DeptStore2F.blk" + +GoldenrodDeptStore3F_BlockData: +CeladonDeptStore3F_BlockData: + INCBIN "maps/DeptStore3F.blk" + +GoldenrodDeptStore4F_BlockData: +CeladonDeptStore4F_BlockData: + INCBIN "maps/DeptStore4F.blk" + +GoldenrodDeptStore5F_BlockData: +CeladonDeptStore5F_BlockData: + INCBIN "maps/DeptStore5F.blk" + +GoldenrodDeptStore6F_BlockData: +CeladonDeptStore6F_BlockData: + INCBIN "maps/DeptStore6F.blk" + +GoldenrodDeptStoreElevator_BlockData: +CeladonDeptStoreElevator_BlockData: + INCBIN "maps/DeptStoreElevator.blk" + +CeladonMansion1F_BlockData: + INCBIN "maps/CeladonMansion1F.blk" + +CeladonMansion2F_BlockData: + INCBIN "maps/CeladonMansion2F.blk" + +CeladonMansion3F_BlockData: + INCBIN "maps/CeladonMansion3F.blk" + +CeladonMansionRoof_BlockData: + INCBIN "maps/CeladonMansionRoof.blk" + +BetaHouse_BlockData: + INCBIN "maps/BetaHouse.blk" + +CeladonGameCorner_BlockData: + INCBIN "maps/CeladonGameCorner.blk" + +CeladonGameCornerPrizeRoom_BlockData: + INCBIN "maps/CeladonGameCornerPrizeRoom.blk" + +Colosseum_BlockData: + INCBIN "maps/Colosseum.blk" + +TradeCenter_BlockData: +TimeCapsule_BlockData: + INCBIN "maps/TradeCenter.blk" + +EcruteakLugiaSpeechHouse_BlockData: +EcruteakItemfinderHouse_BlockData: +VioletNicknameSpeechHouse_BlockData: +VioletOnixTradeHouse_BlockData: + INCBIN "maps/House2.blk" + +BetaCave_BlockData: + INCBIN "maps/BetaCave.blk" + +UnionCaveB1F_BlockData: + INCBIN "maps/UnionCaveB1F.blk" + +UnionCaveB2F_BlockData: + INCBIN "maps/UnionCaveB2F.blk" + +UnionCave1F_BlockData: + INCBIN "maps/UnionCave1F.blk" + +NationalPark_BlockData: +NationalParkBugContest_BlockData: + INCBIN "maps/NationalPark.blk" + +Route6UndergroundEntrance_BlockData: +Route5UndergroundEntrance_BlockData: + INCBIN "maps/UndergroundPathEntrance.blk" + +BetaPokeCenterTradeStation_BlockData: + INCBIN "maps/BetaPokeCenterTradeStation.blk" + +KurtsHouse_BlockData: + INCBIN "maps/KurtsHouse.blk" + +GoldenrodMagnetTrainStation_BlockData: + INCBIN "maps/GoldenrodMagnetTrainStation.blk" + +RuinsOfAlphOutside_BlockData: + INCBIN "maps/RuinsOfAlphOutside.blk" + +BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData: + INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" + +RuinsOfAlphInnerChamber_BlockData: + INCBIN "maps/RuinsOfAlphInnerChamber.blk" + +RuinsOfAlphHoOhChamber_BlockData: +RuinsOfAlphKabutoChamber_BlockData: +RuinsOfAlphOmanyteChamber_BlockData: +RuinsOfAlphAerodactylChamber_BlockData: + INCBIN "maps/RuinsOfAlphPuzzleChamber.blk" + +SproutTower1F_BlockData: + INCBIN "maps/SproutTower1F.blk" + +BetaSproutTowerCutOut1_BlockData: + INCBIN "maps/BetaSproutTowerCutOut1.blk" + +SproutTower2F_BlockData: + INCBIN "maps/SproutTower2F.blk" + +BetaSproutTowerCutOut2_BlockData: + INCBIN "maps/BetaSproutTowerCutOut2.blk" + +SproutTower3F_BlockData: + INCBIN "maps/SproutTower3F.blk" + +BetaSproutTowerCutOut3_BlockData: + INCBIN "maps/BetaSproutTowerCutOut3.blk" + +RadioTower1F_BlockData: + INCBIN "maps/RadioTower1F.blk" + +RadioTower2F_BlockData: + INCBIN "maps/RadioTower2F.blk" + +RadioTower3F_BlockData: + INCBIN "maps/RadioTower3F.blk" + +RadioTower4F_BlockData: + INCBIN "maps/RadioTower4F.blk" + +RadioTower5F_BlockData: + INCBIN "maps/RadioTower5F.blk" + +NewBarkTown_BlockData: + INCBIN "maps/NewBarkTown.blk" + +CherrygroveCity_BlockData: + INCBIN "maps/CherrygroveCity.blk" + +VioletCity_BlockData: + INCBIN "maps/VioletCity.blk" + +AzaleaTown_BlockData: + INCBIN "maps/AzaleaTown.blk" + +CianwoodCity_BlockData: + INCBIN "maps/CianwoodCity.blk" + +GoldenrodCity_BlockData: + INCBIN "maps/GoldenrodCity.blk" + +OlivineCity_BlockData: + INCBIN "maps/OlivineCity.blk" + +EcruteakCity_BlockData: + INCBIN "maps/EcruteakCity.blk" + +MahoganyTown_BlockData: + INCBIN "maps/MahoganyTown.blk" + +LakeOfRage_BlockData: + INCBIN "maps/LakeOfRage.blk" + +BlackthornCity_BlockData: + INCBIN "maps/BlackthornCity.blk" + +SilverCaveOutside_BlockData: + INCBIN "maps/SilverCaveOutside.blk" + +Route6_BlockData: + INCBIN "maps/Route6.blk" + +Route7_BlockData: + INCBIN "maps/Route7.blk" + +Route16_BlockData: + INCBIN "maps/Route16.blk" + +Route18_BlockData: + INCBIN "maps/Route18.blk" + +WarehouseEntrance_BlockData: + INCBIN "maps/WarehouseEntrance.blk" + +UndergroundPathSwitchRoomEntrances_BlockData: + INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk" + +GoldenrodDeptStoreB1F_BlockData: + INCBIN "maps/GoldenrodDeptStoreB1F.blk" + +UndergroundWarehouse_BlockData: + INCBIN "maps/UndergroundWarehouse.blk" + +BetaElevator_BlockData: + INCBIN "maps/BetaElevator.blk" + +TinTower1F_BlockData: + INCBIN "maps/TinTower1F.blk" + +TinTower2F_BlockData: + INCBIN "maps/TinTower2F.blk" + +TinTower3F_BlockData: + INCBIN "maps/TinTower3F.blk" + +TinTower4F_BlockData: + INCBIN "maps/TinTower4F.blk" + +TinTower5F_BlockData: + INCBIN "maps/TinTower5F.blk" + +TinTower6F_BlockData: + INCBIN "maps/TinTower6F.blk" + +TinTower7F_BlockData: + INCBIN "maps/TinTower7F.blk" + +TinTower8F_BlockData: + INCBIN "maps/TinTower8F.blk" + +TinTower9F_BlockData: + INCBIN "maps/TinTower9F.blk" + +TinTowerRoof_BlockData: + INCBIN "maps/TinTowerRoof.blk" + +BurnedTower1F_BlockData: + INCBIN "maps/BurnedTower1F.blk" + +BurnedTowerB1F_BlockData: + INCBIN "maps/BurnedTowerB1F.blk" + +BetaCaveTestMap_BlockData: + INCBIN "maps/BetaCaveTestMap.blk" + +MountMortar1FOutside_BlockData: + INCBIN "maps/MountMortar1FOutside.blk" + +MountMortar1FInside_BlockData: + INCBIN "maps/MountMortar1FInside.blk" + +MountMortar2FInside_BlockData: + INCBIN "maps/MountMortar2FInside.blk" + +MountMortarB1F_BlockData: + INCBIN "maps/MountMortarB1F.blk" + +IcePath1F_BlockData: + INCBIN "maps/IcePath1F.blk" + +IcePathB1F_BlockData: + INCBIN "maps/IcePathB1F.blk" + +IcePathB2FMahoganySide_BlockData: + INCBIN "maps/IcePathB2FMahoganySide.blk" + +IcePathB2FBlackthornSide_BlockData: + INCBIN "maps/IcePathB2FBlackthornSide.blk" + +IcePathB3F_BlockData: + INCBIN "maps/IcePathB3F.blk" + +WhirlIslandNW_BlockData: + INCBIN "maps/WhirlIslandNW.blk" + +WhirlIslandNE_BlockData: + INCBIN "maps/WhirlIslandNE.blk" + +WhirlIslandSW_BlockData: + INCBIN "maps/WhirlIslandSW.blk" + +WhirlIslandCave_BlockData: + INCBIN "maps/WhirlIslandCave.blk" + +WhirlIslandSE_BlockData: + INCBIN "maps/WhirlIslandSE.blk" + +WhirlIslandB1F_BlockData: + INCBIN "maps/WhirlIslandB1F.blk" + +WhirlIslandB2F_BlockData: + INCBIN "maps/WhirlIslandB2F.blk" + +WhirlIslandLugiaChamber_BlockData: + INCBIN "maps/WhirlIslandLugiaChamber.blk" + +SilverCaveRoom1_BlockData: + INCBIN "maps/SilverCaveRoom1.blk" + +SilverCaveRoom2_BlockData: + INCBIN "maps/SilverCaveRoom2.blk" + +SilverCaveRoom3_BlockData: + INCBIN "maps/SilverCaveRoom3.blk" + +BetaRocketHideout1_BlockData: + INCBIN "maps/BetaRocketHideout1.blk" + +BetaRocketHideout2_BlockData: + INCBIN "maps/BetaRocketHideout2.blk" + +BetaEmptyHouse_BlockData: + INCBIN "maps/BetaEmptyHouse.blk" + +BetaRocketHideout3_BlockData: + INCBIN "maps/BetaRocketHideout3.blk" + +MahoganyMart1F_BlockData: +MountMoonGiftShop_BlockData: + INCBIN "maps/GiftShop.blk" + +TeamRocketBaseB1F_BlockData: + INCBIN "maps/TeamRocketBaseB1F.blk" + +TeamRocketBaseB2F_BlockData: + INCBIN "maps/TeamRocketBaseB2F.blk" + +TeamRocketBaseB3F_BlockData: + INCBIN "maps/TeamRocketBaseB3F.blk" + +BetaRoute23EarlyVersion_BlockData: + INCBIN "maps/BetaRoute23EarlyVersion.blk" + +IndigoPlateauPokeCenter1F_BlockData: + INCBIN "maps/IndigoPlateauPokeCenter1F.blk" + +WillsRoom_BlockData: + INCBIN "maps/WillsRoom.blk" + +KogasRoom_BlockData: + INCBIN "maps/KogasRoom.blk" + +BrunosRoom_BlockData: + INCBIN "maps/BrunosRoom.blk" + +KarensRoom_BlockData: + INCBIN "maps/KarensRoom.blk" + +AzaleaGym_BlockData: + INCBIN "maps/AzaleaGym.blk" + +VioletGym_BlockData: + INCBIN "maps/VioletGym.blk" + +GoldenrodGym_BlockData: + INCBIN "maps/GoldenrodGym.blk" + +EcruteakGym_BlockData: + INCBIN "maps/EcruteakGym.blk" + +MahoganyGym_BlockData: + INCBIN "maps/MahoganyGym.blk" + +OlivineGym_BlockData: + INCBIN "maps/OlivineGym.blk" + +BetaUnknown_BlockData: + INCBIN "maps/BetaUnknown.blk" + +CianwoodGym_BlockData: + INCBIN "maps/CianwoodGym.blk" + +BlackthornGym1F_BlockData: + INCBIN "maps/BlackthornGym1F.blk" + +BlackthornGym2F_BlockData: + INCBIN "maps/BlackthornGym2F.blk" + +OlivineLighthouse1F_BlockData: + INCBIN "maps/OlivineLighthouse1F.blk" + +OlivineLighthouse2F_BlockData: + INCBIN "maps/OlivineLighthouse2F.blk" + +OlivineLighthouse3F_BlockData: + INCBIN "maps/OlivineLighthouse3F.blk" + +OlivineLighthouse4F_BlockData: + INCBIN "maps/OlivineLighthouse4F.blk" + +OlivineLighthouse5F_BlockData: + INCBIN "maps/OlivineLighthouse5F.blk" + +OlivineLighthouse6F_BlockData: + INCBIN "maps/OlivineLighthouse6F.blk" + + +SECTION "Map Blockdata 3", ROMX + +BetaCave2_BlockData: + INCBIN "maps/BetaCave2.blk" + +SlowpokeWellB1F_BlockData: + INCBIN "maps/SlowpokeWellB1F.blk" + +SlowpokeWellB2F_BlockData: + INCBIN "maps/SlowpokeWellB2F.blk" + +IlexForest_BlockData: + INCBIN "maps/IlexForest.blk" + +DarkCaveVioletEntrance_BlockData: + INCBIN "maps/DarkCaveVioletEntrance.blk" + +DarkCaveBlackthornEntrance_BlockData: + INCBIN "maps/DarkCaveBlackthornEntrance.blk" + +RuinsOfAlphResearchCenter_BlockData: + INCBIN "maps/RuinsOfAlphResearchCenter.blk" + +GoldenrodBikeShop_BlockData: + INCBIN "maps/GoldenrodBikeShop.blk" + +DanceTheatre_BlockData: + INCBIN "maps/DanceTheatre.blk" + +EcruteakHouse_BlockData: + INCBIN "maps/EcruteakHouse.blk" + +GoldenrodGameCorner_BlockData: + INCBIN "maps/GoldenrodGameCorner.blk" + +Route35NationalParkGate_BlockData: + INCBIN "maps/Route35NationalParkGate.blk" + +Route36NationalParkGate_BlockData: + INCBIN "maps/Route36NationalParkGate.blk" + +FastShip1F_BlockData: + INCBIN "maps/FastShip1F.blk" + +FastShipB1F_BlockData: + INCBIN "maps/FastShipB1F.blk" + +BetaSSAquaInsideCutOut_BlockData: + INCBIN "maps/BetaSSAquaInsideCutOut.blk" + +FastShipCabins_NNW_NNE_NE_BlockData: + INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" + +FastShipCabins_SW_SSW_NW_BlockData: + INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" + +FastShipCabins_SE_SSE_CaptainsCabin_BlockData: + INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" + +OlivinePort_BlockData: + INCBIN "maps/OlivinePort.blk" + +VermilionPort_BlockData: + INCBIN "maps/VermilionPort.blk" + +OlivineCafe_BlockData: +SafariZoneMainOffice_BlockData: + INCBIN "maps/OlivineCafe.blk" + +KrissHouse2F_BlockData: + INCBIN "maps/KrissHouse2F.blk" + +SaffronTrainStation_BlockData: + INCBIN "maps/SaffronTrainStation.blk" + +CeruleanGym_BlockData: + INCBIN "maps/CeruleanGym.blk" + +VermilionGym_BlockData: + INCBIN "maps/VermilionGym.blk" + +SaffronGym_BlockData: + INCBIN "maps/SaffronGym.blk" + +PowerPlant_BlockData: + INCBIN "maps/PowerPlant.blk" + +PokemonFanClub_BlockData: +SafariZoneWardensHome_BlockData: + INCBIN "maps/PokemonFanClub.blk" + +FightingDojo_BlockData: + INCBIN "maps/FightingDojo.blk" + +SilphCo1F_BlockData: + INCBIN "maps/SilphCo1F.blk" + +ViridianGym_BlockData: + INCBIN "maps/ViridianGym.blk" + +TrainerHouse1F_BlockData: + INCBIN "maps/TrainerHouse1F.blk" + +TrainerHouseB1F_BlockData: + INCBIN "maps/TrainerHouseB1F.blk" + +RedsHouse1F_BlockData: + INCBIN "maps/RedsHouse1F.blk" + +RedsHouse2F_BlockData: + INCBIN "maps/RedsHouse2F.blk" + +OaksLab_BlockData: + INCBIN "maps/OaksLab.blk" + +MrFujisHouse_BlockData: + INCBIN "maps/MrFujisHouse.blk" + +LavRadioTower1F_BlockData: + INCBIN "maps/LavRadioTower1F.blk" + +SilverCaveItemRooms_BlockData: + INCBIN "maps/SilverCaveItemRooms.blk" + +DayCare_BlockData: + INCBIN "maps/DayCare.blk" + +SoulHouse_BlockData: + INCBIN "maps/SoulHouse.blk" + +PewterGym_BlockData: + INCBIN "maps/PewterGym.blk" + +CeladonGym_BlockData: + INCBIN "maps/CeladonGym.blk" + +BetaHouse2_BlockData: + INCBIN "maps/BetaHouse2.blk" + +CeladonCafe_BlockData: + INCBIN "maps/CeladonCafe.blk" + +BetaCeladonMansion_BlockData: + INCBIN "maps/BetaCeladonMansion.blk" + +RockTunnel1F_BlockData: + INCBIN "maps/RockTunnel1F.blk" + +RockTunnelB1F_BlockData: + INCBIN "maps/RockTunnelB1F.blk" + +DiglettsCave_BlockData: + INCBIN "maps/DiglettsCave.blk" + +MountMoon_BlockData: + INCBIN "maps/MountMoon.blk" + +SeafoamGym_BlockData: + INCBIN "maps/SeafoamGym.blk" + +MrPokemonsHouse_BlockData: + INCBIN "maps/MrPokemonsHouse.blk" + +VictoryRoadGate_BlockData: + INCBIN "maps/VictoryRoadGate.blk" + +OlivinePortPassage_BlockData: +VermilionPortPassage_BlockData: + INCBIN "maps/PortPassage.blk" + +FuchsiaGym_BlockData: + INCBIN "maps/FuchsiaGym.blk" + +SafariZoneBeta_BlockData: + INCBIN "maps/SafariZoneBeta.blk" + +Underground_BlockData: + INCBIN "maps/Underground.blk" + +Route39Barn_BlockData: + INCBIN "maps/Route39Barn.blk" + +VictoryRoad_BlockData: + INCBIN "maps/VictoryRoad.blk" + +Route23_BlockData: + INCBIN "maps/Route23.blk" + +LancesRoom_BlockData: + INCBIN "maps/LancesRoom.blk" + +HallOfFame_BlockData: + INCBIN "maps/HallOfFame.blk" + +CopycatsHouse1F_BlockData: + INCBIN "maps/CopycatsHouse1F.blk" + +CopycatsHouse2F_BlockData: + INCBIN "maps/CopycatsHouse2F.blk" + +GoldenrodFlowerShop_BlockData: + INCBIN "maps/GoldenrodFlowerShop.blk" + +MountMoonSquare_BlockData: + INCBIN "maps/MountMoonSquare.blk" + +WiseTriosRoom_BlockData: + INCBIN "maps/WiseTriosRoom.blk" + +DragonsDen1F_BlockData: + INCBIN "maps/DragonsDen1F.blk" + +DragonsDenB1F_BlockData: + INCBIN "maps/DragonsDenB1F.blk" + +TohjoFalls_BlockData: + INCBIN "maps/TohjoFalls.blk" + +RuinsOfAlphHoOhItemRoom_BlockData: +RuinsOfAlphKabutoItemRoom_BlockData: +RuinsOfAlphOmanyteItemRoom_BlockData: +RuinsOfAlphAerodactylItemRoom_BlockData: + INCBIN "maps/RuinsOfAlphItemRoom.blk" + +RuinsOfAlphHoOhWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk" + +RuinsOfAlphKabutoWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk" + +RuinsOfAlphOmanyteWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk" + +RuinsOfAlphAerodactylWordRoom_BlockData: + INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk" + +DragonShrine_BlockData: + INCBIN "maps/DragonShrine.blk" + +BattleTower1F_BlockData: + INCBIN "maps/BattleTower1F.blk" + +BattleTowerBattleRoom_BlockData: + INCBIN "maps/BattleTowerBattleRoom.blk" + +GoldenrodPokeComCenter2FMobile_BlockData: + INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" + +MobileTradeRoomMobile_BlockData: + INCBIN "maps/MobileTradeRoomMobile.blk" + +MobileBattleRoom_BlockData: + INCBIN "maps/MobileBattleRoom.blk" + +BattleTowerHallway_BlockData: + INCBIN "maps/BattleTowerHallway.blk" + +BattleTowerElevator_BlockData: + INCBIN "maps/BattleTowerElevator.blk" + +BattleTowerOutside_BlockData: + INCBIN "maps/BattleTowerOutside.blk" + +BetaBlank_BlockData: + INCBIN "maps/BetaBlank.blk" + +GoldenrodDeptStoreRoof_BlockData: + INCBIN "maps/GoldenrodDeptStoreRoof.blk" diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm deleted file mode 100644 index c3f363940..000000000 --- a/maps/blockdata_1.asm +++ /dev/null @@ -1,309 +0,0 @@ -Route32_BlockData: - INCBIN "maps/Route32.blk" - -Route40_BlockData: - INCBIN "maps/Route40.blk" - -Route36_BlockData: - INCBIN "maps/Route36.blk" - -Route44_BlockData: - INCBIN "maps/Route44.blk" - -Route28_BlockData: - INCBIN "maps/Route28.blk" - -BetaHerosHouse_BlockData: - INCBIN "maps/BetaHerosHouse.blk" - -CeladonCity_BlockData: - INCBIN "maps/CeladonCity.blk" - -SaffronCity_BlockData: - INCBIN "maps/SaffronCity.blk" - -Route2_BlockData: - INCBIN "maps/Route2.blk" - -ElmsHouse_BlockData: - INCBIN "maps/ElmsHouse.blk" - -BetaSproutTower1_BlockData: - INCBIN "maps/BetaSproutTower1.blk" - -Route11_BlockData: - INCBIN "maps/Route11.blk" - -BetaSproutTower5_BlockData: - INCBIN "maps/BetaSproutTower5.blk" - -Route15_BlockData: - INCBIN "maps/Route15.blk" - -BetaSproutTower9_BlockData: - INCBIN "maps/BetaSproutTower9.blk" - -Route19_BlockData: - INCBIN "maps/Route19.blk" - -BetaBlackthornCity_BlockData: - INCBIN "maps/BetaBlackthornCity.blk" - -Route10South_BlockData: - INCBIN "maps/Route10South.blk" - -PokeCenter2F_BlockData: -CinnabarPokeCenter2FBeta_BlockData: -CeruleanPokeCenter2FBeta_BlockData: -Route10PokeCenter2FBeta_BlockData: -VermilionPokeCenter2FBeta_BlockData: -PewterPokeCenter2FBeta_BlockData: -FuchsiaPokeCenter2FBeta_BlockData: -LavenderPokeCenter2FBeta_BlockData: -CeladonPokeCenter2FBeta_BlockData: -ViridianPokeCenter2FBeta_BlockData: -SaffronPokeCenter2FBeta_BlockData: - INCBIN "maps/PokeCenter2F.blk" - -Route41_BlockData: - INCBIN "maps/Route41.blk" - -Route33_BlockData: - INCBIN "maps/Route33.blk" - -Route45_BlockData: - INCBIN "maps/Route45.blk" - -Route29_BlockData: - INCBIN "maps/Route29.blk" - -Route37_BlockData: - INCBIN "maps/Route37.blk" - -LavenderTown_BlockData: - INCBIN "maps/LavenderTown.blk" - -PalletTown_BlockData: - INCBIN "maps/PalletTown.blk" - -Route25_BlockData: - INCBIN "maps/Route25.blk" - -Route24_BlockData: - INCBIN "maps/Route24.blk" - -BetaVioletCity_BlockData: - INCBIN "maps/BetaVioletCity.blk" - -Route3_BlockData: - INCBIN "maps/Route3.blk" - -PewterCity_BlockData: - INCBIN "maps/PewterCity.blk" - -BetaIlexForest_BlockData: - INCBIN "maps/BetaIlexForest.blk" - -BetaSproutTower2_BlockData: - INCBIN "maps/BetaSproutTower2.blk" - -Route12_BlockData: - INCBIN "maps/Route12.blk" - -BetaGoldenrodCity_BlockData: - INCBIN "maps/BetaGoldenrodCity.blk" - -Route20_BlockData: - INCBIN "maps/Route20.blk" - -BetaSproutTower6_BlockData: - INCBIN "maps/BetaSproutTower6.blk" - -BetaPokeCenterMainHouse_BlockData: - INCBIN "maps/BetaPokeCenterMainHouse.blk" - -Route30_BlockData: - INCBIN "maps/Route30.blk" - -Route26_BlockData: - INCBIN "maps/Route26.blk" - -Route42_BlockData: - INCBIN "maps/Route42.blk" - -Route34_BlockData: - INCBIN "maps/Route34.blk" - -Route46_BlockData: - INCBIN "maps/Route46.blk" - -FuchsiaCity_BlockData: - INCBIN "maps/FuchsiaCity.blk" - -Route38_BlockData: - INCBIN "maps/Route38.blk" - -BetaCianwoodCity_BlockData: - INCBIN "maps/BetaCianwoodCity.blk" - -OlivineTimsHouse_BlockData: -OlivineHouseBeta_BlockData: -OlivinePunishmentSpeechHouse_BlockData: -OlivineGoodRodHouse_BlockData: -Route39Farmhouse_BlockData: -MahoganyRedGyaradosSpeechHouse_BlockData: -BlackthornDragonSpeechHouse_BlockData: -BlackthornEmysHouse_BlockData: -MoveDeletersHouse_BlockData: -CeruleanGymBadgeSpeechHouse_BlockData: -CeruleanPoliceStation_BlockData: -CeruleanTradeSpeechHouse_BlockData: -BillsHouse_BlockData: -CharcoalKiln_BlockData: -LakeOfRageHiddenPowerHouse_BlockData: -LakeOfRageMagikarpHouse_BlockData: -GoldenrodHappinessRater_BlockData: -GoldenrodBillsHouse_BlockData: -GoldenrodPPSpeechHouse_BlockData: -GoldenrodNameRater_BlockData: -VermilionHouseFishingSpeechHouse_BlockData: -VermilionMagnetTrainSpeechHouse_BlockData: -VermilionHouseDiglettsCaveSpeechHouse_BlockData: -BluesHouse_BlockData: -PewterNidoranSpeechHouse_BlockData: -PewterSnoozeSpeechHouse_BlockData: -FuchsiaBillSpeechHouse_BlockData: -LavenderTownSpeechHouse_BlockData: -LavenderNameRater_BlockData: -Route12SuperRodHouse_BlockData: -Route28FamousSpeechHouse_BlockData: -CeladonMansionRoofHouse_BlockData: -Route16FuchsiaSpeechHouse_BlockData: -ManiasHouse_BlockData: -CianwoodPharmacy_BlockData: -CianwoodCityPhotoStudio_BlockData: -CianwoodLugiaSpeechHouse_BlockData: -PokeSeersHouse_BlockData: -ViridianNicknameSpeechHouse_BlockData: -Route2NuggetSpeechHouse_BlockData: -KrissNeighborsHouse_BlockData: -Route26HealSpeechHouse_BlockData: -Route26DayofWeekSiblingsHouse_BlockData: -Route27SandstormHouse_BlockData: -MrPsychicsHouse_BlockData: -Route5CleanseTagSpeechHouse_BlockData: -CherrygroveGymSpeechHouse_BlockData: -GuideGentsHouse_BlockData: -CherrygroveEvolutionSpeechHouse_BlockData: -Route30BerrySpeechHouse_BlockData: - INCBIN "maps/House1.blk" - -SafariZoneFuchsiaGateBeta_BlockData: -Route19FuchsiaGate_BlockData: -Route43MahoganyGate_BlockData: -Route43Gate_BlockData: -Route35GoldenrodGate_BlockData: -Route36RuinsOfAlphGate_BlockData: -Route34IlexForestGate_BlockData: -Route6SaffronGate_BlockData: -Route40BattleTowerGate_BlockData: -Route2Gate_BlockData: -Route2946Gate_BlockData: -Route5SaffronCityGate_BlockData: - INCBIN "maps/NorthSouthGate.blk" - -BetaTeakCity_BlockData: - INCBIN "maps/BetaTeakCity.blk" - -BetaCherrygroveCity_BlockData: - INCBIN "maps/BetaCherrygroveCity.blk" - -CinnabarIsland_BlockData: - INCBIN "maps/CinnabarIsland.blk" - -Route4_BlockData: - INCBIN "maps/Route4.blk" - -Route8_BlockData: - INCBIN "maps/Route8.blk" - -BetaSproutTower3_BlockData: - INCBIN "maps/BetaSproutTower3.blk" - -ViridianCity_BlockData: - INCBIN "maps/ViridianCity.blk" - -Route13_BlockData: - INCBIN "maps/Route13.blk" - -Route21_BlockData: - INCBIN "maps/Route21.blk" - -BetaSproutTower7_BlockData: - INCBIN "maps/BetaSproutTower7.blk" - -Route17_BlockData: - INCBIN "maps/Route17.blk" - -BetaMahoganyTown_BlockData: - INCBIN "maps/BetaMahoganyTown.blk" - -Route31_BlockData: - INCBIN "maps/Route31.blk" - -Route27_BlockData: - INCBIN "maps/Route27.blk" - -Route35_BlockData: - INCBIN "maps/Route35.blk" - -Route43_BlockData: - INCBIN "maps/Route43.blk" - -Route39_BlockData: - INCBIN "maps/Route39.blk" - -KrissHouse1F_BlockData: - INCBIN "maps/KrissHouse1F.blk" - -Route38EcruteakGate_BlockData: -Route42EcruteakGate_BlockData: -Route32RuinsOfAlphGate_BlockData: -IlexForestAzaleaGate_BlockData: -Route15FuchsiaGate_BlockData: -Route8SaffronGate_BlockData: -Route16Gate_BlockData: -Route7SaffronGate_BlockData: -Route1718Gate_BlockData: -Route31VioletGate_BlockData: - INCBIN "maps/EastWestGate.blk" - -BetaAzaleaTown_BlockData: - INCBIN "maps/BetaAzaleaTown.blk" - -VermilionCity_BlockData: - INCBIN "maps/VermilionCity.blk" - -BetaOlivineCity_BlockData: - INCBIN "maps/BetaOlivineCity.blk" - -BetaNewBarkTown_BlockData: - INCBIN "maps/BetaNewBarkTown.blk" - -ElmsLab_BlockData: - INCBIN "maps/ElmsLab.blk" - -CeruleanCity_BlockData: - INCBIN "maps/CeruleanCity.blk" - -Route1_BlockData: - INCBIN "maps/Route1.blk" - -Route5_BlockData: - INCBIN "maps/Route5.blk" - -Route9_BlockData: - INCBIN "maps/Route9.blk" - -Route22_BlockData: - INCBIN "maps/Route22.blk" diff --git a/maps/blockdata_2.asm b/maps/blockdata_2.asm deleted file mode 100644 index f88ac4c69..000000000 --- a/maps/blockdata_2.asm +++ /dev/null @@ -1,462 +0,0 @@ -Route14_BlockData: - INCBIN "maps/Route14.blk" - -BetaSproutTower8_BlockData: - INCBIN "maps/BetaSproutTower8.blk" - -OlivineMart_BlockData: -EcruteakMart_BlockData: -BlackthornMart_BlockData: -CeruleanMart_BlockData: -AzaleaMart_BlockData: -VioletMart_BlockData: -VermilionMart_BlockData: -PewterMart_BlockData: -FuchsiaMart_BlockData: -LavenderMart_BlockData: -ViridianMart_BlockData: -SaffronMart_BlockData: -CherrygroveMart_BlockData: - INCBIN "maps/Mart.blk" - -Route10North_BlockData: - INCBIN "maps/Route10North.blk" - -BetaLakeOfRage_BlockData: - INCBIN "maps/BetaLakeOfRage.blk" - -OlivinePokeCenter1F_BlockData: -MahoganyPokeCenter1F_BlockData: -EcruteakPokeCenter1F_BlockData: -BlackthornPokeCenter1F_BlockData: -CinnabarPokeCenter1F_BlockData: -CeruleanPokeCenter1F_BlockData: -Route10PokeCenter1F_BlockData: -AzaleaPokeCenter1F_BlockData: -VioletPokeCenter1F_BlockData: -Route32PokeCenter1F_BlockData: -GoldenrodPokeCenter1F_BlockData: -VermilionPokeCenter1F_BlockData: -PewterPokeCenter1F_BlockData: -FuchsiaPokeCenter1F_BlockData: -LavenderPokeCenter1F_BlockData: -SilverCavePokeCenter1F_BlockData: -CeladonPokeCenter1F_BlockData: -CianwoodPokeCenter1F_BlockData: -ViridianPokeCenter1F_BlockData: -SaffronPokeCenter1F_BlockData: -CherrygrovePokeCenter1F_BlockData: - INCBIN "maps/PokeCenter1F.blk" - -BetaPewterMuseumOfScience1F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience1F.blk" - -BetaPewterMuseumOfScience2F_BlockData: - INCBIN "maps/BetaPewterMuseumOfScience2F.blk" - -EarlsPokemonAcademy_BlockData: - INCBIN "maps/EarlsPokemonAcademy.blk" - -BetaCinnabarIslandPokemonLabHallway_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabHallway.blk" - -BetaCinnabarIslandPokemonLabRoom1_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom1.blk" - -BetaCinnabarIslandPokemonLabRoom2_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom2.blk" - -BetaCinnabarIslandPokemonLabRoom3_BlockData: - INCBIN "maps/BetaCinnabarIslandPokemonLabRoom3.blk" - -GoldenrodDeptStore1F_BlockData: -CeladonDeptStore1F_BlockData: - INCBIN "maps/DeptStore1F.blk" - -GoldenrodDeptStore2F_BlockData: -CeladonDeptStore2F_BlockData: - INCBIN "maps/DeptStore2F.blk" - -GoldenrodDeptStore3F_BlockData: -CeladonDeptStore3F_BlockData: - INCBIN "maps/DeptStore3F.blk" - -GoldenrodDeptStore4F_BlockData: -CeladonDeptStore4F_BlockData: - INCBIN "maps/DeptStore4F.blk" - -GoldenrodDeptStore5F_BlockData: -CeladonDeptStore5F_BlockData: - INCBIN "maps/DeptStore5F.blk" - -GoldenrodDeptStore6F_BlockData: -CeladonDeptStore6F_BlockData: - INCBIN "maps/DeptStore6F.blk" - -GoldenrodDeptStoreElevator_BlockData: -CeladonDeptStoreElevator_BlockData: - INCBIN "maps/DeptStoreElevator.blk" - -CeladonMansion1F_BlockData: - INCBIN "maps/CeladonMansion1F.blk" - -CeladonMansion2F_BlockData: - INCBIN "maps/CeladonMansion2F.blk" - -CeladonMansion3F_BlockData: - INCBIN "maps/CeladonMansion3F.blk" - -CeladonMansionRoof_BlockData: - INCBIN "maps/CeladonMansionRoof.blk" - -BetaHouse_BlockData: - INCBIN "maps/BetaHouse.blk" - -CeladonGameCorner_BlockData: - INCBIN "maps/CeladonGameCorner.blk" - -CeladonGameCornerPrizeRoom_BlockData: - INCBIN "maps/CeladonGameCornerPrizeRoom.blk" - -Colosseum_BlockData: - INCBIN "maps/Colosseum.blk" - -TradeCenter_BlockData: -TimeCapsule_BlockData: - INCBIN "maps/TradeCenter.blk" - -EcruteakLugiaSpeechHouse_BlockData: -EcruteakItemfinderHouse_BlockData: -VioletNicknameSpeechHouse_BlockData: -VioletOnixTradeHouse_BlockData: - INCBIN "maps/House2.blk" - -BetaCave_BlockData: - INCBIN "maps/BetaCave.blk" - -UnionCaveB1F_BlockData: - INCBIN "maps/UnionCaveB1F.blk" - -UnionCaveB2F_BlockData: - INCBIN "maps/UnionCaveB2F.blk" - -UnionCave1F_BlockData: - INCBIN "maps/UnionCave1F.blk" - -NationalPark_BlockData: -NationalParkBugContest_BlockData: - INCBIN "maps/NationalPark.blk" - -Route6UndergroundEntrance_BlockData: -Route5UndergroundEntrance_BlockData: - INCBIN "maps/UndergroundPathEntrance.blk" - -BetaPokeCenterTradeStation_BlockData: - INCBIN "maps/BetaPokeCenterTradeStation.blk" - -KurtsHouse_BlockData: - INCBIN "maps/KurtsHouse.blk" - -GoldenrodMagnetTrainStation_BlockData: - INCBIN "maps/GoldenrodMagnetTrainStation.blk" - -RuinsOfAlphOutside_BlockData: - INCBIN "maps/RuinsOfAlphOutside.blk" - -BetaRuinsOfAlphUnsolvedPuzzleRoom_BlockData: - INCBIN "maps/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk" - -RuinsOfAlphInnerChamber_BlockData: - INCBIN "maps/RuinsOfAlphInnerChamber.blk" - -RuinsOfAlphHoOhChamber_BlockData: -RuinsOfAlphKabutoChamber_BlockData: -RuinsOfAlphOmanyteChamber_BlockData: -RuinsOfAlphAerodactylChamber_BlockData: - INCBIN "maps/RuinsOfAlphPuzzleChamber.blk" - -SproutTower1F_BlockData: - INCBIN "maps/SproutTower1F.blk" - -BetaSproutTowerCutOut1_BlockData: - INCBIN "maps/BetaSproutTowerCutOut1.blk" - -SproutTower2F_BlockData: - INCBIN "maps/SproutTower2F.blk" - -BetaSproutTowerCutOut2_BlockData: - INCBIN "maps/BetaSproutTowerCutOut2.blk" - -SproutTower3F_BlockData: - INCBIN "maps/SproutTower3F.blk" - -BetaSproutTowerCutOut3_BlockData: - INCBIN "maps/BetaSproutTowerCutOut3.blk" - -RadioTower1F_BlockData: - INCBIN "maps/RadioTower1F.blk" - -RadioTower2F_BlockData: - INCBIN "maps/RadioTower2F.blk" - -RadioTower3F_BlockData: - INCBIN "maps/RadioTower3F.blk" - -RadioTower4F_BlockData: - INCBIN "maps/RadioTower4F.blk" - -RadioTower5F_BlockData: - INCBIN "maps/RadioTower5F.blk" - -NewBarkTown_BlockData: - INCBIN "maps/NewBarkTown.blk" - -CherrygroveCity_BlockData: - INCBIN "maps/CherrygroveCity.blk" - -VioletCity_BlockData: - INCBIN "maps/VioletCity.blk" - -AzaleaTown_BlockData: - INCBIN "maps/AzaleaTown.blk" - -CianwoodCity_BlockData: - INCBIN "maps/CianwoodCity.blk" - -GoldenrodCity_BlockData: - INCBIN "maps/GoldenrodCity.blk" - -OlivineCity_BlockData: - INCBIN "maps/OlivineCity.blk" - -EcruteakCity_BlockData: - INCBIN "maps/EcruteakCity.blk" - -MahoganyTown_BlockData: - INCBIN "maps/MahoganyTown.blk" - -LakeOfRage_BlockData: - INCBIN "maps/LakeOfRage.blk" - -BlackthornCity_BlockData: - INCBIN "maps/BlackthornCity.blk" - -SilverCaveOutside_BlockData: - INCBIN "maps/SilverCaveOutside.blk" - -Route6_BlockData: - INCBIN "maps/Route6.blk" - -Route7_BlockData: - INCBIN "maps/Route7.blk" - -Route16_BlockData: - INCBIN "maps/Route16.blk" - -Route18_BlockData: - INCBIN "maps/Route18.blk" - -WarehouseEntrance_BlockData: - INCBIN "maps/WarehouseEntrance.blk" - -UndergroundPathSwitchRoomEntrances_BlockData: - INCBIN "maps/UndergroundPathSwitchRoomEntrances.blk" - -GoldenrodDeptStoreB1F_BlockData: - INCBIN "maps/GoldenrodDeptStoreB1F.blk" - -UndergroundWarehouse_BlockData: - INCBIN "maps/UndergroundWarehouse.blk" - -BetaElevator_BlockData: - INCBIN "maps/BetaElevator.blk" - -TinTower1F_BlockData: - INCBIN "maps/TinTower1F.blk" - -TinTower2F_BlockData: - INCBIN "maps/TinTower2F.blk" - -TinTower3F_BlockData: - INCBIN "maps/TinTower3F.blk" - -TinTower4F_BlockData: - INCBIN "maps/TinTower4F.blk" - -TinTower5F_BlockData: - INCBIN "maps/TinTower5F.blk" - -TinTower6F_BlockData: - INCBIN "maps/TinTower6F.blk" - -TinTower7F_BlockData: - INCBIN "maps/TinTower7F.blk" - -TinTower8F_BlockData: - INCBIN "maps/TinTower8F.blk" - -TinTower9F_BlockData: - INCBIN "maps/TinTower9F.blk" - -TinTowerRoof_BlockData: - INCBIN "maps/TinTowerRoof.blk" - -BurnedTower1F_BlockData: - INCBIN "maps/BurnedTower1F.blk" - -BurnedTowerB1F_BlockData: - INCBIN "maps/BurnedTowerB1F.blk" - -BetaCaveTestMap_BlockData: - INCBIN "maps/BetaCaveTestMap.blk" - -MountMortar1FOutside_BlockData: - INCBIN "maps/MountMortar1FOutside.blk" - -MountMortar1FInside_BlockData: - INCBIN "maps/MountMortar1FInside.blk" - -MountMortar2FInside_BlockData: - INCBIN "maps/MountMortar2FInside.blk" - -MountMortarB1F_BlockData: - INCBIN "maps/MountMortarB1F.blk" - -IcePath1F_BlockData: - INCBIN "maps/IcePath1F.blk" - -IcePathB1F_BlockData: - INCBIN "maps/IcePathB1F.blk" - -IcePathB2FMahoganySide_BlockData: - INCBIN "maps/IcePathB2FMahoganySide.blk" - -IcePathB2FBlackthornSide_BlockData: - INCBIN "maps/IcePathB2FBlackthornSide.blk" - -IcePathB3F_BlockData: - INCBIN "maps/IcePathB3F.blk" - -WhirlIslandNW_BlockData: - INCBIN "maps/WhirlIslandNW.blk" - -WhirlIslandNE_BlockData: - INCBIN "maps/WhirlIslandNE.blk" - -WhirlIslandSW_BlockData: - INCBIN "maps/WhirlIslandSW.blk" - -WhirlIslandCave_BlockData: - INCBIN "maps/WhirlIslandCave.blk" - -WhirlIslandSE_BlockData: - INCBIN "maps/WhirlIslandSE.blk" - -WhirlIslandB1F_BlockData: - INCBIN "maps/WhirlIslandB1F.blk" - -WhirlIslandB2F_BlockData: - INCBIN "maps/WhirlIslandB2F.blk" - -WhirlIslandLugiaChamber_BlockData: - INCBIN "maps/WhirlIslandLugiaChamber.blk" - -SilverCaveRoom1_BlockData: - INCBIN "maps/SilverCaveRoom1.blk" - -SilverCaveRoom2_BlockData: - INCBIN "maps/SilverCaveRoom2.blk" - -SilverCaveRoom3_BlockData: - INCBIN "maps/SilverCaveRoom3.blk" - -BetaRocketHideout1_BlockData: - INCBIN "maps/BetaRocketHideout1.blk" - -BetaRocketHideout2_BlockData: - INCBIN "maps/BetaRocketHideout2.blk" - -BetaEmptyHouse_BlockData: - INCBIN "maps/BetaEmptyHouse.blk" - -BetaRocketHideout3_BlockData: - INCBIN "maps/BetaRocketHideout3.blk" - -MahoganyMart1F_BlockData: -MountMoonGiftShop_BlockData: - INCBIN "maps/GiftShop.blk" - -TeamRocketBaseB1F_BlockData: - INCBIN "maps/TeamRocketBaseB1F.blk" - -TeamRocketBaseB2F_BlockData: - INCBIN "maps/TeamRocketBaseB2F.blk" - -TeamRocketBaseB3F_BlockData: - INCBIN "maps/TeamRocketBaseB3F.blk" - -BetaRoute23EarlyVersion_BlockData: - INCBIN "maps/BetaRoute23EarlyVersion.blk" - -IndigoPlateauPokeCenter1F_BlockData: - INCBIN "maps/IndigoPlateauPokeCenter1F.blk" - -WillsRoom_BlockData: - INCBIN "maps/WillsRoom.blk" - -KogasRoom_BlockData: - INCBIN "maps/KogasRoom.blk" - -BrunosRoom_BlockData: - INCBIN "maps/BrunosRoom.blk" - -KarensRoom_BlockData: - INCBIN "maps/KarensRoom.blk" - -AzaleaGym_BlockData: - INCBIN "maps/AzaleaGym.blk" - -VioletGym_BlockData: - INCBIN "maps/VioletGym.blk" - -GoldenrodGym_BlockData: - INCBIN "maps/GoldenrodGym.blk" - -EcruteakGym_BlockData: - INCBIN "maps/EcruteakGym.blk" - -MahoganyGym_BlockData: - INCBIN "maps/MahoganyGym.blk" - -OlivineGym_BlockData: - INCBIN "maps/OlivineGym.blk" - -BetaUnknown_BlockData: - INCBIN "maps/BetaUnknown.blk" - -CianwoodGym_BlockData: - INCBIN "maps/CianwoodGym.blk" - -BlackthornGym1F_BlockData: - INCBIN "maps/BlackthornGym1F.blk" - -BlackthornGym2F_BlockData: - INCBIN "maps/BlackthornGym2F.blk" - -OlivineLighthouse1F_BlockData: - INCBIN "maps/OlivineLighthouse1F.blk" - -OlivineLighthouse2F_BlockData: - INCBIN "maps/OlivineLighthouse2F.blk" - -OlivineLighthouse3F_BlockData: - INCBIN "maps/OlivineLighthouse3F.blk" - -OlivineLighthouse4F_BlockData: - INCBIN "maps/OlivineLighthouse4F.blk" - -OlivineLighthouse5F_BlockData: - INCBIN "maps/OlivineLighthouse5F.blk" - -OlivineLighthouse6F_BlockData: - INCBIN "maps/OlivineLighthouse6F.blk" diff --git a/maps/blockdata_3.asm b/maps/blockdata_3.asm deleted file mode 100644 index 5175f9ce6..000000000 --- a/maps/blockdata_3.asm +++ /dev/null @@ -1,266 +0,0 @@ -BetaCave2_BlockData: - INCBIN "maps/BetaCave2.blk" - -SlowpokeWellB1F_BlockData: - INCBIN "maps/SlowpokeWellB1F.blk" - -SlowpokeWellB2F_BlockData: - INCBIN "maps/SlowpokeWellB2F.blk" - -IlexForest_BlockData: - INCBIN "maps/IlexForest.blk" - -DarkCaveVioletEntrance_BlockData: - INCBIN "maps/DarkCaveVioletEntrance.blk" - -DarkCaveBlackthornEntrance_BlockData: - INCBIN "maps/DarkCaveBlackthornEntrance.blk" - -RuinsOfAlphResearchCenter_BlockData: - INCBIN "maps/RuinsOfAlphResearchCenter.blk" - -GoldenrodBikeShop_BlockData: - INCBIN "maps/GoldenrodBikeShop.blk" - -DanceTheatre_BlockData: - INCBIN "maps/DanceTheatre.blk" - -EcruteakHouse_BlockData: - INCBIN "maps/EcruteakHouse.blk" - -GoldenrodGameCorner_BlockData: - INCBIN "maps/GoldenrodGameCorner.blk" - -Route35NationalParkGate_BlockData: - INCBIN "maps/Route35NationalParkGate.blk" - -Route36NationalParkGate_BlockData: - INCBIN "maps/Route36NationalParkGate.blk" - -FastShip1F_BlockData: - INCBIN "maps/FastShip1F.blk" - -FastShipB1F_BlockData: - INCBIN "maps/FastShipB1F.blk" - -BetaSSAquaInsideCutOut_BlockData: - INCBIN "maps/BetaSSAquaInsideCutOut.blk" - -FastShipCabins_NNW_NNE_NE_BlockData: - INCBIN "maps/FastShipCabins_NNW_NNE_NE.blk" - -FastShipCabins_SW_SSW_NW_BlockData: - INCBIN "maps/FastShipCabins_SW_SSW_NW.blk" - -FastShipCabins_SE_SSE_CaptainsCabin_BlockData: - INCBIN "maps/FastShipCabins_SE_SSE_CaptainsCabin.blk" - -OlivinePort_BlockData: - INCBIN "maps/OlivinePort.blk" - -VermilionPort_BlockData: - INCBIN "maps/VermilionPort.blk" - -OlivineCafe_BlockData: -SafariZoneMainOffice_BlockData: - INCBIN "maps/OlivineCafe.blk" - -KrissHouse2F_BlockData: - INCBIN "maps/KrissHouse2F.blk" - -SaffronTrainStation_BlockData: - INCBIN "maps/SaffronTrainStation.blk" - -CeruleanGym_BlockData: - INCBIN "maps/CeruleanGym.blk" - -VermilionGym_BlockData: - INCBIN "maps/VermilionGym.blk" - -SaffronGym_BlockData: - INCBIN "maps/SaffronGym.blk" - -PowerPlant_BlockData: - INCBIN "maps/PowerPlant.blk" - -PokemonFanClub_BlockData: -SafariZoneWardensHome_BlockData: - INCBIN "maps/PokemonFanClub.blk" - -FightingDojo_BlockData: - INCBIN "maps/FightingDojo.blk" - -SilphCo1F_BlockData: - INCBIN "maps/SilphCo1F.blk" - -ViridianGym_BlockData: - INCBIN "maps/ViridianGym.blk" - -TrainerHouse1F_BlockData: - INCBIN "maps/TrainerHouse1F.blk" - -TrainerHouseB1F_BlockData: - INCBIN "maps/TrainerHouseB1F.blk" - -RedsHouse1F_BlockData: - INCBIN "maps/RedsHouse1F.blk" - -RedsHouse2F_BlockData: - INCBIN "maps/RedsHouse2F.blk" - -OaksLab_BlockData: - INCBIN "maps/OaksLab.blk" - -MrFujisHouse_BlockData: - INCBIN "maps/MrFujisHouse.blk" - -LavRadioTower1F_BlockData: - INCBIN "maps/LavRadioTower1F.blk" - -SilverCaveItemRooms_BlockData: - INCBIN "maps/SilverCaveItemRooms.blk" - -DayCare_BlockData: - INCBIN "maps/DayCare.blk" - -SoulHouse_BlockData: - INCBIN "maps/SoulHouse.blk" - -PewterGym_BlockData: - INCBIN "maps/PewterGym.blk" - -CeladonGym_BlockData: - INCBIN "maps/CeladonGym.blk" - -BetaHouse2_BlockData: - INCBIN "maps/BetaHouse2.blk" - -CeladonCafe_BlockData: - INCBIN "maps/CeladonCafe.blk" - -BetaCeladonMansion_BlockData: - INCBIN "maps/BetaCeladonMansion.blk" - -RockTunnel1F_BlockData: - INCBIN "maps/RockTunnel1F.blk" - -RockTunnelB1F_BlockData: - INCBIN "maps/RockTunnelB1F.blk" - -DiglettsCave_BlockData: - INCBIN "maps/DiglettsCave.blk" - -MountMoon_BlockData: - INCBIN "maps/MountMoon.blk" - -SeafoamGym_BlockData: - INCBIN "maps/SeafoamGym.blk" - -MrPokemonsHouse_BlockData: - INCBIN "maps/MrPokemonsHouse.blk" - -VictoryRoadGate_BlockData: - INCBIN "maps/VictoryRoadGate.blk" - -OlivinePortPassage_BlockData: -VermilionPortPassage_BlockData: - INCBIN "maps/PortPassage.blk" - -FuchsiaGym_BlockData: - INCBIN "maps/FuchsiaGym.blk" - -SafariZoneBeta_BlockData: - INCBIN "maps/SafariZoneBeta.blk" - -Underground_BlockData: - INCBIN "maps/Underground.blk" - -Route39Barn_BlockData: - INCBIN "maps/Route39Barn.blk" - -VictoryRoad_BlockData: - INCBIN "maps/VictoryRoad.blk" - -Route23_BlockData: - INCBIN "maps/Route23.blk" - -LancesRoom_BlockData: - INCBIN "maps/LancesRoom.blk" - -HallOfFame_BlockData: - INCBIN "maps/HallOfFame.blk" - -CopycatsHouse1F_BlockData: - INCBIN "maps/CopycatsHouse1F.blk" - -CopycatsHouse2F_BlockData: - INCBIN "maps/CopycatsHouse2F.blk" - -GoldenrodFlowerShop_BlockData: - INCBIN "maps/GoldenrodFlowerShop.blk" - -MountMoonSquare_BlockData: - INCBIN "maps/MountMoonSquare.blk" - -WiseTriosRoom_BlockData: - INCBIN "maps/WiseTriosRoom.blk" - -DragonsDen1F_BlockData: - INCBIN "maps/DragonsDen1F.blk" - -DragonsDenB1F_BlockData: - INCBIN "maps/DragonsDenB1F.blk" - -TohjoFalls_BlockData: - INCBIN "maps/TohjoFalls.blk" - -RuinsOfAlphHoOhItemRoom_BlockData: -RuinsOfAlphKabutoItemRoom_BlockData: -RuinsOfAlphOmanyteItemRoom_BlockData: -RuinsOfAlphAerodactylItemRoom_BlockData: - INCBIN "maps/RuinsOfAlphItemRoom.blk" - -RuinsOfAlphHoOhWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphHoOhWordRoom.blk" - -RuinsOfAlphKabutoWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphKabutoWordRoom.blk" - -RuinsOfAlphOmanyteWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphOmanyteWordRoom.blk" - -RuinsOfAlphAerodactylWordRoom_BlockData: - INCBIN "maps/RuinsOfAlphAerodactylWordRoom.blk" - -DragonShrine_BlockData: - INCBIN "maps/DragonShrine.blk" - -BattleTower1F_BlockData: - INCBIN "maps/BattleTower1F.blk" - -BattleTowerBattleRoom_BlockData: - INCBIN "maps/BattleTowerBattleRoom.blk" - -GoldenrodPokeComCenter2FMobile_BlockData: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" - -MobileTradeRoomMobile_BlockData: - INCBIN "maps/MobileTradeRoomMobile.blk" - -MobileBattleRoom_BlockData: - INCBIN "maps/MobileBattleRoom.blk" - -BattleTowerHallway_BlockData: - INCBIN "maps/BattleTowerHallway.blk" - -BattleTowerElevator_BlockData: - INCBIN "maps/BattleTowerElevator.blk" - -BattleTowerOutside_BlockData: - INCBIN "maps/BattleTowerOutside.blk" - -BetaBlank_BlockData: - INCBIN "maps/BetaBlank.blk" - -GoldenrodDeptStoreRoof_BlockData: - INCBIN "maps/GoldenrodDeptStoreRoof.blk" diff --git a/tilesets/data.asm b/tilesets/data.asm new file mode 100644 index 000000000..6d1ead4c0 --- /dev/null +++ b/tilesets/data.asm @@ -0,0 +1,434 @@ +SECTION "Roofs", ROMX + +INCLUDE "tilesets/roofs.asm" + + +SECTION "Tileset Data 1", ROMX + +Tileset03GFX: ; 0x18000 +INCBIN "gfx/tilesets/03.2bpp.lz" +; 0x18606 + +Tileset03Meta: ; 0x18606 +INCBIN "tilesets/03_metatiles.bin" +; 0x18e06 + +Tileset03Coll: ; 0x18e06 +INCBIN "tilesets/03_collision.bin" +; 0x19006 + +Tileset00GFX: ; 0x19006 +Tileset01GFX: ; 0x19006 +INCBIN "gfx/tilesets/01.2bpp.lz" +; 0x19c0e + +Tileset00Meta: ; 0x19c0e +Tileset01Meta: ; 0x19c0e +INCBIN "tilesets/01_metatiles.bin" +; 0x1a40e + +Tileset00Coll: ; 0x1a40e +Tileset01Coll: ; 0x1a40e +INCBIN "tilesets/01_collision.bin" +; 0x1a60e + +Tileset29GFX: ; 0x1a60e +INCBIN "gfx/tilesets/29.2bpp.lz" +; 0x1af3e + +Tileset29Meta: ; 0x1af3e +INCBIN "tilesets/29_metatiles.bin" +; 0x1b33e + +Tileset29Coll: ; 0x1b33e +INCBIN "tilesets/29_collision.bin" +; 0x1b43e + +Tileset20GFX: ; 0x1b43e +INCBIN "gfx/tilesets/20.2bpp.lz" +; 0x1b8fe + +Tileset20Meta: ; 0x1b8fe +INCBIN "tilesets/20_metatiles.bin" +; 0x1bcfe + +Tileset20Coll: ; 0x1bcfe +INCBIN "tilesets/20_collision.bin" +; 0x1bdfe + + +SECTION "Tileset Data 2", ROMX + +Tileset07GFX: ; 0x1c30c +INCBIN "gfx/tilesets/07.2bpp.lz" +; 0x1c73c + +Tileset07Meta: ; 0x1c73c +INCBIN "tilesets/07_metatiles.bin" +; 0x1cb3c + +Tileset07Coll: ; 0x1cb3c +INCBIN "tilesets/07_collision.bin" +; 0x1cc3c + +Tileset09GFX: ; 0x1cc3c +INCBIN "gfx/tilesets/09.2bpp.lz" +; 0x1d04c + +Tileset09Meta: ; 0x1d04c +INCBIN "tilesets/09_metatiles.bin" +; 0x1d44c + +Tileset09Coll: ; 0x1d44c +INCBIN "tilesets/09_collision.bin" +; 0x1d54c + +Tileset06GFX: ; 0x1d54c +INCBIN "gfx/tilesets/06.2bpp.lz" +; 0x1d92c + +Tileset06Meta: ; 0x1d92c +INCBIN "tilesets/06_metatiles.bin" +; 0x1dd2c + +Tileset06Coll: ; 0x1dd2c +INCBIN "tilesets/06_collision.bin" +; 0x1de2c + +Tileset13GFX: ; 0x1de2c +INCBIN "gfx/tilesets/13.2bpp.lz" +; 0x1e58c + +Tileset13Meta: ; 0x1e58c +INCBIN "tilesets/13_metatiles.bin" +; 0x1e98c + +Tileset13Coll: ; 0x1e98c +INCBIN "tilesets/13_collision.bin" +; 0x1ea8c + +Tileset24GFX: ; 0x1ea8c +INCBIN "gfx/tilesets/24.2bpp.lz" +; 0x1ee1c + +Tileset24Meta: ; 0x1ee1c +Tileset30Meta: ; 0x1ee1c +INCBIN "tilesets/24_metatiles.bin" +; 0x1f21c + +Tileset24Coll: ; 0x1f21c +Tileset30Coll: ; 0x1f21c +INCBIN "tilesets/24_collision.bin" +; 0x1f31c + + +SECTION "Tileset Data 3", ROMX + +Tileset23GFX: ; 0x20181 +INCBIN "gfx/tilesets/23.2bpp.lz" +; 0x206e1 + +Tileset23Meta: ; 0x206e1 +INCBIN "tilesets/23_metatiles.bin" +; 0x20ae1 + +Tileset23Coll: ; 0x20ae1 +INCBIN "tilesets/23_collision.bin" +; 0x20be1 + +Tileset10GFX: ; 0x20be1 +INCBIN "gfx/tilesets/10.2bpp.lz" +; 0x213e1 + +Tileset10Meta: ; 0x213e1 +INCBIN "tilesets/10_metatiles.bin" +; 0x217e1 + +Tileset10Coll: ; 0x217e1 +INCBIN "tilesets/10_collision.bin" +; 0x218e1 + +Tileset12GFX: ; 0x218e1 +INCBIN "gfx/tilesets/12.2bpp.lz" +; 0x22031 + +Tileset12Meta: ; 0x22031 +INCBIN "tilesets/12_metatiles.bin" +; 0x22431 + +Tileset12Coll: ; 0x22431 +INCBIN "tilesets/12_collision.bin" +; 0x22531 + +Tileset14GFX: ; 0x22531 +INCBIN "gfx/tilesets/14.2bpp.lz" +; 0x22af1 + +Tileset14Meta: ; 0x22af1 +INCBIN "tilesets/14_metatiles.bin" +; 0x22ef1 + +Tileset14Coll: ; 0x22ef1 +INCBIN "tilesets/14_collision.bin" +; 0x22ff1 + +Tileset17GFX: ; 0x22ff1 +INCBIN "gfx/tilesets/17.2bpp.lz" +; 0x23391 + +Tileset17Meta: ; 0x23391 +INCBIN "tilesets/17_metatiles.bin" +; 0x23791 + +Tileset17Coll: ; 0x23791 +INCBIN "tilesets/17_collision.bin" +; 0x23891 + +Tileset31Meta: ; 0x23891 +INCBIN "tilesets/31_metatiles.bin" +; 0x23b11 + + +SECTION "Tileset Data 4", ROMX + +Tileset15GFX: ; 0x30000 +INCBIN "gfx/tilesets/15.2bpp.lz" +; 0x304e0 + +Tileset15Meta: ; 0x304e0 +INCBIN "tilesets/15_metatiles.bin" +; 0x308e0 + +Tileset15Coll: ; 0x308e0 +INCBIN "tilesets/15_collision.bin" +; 0x309e0 + +Tileset25GFX: ; 0x309e0 +INCBIN "gfx/tilesets/25.2bpp.lz" +; 0x30e80 + +Tileset25Meta: ; 0x30e80 +INCBIN "tilesets/25_metatiles.bin" +; 0x31280 + +Tileset25Coll: ; 0x31280 +INCBIN "tilesets/25_collision.bin" +; 0x31380 + +Tileset27GFX: ; 0x31380 +INCBIN "gfx/tilesets/27.2bpp.lz" +; 0x318e0 + +Tileset27Meta: ; 0x318e0 +INCBIN "tilesets/27_metatiles.bin" +; 0x31ce0 + +Tileset27Coll: ; 0x31ce0 +INCBIN "tilesets/27_collision.bin" +; 0x31de0 + +Tileset28GFX: ; 0x31de0 +INCBIN "gfx/tilesets/28.2bpp.lz" +; 0x321b0 + +Tileset28Meta: ; 0x321b0 +INCBIN "tilesets/28_metatiles.bin" +; 0x325b0 + +Tileset28Coll: ; 0x325b0 +INCBIN "tilesets/28_collision.bin" +; 0x326b0 + +Tileset30GFX: ; 0x326b0 +INCBIN "gfx/tilesets/30.2bpp.lz" +; 0x329f0 + +UnusedTileset30Meta: ; 0x329f0 +INCBIN "tilesets/unused_30_metatiles.bin" +; 0x331f0 + +UnusedTileset30Coll: ; 0x331f0 +INCBIN "tilesets/unused_30_collision.bin" +; 0x333f0 + + +SECTION "Tileset Data 5", ROMX + +Tileset21GFX: ; 0xb4000 +INCBIN "gfx/tilesets/21.2bpp.lz" +; 0xb48a0 + +Tileset21Meta: ; 0xb48a0 +INCBIN "tilesets/21_metatiles.bin" +; 0xb4ca0 + +Tileset21Coll: ; 0xb4ca0 +INCBIN "tilesets/21_collision.bin" +; 0xb4da0 + +Tileset22GFX: ; 0xb4da0 +INCBIN "gfx/tilesets/22.2bpp.lz" +; 0xb50e0 + +Tileset22Meta: ; 0xb50e0 +INCBIN "tilesets/22_metatiles.bin" +; 0xb54e0 + +Tileset22Coll: ; 0xb54e0 +INCBIN "tilesets/22_collision.bin" +; 0xb55e0 + +Tileset08GFX: ; 0xb55e0 +INCBIN "gfx/tilesets/08.2bpp.lz" +; 0xb59e0 + +Tileset08Meta: ; 0xb59e0 +INCBIN "tilesets/08_metatiles.bin" +; 0xb5de0 + +Tileset08Coll: ; 0xb5de0 +INCBIN "tilesets/08_collision.bin" +; 0xb5ee0 + +Tileset02GFX: ; 0xb5ee0 +Tileset04GFX: ; 0xb5ee0 +INCBIN "gfx/tilesets/02.2bpp.lz" +; 0xb6ae8 + +Tileset02Meta: ; 0xb6ae8 +INCBIN "tilesets/02_metatiles.bin" +; 0xb72e8 + +Tileset02Coll: ; 0xb72e8 +INCBIN "tilesets/02_collision.bin" +; 0xb74e8 + +Tileset16GFX: ; 0xb74e8 +INCBIN "gfx/tilesets/16.2bpp.lz" +; 0xb79a8 + +Tileset16Meta: ; 0xb79a8 +INCBIN "tilesets/16_metatiles.bin" +; 0xb7da8 + +Tileset16Coll: ; 0xb7da8 +INCBIN "tilesets/16_collision.bin" +; 0xb7ea8 + + +SECTION "Tileset Data 6", ROMX + +Tileset31GFX: ; 0xdc000 +INCBIN "gfx/tilesets/31.2bpp.lz" +; 0xdc3d0 + +Tileset18GFX: ; 0xdc3d0 +INCBIN "gfx/tilesets/18.2bpp.lz" +; 0xdcc50 + +Tileset18Meta: ; 0xdcc50 +INCBIN "tilesets/18_metatiles.bin" +; 0xdd050 + +Tileset18Coll: ; 0xdd050 +INCBIN "tilesets/18_collision.bin" +; 0xdd150 + +Tileset05GFX: ; 0xdd150 +INCBIN "gfx/tilesets/05.2bpp.lz" +; 0xdd600 + +Tileset05Meta: ; 0xdd600 +INCBIN "tilesets/05_metatiles.bin" +; 0xdda00 + +Tileset05Coll: ; 0xdda00 +INCBIN "tilesets/05_collision.bin" +; 0xddb00 + +Tileset19GFX: ; 0xddb00 +INCBIN "gfx/tilesets/19.2bpp.lz" +; 0xddf70 + +Tileset19Meta: ; 0xddf70 +INCBIN "tilesets/19_metatiles.bin" +; 0xde370 + +Tileset19Coll: ; 0xde370 +INCBIN "tilesets/19_collision.bin" +; 0xde470 + +Tileset31Coll: ; 0xde470 +INCBIN "tilesets/31_collision.bin" +; 0xde570 + +Tileset11GFX: ; 0xde570 +INCBIN "gfx/tilesets/11.2bpp.lz" +; 0xde990 + +Tileset11Meta: ; 0xde990 +INCBIN "tilesets/11_metatiles.bin" +; 0xded90 + +Tileset11Coll: ; 0xded90 +INCBIN "tilesets/11_collision.bin" +; 0xdee90 + +Tileset04Meta: ; 0xdee90 +INCBIN "tilesets/04_metatiles.bin" +; 0xdf690 + +Tileset04Coll: ; 0xdf690 +INCBIN "tilesets/04_collision.bin" +; 0xdf890 + +Tileset32Meta: ; 0xdf890 +INCBIN "tilesets/32_metatiles.bin" +; 0xdfc90 + +Tileset32Coll: ; 0xdfc90 +Tileset33Coll: ; 0xdfc90 +Tileset34Coll: ; 0xdfc90 +Tileset35Coll: ; 0xdfc90 +Tileset36Coll: ; 0xdfc90 +INCBIN "tilesets/32_collision.bin" +; 0xdfd90 + + +SECTION "Tileset Data 7", ROMX + +Tileset26GFX: ; 0x1dc5a1 +Tileset32GFX: ; 0x1dc5a1 +Tileset33GFX: ; 0x1dc5a1 +Tileset34GFX: ; 0x1dc5a1 +Tileset35GFX: ; 0x1dc5a1 +Tileset36GFX: ; 0x1dc5a1 +INCBIN "gfx/tilesets/26.2bpp.lz" +; 0x1dd1a9 + +Tileset26Meta: ; 0x1dd1a9 +INCBIN "tilesets/26_metatiles.bin" +; 0x1dd5a9 + +Tileset26Coll: ; 0x1dd5a9 +INCBIN "tilesets/26_collision.bin" +; 0x1dd6a9 + + +SECTION "Tileset Data 8", ROMX + +Tileset33Meta: ; 0x1e0000 +INCBIN "tilesets/33_metatiles.bin" +; 0x1e0400 + +Tileset34Meta: ; 0x1e0400 +INCBIN "tilesets/34_metatiles.bin" +; 0x1e0800 + +Tileset35Meta: ; 0x1e0800 +INCBIN "tilesets/35_metatiles.bin" +; 0x1e0c00 + +Tileset36Meta: ; 0x1e0c00 +INCBIN "tilesets/36_metatiles.bin" +; 0x1e1000 diff --git a/tilesets/data_1.asm b/tilesets/data_1.asm deleted file mode 100644 index 307dac666..000000000 --- a/tilesets/data_1.asm +++ /dev/null @@ -1,50 +0,0 @@ -Tileset03GFX: ; 0x18000 -INCBIN "gfx/tilesets/03.2bpp.lz" -; 0x18606 - -Tileset03Meta: ; 0x18606 -INCBIN "tilesets/03_metatiles.bin" -; 0x18e06 - -Tileset03Coll: ; 0x18e06 -INCBIN "tilesets/03_collision.bin" -; 0x19006 - -Tileset00GFX: ; 0x19006 -Tileset01GFX: ; 0x19006 -INCBIN "gfx/tilesets/01.2bpp.lz" -; 0x19c0e - -Tileset00Meta: ; 0x19c0e -Tileset01Meta: ; 0x19c0e -INCBIN "tilesets/01_metatiles.bin" -; 0x1a40e - -Tileset00Coll: ; 0x1a40e -Tileset01Coll: ; 0x1a40e -INCBIN "tilesets/01_collision.bin" -; 0x1a60e - -Tileset29GFX: ; 0x1a60e -INCBIN "gfx/tilesets/29.2bpp.lz" -; 0x1af3e - -Tileset29Meta: ; 0x1af3e -INCBIN "tilesets/29_metatiles.bin" -; 0x1b33e - -Tileset29Coll: ; 0x1b33e -INCBIN "tilesets/29_collision.bin" -; 0x1b43e - -Tileset20GFX: ; 0x1b43e -INCBIN "gfx/tilesets/20.2bpp.lz" -; 0x1b8fe - -Tileset20Meta: ; 0x1b8fe -INCBIN "tilesets/20_metatiles.bin" -; 0x1bcfe - -Tileset20Coll: ; 0x1bcfe -INCBIN "tilesets/20_collision.bin" -; 0x1bdfe diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm deleted file mode 100644 index 9109cc235..000000000 --- a/tilesets/data_2.asm +++ /dev/null @@ -1,61 +0,0 @@ -Tileset07GFX: ; 0x1c30c -INCBIN "gfx/tilesets/07.2bpp.lz" -; 0x1c73c - -Tileset07Meta: ; 0x1c73c -INCBIN "tilesets/07_metatiles.bin" -; 0x1cb3c - -Tileset07Coll: ; 0x1cb3c -INCBIN "tilesets/07_collision.bin" -; 0x1cc3c - -Tileset09GFX: ; 0x1cc3c -INCBIN "gfx/tilesets/09.2bpp.lz" -; 0x1d04c - -Tileset09Meta: ; 0x1d04c -INCBIN "tilesets/09_metatiles.bin" -; 0x1d44c - -Tileset09Coll: ; 0x1d44c -INCBIN "tilesets/09_collision.bin" -; 0x1d54c - -Tileset06GFX: ; 0x1d54c -INCBIN "gfx/tilesets/06.2bpp.lz" -; 0x1d92c - -Tileset06Meta: ; 0x1d92c -INCBIN "tilesets/06_metatiles.bin" -; 0x1dd2c - -Tileset06Coll: ; 0x1dd2c -INCBIN "tilesets/06_collision.bin" -; 0x1de2c - -Tileset13GFX: ; 0x1de2c -INCBIN "gfx/tilesets/13.2bpp.lz" -; 0x1e58c - -Tileset13Meta: ; 0x1e58c -INCBIN "tilesets/13_metatiles.bin" -; 0x1e98c - -Tileset13Coll: ; 0x1e98c -INCBIN "tilesets/13_collision.bin" -; 0x1ea8c - -Tileset24GFX: ; 0x1ea8c -INCBIN "gfx/tilesets/24.2bpp.lz" -; 0x1ee1c - -Tileset24Meta: ; 0x1ee1c -Tileset30Meta: ; 0x1ee1c -INCBIN "tilesets/24_metatiles.bin" -; 0x1f21c - -Tileset24Coll: ; 0x1f21c -Tileset30Coll: ; 0x1f21c -INCBIN "tilesets/24_collision.bin" -; 0x1f31c diff --git a/tilesets/data_3.asm b/tilesets/data_3.asm deleted file mode 100644 index 72b2b72ff..000000000 --- a/tilesets/data_3.asm +++ /dev/null @@ -1,64 +0,0 @@ -Tileset23GFX: ; 0x20181 -INCBIN "gfx/tilesets/23.2bpp.lz" -; 0x206e1 - -Tileset23Meta: ; 0x206e1 -INCBIN "tilesets/23_metatiles.bin" -; 0x20ae1 - -Tileset23Coll: ; 0x20ae1 -INCBIN "tilesets/23_collision.bin" -; 0x20be1 - -Tileset10GFX: ; 0x20be1 -INCBIN "gfx/tilesets/10.2bpp.lz" -; 0x213e1 - -Tileset10Meta: ; 0x213e1 -INCBIN "tilesets/10_metatiles.bin" -; 0x217e1 - -Tileset10Coll: ; 0x217e1 -INCBIN "tilesets/10_collision.bin" -; 0x218e1 - -Tileset12GFX: ; 0x218e1 -INCBIN "gfx/tilesets/12.2bpp.lz" -; 0x22031 - -Tileset12Meta: ; 0x22031 -INCBIN "tilesets/12_metatiles.bin" -; 0x22431 - -Tileset12Coll: ; 0x22431 -INCBIN "tilesets/12_collision.bin" -; 0x22531 - -Tileset14GFX: ; 0x22531 -INCBIN "gfx/tilesets/14.2bpp.lz" -; 0x22af1 - -Tileset14Meta: ; 0x22af1 -INCBIN "tilesets/14_metatiles.bin" -; 0x22ef1 - -Tileset14Coll: ; 0x22ef1 -INCBIN "tilesets/14_collision.bin" -; 0x22ff1 - -Tileset17GFX: ; 0x22ff1 -INCBIN "gfx/tilesets/17.2bpp.lz" -; 0x23391 - -Tileset17Meta: ; 0x23391 -INCBIN "tilesets/17_metatiles.bin" -; 0x23791 - -Tileset17Coll: ; 0x23791 -INCBIN "tilesets/17_collision.bin" -; 0x23891 - -; todo -Tileset31Meta: ; 0x23891 -INCBIN "tilesets/31_metatiles.bin" -; 0x23b11 diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm deleted file mode 100644 index fb61d1f2b..000000000 --- a/tilesets/data_4.asm +++ /dev/null @@ -1,59 +0,0 @@ -Tileset15GFX: ; 0x30000 -INCBIN "gfx/tilesets/15.2bpp.lz" -; 0x304e0 - -Tileset15Meta: ; 0x304e0 -INCBIN "tilesets/15_metatiles.bin" -; 0x308e0 - -Tileset15Coll: ; 0x308e0 -INCBIN "tilesets/15_collision.bin" -; 0x309e0 - -Tileset25GFX: ; 0x309e0 -INCBIN "gfx/tilesets/25.2bpp.lz" -; 0x30e80 - -Tileset25Meta: ; 0x30e80 -INCBIN "tilesets/25_metatiles.bin" -; 0x31280 - -Tileset25Coll: ; 0x31280 -INCBIN "tilesets/25_collision.bin" -; 0x31380 - -Tileset27GFX: ; 0x31380 -INCBIN "gfx/tilesets/27.2bpp.lz" -; 0x318e0 - -Tileset27Meta: ; 0x318e0 -INCBIN "tilesets/27_metatiles.bin" -; 0x31ce0 - -Tileset27Coll: ; 0x31ce0 -INCBIN "tilesets/27_collision.bin" -; 0x31de0 - -Tileset28GFX: ; 0x31de0 -INCBIN "gfx/tilesets/28.2bpp.lz" -; 0x321b0 - -Tileset28Meta: ; 0x321b0 -INCBIN "tilesets/28_metatiles.bin" -; 0x325b0 - -Tileset28Coll: ; 0x325b0 -INCBIN "tilesets/28_collision.bin" -; 0x326b0 - -Tileset30GFX: ; 0x326b0 -INCBIN "gfx/tilesets/30.2bpp.lz" -; 0x329f0 - -UnusedTileset30Meta: ; 0x329f0 -INCBIN "tilesets/unused_30_metatiles.bin" -; 0x331f0 - -UnusedTileset30Coll: ; 0x331f0 -INCBIN "tilesets/unused_30_collision.bin" -; 0x333f0 diff --git a/tilesets/data_5.asm b/tilesets/data_5.asm deleted file mode 100644 index 109df2daf..000000000 --- a/tilesets/data_5.asm +++ /dev/null @@ -1,60 +0,0 @@ -Tileset21GFX: ; 0xb4000 -INCBIN "gfx/tilesets/21.2bpp.lz" -; 0xb48a0 - -Tileset21Meta: ; 0xb48a0 -INCBIN "tilesets/21_metatiles.bin" -; 0xb4ca0 - -Tileset21Coll: ; 0xb4ca0 -INCBIN "tilesets/21_collision.bin" -; 0xb4da0 - -Tileset22GFX: ; 0xb4da0 -INCBIN "gfx/tilesets/22.2bpp.lz" -; 0xb50e0 - -Tileset22Meta: ; 0xb50e0 -INCBIN "tilesets/22_metatiles.bin" -; 0xb54e0 - -Tileset22Coll: ; 0xb54e0 -INCBIN "tilesets/22_collision.bin" -; 0xb55e0 - -Tileset08GFX: ; 0xb55e0 -INCBIN "gfx/tilesets/08.2bpp.lz" -; 0xb59e0 - -Tileset08Meta: ; 0xb59e0 -INCBIN "tilesets/08_metatiles.bin" -; 0xb5de0 - -Tileset08Coll: ; 0xb5de0 -INCBIN "tilesets/08_collision.bin" -; 0xb5ee0 - -Tileset02GFX: ; 0xb5ee0 -Tileset04GFX: ; 0xb5ee0 -INCBIN "gfx/tilesets/04.2bpp.lz" -; 0xb6ae8 - -Tileset02Meta: ; 0xb6ae8 -INCBIN "tilesets/02_metatiles.bin" -; 0xb72e8 - -Tileset02Coll: ; 0xb72e8 -INCBIN "tilesets/02_collision.bin" -; 0xb74e8 - -Tileset16GFX: ; 0xb74e8 -INCBIN "gfx/tilesets/16.2bpp.lz" -; 0xb79a8 - -Tileset16Meta: ; 0xb79a8 -INCBIN "tilesets/16_metatiles.bin" -; 0xb7da8 - -Tileset16Coll: ; 0xb7da8 -INCBIN "tilesets/16_collision.bin" -; 0xb7ea8 diff --git a/tilesets/data_6.asm b/tilesets/data_6.asm deleted file mode 100644 index 695282bc7..000000000 --- a/tilesets/data_6.asm +++ /dev/null @@ -1,75 +0,0 @@ -Tileset31GFX: ; 0xdc000 -INCBIN "gfx/tilesets/31.2bpp.lz" -; 0xdc3d0 - -Tileset18GFX: ; 0xdc3d0 -INCBIN "gfx/tilesets/18.2bpp.lz" -; 0xdcc50 - -Tileset18Meta: ; 0xdcc50 -INCBIN "tilesets/18_metatiles.bin" -; 0xdd050 - -Tileset18Coll: ; 0xdd050 -INCBIN "tilesets/18_collision.bin" -; 0xdd150 - -Tileset05GFX: ; 0xdd150 -INCBIN "gfx/tilesets/05.2bpp.lz" -; 0xdd600 - -Tileset05Meta: ; 0xdd600 -INCBIN "tilesets/05_metatiles.bin" -; 0xdda00 - -Tileset05Coll: ; 0xdda00 -INCBIN "tilesets/05_collision.bin" -; 0xddb00 - -Tileset19GFX: ; 0xddb00 -INCBIN "gfx/tilesets/19.2bpp.lz" -; 0xddf70 - -Tileset19Meta: ; 0xddf70 -INCBIN "tilesets/19_metatiles.bin" -; 0xde370 - -Tileset19Coll: ; 0xde370 -INCBIN "tilesets/19_collision.bin" -; 0xde470 - -Tileset31Coll: ; 0xde470 -INCBIN "tilesets/31_collision.bin" -; 0xde570 - -Tileset11GFX: ; 0xde570 -INCBIN "gfx/tilesets/11.2bpp.lz" -; 0xde990 - -Tileset11Meta: ; 0xde990 -INCBIN "tilesets/11_metatiles.bin" -; 0xded90 - -Tileset11Coll: ; 0xded90 -INCBIN "tilesets/11_collision.bin" -; 0xdee90 - -Tileset04Meta: ; 0xdee90 -INCBIN "tilesets/04_metatiles.bin" -; 0xdf690 - -Tileset04Coll: ; 0xdf690 -INCBIN "tilesets/04_collision.bin" -; 0xdf890 - -Tileset32Meta: ; 0xdf890 -INCBIN "tilesets/32_metatiles.bin" -; 0xdfc90 - -Tileset32Coll: ; 0xdfc90 -Tileset33Coll: ; 0xdfc90 -Tileset34Coll: ; 0xdfc90 -Tileset35Coll: ; 0xdfc90 -Tileset36Coll: ; 0xdfc90 -INCBIN "tilesets/36_collision.bin" -; 0xdfd90 diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm deleted file mode 100644 index d781ab518..000000000 --- a/tilesets/data_7.asm +++ /dev/null @@ -1,16 +0,0 @@ -Tileset26GFX: ; 0x1dc5a1 -Tileset32GFX: ; 0x1dc5a1 -Tileset33GFX: ; 0x1dc5a1 -Tileset34GFX: ; 0x1dc5a1 -Tileset35GFX: ; 0x1dc5a1 -Tileset36GFX: ; 0x1dc5a1 -INCBIN "gfx/tilesets/26.2bpp.lz" -; 0x1dd1a9 - -Tileset26Meta: ; 0x1dd1a9 -INCBIN "tilesets/26_metatiles.bin" -; 0x1dd5a9 - -Tileset26Coll: ; 0x1dd5a9 -INCBIN "tilesets/26_collision.bin" -; 0x1dd6a9 diff --git a/tilesets/data_8.asm b/tilesets/data_8.asm deleted file mode 100644 index 7ee2ecf3d..000000000 --- a/tilesets/data_8.asm +++ /dev/null @@ -1,15 +0,0 @@ -Tileset33Meta: ; 0x1e0000 -INCBIN "tilesets/33_metatiles.bin" -; 0x1e0400 - -Tileset34Meta: ; 0x1e0400 -INCBIN "tilesets/34_metatiles.bin" -; 0x1e0800 - -Tileset35Meta: ; 0x1e0800 -INCBIN "tilesets/35_metatiles.bin" -; 0x1e0c00 - -Tileset36Meta: ; 0x1e0c00 -INCBIN "tilesets/36_metatiles.bin" -; 0x1e1000 From 25bff5c1ac83e9f260738b8b2614f3d4f63878e8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 13:58:55 -0500 Subject: [PATCH 03/35] Remove unused .asm file --- data/pokedex/entries_crystal.asm | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 data/pokedex/entries_crystal.asm diff --git a/data/pokedex/entries_crystal.asm b/data/pokedex/entries_crystal.asm deleted file mode 100644 index fc38b063d..000000000 --- a/data/pokedex/entries_crystal.asm +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDE "pokecrystal.asm" -INCLUDE "data/pokedex/entries.asm" From 66527d861f3b491f910c954c3f5d48a182d7ba12 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 15:36:58 -0500 Subject: [PATCH 04/35] "Trainer*AfterBattleText" labels --- maps/AzaleaMart.asm | 20 +++++----- maps/AzaleaPokeCenter1F.asm | 34 ++++++++--------- maps/AzaleaTown.asm | 31 ++++++++------- maps/BlackthornGym1F.asm | 12 +++--- maps/BlackthornGym2F.asm | 8 ++-- maps/CeladonGym.asm | 20 +++++----- maps/CeruleanGym.asm | 12 +++--- maps/DanceTheatre.asm | 20 +++++----- maps/DragonsDenB1F.asm | 16 ++++---- maps/EcruteakGym.asm | 16 ++++---- maps/FastShipB1F.asm | 40 ++++++++++---------- maps/FastShipCabins_NNW_NNE_NE.asm | 24 ++++++------ maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 28 +++++++------- maps/FastShipCabins_SW_SSW_NW.asm | 12 +++--- maps/GoldenrodGym.asm | 16 ++++---- maps/IlexForest.asm | 4 +- maps/LakeOfRage.asm | 16 ++++---- maps/MahoganyGym.asm | 20 +++++----- maps/MountMortar1FInside.asm | 8 ++-- maps/MountMortar2FInside.asm | 4 +- maps/NationalPark.asm | 8 ++-- maps/OlivineLighthouse2F.asm | 4 +- maps/OlivineLighthouse3F.asm | 12 +++--- maps/OlivineLighthouse4F.asm | 8 ++-- maps/OlivineLighthouse5F.asm | 8 ++-- maps/PewterGym.asm | 4 +- maps/RadioTower1F.asm | 4 +- maps/RadioTower2F.asm | 16 ++++---- maps/RadioTower3F.asm | 16 ++++---- maps/RadioTower4F.asm | 16 ++++---- maps/RadioTower5F.asm | 4 +- maps/Route1.asm | 8 ++-- maps/Route10South.asm | 8 ++-- maps/Route11.asm | 16 ++++---- maps/Route12.asm | 16 ++++---- maps/Route13.asm | 20 +++++----- maps/Route14.asm | 12 +++--- maps/Route15.asm | 24 ++++++------ maps/Route17.asm | 16 ++++---- maps/Route18.asm | 8 ++-- maps/Route19.asm | 16 ++++---- maps/Route2.asm | 12 +++--- maps/Route20.asm | 12 +++--- maps/Route21.asm | 12 +++--- maps/Route25.asm | 28 +++++++------- maps/Route26.asm | 16 ++++---- maps/Route27.asm | 16 ++++---- maps/Route3.asm | 16 ++++---- maps/Route35.asm | 24 ++++++------ maps/Route37.asm | 12 +++--- maps/Route39.asm | 12 +++--- maps/Route4.asm | 12 +++--- maps/Route40.asm | 16 ++++---- maps/Route41.asm | 40 ++++++++++---------- maps/Route42.asm | 8 ++-- maps/Route43.asm | 16 ++++---- maps/Route44.asm | 20 +++++----- maps/Route45.asm | 20 +++++----- maps/Route46.asm | 8 ++-- maps/Route6.asm | 8 ++-- maps/Route8.asm | 20 +++++----- maps/Route9.asm | 24 ++++++------ maps/RuinsOfAlphOutside.asm | 4 +- maps/SaffronGym.asm | 16 ++++---- maps/SlowpokeWellB1F.asm | 12 +++--- maps/SproutTower1F.asm | 4 +- maps/SproutTower2F.asm | 8 ++-- maps/SproutTower3F.asm | 12 +++--- maps/TeamRocketBaseB1F.asm | 8 ++-- maps/TeamRocketBaseB2F.asm | 12 +++--- maps/TeamRocketBaseB3F.asm | 16 ++++---- maps/UndergroundPathSwitchRoomEntrances.asm | 24 ++++++------ maps/UndergroundWarehouse.asm | 12 +++--- maps/UnionCave1F.asm | 20 +++++----- maps/UnionCaveB1F.asm | 16 ++++---- maps/UnionCaveB2F.asm | 12 +++--- maps/VermilionGym.asm | 12 +++--- maps/VioletGym.asm | 8 ++-- maps/WarehouseEntrance.asm | 16 ++++---- 79 files changed, 584 insertions(+), 585 deletions(-) diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index ed88a0fd1..104a5a57a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -10,19 +10,19 @@ AzaleaMart_MapScriptHeader: .MapCallbacks: db 0 -ClerkScript_0x18e040: +AzaleaMartClerkScript: opentext pokemart MARTTYPE_STANDARD, MART_AZALEA closetext end -CooltrainerMScript_0x18e047: - jumptextfaceplayer UnknownText_0x18e04d +AzaleaMartCooltrainerMScript: + jumptextfaceplayer AzaleaMartCooltrainerMText -BugCatcherScript_0x18e04a: - jumptextfaceplayer UnknownText_0x18e0b6 +AzaleaMartBugCatcherScript: + jumptextfaceplayer AzaleaMartBugCatcherText -UnknownText_0x18e04d: +AzaleaMartCooltrainerMText: text "There's no GREAT" line "BALL here. #" @@ -34,7 +34,7 @@ UnknownText_0x18e04d: cont "his custom BALLS." done -UnknownText_0x18e0b6: +AzaleaMartBugCatcherText: text "A GREAT BALL is" line "better for catch-" cont "ing #MON than a" @@ -62,6 +62,6 @@ AzaleaMart_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18e040, -1 - person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18e047, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18e04a, -1 + person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 + person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 + person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 617db23a4..2b3ca2e70 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -9,27 +9,27 @@ AzaleaPokeCenter1F_MapScriptHeader: db 1 ; triggers - dw UnknownScript_0x18db27, 0 + maptrigger .Trigger0 .MapCallbacks: db 0 -UnknownScript_0x18db27: +.Trigger0: end -NurseScript_0x18db28: +AzaleaPokeCenter1FNurseScript: jumpstd pokecenternurse -GentlemanScript_0x18db2b: - jumptextfaceplayer UnknownText_0x18db34 +AzaleaPokeCenter1FGentlemanScript: + jumptextfaceplayer AzaleaPokeCenter1FGentlemanText -FishingGuruScript_0x18db2e: - jumptextfaceplayer UnknownText_0x18dbee +AzaleaPokeCenter1FFishingGuruScript: + jumptextfaceplayer AzaleaPokeCenter1FFishingGuruText -PokefanFScript_0x18db31: - jumptextfaceplayer UnknownText_0x18dc19 +AzaleaPokeCenter1FPokefanFScript: + jumptextfaceplayer AzaleaPokeCenter1FPokefanFText -UnknownText_0x18db34: +AzaleaPokeCenter1FGentlemanText: text "Do your #MON" line "know HM moves?" @@ -40,7 +40,7 @@ UnknownText_0x18db34: line "fainted." done -UnknownText_0x18db88: +AzaleaPokeCenter1FUnusedText: text "This BILL guy" line "created the system" @@ -52,13 +52,13 @@ UnknownText_0x18db88: cont "#MON per BOX." done -UnknownText_0x18dbee: +AzaleaPokeCenter1FFishingGuruText: text "BILL's PC can" line "store up to 20" cont "#MON per BOX." done -UnknownText_0x18dc19: +AzaleaPokeCenter1FPokefanFText: text "Do you know about" line "APRICORNS?" @@ -96,7 +96,7 @@ AzaleaPokeCenter1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18db28, -1 - person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x18db2b, -1 - person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18db2e, -1 - person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18db31, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FNurseScript, -1 + person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FGentlemanScript, -1 + person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FFishingGuruScript, -1 + person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 23da7452d..1714e0432 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -112,10 +112,10 @@ AzaleaTownRivalBattleScript: end AzaleaTownRocket1Script: - jumptextfaceplayer GoodSamaritanRocketText + jumptextfaceplayer AzaleaTownRocket1Text AzaleaTownRocket2Script: - jumptextfaceplayer TastySlowpokeTailRocketText + jumptextfaceplayer AzaleaTownRocket2Text AzaleaTownGrampsScript: faceplayer @@ -159,15 +159,15 @@ WoosterScript: closetext end -AzaleaTown_CelebiEventScript: - applymovement PLAYER, Movement_PlayerWalksOutOfKurtsHouse +AzaleaTownCelebiTrigger: + applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement opentext - writetext IlexForestIsRestlessText + writetext AzaleaTownKurtText1 buttonsound spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT - writetext HeresTheGSBallBackText + writetext AzaleaTownKurtText2 buttonsound - writetext PleaseInvestigateIlexForestText + writetext AzaleaTownKurtText3 waitbutton verbosegiveitem GS_BALL spriteface AZALEATOWN_KURT_OUTSIDE, LEFT @@ -181,7 +181,7 @@ AzaleaTown_CelebiEventScript: AzaleaTownKurtScript: faceplayer opentext - writetext PleaseInvestigateIlexForestText + writetext AzaleaTownKurtText3 waitbutton spriteface AZALEATOWN_KURT_OUTSIDE, LEFT closetext @@ -217,7 +217,6 @@ WhiteApricornTree: AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL - AzaleaTownRivalBattleApproachMovement1: step LEFT step LEFT @@ -244,7 +243,7 @@ AzaleaTownRivalBattleExitMovement: step LEFT step_end -Movement_PlayerWalksOutOfKurtsHouse: +AzaleaTownPlayerLeavesKurtsHouseMovement: step LEFT step LEFT step UP @@ -314,7 +313,7 @@ AzaleaTownRivalLossText: line "you were lying." done -GoodSamaritanRocketText: +AzaleaTownRocket1Text: text "It's unsafe to go" line "in there, so I'm" cont "standing guard." @@ -323,7 +322,7 @@ GoodSamaritanRocketText: line "Samaritan?" done -TastySlowpokeTailRocketText: +AzaleaTownRocket2Text: text "Do you know about" line "SLOWPOKETAIL? I" cont "heard it's tasty!" @@ -392,19 +391,19 @@ WoosterText: text "WOOSTER: Gugyoo…" done -IlexForestIsRestlessText: +AzaleaTownKurtText1: text "ILEX FOREST is" line "restless!" para "What is going on?" done -HeresTheGSBallBackText: +AzaleaTownKurtText2: text ", here's" line "your GS BALL back!" done -PleaseInvestigateIlexForestText: +AzaleaTownKurtText3: text "Could you go see" line "why ILEX FOREST is" cont "so restless?" @@ -479,7 +478,7 @@ AzaleaTown_MapEventHeader: db 3 xy_trigger 1, $a, $5, $0, AzaleaTownRivalBattleTrigger1, $0, $0 xy_trigger 1, $b, $5, $0, AzaleaTownRivalBattleTrigger2, $0, $0 - xy_trigger 2, $6, $9, $0, AzaleaTown_CelebiEventScript, $0, $0 + xy_trigger 2, $6, $9, $0, AzaleaTownCelebiTrigger, $0, $0 .Signposts: db 9 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b36e7ef67..b291385ca 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -100,7 +100,7 @@ TrainerCooltrainermPaul: CooltrainermPaulScript: end_if_just_battled opentext - writetext CooltrainermPaulAfterText + writetext CooltrainermPaulAfterBattleText waitbutton closetext end @@ -111,7 +111,7 @@ TrainerCooltrainermMike: CooltrainermMikeScript: end_if_just_battled opentext - writetext CooltrainermMikeAfterText + writetext CooltrainermMikeAfterBattleText waitbutton closetext end @@ -122,7 +122,7 @@ TrainerCooltrainerfLola: CooltrainerfLolaScript: end_if_just_battled opentext - writetext CooltrainerfLolaAfterText + writetext CooltrainerfLolaAfterBattleText waitbutton closetext end @@ -300,7 +300,7 @@ CooltrainermPaulBeatenText: line "lost?" done -CooltrainermPaulAfterText: +CooltrainermPaulAfterBattleText: text "LANCE told you" line "that he'd like to" @@ -318,7 +318,7 @@ CooltrainermMikeBeatenText: text "That's odd." done -CooltrainermMikeAfterText: +CooltrainermMikeAfterBattleText: text "I know my short-" line "comings now." @@ -344,7 +344,7 @@ CooltrainerfLolaBeatenText: text "Way to go!" done -CooltrainerfLolaAfterText: +CooltrainerfLolaAfterBattleText: text "Dragons are weak" line "against dragon-" cont "type moves." diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index eeff34d3e..bb6a8e5a1 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -68,7 +68,7 @@ TrainerCooltrainermCody: CooltrainermCodyScript: end_if_just_battled opentext - writetext CooltrainermCodyAfterText + writetext CooltrainermCodyAfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ TrainerCooltrainerfFran: CooltrainerfFranScript: end_if_just_battled opentext - writetext CooltrainerfFranAfterText + writetext CooltrainerfFranAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ CooltrainermCodyBeatenText: line "had a dragon!" done -CooltrainermCodyAfterText: +CooltrainermCodyAfterBattleText: text "Members of our" line "dragon-user clan" @@ -119,7 +119,7 @@ CooltrainerfFranBeatenText: text "Awww… I lost…" done -CooltrainerfFranAfterText: +CooltrainerfFranAfterBattleText: text "Uh-oh… CLAIR is" line "going to be mad…" done diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 411d109f7..96681f351 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -55,7 +55,7 @@ TrainerLassMichelle: LassMichelleScript: end_if_just_battled opentext - writetext UnknownText_0x72e30 + writetext LassMichelleAfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerPicnickerTanya: PicnickerTanyaScript: end_if_just_battled opentext - writetext UnknownText_0x72e8e + writetext PicnickerTanyaAfterBattleText waitbutton closetext end @@ -77,7 +77,7 @@ TrainerBeautyJulia: BeautyJuliaScript: end_if_just_battled opentext - writetext UnknownText_0x72f01 + writetext BeautyJuliaAfterBattleText waitbutton closetext end @@ -88,7 +88,7 @@ TrainerTwinsJoandzoe1: TwinsJoandzoe1Script: end_if_just_battled opentext - writetext UnknownText_0x72f70 + writetext TwinsJoandzoe1AfterBattleText waitbutton closetext end @@ -99,7 +99,7 @@ TrainerTwinsJoandzoe2: TwinsJoandzoe2Script: end_if_just_battled opentext - writetext UnknownText_0x72fc0 + writetext TwinsJoandzoe2AfterBattleText waitbutton closetext end @@ -199,7 +199,7 @@ LassMichelleBeatenText: text "Oh, bleah!" done -UnknownText_0x72e30: +LassMichelleAfterBattleText: text "I just got care-" line "less, that's all!" done @@ -214,7 +214,7 @@ PicnickerTanyaBeatenText: text "Oh, that's it?" done -UnknownText_0x72e8e: +PicnickerTanyaAfterBattleText: text "Oh, look at all" line "your BADGES. No" @@ -232,7 +232,7 @@ BeautyJuliaBeatenText: text "How annoying!" done -UnknownText_0x72f01: +BeautyJuliaAfterBattleText: text "How do I go about" line "becoming ladylike" cont "like ERIKA?" @@ -248,7 +248,7 @@ TwinsJoandzoe1BeatenText: text "Oh… We lost…" done -UnknownText_0x72f70: +TwinsJoandzoe1AfterBattleText: text "ERIKA will get you" line "back for us!" done @@ -262,7 +262,7 @@ TwinsJoandzoe2BeatenText: text "We couldn't win…" done -UnknownText_0x72fc0: +TwinsJoandzoe2AfterBattleText: text "ERIKA is much," line "much stronger!" done diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a91a3cc9d..52e993891 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -93,7 +93,7 @@ TrainerSwimmerfDiana: SwimmerfDianaScript: end_if_just_battled opentext - writetext UnknownText_0x188856 + writetext SwimmerfDianaAfterBattleText waitbutton closetext end @@ -104,7 +104,7 @@ TrainerSwimmerfBriana: SwimmerfBrianaScript: end_if_just_battled opentext - writetext UnknownText_0x1888c0 + writetext SwimmerfBrianaAfterBattleText waitbutton closetext end @@ -115,7 +115,7 @@ TrainerSwimmermParker: SwimmermParkerScript: end_if_just_battled opentext - writetext UnknownText_0x188943 + writetext SwimmermParkerAfterBattleText waitbutton closetext end @@ -299,7 +299,7 @@ SwimmerfDianaBeatenText: line "the winner!" done -UnknownText_0x188856: +SwimmerfDianaAfterBattleText: text "I'll be swimming" line "quietly." done @@ -315,7 +315,7 @@ SwimmerfBrianaBeatenText: line "disposed of me…" done -UnknownText_0x1888c0: +SwimmerfBrianaAfterBattleText: text "Don't be too smug" line "about beating me." @@ -335,7 +335,7 @@ SwimmermParkerBeatenText: text "This can't be…" done -UnknownText_0x188943: +SwimmermParkerAfterBattleText: text "MISTY has gotten" line "much better in the" cont "past few years." diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index d4a647207..ce7ea5958 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -22,7 +22,7 @@ TrainerKimono_girlNaoko2: Kimono_girlNaoko2Script: end_if_just_battled opentext - writetext UnknownText_0x99579 + writetext Kimono_girlNaoko2AfterBattleText waitbutton closetext end @@ -33,7 +33,7 @@ TrainerKimono_girlSayo: Kimono_girlSayoScript: end_if_just_battled opentext - writetext UnknownText_0x9960b + writetext Kimono_girlSayoAfterBattleText waitbutton closetext end @@ -44,7 +44,7 @@ TrainerKimono_girlZuki: Kimono_girlZukiScript: end_if_just_battled opentext - writetext UnknownText_0x99688 + writetext Kimono_girlZukiAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ TrainerKimono_girlKuni: Kimono_girlKuniScript: end_if_just_battled opentext - writetext UnknownText_0x99714 + writetext Kimono_girlKuniAfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerKimono_girlMiki: Kimono_girlMikiScript: end_if_just_battled opentext - writetext UnknownText_0x997a8 + writetext Kimono_girlMikiAfterBattleText waitbutton closetext end @@ -148,7 +148,7 @@ Kimono_girlNaoko2BeatenText: line "strong." done -UnknownText_0x99579: +Kimono_girlNaoko2AfterBattleText: text "I enjoyed that" line "bout. I would like" cont "to see you again." @@ -167,7 +167,7 @@ Kimono_girlSayoBeatenText: line "I almost had you." done -UnknownText_0x9960b: +Kimono_girlSayoAfterBattleText: text "Rhythm is impor-" line "tant for both" @@ -188,7 +188,7 @@ Kimono_girlZukiBeatenText: line "#MON left…" done -UnknownText_0x99688: +Kimono_girlZukiAfterBattleText: text "I put a different" line "flower in my bar-" cont "rette every month." @@ -205,7 +205,7 @@ Kimono_girlKuniBeatenText: line "than you look." done -UnknownText_0x99714: +Kimono_girlKuniAfterBattleText: text "I trained a lot," line "so I thought I was" @@ -224,7 +224,7 @@ Kimono_girlMikiBeatenText: line "at #MON too." done -UnknownText_0x997a8: +Kimono_girlMikiAfterBattleText: text "I can keep dancing" line "because there are" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 3a93fc87d..ef6ec59ed 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -94,7 +94,7 @@ TrainerCooltrainermDarin: CooltrainermDarinScript: end_if_just_battled opentext - writetext CooltrainermDarinAfterText + writetext CooltrainermDarinAfterBattleText waitbutton closetext end @@ -105,7 +105,7 @@ TrainerCooltrainerfCara: CooltrainerfCaraScript: end_if_just_battled opentext - writetext CooltrainerfCaraAfterText + writetext CooltrainerfCaraAfterBattleText waitbutton closetext end @@ -116,7 +116,7 @@ TrainerTwinsLeaandpia1: TwinsLeaandpia1Script: end_if_just_battled opentext - writetext TrinsLeaandpia1AfterText + writetext TwinsLeaandpia1AfterBattleText waitbutton closetext end @@ -127,7 +127,7 @@ TrainerTwinsLeaandpia2: TwinsLeaandpia2Script: end_if_just_battled opentext - writetext TrinsLeaandpia2AfterText + writetext TwinsLeaandpia2AfterBattleText waitbutton closetext end @@ -332,7 +332,7 @@ CooltrainermDarinBeatenText: text "S-strong!" done -CooltrainermDarinAfterText: +CooltrainermDarinAfterBattleText: text "The SHRINE ahead" line "is home to the" @@ -352,7 +352,7 @@ CooltrainerfCaraBeatenText: text "Oh yikes, I lost!" done -CooltrainerfCaraAfterText: +CooltrainerfCaraAfterBattleText: text "Soon I'm going to" line "get permission" @@ -378,7 +378,7 @@ TwinsLeaandpia1BeatenText: text "Ouchies." done -TrinsLeaandpia1AfterText: +TwinsLeaandpia1AfterBattleText: text "It was like having" line "to battle LANCE." done @@ -391,7 +391,7 @@ TwinsLeaandpia2BeatenText: text "Meanie." done -TrinsLeaandpia2AfterText: +TwinsLeaandpia2AfterBattleText: text "We'll tell on you." para "MASTER will be" diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index b01e9af81..0af0cf3c9 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -105,7 +105,7 @@ TrainerSageJeffrey: SageJeffreyScript: end_if_just_battled opentext - writetext UnknownText_0x9a263 + writetext SageJeffreyAfterBattleText waitbutton closetext end @@ -116,7 +116,7 @@ TrainerSagePing: SagePingScript: end_if_just_battled opentext - writetext UnknownText_0x9a2b7 + writetext SagePingAfterBattleText waitbutton closetext end @@ -127,7 +127,7 @@ TrainerMediumMartha: MediumMarthaScript: end_if_just_battled opentext - writetext UnknownText_0x9a318 + writetext MediumMarthaAfterBattleText waitbutton closetext end @@ -138,7 +138,7 @@ TrainerMediumGrace: MediumGraceScript: end_if_just_battled opentext - writetext UnknownText_0x9a38a + writetext MediumGraceAfterBattleText waitbutton closetext end @@ -297,7 +297,7 @@ SageJeffreyBeatenText: line "experienced both." done -UnknownText_0x9a263: +SageJeffreyAfterBattleText: text "Where did #MON" line "come from?" done @@ -312,7 +312,7 @@ SagePingBeatenText: text "Ah! Well done!" done -UnknownText_0x9a2b7: +SagePingAfterBattleText: text "We use only ghost-" line "type #MON." @@ -329,7 +329,7 @@ MediumMarthaBeatenText: text "I, I, I lost!" done -UnknownText_0x9a318: +MediumMarthaAfterBattleText: text "The one who wants" line "to win most--will!" done @@ -346,7 +346,7 @@ MediumGraceBeatenText: text "Wha-what?" done -UnknownText_0x9a38a: +MediumGraceAfterBattleText: text "Fine. I shall tell" line "you the secret of" diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 4a4d3a87c..e3478657b 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -101,7 +101,7 @@ TrainerSailorJeff: SailorJeffScript: end_if_just_battled opentext - writetext UnknownText_0x76a38 + writetext SailorJeffAfterBattleText waitbutton closetext end @@ -112,7 +112,7 @@ TrainerPicnickerDebra: PicnickerDebraScript: end_if_just_battled opentext - writetext UnknownText_0x76a99 + writetext PicnickerDebraAfterBattleText waitbutton closetext end @@ -123,7 +123,7 @@ TrainerJugglerFritz: JugglerFritzScript: end_if_just_battled opentext - writetext UnknownText_0x76b02 + writetext JugglerFritzAfterBattleText waitbutton closetext end @@ -134,7 +134,7 @@ TrainerSailorGarrett: SailorGarrettScript: end_if_just_battled opentext - writetext UnknownText_0x76b7a + writetext SailorGarrettAfterBattleText waitbutton closetext end @@ -145,7 +145,7 @@ TrainerFisherJonah: FisherJonahScript: end_if_just_battled opentext - writetext UnknownText_0x76c22 + writetext FisherJonahAfterBattleText waitbutton closetext end @@ -156,7 +156,7 @@ TrainerBlackbeltWai: BlackbeltWaiScript: end_if_just_battled opentext - writetext UnknownText_0x76c9e + writetext BlackbeltWaiAfterBattleText waitbutton closetext end @@ -167,7 +167,7 @@ TrainerSailorKenneth: SailorKennethScript: end_if_just_battled opentext - writetext UnknownText_0x76d5f + writetext SailorKennethAfterBattleText waitbutton closetext end @@ -178,7 +178,7 @@ TrainerTeacherShirley: TeacherShirleyScript: end_if_just_battled opentext - writetext UnknownText_0x76de1 + writetext TeacherShirleyAfterBattleText waitbutton closetext end @@ -189,7 +189,7 @@ TrainerSchoolboyNate: SchoolboyNateScript: end_if_just_battled opentext - writetext UnknownText_0x76e3d + writetext SchoolboyNateAfterBattleText waitbutton closetext end @@ -200,7 +200,7 @@ TrainerSchoolboyRicky: SchoolboyRickyScript: end_if_just_battled opentext - writetext UnknownText_0x76eb6 + writetext SchoolboyRickyAfterBattleText waitbutton closetext end @@ -278,7 +278,7 @@ SailorJeffBeatenText: line "break's over!" done -UnknownText_0x76a38: +SailorJeffAfterBattleText: text "I guess I can't" line "win if I don't get" cont "serious." @@ -294,7 +294,7 @@ PicnickerDebraBeatenText: line "strong!" done -UnknownText_0x76a99: +PicnickerDebraAfterBattleText: text "SAFFRON, CELADON…" line "I hear there are" @@ -312,7 +312,7 @@ JugglerFritzBeatenText: line "more…" done -UnknownText_0x76b02: +JugglerFritzAfterBattleText: text "No more ships for" line "me. Next time," @@ -330,7 +330,7 @@ SailorGarrettBeatenText: line "field…" done -UnknownText_0x76b7a: +SailorGarrettAfterBattleText: text "We get different" line "passengers from" @@ -352,7 +352,7 @@ FisherJonahBeatenText: line "anymore…" done -UnknownText_0x76c22: +FisherJonahAfterBattleText: text "I plan to fish off" line "VERMILION's pier." done @@ -370,7 +370,7 @@ BlackbeltWaiBeatenText: line "over!" done -UnknownText_0x76c9e: +BlackbeltWaiAfterBattleText: text "I couldn't find" line "the KARATE KING in" cont "JOHTO." @@ -393,7 +393,7 @@ SailorKennethBeatenText: line "ing is obvious…" done -UnknownText_0x76d5f: +SailorKennethAfterBattleText: text "Eight BADGES!" line "They must prove" @@ -413,7 +413,7 @@ TeacherShirleyBeatenText: text "Aaack!" done -UnknownText_0x76de1: +TeacherShirleyAfterBattleText: text "We're on a field" line "trip to the RUINS" cont "outside VIOLET." @@ -428,7 +428,7 @@ SchoolboyNateBeatenText: text "Yaargh!" done -UnknownText_0x76e3d: +SchoolboyNateAfterBattleText: text "Radios pick up" line "strange signals" cont "inside the RUINS." @@ -444,7 +444,7 @@ SchoolboyRickyBeatenText: text "I was done in!" done -UnknownText_0x76eb6: +SchoolboyRickyAfterBattleText: text "I read that there" line "are four of those" cont "stone panels." diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 9c7960201..28cdc79f0 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -20,7 +20,7 @@ TrainerCooltrainermSean: CooltrainermSeanScript: end_if_just_battled opentext - writetext UnknownText_0x7567b + writetext CooltrainermSeanAfterBattleText waitbutton closetext end @@ -31,7 +31,7 @@ TrainerCooltrainerfCarol: CooltrainerfCarolScript: end_if_just_battled opentext - writetext UnknownText_0x756f7 + writetext CooltrainerfCarolAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ TrainerPokemaniacEthan: PokemaniacEthanScript: end_if_just_battled opentext - writetext UnknownText_0x7574b + writetext PokemaniacEthanAfterBattleText waitbutton closetext end @@ -53,7 +53,7 @@ TrainerHikerNoland: HikerNolandScript: end_if_just_battled opentext - writetext UnknownText_0x757d4 + writetext HikerNolandAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ TrainerGentlemanEdward: GentlemanEdwardScript: end_if_just_battled opentext - writetext UnknownText_0x75937 + writetext GentlemanEdwardAfterBattleText waitbutton closetext end @@ -75,7 +75,7 @@ TrainerBurglarCorey: BurglarCoreyScript: end_if_just_battled opentext - writetext UnknownText_0x75996 + writetext BurglarCoreyAfterBattleText waitbutton closetext end @@ -142,7 +142,7 @@ CooltrainermSeanBeatenText: text "I wanted to win!" done -UnknownText_0x7567b: +CooltrainermSeanAfterBattleText: text "Trainers from" line "JOHTO can battle" @@ -160,7 +160,7 @@ CooltrainerfCarolBeatenText: line "ent between us?" done -UnknownText_0x756f7: +CooltrainerfCarolAfterBattleText: text "I'm going to beat" line "you someday!" done @@ -175,7 +175,7 @@ PokemaniacEthanBeatenText: text "Gyaaaah!" done -UnknownText_0x7574b: +PokemaniacEthanAfterBattleText: text "LILY's nice, but" line "MARY's the best!" @@ -194,7 +194,7 @@ HikerNolandBeatenText: line "handle!" done -UnknownText_0x757d4: +HikerNolandAfterBattleText: text "I wonder if there" line "are any mountains" @@ -240,7 +240,7 @@ GentlemanEdwardBeatenText: line "it…" done -UnknownText_0x75937: +GentlemanEdwardAfterBattleText: text "I give up." line "You don't have to" @@ -258,7 +258,7 @@ BurglarCoreyBeatenText: line "I lost!" done -UnknownText_0x75996: +BurglarCoreyAfterBattleText: text "I found a pretty" line "coin here." diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 9b8aeac85..6850eb85c 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -146,7 +146,7 @@ TrainerPokefanmColin: PokefanmColinScript: end_if_just_battled opentext - writetext UnknownText_0x7635b + writetext PokefanmColinAfterBattleText waitbutton closetext end @@ -157,7 +157,7 @@ TrainerTwinsMegandpeg1: TwinsMegandpeg1Script: end_if_just_battled opentext - writetext UnknownText_0x763c2 + writetext TwinsMegandpeg1AfterBattleText waitbutton closetext end @@ -168,7 +168,7 @@ TrainerTwinsMegandpeg2: TwinsMegandpeg2Script: end_if_just_battled opentext - writetext UnknownText_0x76428 + writetext TwinsMegandpeg2AfterBattleText waitbutton closetext end @@ -179,7 +179,7 @@ TrainerPsychicRodney: PsychicRodneyScript: end_if_just_battled opentext - writetext UnknownText_0x76497 + writetext PsychicRodneyAfterBattleText waitbutton closetext end @@ -190,7 +190,7 @@ TrainerPokefanmJeremy: PokefanmJeremyScript: end_if_just_battled opentext - writetext UnknownText_0x7651c + writetext PokefanmJeremyAfterBattleText waitbutton closetext end @@ -201,7 +201,7 @@ TrainerPokefanfGeorgia: PokefanfGeorgiaScript: end_if_just_battled opentext - writetext UnknownText_0x76596 + writetext PokefanfGeorgiaAfterBattleText waitbutton closetext end @@ -212,7 +212,7 @@ TrainerSupernerdShawn: SupernerdShawnScript: end_if_just_battled opentext - writetext UnknownText_0x7660f + writetext SupernerdShawnAfterBattleText waitbutton closetext end @@ -347,7 +347,7 @@ PokefanmColinBeatenText: text "You're strong!" done -UnknownText_0x7635b: +PokefanmColinAfterBattleText: text "You're traveling" line "all alone?" @@ -365,7 +365,7 @@ TwinsMegandpeg1BeatenText: text "Oh! We lost!" done -UnknownText_0x763c2: +TwinsMegandpeg1AfterBattleText: text "Baby is a rude" line "name to call us" cont "girls!" @@ -382,7 +382,7 @@ TwinsMegandpeg2BeatenText: text "Oh! We lost!" done -UnknownText_0x76428: +TwinsMegandpeg2AfterBattleText: text "Sometimes, kids" line "are smarter than" cont "grown-ups!" @@ -399,7 +399,7 @@ PsychicRodneyBeatenText: line "thing!" done -UnknownText_0x76497: +PsychicRodneyAfterBattleText: text "I get it. You can" line "hear JOHTO's radio" cont "on the FAST SHIP." @@ -416,7 +416,7 @@ PokefanmJeremyBeatenText: line "ful #MON!" done -UnknownText_0x7651c: +PokefanmJeremyAfterBattleText: text "I must go to the" line "#MON SALON and" cont "fix them up nice!" @@ -433,7 +433,7 @@ PokefanfGeorgiaBeatenText: line "to do?" done -UnknownText_0x76596: +PokefanfGeorgiaAfterBattleText: text "Oh, yes! I have to" line "get my #MON out" cont "of DAY-CARE!" @@ -450,7 +450,7 @@ SupernerdShawnBeatenText: line "Please!" done -UnknownText_0x7660f: +SupernerdShawnAfterBattleText: text "You should use the" line "right BALLS to fit" cont "the situation." diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 76933c600..88dac7f49 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -17,7 +17,7 @@ TrainerFirebreatherLyle: FirebreatherLyleScript: end_if_just_battled opentext - writetext UnknownText_0x75b52 + writetext FirebreatherLyleAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerBug_catcherKen: Bug_catcherKenScript: end_if_just_battled opentext - writetext UnknownText_0x75bd5 + writetext Bug_catcherKenAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerBeautyCassie: BeautyCassieScript: end_if_just_battled opentext - writetext UnknownText_0x75c43 + writetext BeautyCassieAfterBattleText waitbutton closetext end @@ -124,7 +124,7 @@ FirebreatherLyleBeatenText: line "flame's tiny…" done -UnknownText_0x75b52: +FirebreatherLyleAfterBattleText: text "I guess fire is" line "weak on the sea." @@ -143,7 +143,7 @@ Bug_catcherKenBeatenText: line "You're tough!" done -UnknownText_0x75bd5: +Bug_catcherKenAfterBattleText: text "You can find lots" line "of #MON in the" cont "trees of JOHTO!" @@ -159,7 +159,7 @@ BeautyCassieBeatenText: text "My heart weeps…" done -UnknownText_0x75c43: +BeautyCassieAfterBattleText: text "A voyage is best" line "for getting over" cont "a broken heart." diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3fb6057dc..b014bc126 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -100,7 +100,7 @@ TrainerLassCarrie: LassCarrieScript: end_if_just_battled opentext - writetext LassCarrieOWText + writetext LassCarrieAfterBattleText waitbutton closetext end @@ -124,7 +124,7 @@ TrainerLassBridget: LassBridgetScript: end_if_just_battled opentext - writetext LassBridgetOWText + writetext LassBridgetAfterBattleText waitbutton closetext end @@ -135,7 +135,7 @@ TrainerBeautyVictoria: BeautyVictoriaScript: end_if_just_battled opentext - writetext BeautyVictoriaOWText + writetext BeautyVictoriaAfterBattleText waitbutton closetext end @@ -146,7 +146,7 @@ TrainerBeautySamantha: BeautySamanthaScript: end_if_just_battled opentext - writetext BeautySamanthaOWText + writetext BeautySamanthaAfterBattleText waitbutton closetext end @@ -285,7 +285,7 @@ LassCarrieBeatenText: line "you were weak…" done -LassCarrieOWText: +LassCarrieAfterBattleText: text "Do my #MON" line "think I'm cute?" done @@ -303,7 +303,7 @@ LassBridgetBeatenText: text "Oh, no, no, no!" done -LassBridgetOWText: +LassBridgetAfterBattleText: text "I'm trying to beat" line "WHITNEY, but…" cont "It's depressing." @@ -339,7 +339,7 @@ BeautyVictoriaBeatenText: line "it's over?" done -BeautyVictoriaOWText: +BeautyVictoriaAfterBattleText: text "Wow, you must be" line "good to beat me!" cont "Keep it up!" @@ -356,7 +356,7 @@ BeautySamanthaBeatenText: line "I'm so sorry!" done -BeautySamanthaOWText: +BeautySamanthaAfterBattleText: text "I taught MEOWTH" line "moves for taking" cont "on any type…" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d09ec7ab7..c1817a6cc 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -396,7 +396,7 @@ TrainerBug_catcherWayne: Bug_catcherWayneScript: end_if_just_battled opentext - writetext Bug_catcherWayneAfterText + writetext Bug_catcherWayneAfterBattleText waitbutton closetext end @@ -929,7 +929,7 @@ Bug_catcherWayneBeatenText: line "#MON before…" done -Bug_catcherWayneAfterText: +Bug_catcherWayneAfterBattleText: text "A #MON I've" line "never seen before" diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index d741ec62e..db08e2b5f 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -156,7 +156,7 @@ TrainerFisherAndre: FisherAndreScript: end_if_just_battled opentext - writetext UnknownText_0x7058f + writetext FisherAndreAfterBattleText waitbutton closetext end @@ -167,7 +167,7 @@ TrainerFisherRaymond: FisherRaymondScript: end_if_just_battled opentext - writetext UnknownText_0x70611 + writetext FisherRaymondAfterBattleText waitbutton closetext end @@ -178,7 +178,7 @@ TrainerCooltrainermAaron: CooltrainermAaronScript: end_if_just_battled opentext - writetext UnknownText_0x7069c + writetext CooltrainermAaronAfterBattleText waitbutton closetext end @@ -189,7 +189,7 @@ TrainerCooltrainerfLois: CooltrainerfLoisScript: end_if_just_battled opentext - writetext UnknownText_0x70752 + writetext CooltrainerfLoisAfterBattleText waitbutton closetext end @@ -379,7 +379,7 @@ FisherAndreBeatenText: line "MON trainer…" done -UnknownText_0x7058f: +FisherAndreAfterBattleText: text "I won't lose as an" line "angler! I catch" cont "#MON all day." @@ -398,7 +398,7 @@ FisherRaymondBeatenText: line "tangled up…" done -UnknownText_0x70611: +FisherRaymondAfterBattleText: text "Why can't I catch" line "any good #MON?" done @@ -419,7 +419,7 @@ CooltrainermAaronBeatenText: line "Good battle." done -UnknownText_0x7069c: +CooltrainermAaronAfterBattleText: text "#MON and their" line "trainer become" @@ -444,7 +444,7 @@ CooltrainerfLoisBeatenText: text "Good going!" done -UnknownText_0x70752: +CooltrainerfLoisAfterBattleText: text "Come to think of" line "it, I've seen a" cont "pink BUTTERFREE." diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 5ac4ef61b..fb78311eb 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -76,7 +76,7 @@ TrainerSkierRoxanne: SkierRoxanneScript: end_if_just_battled opentext - writetext UnknownText_0x19a116 + writetext SkierRoxanneAfterBattleText waitbutton closetext end @@ -87,7 +87,7 @@ TrainerSkierClarissa: SkierClarissaScript: end_if_just_battled opentext - writetext UnknownText_0x19a18f + writetext SkierClarissaAfterBattleText waitbutton closetext end @@ -98,7 +98,7 @@ TrainerBoarderRonald: BoarderRonaldScript: end_if_just_battled opentext - writetext UnknownText_0x199f2d + writetext BoarderRonaldAfterBattleText waitbutton closetext end @@ -109,7 +109,7 @@ TrainerBoarderBrad: BoarderBradScript: end_if_just_battled opentext - writetext BorderBradTalkText + writetext BoarderBradAfterBattleText waitbutton closetext end @@ -120,7 +120,7 @@ TrainerBoarderDouglas: BoarderDouglasScript: end_if_just_battled opentext - writetext BorderDouglasTalkText + writetext BoarderDouglasAfterBattleText waitbutton closetext end @@ -251,7 +251,7 @@ BoarderRonaldBeatenText: line "do a thing." done -UnknownText_0x199f2d: +BoarderRonaldAfterBattleText: text "I think there's a" line "move a #MON" @@ -276,7 +276,7 @@ BoarderBradBeatenText: line "serious we are?" done -BorderBradTalkText: +BoarderBradAfterBattleText: text "This GYM is great." line "I love boarding" cont "with my #MON!" @@ -292,7 +292,7 @@ BoarderDouglasBeatenText: line "PRYCE's secret." done -BorderDouglasTalkText: +BoarderDouglasAfterBattleText: text "The secret behind" line "PRYCE's power…" @@ -316,7 +316,7 @@ SkierRoxanneBeatenText: line "you in skiing!" done -UnknownText_0x19a116: +SkierRoxanneAfterBattleText: text "If you don't skate" line "with precision," @@ -334,7 +334,7 @@ SkierClarissaBeatenText: line "wipe out!" done -UnknownText_0x19a18f: +SkierClarissaAfterBattleText: text "I shouldn't have" line "been bragging" cont "about my skiing…" diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 18abb2152..4335f190f 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -23,7 +23,7 @@ TrainerPokemaniacMiller: PokemaniacMillerScript: end_if_just_battled opentext - writetext UnknownText_0x7debd + writetext PokemaniacMillerAfterBattleText waitbutton closetext end @@ -34,7 +34,7 @@ TrainerSupernerdMarkus: SupernerdMarkusScript: end_if_just_battled opentext - writetext UnknownText_0x7df97 + writetext SupernerdMarkusAfterBattleText waitbutton closetext end @@ -77,7 +77,7 @@ PokemaniacMillerBeatenText: line "kid…?" done -UnknownText_0x7debd: +PokemaniacMillerAfterBattleText: text "A while back, this" line "karate dude wanted" @@ -103,7 +103,7 @@ SupernerdMarkusBeatenText: line "someone else…" done -UnknownText_0x7df97: +SupernerdMarkusAfterBattleText: text "I came to explore" line "MT.MORTAR, but I" diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index f76300a68..1d1da1da1 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -20,7 +20,7 @@ TrainerSupernerdHugh: SupernerdHughScript: end_if_just_battled opentext - writetext UnknownText_0x7e10e + writetext SupernerdHughAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ SupernerdHughBeatenText: text "Sorry, my mistake." done -UnknownText_0x7e10e: +SupernerdHughAfterBattleText: text "I'm investigating" line "MT.MORTAR, but my" cont "pal's gone AWOL." diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 1babc73a2..f174a8efe 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -194,7 +194,7 @@ TrainerPokefanmWilliam: PokefanmWilliamScript: end_if_just_battled opentext - writetext UnknownText_0x5c645 + writetext PokefanmWilliamAfterBattleText waitbutton closetext end @@ -284,7 +284,7 @@ TrainerLassKrise: LassKriseScript: end_if_just_battled opentext - writetext UnknownText_0x5c71d + writetext LassKriseAfterBattleText waitbutton closetext end @@ -454,7 +454,7 @@ PokefanmWilliamBeatenText: text "M-my #MON!" done -UnknownText_0x5c645: +PokefanmWilliamAfterBattleText: text "I lost the battle," line "but my #MON win" @@ -484,7 +484,7 @@ LassKriseBeatenText: text "…Hmmm…" done -UnknownText_0x5c71d: +LassKriseAfterBattleText: text "I thought you were" line "staring at me" cont "because I'm cute!" diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 9afec908a..9348dce9f 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -15,7 +15,7 @@ TrainerGentlemanAlfred: GentlemanAlfredScript: end_if_just_battled opentext - writetext UnknownText_0x5b13e + writetext GentlemanAlfredAfterBattleText waitbutton closetext end @@ -183,7 +183,7 @@ GentlemanAlfredBeatenText: line "you're serious." done -UnknownText_0x5b13e: +GentlemanAlfredAfterBattleText: text "Up top is a #-" line "MON that keeps the" cont "LIGHTHOUSE lit." diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index ea1c26ac3..531492190 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -17,7 +17,7 @@ TrainerBird_keeperTheo: Bird_keeperTheoScript: end_if_just_battled opentext - writetext UnknownText_0x5b2df + writetext Bird_keeperTheoAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerGentlemanPreston: GentlemanPrestonScript: end_if_just_battled opentext - writetext UnknownText_0x5b457 + writetext GentlemanPrestonAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerSailorTerrell: SailorTerrellScript: end_if_just_battled opentext - writetext UnknownText_0x5b384 + writetext SailorTerrellAfterBattleText waitbutton closetext end @@ -60,7 +60,7 @@ Bird_keeperTheoBeatenText: line "concerned…" done -UnknownText_0x5b2df: +Bird_keeperTheoAfterBattleText: text "How the heck do" line "you go up?" @@ -82,7 +82,7 @@ SailorTerrellBeatenText: line "and strong…" done -UnknownText_0x5b384: +SailorTerrellAfterBattleText: text "Every time I come" line "back to OLIVINE, I" cont "visit the GYM." @@ -106,7 +106,7 @@ GentlemanPrestonBeatenText: line "train some more…" done -UnknownText_0x5b457: +GentlemanPrestonAfterBattleText: text "JASMINE used to" line "use rock #MON" cont "like ONIX." diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index ae5571dec..ec20af243 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -15,7 +15,7 @@ TrainerLassConnie: LassConnie1Script: end_if_just_battled opentext - writetext UnknownText_0x5b63c + writetext LassConnie1AfterBattleText waitbutton closetext end @@ -26,7 +26,7 @@ TrainerSailorKent: SailorKentScript: end_if_just_battled opentext - writetext UnknownText_0x5b584 + writetext SailorKentAfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ SailorKentBeatenText: line "smile either…" done -UnknownText_0x5b584: +SailorKentAfterBattleText: text "Speaking of sick," line "I've heard there's" @@ -68,7 +68,7 @@ LassConnie1BeatenText: text "Aaack! My #MON!" done -UnknownText_0x5b63c: +LassConnie1AfterBattleText: text "Right. Anybody" line "would be worried" cont "if his or her own" diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7b8b334c9..963dfd2eb 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -18,7 +18,7 @@ TrainerBird_keeperDenis: Bird_keeperDenisScript: end_if_just_battled opentext - writetext UnknownText_0x60ac3 + writetext Bird_keeperDenisAfterBattleText waitbutton closetext end @@ -29,7 +29,7 @@ TrainerSailorErnest: SailorErnestScript: end_if_just_battled opentext - writetext UnknownText_0x60a1f + writetext SailorErnestAfterBattleText waitbutton closetext end @@ -60,7 +60,7 @@ SailorErnestBeatenText: line "overwhelming!" done -UnknownText_0x60a1f: +SailorErnestAfterBattleText: text "A GYM LEADER isn't" line "just about being" @@ -81,7 +81,7 @@ Bird_keeperDenisBeatenText: text "Oops…They crashed…" done -UnknownText_0x60ac3: +Bird_keeperDenisAfterBattleText: text "My #MON learned" line "how to use FLY in" cont "CIANWOOD." diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 3adc06019..fd5f9d74a 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -46,7 +46,7 @@ TrainerCamperJerry: CamperJerryScript: end_if_just_battled opentext - writetext UnknownText_0x1a2c0f + writetext CamperJerryAfterBattleText waitbutton closetext end @@ -166,7 +166,7 @@ CamperJerryBeatenText: line "these battles…" done -UnknownText_0x1a2c0f: +CamperJerryAfterBattleText: text "Hey, you! Trainer" line "from JOHTO! BROCK" diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 4e670be07..8fe22d242 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -191,7 +191,7 @@ TrainerGruntM3: GruntM3Script: end_if_just_battled opentext - writetext UnknownText_0x5d5a2 + writetext GruntM3AfterBattleText waitbutton closetext end @@ -442,7 +442,7 @@ GruntM3BeatenText: line "must watch you…" done -UnknownText_0x5d5a2: +GruntM3AfterBattleText: text "You're too strong." para "Our plan could be" diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 5925532e9..093ad758c 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -60,7 +60,7 @@ TrainerGruntM4: GruntM4Script: end_if_just_battled opentext - writetext UnknownText_0x5db07 + writetext GruntM4AfterBattleText waitbutton closetext end @@ -71,7 +71,7 @@ TrainerGruntM5: GruntM5Script: end_if_just_battled opentext - writetext UnknownText_0x5db99 + writetext GruntM5AfterBattleText waitbutton closetext end @@ -82,7 +82,7 @@ TrainerGruntM6: GruntM6Script: end_if_just_battled opentext - writetext UnknownText_0x5dc00 + writetext GruntM6AfterBattleText waitbutton closetext end @@ -93,7 +93,7 @@ TrainerGruntF2: GruntF2Script: end_if_just_battled opentext - writetext UnknownText_0x5dcd0 + writetext GruntF2AfterBattleText waitbutton closetext end @@ -402,7 +402,7 @@ GruntM4BeatenText: line "cute!" done -UnknownText_0x5db07: +GruntM4AfterBattleText: text "We won't let you" line "ruin our plans" cont "for our comeback!" @@ -422,7 +422,7 @@ GruntM5BeatenText: line "hero?" done -UnknownText_0x5db99: +GruntM5AfterBattleText: text "We're not always" line "evil. We just do" cont "whatever we like." @@ -437,7 +437,7 @@ GruntM6BeatenText: text "Arggh. I give up." done -UnknownText_0x5dc00: +GruntM6AfterBattleText: text "Our EXECUTIVES are" line "trying to take" cont "this place over." @@ -464,7 +464,7 @@ GruntF2BeatenText: text "Wh-who are you?" done -UnknownText_0x5dcd0: +GruntF2AfterBattleText: text "You beat me, and" line "I won't forget it!" done diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 166950d44..fef269adf 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -91,7 +91,7 @@ TrainerGruntM7: GruntM7Script: end_if_just_battled opentext - writetext UnknownText_0x5e8d0 + writetext GruntM7AfterBattleText waitbutton closetext end @@ -102,7 +102,7 @@ TrainerGruntM8: GruntM8Script: end_if_just_battled opentext - writetext UnknownText_0x5e944 + writetext GruntM8AfterBattleText waitbutton closetext end @@ -113,7 +113,7 @@ TrainerGruntM9: GruntM9Script: end_if_just_battled opentext - writetext UnknownText_0x5e9d0 + writetext GruntM9AfterBattleText waitbutton closetext end @@ -124,7 +124,7 @@ TrainerScientistMarc: ScientistMarcScript: end_if_just_battled opentext - writetext UnknownText_0x5ea61 + writetext ScientistMarcAfterBattleText waitbutton closetext end @@ -246,7 +246,7 @@ GruntM7BeatenText: text "What?!" done -UnknownText_0x5e8d0: +GruntM7AfterBattleText: text "I failed in my" line "duties…" @@ -264,7 +264,7 @@ GruntM8BeatenText: text "You're kidding!" done -UnknownText_0x5e944: +GruntM8AfterBattleText: text "I feel lousy over" line "losing!" @@ -284,7 +284,7 @@ GruntM9BeatenText: text "I'm done for!" done -UnknownText_0x5e9d0: +GruntM9AfterBattleText: text "What?! You made it" line "past our men in" cont "the UNDERGROUND?" @@ -304,7 +304,7 @@ ScientistMarcBeatenText: line "too lightly!" done -UnknownText_0x5ea61: +ScientistMarcAfterBattleText: text "Bwahahaha…" para "I can transmit as" diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 983beb843..353977c3d 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -61,7 +61,7 @@ TrainerGruntM10: GruntM10Script: end_if_just_battled opentext - writetext UnknownText_0x5ede2 + writetext GruntM10AfterBattleText waitbutton closetext end @@ -72,7 +72,7 @@ TrainerExecutivem2: Executivem2Script: end_if_just_battled opentext - writetext UnknownText_0x5ee69 + writetext Executivem2AfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ TrainerGruntF4: GruntF4Script: end_if_just_battled opentext - writetext UnknownText_0x5ef31 + writetext GruntF4AfterBattleText waitbutton closetext end @@ -94,7 +94,7 @@ TrainerScientistRich: ScientistRichScript: end_if_just_battled opentext - writetext UnknownText_0x5efcb + writetext ScientistRichAfterBattleText waitbutton closetext end @@ -163,7 +163,7 @@ GruntM10BeatenText: text "No! Unbelievable!" done -UnknownText_0x5ede2: +GruntM10AfterBattleText: text "I don't believe" line "it! I was beaten!" done @@ -182,7 +182,7 @@ Executivem2BeatenText: line "down!" done -UnknownText_0x5ee69: +Executivem2AfterBattleText: text "You've earned my" line "respect, so here's" cont "some advice." @@ -208,7 +208,7 @@ GruntF4BeatenText: line "useless!" done -UnknownText_0x5ef31: +GruntF4AfterBattleText: text "I love my" line "beautiful self!" @@ -231,7 +231,7 @@ ScientistRichBeatenText: line "come with snags." done -UnknownText_0x5efcb: +ScientistRichAfterBattleText: text "Do you honestly" line "believe you can" cont "stop TEAM ROCKET?" diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c9c965496..3f8b444d4 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -75,7 +75,7 @@ TrainerExecutivef1: Executivef1Script: end_if_just_battled opentext - writetext Executivef1AfterText + writetext Executivef1AfterBattleText waitbutton closetext end @@ -258,7 +258,7 @@ Executivef1BeatenText: line "I still lost…" done -Executivef1AfterText: +Executivef1AfterBattleText: text ", isn't it?" para "A brat like you" diff --git a/maps/Route1.asm b/maps/Route1.asm index a8070b4e5..90377eb9b 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -16,7 +16,7 @@ TrainerSchoolboyDanny: SchoolboyDannyScript: end_if_just_battled opentext - writetext UnknownText_0x1ac5d7 + writetext SchoolboyDannyAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerCooltrainerfQuinn: CooltrainerfQuinnScript: end_if_just_battled opentext - writetext UnknownText_0x1ac640 + writetext CooltrainerfQuinnAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SchoolboyDannyBeatenText: line "losing record…" done -UnknownText_0x1ac5d7: +SchoolboyDannyAfterBattleText: text "For trainers, it's" line "a given that we'll" @@ -66,7 +66,7 @@ CooltrainerfQuinnBeatenText: text "Down and out…" done -UnknownText_0x1ac640: +CooltrainerfQuinnAfterBattleText: text "You're strong." para "You obviously must" diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a644f1540..c923c44d3 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -15,7 +15,7 @@ TrainerHikerJim: HikerJimScript: end_if_just_battled opentext - writetext UnknownText_0x1ae43b + writetext HikerJimAfterBattleText waitbutton closetext end @@ -26,7 +26,7 @@ TrainerPokefanmRobert: PokefanmRobertScript: end_if_just_battled opentext - writetext UnknownText_0x1ae4a9 + writetext PokefanmRobertAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ HikerJimBeatenText: text "Hahaha-hachoo!" done -UnknownText_0x1ae43b: +HikerJimAfterBattleText: text "Hay fever is" line "making me sneeze!" cont "Ahahah-CHOO!" @@ -60,7 +60,7 @@ PokefanmRobertBeatenText: line "that's my loss." done -UnknownText_0x1ae4a9: +PokefanmRobertAfterBattleText: text "Look what you did" line "to my #MON…" diff --git a/maps/Route11.asm b/maps/Route11.asm index 05b19d424..444800a0d 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -18,7 +18,7 @@ TrainerYoungsterOwen: YoungsterOwenScript: end_if_just_battled opentext - writetext UnknownText_0x680b2 + writetext YoungsterOwenAfterBattleText waitbutton closetext end @@ -29,7 +29,7 @@ TrainerYoungsterJason: YoungsterJasonScript: end_if_just_battled opentext - writetext UnknownText_0x6814a + writetext YoungsterJasonAfterBattleText waitbutton closetext end @@ -40,7 +40,7 @@ TrainerPsychicHerman: PsychicHermanScript: end_if_just_battled opentext - writetext UnknownText_0x6817b + writetext PsychicHermanAfterBattleText waitbutton closetext end @@ -51,7 +51,7 @@ TrainerPsychicFidel: PsychicFidelScript: end_if_just_battled opentext - writetext UnknownText_0x681ec + writetext PsychicFidelAfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ YoungsterOwenBeatenText: line "happen?" done -UnknownText_0x680b2: +YoungsterOwenAfterBattleText: text "I fought fair and" line "square with honor." @@ -100,7 +100,7 @@ YoungsterJasonBeatenText: line "I got stomped!" done -UnknownText_0x6814a: +YoungsterJasonAfterBattleText: text "I'm going to catch" line "more #MON in" cont "the grass." @@ -114,7 +114,7 @@ PsychicHermanBeatenText: text "…" done -UnknownText_0x6817b: +PsychicHermanAfterBattleText: text "…" para "I lost while I had" @@ -133,7 +133,7 @@ PsychicFidelBeatenText: line "your power…" done -UnknownText_0x681ec: +PsychicFidelAfterBattleText: text "Strength in con-" line "viction…" diff --git a/maps/Route12.asm b/maps/Route12.asm index 2a1e078f5..cc5397534 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -19,7 +19,7 @@ TrainerFisherKyle: FisherKyleScript: end_if_just_battled opentext - writetext UnknownText_0x1a7238 + writetext FisherKyleAfterBattleText waitbutton closetext end @@ -30,7 +30,7 @@ TrainerFisherMartin: FisherMartinScript: end_if_just_battled opentext - writetext UnknownText_0x1a704c + writetext FisherMartinAfterBattleText waitbutton closetext end @@ -41,7 +41,7 @@ TrainerFisherStephen: FisherStephenScript: end_if_just_battled opentext - writetext UnknownText_0x1a70d4 + writetext FisherStephenAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ TrainerFisherBarney: FisherBarneyScript: end_if_just_battled opentext - writetext UnknownText_0x1a716d + writetext FisherBarneyAfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ FisherMartinBeatenText: text "Gwaaah!" done -UnknownText_0x1a704c: +FisherMartinAfterBattleText: text "I'm too impatient" line "for fishing…" done @@ -100,7 +100,7 @@ FisherStephenBeatenText: line "distracted me!" done -UnknownText_0x1a70d4: +FisherStephenAfterBattleText: text "Have you checked" line "out KANTO's radio" @@ -119,7 +119,7 @@ FisherBarneyBeatenText: line "coming up next!" done -UnknownText_0x1a716d: +FisherBarneyAfterBattleText: text "I think electric-" line "ity is the most" @@ -144,7 +144,7 @@ FisherKyleBeatenText: text "You do remember?" done -UnknownText_0x1a7238: +FisherKyleAfterBattleText: text "The tug you feel" line "on the ROD when" diff --git a/maps/Route13.asm b/maps/Route13.asm index 79e035aa6..966bb61f5 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -18,7 +18,7 @@ TrainerPokefanmAlex: PokefanmAlexScript: end_if_just_battled opentext - writetext UnknownText_0x1a24e3 + writetext PokefanmAlexAfterBattleText waitbutton closetext end @@ -29,7 +29,7 @@ TrainerPokefanmJoshua: PokefanmJoshuaScript: end_if_just_battled opentext - writetext UnknownText_0x1a254f + writetext PokefanmJoshuaAfterBattleText waitbutton closetext end @@ -40,7 +40,7 @@ TrainerBird_keeperPerry: Bird_keeperPerryScript: end_if_just_battled opentext - writetext UnknownText_0x1a25db + writetext Bird_keeperPerryAfterBattleText waitbutton closetext end @@ -51,7 +51,7 @@ TrainerBird_keeperBret: Bird_keeperBretScript: end_if_just_battled opentext - writetext UnknownText_0x1a2662 + writetext Bird_keeperBretAfterBattleText waitbutton closetext end @@ -62,7 +62,7 @@ TrainerHikerKenny: HikerKennyScript: end_if_just_battled opentext - writetext UnknownText_0x1a26c2 + writetext HikerKennyAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ PokefanmAlexBeatenText: line "mock royalty!" done -UnknownText_0x1a24e3: +PokefanmAlexAfterBattleText: text "Doesn't everyone" line "wish to someday be" cont "a king?" @@ -106,7 +106,7 @@ PokefanmJoshuaBeatenText: text "PI-PIKACHU!" done -UnknownText_0x1a254f: +PokefanmJoshuaAfterBattleText: text "You look like you" line "have many #MON," @@ -125,7 +125,7 @@ Bird_keeperPerryBeatenText: line "your speed…" done -UnknownText_0x1a25db: +Bird_keeperPerryAfterBattleText: text "Your #MON are" line "remarkably well-" cont "trained." @@ -144,7 +144,7 @@ Bird_keeperBretBeatenText: line "Not good enough!" done -UnknownText_0x1a2662: +Bird_keeperBretAfterBattleText: text "If you groom them," line "#MON get happy." done @@ -159,7 +159,7 @@ HikerKennyBeatenText: text "I lost…" done -UnknownText_0x1a26c2: +HikerKennyAfterBattleText: text "Geological fea-" line "tures don't appear" cont "to change." diff --git a/maps/Route14.asm b/maps/Route14.asm index fabb3af5c..0a42a2a8e 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -25,7 +25,7 @@ TrainerPokefanmCarter: PokefanmCarterScript: end_if_just_battled opentext - writetext UnknownText_0x1ad508 + writetext PokefanmCarterAfterBattleText waitbutton closetext end @@ -36,7 +36,7 @@ TrainerBird_keeperRoy: Bird_keeperRoyScript: end_if_just_battled opentext - writetext UnknownText_0x1ad5a4 + writetext Bird_keeperRoyAfterBattleText waitbutton closetext end @@ -47,7 +47,7 @@ TrainerPokefanmTrevor: PokefanmTrevorScript: end_if_just_battled opentext - writetext UnknownText_0x1ad660 + writetext PokefanmTrevorAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ PokefanmCarterBeatenText: text "Awaaah!" done -UnknownText_0x1ad508: +PokefanmCarterAfterBattleText: text "SQUIRTLE, CHARMAN-" line "DER and BULBASAUR…" @@ -83,7 +83,7 @@ Bird_keeperRoyBeatenText: line "can't ever fly…" done -UnknownText_0x1ad5a4: +Bird_keeperRoyAfterBattleText: text "You have #MON" line "that know the HM" @@ -107,7 +107,7 @@ PokefanmTrevorBeatenText: line "this PSYDUCK?" done -UnknownText_0x1ad660: +PokefanmTrevorAfterBattleText: text "If only there were" line "an easy way to" diff --git a/maps/Route15.asm b/maps/Route15.asm index 50406872e..48a56dba9 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -20,7 +20,7 @@ TrainerTeacherColette: TeacherColetteScript: end_if_just_battled opentext - writetext UnknownText_0x1aa60d + writetext TeacherColetteAfterBattleText waitbutton closetext end @@ -31,7 +31,7 @@ TrainerTeacherHillary: TeacherHillaryScript: end_if_just_battled opentext - writetext UnknownText_0x1aa6ca + writetext TeacherHillaryAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ TrainerSchoolboyKipp: SchoolboyKippScript: end_if_just_battled opentext - writetext UnknownText_0x1aa740 + writetext SchoolboyKippAfterBattleText waitbutton closetext end @@ -53,7 +53,7 @@ TrainerSchoolboyTommy: SchoolboyTommyScript: end_if_just_battled opentext - writetext UnknownText_0x1aa7bc + writetext SchoolboyTommyAfterBattleText waitbutton closetext end @@ -64,7 +64,7 @@ TrainerSchoolboyJohnny: SchoolboyJohnnyScript: end_if_just_battled opentext - writetext UnknownText_0x1aa84a + writetext SchoolboyJohnnyAfterBattleText waitbutton closetext end @@ -75,7 +75,7 @@ TrainerSchoolboyBilly: SchoolboyBillyScript: end_if_just_battled opentext - writetext UnknownText_0x1aa8b0 + writetext SchoolboyBillyAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ TeacherColetteBeatenText: text "Kyaaah!" done -UnknownText_0x1aa60d: +TeacherColetteAfterBattleText: text "Before I became a" line "teacher, I used to" @@ -119,7 +119,7 @@ TeacherHillaryBeatenText: line "lose…" done -UnknownText_0x1aa6ca: +TeacherHillaryAfterBattleText: text "Studying is impor-" line "tant, but exercise" cont "is just as vital." @@ -135,7 +135,7 @@ SchoolboyKippBeatenText: line "I was beaten!" done -UnknownText_0x1aa740: +SchoolboyKippAfterBattleText: text "My mom worries so" line "much about me, I" @@ -153,7 +153,7 @@ SchoolboyTommyBeatenText: line "homework!" done -UnknownText_0x1aa7bc: +SchoolboyTommyAfterBattleText: text "Sayonara! I just" line "learned that in my" cont "Japanese class." @@ -172,7 +172,7 @@ SchoolboyJohnnyBeatenText: line "tough!" done -UnknownText_0x1aa84a: +SchoolboyJohnnyAfterBattleText: text "I'm tired of walk-" line "ing. I need to" cont "take a break." @@ -188,7 +188,7 @@ SchoolboyBillyBeatenText: line "How could I lose?" done -UnknownText_0x1aa8b0: +SchoolboyBillyAfterBattleText: text "If #MON were a" line "subject at school," cont "I'd be the best!" diff --git a/maps/Route17.asm b/maps/Route17.asm index b01ce1ddc..0a20a3e78 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -26,7 +26,7 @@ TrainerBikerCharles: BikerCharlesScript: end_if_just_battled opentext - writetext UnknownText_0x1ad293 + writetext BikerCharlesAfterBattleText waitbutton closetext end @@ -37,7 +37,7 @@ TrainerBikerRiley: BikerRileyScript: end_if_just_battled opentext - writetext UnknownText_0x1ad13b + writetext BikerRileyAfterBattleText waitbutton closetext end @@ -48,7 +48,7 @@ TrainerBikerJoel: BikerJoelScript: end_if_just_battled opentext - writetext UnknownText_0x1ad196 + writetext BikerJoelAfterBattleText waitbutton closetext end @@ -59,7 +59,7 @@ TrainerBikerGlenn: BikerGlennScript: end_if_just_battled opentext - writetext UnknownText_0x1ad225 + writetext BikerGlennAfterBattleText waitbutton closetext end @@ -81,7 +81,7 @@ BikerRileyBeatenText: text "Whoa, you kick!" done -UnknownText_0x1ad13b: +BikerRileyAfterBattleText: text "Don't get cocky," line "you JOHTO punk!" done @@ -96,7 +96,7 @@ BikerJoelBeatenText: line "look cool…" done -UnknownText_0x1ad196: +BikerJoelAfterBattleText: text "I look cool, but" line "I'm weak, so I'm" cont "not really cool." @@ -115,7 +115,7 @@ BikerGlennBeatenText: line "awesome torque!" done -UnknownText_0x1ad225: +BikerGlennAfterBattleText: text "Hands-free riding" line "is considered cool" cont "on CYCLING ROAD." @@ -131,7 +131,7 @@ BikerCharlesBeatenText: line "burn!" done -UnknownText_0x1ad293: +BikerCharlesAfterBattleText: text "Reckless driving" line "causes accidents!" cont "Take it easy!" diff --git a/maps/Route18.asm b/maps/Route18.asm index 6c28da07e..c51cb389d 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -15,7 +15,7 @@ TrainerBird_keeperBoris: Bird_keeperBorisScript: end_if_just_battled opentext - writetext UnknownText_0x1acfa5 + writetext Bird_keeperBorisAfterBattleText waitbutton closetext end @@ -26,7 +26,7 @@ TrainerBird_keeperBob: Bird_keeperBobScript: end_if_just_battled opentext - writetext UnknownText_0x1ad00d + writetext Bird_keeperBobAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ Bird_keeperBorisBeatenText: text "Ayieee!" done -UnknownText_0x1acfa5: +Bird_keeperBorisAfterBattleText: text "Since you're so" line "strong, it must be" cont "fun to battle." @@ -62,7 +62,7 @@ Bird_keeperBobBeatenText: text "…Whew!" done -UnknownText_0x1ad00d: +Bird_keeperBobAfterBattleText: text "If you don't have" line "a BICYCLE, you're" diff --git a/maps/Route19.asm b/maps/Route19.asm index d414459a0..11e21de7f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -35,7 +35,7 @@ TrainerSwimmerfDawn: SwimmerfDawnScript: end_if_just_battled opentext - writetext UnknownText_0x19ebad + writetext SwimmerfDawnAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ TrainerSwimmermHarold: SwimmermHaroldScript: end_if_just_battled opentext - writetext UnknownText_0x19eab4 + writetext SwimmermHaroldAfterBattleText waitbutton closetext end @@ -57,7 +57,7 @@ TrainerSwimmermJerome: SwimmermJeromeScript: end_if_just_battled opentext - writetext UnknownText_0x19ec7e + writetext SwimmermJeromeAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ TrainerSwimmermTucker: SwimmermTuckerScript: end_if_just_battled opentext - writetext UnknownText_0x19eb3b + writetext SwimmermTuckerAfterBattleText waitbutton closetext end @@ -121,7 +121,7 @@ SwimmermHaroldBeatenText: text "Glub…" done -UnknownText_0x19eab4: +SwimmermHaroldAfterBattleText: text "At night, the sea" line "turns black. It" @@ -141,7 +141,7 @@ SwimmermTuckerBeatenText: text "I'm drowning!" done -UnknownText_0x19eb3b: +SwimmermTuckerAfterBattleText: text "I… asked my girl-" line "friend to swim to" cont "FUCHSIA… Gasp…" @@ -157,7 +157,7 @@ SwimmerfDawnBeatenText: line "at swimming…" done -UnknownText_0x19ebad: +SwimmerfDawnAfterBattleText: text "It's a quick swim" line "between FUCHSIA" @@ -184,7 +184,7 @@ SwimmermJeromeBeatenText: line "win." done -UnknownText_0x19ec7e: +SwimmermJeromeAfterBattleText: text "I might be bad at" line "swimming, but I" cont "love the sea." diff --git a/maps/Route2.asm b/maps/Route2.asm index 6b7a0e8ec..14d025c09 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -21,7 +21,7 @@ TrainerBug_catcherRob: Bug_catcherRobScript: end_if_just_battled opentext - writetext UnknownText_0x1ac34d + writetext Bug_catcherRobAfterBattleText waitbutton closetext end @@ -32,7 +32,7 @@ TrainerBug_catcherEd: Bug_catcherEdScript: end_if_just_battled opentext - writetext UnknownText_0x1ac3cf + writetext Bug_catcherEdAfterBattleText waitbutton closetext end @@ -43,7 +43,7 @@ TrainerBug_catcherDoug: Bug_catcherDougScript: end_if_just_battled opentext - writetext UnknownText_0x1ac423 + writetext Bug_catcherDougAfterBattleText waitbutton closetext end @@ -91,7 +91,7 @@ Bug_catcherRobBeatenText: text "I was whipped…" done -UnknownText_0x1ac34d: +Bug_catcherRobAfterBattleText: text "I'm going to look" line "for stronger bug" cont "#MON." @@ -109,7 +109,7 @@ Bug_catcherEdBeatenText: text "Ouch, ouch, ouch!" done -UnknownText_0x1ac3cf: +Bug_catcherEdAfterBattleText: text "They'll really" line "sting when you" cont "take a bath." @@ -124,7 +124,7 @@ Bug_catcherDougBeatenText: text "No good!" done -UnknownText_0x1ac423: +Bug_catcherDougAfterBattleText: text "Bug #MON squish" line "like plush toys" diff --git a/maps/Route20.asm b/maps/Route20.asm index 3355026dd..5733f3f9f 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -24,7 +24,7 @@ TrainerSwimmerfNicole: SwimmerfNicoleScript: end_if_just_battled opentext - writetext UnknownText_0x1acd93 + writetext SwimmerfNicoleAfterBattleText waitbutton closetext end @@ -35,7 +35,7 @@ TrainerSwimmerfLori: SwimmerfLoriScript: end_if_just_battled opentext - writetext UnknownText_0x1ace15 + writetext SwimmerfLoriAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ TrainerSwimmermCameron: SwimmermCameronScript: end_if_just_battled opentext - writetext UnknownText_0x1ace8b + writetext SwimmermCameronAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ SwimmerfNicoleBeatenText: text "Oh, no!" done -UnknownText_0x1acd93: +SwimmerfNicoleAfterBattleText: text "Swimming exercises" line "your full body." @@ -83,7 +83,7 @@ SwimmerfLoriBeatenText: text "No!" done -UnknownText_0x1ace15: +SwimmerfLoriAfterBattleText: text "SURF is no longer" line "the only HM move" cont "you use in water." @@ -101,7 +101,7 @@ SwimmermCameronBeatenText: text "Aiyah!" done -UnknownText_0x1ace8b: +SwimmermCameronAfterBattleText: text "Besides the sea, I" line "can also swim in" cont "ponds and rivers." diff --git a/maps/Route21.asm b/maps/Route21.asm index bb3a2cb59..8fd1ab52e 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -16,7 +16,7 @@ TrainerSwimmermSeth: SwimmermSethScript: end_if_just_battled opentext - writetext UnknownText_0x1ac873 + writetext SwimmermSethAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerSwimmerfNikki: SwimmerfNikkiScript: end_if_just_battled opentext - writetext UnknownText_0x1ac8f1 + writetext SwimmerfNikkiAfterBattleText waitbutton closetext end @@ -38,7 +38,7 @@ TrainerFisherArnold: FisherArnoldScript: end_if_just_battled opentext - writetext UnknownText_0x1ac95c + writetext FisherArnoldAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ SwimmermSethBeatenText: text "Glug…" done -UnknownText_0x1ac873: +SwimmermSethAfterBattleText: text "This arrogant guy" line "was at CINNABAR's" cont "volcano." @@ -69,7 +69,7 @@ SwimmerfNikkiBeatenText: line "sunburn…" done -UnknownText_0x1ac8f1: +SwimmerfNikkiAfterBattleText: text "I have to watch" line "out for blemishes" cont "caused by the sun." @@ -84,7 +84,7 @@ FisherArnoldBeatenText: text "Utter failure…" done -UnknownText_0x1ac95c: +FisherArnoldAfterBattleText: text "I'll just go back" line "to fishing…" done diff --git a/maps/Route25.asm b/maps/Route25.asm index f49c4c3d4..911017ef6 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -86,7 +86,7 @@ TrainerSchoolboyDudley: SchoolboyDudleyScript: end_if_just_battled opentext - writetext UnknownText_0x19f1b5 + writetext SchoolboyDudleyAfterBattleText waitbutton closetext end @@ -97,7 +97,7 @@ TrainerLassEllen: LassEllenScript: end_if_just_battled opentext - writetext UnknownText_0x19f208 + writetext LassEllenAfterBattleText waitbutton closetext end @@ -108,7 +108,7 @@ TrainerSchoolboyJoe: SchoolboyJoeScript: end_if_just_battled opentext - writetext UnknownText_0x19f25c + writetext SchoolboyJoeAfterBattleText waitbutton closetext end @@ -119,7 +119,7 @@ TrainerLassLaura: LassLauraScript: end_if_just_battled opentext - writetext UnknownText_0x19f2a6 + writetext LassLauraAfterBattleText waitbutton closetext end @@ -130,7 +130,7 @@ TrainerCamperLloyd: CamperLloydScript: end_if_just_battled opentext - writetext UnknownText_0x19f2f8 + writetext CamperLloydAfterBattleText waitbutton closetext end @@ -141,7 +141,7 @@ TrainerLassShannon: LassShannonScript: end_if_just_battled opentext - writetext UnknownText_0x19f35b + writetext LassShannonAfterBattleText waitbutton closetext end @@ -152,7 +152,7 @@ TrainerSupernerdPat: SupernerdPatScript: end_if_just_battled opentext - writetext UnknownText_0x19f41a + writetext SupernerdPatAfterBattleText waitbutton closetext end @@ -287,7 +287,7 @@ SchoolboyDudleyBeatenText: text "Whoo! Good stuff." done -UnknownText_0x19f1b5: +SchoolboyDudleyAfterBattleText: text "I did my best." line "I have no regrets." done @@ -301,7 +301,7 @@ LassEllenBeatenText: text "How could I lose?" done -UnknownText_0x19f208: +LassEllenAfterBattleText: text "I did my best." line "I have no regrets." done @@ -315,7 +315,7 @@ SchoolboyJoeBeatenText: text "Ow! Stomped flat!" done -UnknownText_0x19f25c: +SchoolboyJoeAfterBattleText: text "I did my best." line "I have no regrets." done @@ -329,7 +329,7 @@ LassLauraBeatenText: text "I lost too…" done -UnknownText_0x19f2a6: +LassLauraAfterBattleText: text "I did my best." line "I have no regrets." done @@ -343,7 +343,7 @@ CamperLloydBeatenText: text "Whoa! Too much." done -UnknownText_0x19f2f8: +CamperLloydAfterBattleText: text "I did my best." line "I have no regrets." done @@ -358,7 +358,7 @@ LassShannonBeatenText: text "You're kidding." done -UnknownText_0x19f35b: +LassShannonAfterBattleText: text "I did my best." line "I have no regrets." done @@ -382,7 +382,7 @@ SupernerdPatBeatenText: line "at all?" done -UnknownText_0x19f41a: +SupernerdPatAfterBattleText: text "I'm sorry… I won't" line "cheat anymore…" done diff --git a/maps/Route26.asm b/maps/Route26.asm index ccc32ed63..dc0538fb3 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -21,7 +21,7 @@ TrainerCooltrainermJake: CooltrainermJakeScript: end_if_just_battled opentext - writetext UnknownText_0x1a4f08 + writetext CooltrainermJakeAfterBattleText waitbutton closetext end @@ -125,7 +125,7 @@ TrainerCooltrainerfJoyce: CooltrainerfJoyceScript: end_if_just_battled opentext - writetext UnknownText_0x1a50d7 + writetext CooltrainerfJoyceAfterBattleText waitbutton closetext end @@ -229,7 +229,7 @@ TrainerPsychicRichard: PsychicRichardScript: end_if_just_battled opentext - writetext UnknownText_0x1a5278 + writetext PsychicRichardAfterBattleText waitbutton closetext end @@ -240,7 +240,7 @@ TrainerFisherScott: FisherScottScript: end_if_just_battled opentext - writetext UnknownText_0x1a5326 + writetext FisherScottAfterBattleText waitbutton closetext end @@ -266,7 +266,7 @@ CooltrainermJakeBeatenText: text "I blew it!" done -UnknownText_0x1a4f08: +CooltrainermJakeAfterBattleText: text "It's going to be" line "tough to win at" cont "the LEAGUE." @@ -321,7 +321,7 @@ CooltrainerfJoyceBeatenText: line "believe this!" done -UnknownText_0x1a50d7: +CooltrainerfJoyceAfterBattleText: text "I've defeated" line "eight GYM LEADERS," @@ -374,7 +374,7 @@ PsychicRichardBeatenText: text "Good battle!" done -UnknownText_0x1a5278: +PsychicRichardAfterBattleText: text "People and #MON" line "grow from their" cont "experiences." @@ -397,7 +397,7 @@ FisherScottBeatenText: line "battle!" done -UnknownText_0x1a5326: +FisherScottAfterBattleText: text "Just like in fish-" line "ing, it's all over" diff --git a/maps/Route27.asm b/maps/Route27.asm index 1ff42703a..7781e5bbf 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -56,7 +56,7 @@ TrainerPsychicGilbert: PsychicGilbertScript: end_if_just_battled opentext - writetext UnknownText_0x1a0dd2 + writetext PsychicGilbertAfterBattleText waitbutton closetext end @@ -180,7 +180,7 @@ TrainerCooltrainermBlake: CooltrainermBlakeScript: end_if_just_battled opentext - writetext UnknownText_0x1a0b0b + writetext CooltrainermBlakeAfterBattleText waitbutton closetext end @@ -191,7 +191,7 @@ TrainerCooltrainermBrian: CooltrainermBrianScript: end_if_just_battled opentext - writetext UnknownText_0x1a0bac + writetext CooltrainermBrianAfterBattleText waitbutton closetext end @@ -295,7 +295,7 @@ TrainerCooltrainerfMegan: CooltrainerfMeganScript: end_if_just_battled opentext - writetext UnknownText_0x1a0cce + writetext CooltrainerfMeganAfterBattleText waitbutton closetext end @@ -344,7 +344,7 @@ CooltrainermBlakeBeatenText: text "Yow!" done -UnknownText_0x1a0b0b: +CooltrainermBlakeAfterBattleText: text "If you prevail on" line "this harsh trek," @@ -365,7 +365,7 @@ CooltrainermBrianBeatenText: text "Just as I thought!" done -UnknownText_0x1a0bac: +CooltrainermBrianAfterBattleText: text "A good trainer can" line "recognize other" cont "good trainers." @@ -405,7 +405,7 @@ CooltrainerfMeganBeatenText: line "strong!" done -UnknownText_0x1a0cce: +CooltrainerfMeganAfterBattleText: text "I'm checking out" line "pre- and post-" cont "evolution #MON." @@ -436,7 +436,7 @@ PsychicGilbertBeatenText: text "You're too much!" done -UnknownText_0x1a0dd2: +PsychicGilbertAfterBattleText: text "With your skills," line "you'll do well at" cont "the LEAGUE." diff --git a/maps/Route3.asm b/maps/Route3.asm index b5e08faf9..339e0c2b1 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -17,7 +17,7 @@ TrainerFirebreatherOtis: FirebreatherOtisScript: end_if_just_battled opentext - writetext UnknownText_0x1adff7 + writetext FirebreatherOtisAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerYoungsterWarren: YoungsterWarrenScript: end_if_just_battled opentext - writetext UnknownText_0x1ae051 + writetext YoungsterWarrenAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerYoungsterJimmy: YoungsterJimmyScript: end_if_just_battled opentext - writetext UnknownText_0x1ae0a9 + writetext YoungsterJimmyAfterBattleText waitbutton closetext end @@ -50,7 +50,7 @@ TrainerFirebreatherBurt: FirebreatherBurtScript: end_if_just_battled opentext - writetext UnknownText_0x1ae118 + writetext FirebreatherBurtAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ FirebreatherOtisBeatenText: line "I'm all wet…" done -UnknownText_0x1adff7: +FirebreatherOtisAfterBattleText: text "When it rains," line "it's hard to get" cont "ignition…" @@ -83,7 +83,7 @@ YoungsterWarrenBeatenText: text "I knew I'd lose…" done -UnknownText_0x1ae051: +YoungsterWarrenAfterBattleText: text "You looked strong." para "I was afraid to" @@ -99,7 +99,7 @@ YoungsterJimmyBeatenText: text "Blown away!" done -UnknownText_0x1ae0a9: +YoungsterJimmyAfterBattleText: text "I wear shorts the" line "whole year round." @@ -116,7 +116,7 @@ FirebreatherBurtBeatenText: text "Yow! That's hot!" done -UnknownText_0x1ae118: +FirebreatherBurtAfterBattleText: text "The greatest fire-" line "breather in KANTO," cont "that's me." diff --git a/maps/Route35.asm b/maps/Route35.asm index afa3f8ce0..05abdc63e 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -24,7 +24,7 @@ TrainerBird_keeperBryan: Bird_keeperBryanScript: end_if_just_battled opentext - writetext UnknownText_0x19cc87 + writetext Bird_keeperBryanAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ TrainerCamperIvan: CamperIvanScript: end_if_just_battled opentext - writetext UnknownText_0x19cac4 + writetext CamperIvanAfterBattleText waitbutton closetext end @@ -101,7 +101,7 @@ TrainerCamperElliot: CamperElliotScript: end_if_just_battled opentext - writetext UnknownText_0x19cb47 + writetext CamperElliotAfterBattleText waitbutton closetext end @@ -112,7 +112,7 @@ TrainerPicnickerBrooke: PicnickerBrookeScript: end_if_just_battled opentext - writetext UnknownText_0x19cbba + writetext PicnickerBrookeAfterBattleText waitbutton closetext end @@ -123,7 +123,7 @@ TrainerPicnickerKim: PicnickerKimScript: end_if_just_battled opentext - writetext UnknownText_0x19cc21 + writetext PicnickerKimAfterBattleText waitbutton closetext end @@ -231,7 +231,7 @@ TrainerFirebreatherWalt: FirebreatherWaltScript: end_if_just_battled opentext - writetext UnknownText_0x19cebc + writetext FirebreatherWaltAfterBattleText waitbutton closetext end @@ -288,7 +288,7 @@ CamperIvanBeatenText: text "I give!" done -UnknownText_0x19cac4: +CamperIvanAfterBattleText: text "Music on the radio" line "changes the moods" cont "of wild #MON." @@ -305,7 +305,7 @@ CamperElliotBeatenText: line "have lost for me…" done -UnknownText_0x19cb47: +CamperElliotAfterBattleText: text "I was humiliated" line "in front of my" cont "girlfriend…" @@ -322,7 +322,7 @@ PicnickerBrookeBeatenText: line "strong!" done -UnknownText_0x19cbba: +PicnickerBrookeAfterBattleText: text "I can count on my" line "#MON more than" cont "my boyfriend." @@ -338,7 +338,7 @@ PicnickerKimBeatenText: line "win…" done -UnknownText_0x19cc21: +PicnickerKimAfterBattleText: text "The GYM BADGES are" line "pretty. I collect" cont "them." @@ -354,7 +354,7 @@ Bird_keeperBryanBeatenText: line "enough!" done -UnknownText_0x19cc87: +Bird_keeperBryanAfterBattleText: text "Some #MON flee" line "right away." @@ -426,7 +426,7 @@ FirebreatherWaltBeatenText: line "tip of my nose!" done -UnknownText_0x19cebc: +FirebreatherWaltAfterBattleText: text "The #MON March" line "on the radio lures" cont "wild #MON." diff --git a/maps/Route37.asm b/maps/Route37.asm index 7c4b6e98f..df3877226 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -34,7 +34,7 @@ TrainerTwinsAnnandanne1: TwinsAnnandanne1Script: end_if_just_battled opentext - writetext UnknownText_0x1a8e62 + writetext TwinsAnnandanne1AfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ TrainerTwinsAnnandanne2: TwinsAnnandanne2Script: end_if_just_battled opentext - writetext UnknownText_0x1a8eec + writetext TwinsAnnandanne2AfterBattleText waitbutton closetext end @@ -56,7 +56,7 @@ TrainerPsychicGreg: PsychicGregScript: end_if_just_battled opentext - writetext UnknownText_0x1a8f80 + writetext PsychicGregAfterBattleText waitbutton closetext end @@ -131,7 +131,7 @@ TwinsAnnandanne1BeatenText: line "little too strong." done -UnknownText_0x1a8e62: +TwinsAnnandanne1AfterBattleText: text "ANN: I can tell" line "what my sister and" @@ -150,7 +150,7 @@ TwinsAnnandanne2BeatenText: line "little too strong." done -UnknownText_0x1a8eec: +TwinsAnnandanne2AfterBattleText: text "ANNE: We share the" line "same feelings as" cont "our #MON." @@ -170,7 +170,7 @@ PsychicGregBeatenText: line "pretty sad…" done -UnknownText_0x1a8f80: +PsychicGregAfterBattleText: text "Putting #MON to" line "sleep or paralyz-" cont "ing them are good" diff --git a/maps/Route39.asm b/maps/Route39.asm index 5f7d33279..eb90889a5 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -110,7 +110,7 @@ TrainerPokefanfRuth: PokefanfRuthScript: end_if_just_battled opentext - writetext UnknownText_0x1a5db2 + writetext PokefanfRuthAfterBattleText waitbutton closetext end @@ -121,7 +121,7 @@ TrainerSailorEugene: SailorEugeneScript: end_if_just_battled opentext - writetext UnknownText_0x1a5c4d + writetext SailorEugeneAfterBattleText waitbutton closetext end @@ -132,7 +132,7 @@ TrainerPsychicNorman: PsychicNormanScript: end_if_just_battled opentext - writetext UnknownText_0x1a5e57 + writetext PsychicNormanAfterBattleText waitbutton closetext end @@ -199,7 +199,7 @@ SailorEugeneBeatenText: text "Awaaargh!" done -UnknownText_0x1a5c4d: +SailorEugeneAfterBattleText: text "My #MON were" line "caught and raised" cont "overseas." @@ -245,7 +245,7 @@ PokefanfRuthBeatenText: line "losing." done -UnknownText_0x1a5db2: +PokefanfRuthAfterBattleText: text "Do you know about" line "baby #MON?" @@ -269,7 +269,7 @@ PsychicNormanBeatenText: line "have potential." done -UnknownText_0x1a5e57: +PsychicNormanAfterBattleText: text "You know how #-" line "MON have different" cont "abilities?" diff --git a/maps/Route4.asm b/maps/Route4.asm index bfea8c8aa..1bd5ae694 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -17,7 +17,7 @@ TrainerBird_keeperHank: Bird_keeperHankScript: end_if_just_battled opentext - writetext UnknownText_0x1ae258 + writetext Bird_keeperHankAfterBattleText waitbutton closetext end @@ -28,7 +28,7 @@ TrainerPicnickerHope: PicnickerHopeScript: end_if_just_battled opentext - writetext UnknownText_0x1ae320 + writetext PicnickerHopeAfterBattleText waitbutton closetext end @@ -39,7 +39,7 @@ TrainerPicnickerSharon: PicnickerSharonScript: end_if_just_battled opentext - writetext UnknownText_0x1ae369 + writetext PicnickerSharonAfterBattleText waitbutton closetext end @@ -65,7 +65,7 @@ Bird_keeperHankBeatenText: line "one…" done -UnknownText_0x1ae258: +Bird_keeperHankAfterBattleText: text "If you have a" line "specific #MON" @@ -92,7 +92,7 @@ PicnickerHopeBeatenText: line "strong." done -UnknownText_0x1ae320: +PicnickerHopeAfterBattleText: text "I heard CLEFAIRY" line "appear at MT.MOON." @@ -109,7 +109,7 @@ PicnickerSharonBeatenText: text "…" done -UnknownText_0x1ae369: +PicnickerSharonAfterBattleText: text "……I'll go train" line "some more…" done diff --git a/maps/Route40.asm b/maps/Route40.asm index 6ae3d5922..81891c7b9 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -40,7 +40,7 @@ TrainerSwimmerfElaine: SwimmerfElaineScript: end_if_just_battled opentext - writetext UnknownText_0x1a637b + writetext SwimmerfElaineAfterBattleText waitbutton closetext end @@ -51,7 +51,7 @@ TrainerSwimmerfPaula: SwimmerfPaulaScript: end_if_just_battled opentext - writetext UnknownText_0x1a63f5 + writetext SwimmerfPaulaAfterBattleText waitbutton closetext end @@ -62,7 +62,7 @@ TrainerSwimmermSimon: SwimmermSimonScript: end_if_just_battled opentext - writetext UnknownText_0x1a6282 + writetext SwimmermSimonAfterBattleText waitbutton closetext end @@ -73,7 +73,7 @@ TrainerSwimmermRandall: SwimmermRandallScript: end_if_just_battled opentext - writetext UnknownText_0x1a62fa + writetext SwimmermRandallAfterBattleText waitbutton closetext end @@ -177,7 +177,7 @@ SwimmermSimonBeatenText: text "OK! Uncle! I give!" done -UnknownText_0x1a6282: +SwimmermSimonAfterBattleText: text "CIANWOOD CITY is" line "a good distance" cont "away from here." @@ -195,7 +195,7 @@ SwimmermRandallBeatenText: text "Uh-oh. I lost…" done -UnknownText_0x1a62fa: +SwimmermRandallAfterBattleText: text "Swimming exercises" line "your entire body." cont "It's healthy." @@ -213,7 +213,7 @@ SwimmerfElaineBeatenText: text "I lost that one!" done -UnknownText_0x1a637b: +SwimmerfElaineAfterBattleText: text "I'd say I'm a bet-" line "ter swimmer than" cont "you. Yeah!" @@ -232,7 +232,7 @@ SwimmerfPaulaBeatenText: line "dizzy!" done -UnknownText_0x1a63f5: +SwimmerfPaulaAfterBattleText: text "While I float like" line "this, the waves" cont "carry me along." diff --git a/maps/Route41.asm b/maps/Route41.asm index 6c4b5c0d5..27c4a400e 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -23,7 +23,7 @@ TrainerSwimmerfKaylee: SwimmerfKayleeScript: end_if_just_battled opentext - writetext UnknownText_0x1a6c7f + writetext SwimmerfKayleeAfterBattleText waitbutton closetext end @@ -34,7 +34,7 @@ TrainerSwimmerfSusie: SwimmerfSusieScript: end_if_just_battled opentext - writetext UnknownText_0x1a6d11 + writetext SwimmerfSusieAfterBattleText waitbutton closetext end @@ -45,7 +45,7 @@ TrainerSwimmerfDenise: SwimmerfDeniseScript: end_if_just_battled opentext - writetext UnknownText_0x1a6d79 + writetext SwimmerfDeniseAfterBattleText waitbutton closetext end @@ -56,7 +56,7 @@ TrainerSwimmerfKara: SwimmerfKaraScript: end_if_just_battled opentext - writetext UnknownText_0x1a6e58 + writetext SwimmerfKaraAfterBattleText waitbutton closetext end @@ -67,7 +67,7 @@ TrainerSwimmerfWendy: SwimmerfWendyScript: end_if_just_battled opentext - writetext UnknownText_0x1a6ec2 + writetext SwimmerfWendyAfterBattleText waitbutton closetext end @@ -78,7 +78,7 @@ TrainerSwimmermCharlie: SwimmermCharlieScript: end_if_just_battled opentext - writetext UnknownText_0x1a696e + writetext SwimmermCharlieAfterBattleText waitbutton closetext end @@ -89,7 +89,7 @@ TrainerSwimmermGeorge: SwimmermGeorgeScript: end_if_just_battled opentext - writetext UnknownText_0x1a69d4 + writetext SwimmermGeorgeAfterBattleText waitbutton closetext end @@ -100,7 +100,7 @@ TrainerSwimmermBerke: SwimmermBerkeScript: end_if_just_battled opentext - writetext UnknownText_0x1a6aa4 + writetext SwimmermBerkeAfterBattleText waitbutton closetext end @@ -111,7 +111,7 @@ TrainerSwimmermKirk: SwimmermKirkScript: end_if_just_battled opentext - writetext UnknownText_0x1a6b6c + writetext SwimmermKirkAfterBattleText waitbutton closetext end @@ -122,7 +122,7 @@ TrainerSwimmermMathew: SwimmermMathewScript: end_if_just_battled opentext - writetext UnknownText_0x1a6bed + writetext SwimmermMathewAfterBattleText waitbutton closetext end @@ -148,7 +148,7 @@ SwimmermCharlieBeatenText: line "prune skin!" done -UnknownText_0x1a696e: +SwimmermCharlieAfterBattleText: text "Isn't it relaxing" line "just floating like" cont "this?" @@ -164,7 +164,7 @@ SwimmermGeorgeBeatenText: text "Pant, pant…" done -UnknownText_0x1a69d4: +SwimmermGeorgeAfterBattleText: text "It's so far to" line "CIANWOOD." @@ -189,7 +189,7 @@ SwimmermBerkeBeatenText: line "to your strength?" done -UnknownText_0x1a6aa4: +SwimmermBerkeAfterBattleText: text "It was a dark and" line "stormy night…" @@ -214,7 +214,7 @@ SwimmermKirkBeatenText: text "I'm beat!" done -UnknownText_0x1a6b6c: +SwimmermKirkAfterBattleText: text "The currents keep" line "me from reaching" cont "that island." @@ -231,7 +231,7 @@ SwimmermMathewBeatenText: line "great endurance!" done -UnknownText_0x1a6bed: +SwimmermMathewAfterBattleText: text "A secret about" line "WHIRL ISLANDS…" @@ -252,7 +252,7 @@ SwimmerfKayleeBeatenText: line "it?" done -UnknownText_0x1a6c7f: +SwimmerfKayleeAfterBattleText: text "There's supposed" line "to be a big #-" cont "MON deep beneath" @@ -272,7 +272,7 @@ SwimmerfSusieBeatenText: text "I'm crushed…" done -UnknownText_0x1a6d11: +SwimmerfSusieAfterBattleText: text "Wasn't there a hit" line "song about a boy" cont "riding a LAPRAS?" @@ -288,7 +288,7 @@ SwimmerfDeniseBeatenText: text "Ohhh!" done -UnknownText_0x1a6d79: +SwimmerfDeniseAfterBattleText: text "A sunburn is the" line "worst for skin." @@ -316,7 +316,7 @@ SwimmerfKaraBeatenText: line "energy than I do." done -UnknownText_0x1a6e58: +SwimmerfKaraAfterBattleText: text "I heard roars from" line "deep inside the" cont "ISLANDS." @@ -332,7 +332,7 @@ SwimmerfWendyBeatenText: text "Oh, dear…" done -UnknownText_0x1a6ec2: +SwimmerfWendyAfterBattleText: text "The clusters of" line "STARYU light up" cont "at the same time." diff --git a/maps/Route42.asm b/maps/Route42.asm index b9007bb08..cd52b8973 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -170,7 +170,7 @@ TrainerPokemaniacShane: PokemaniacShaneScript: end_if_just_battled opentext - writetext UnknownText_0x1a94d6 + writetext PokemaniacShaneAfterBattleText waitbutton closetext end @@ -181,7 +181,7 @@ TrainerHikerBenjamin: HikerBenjaminScript: end_if_just_battled opentext - writetext UnknownText_0x1a943f + writetext HikerBenjaminAfterBattleText waitbutton closetext end @@ -260,7 +260,7 @@ HikerBenjaminBeatenText: text "Gahahah!" done -UnknownText_0x1a943f: +HikerBenjaminAfterBattleText: text "Losing feels in-" line "significant if you" @@ -281,7 +281,7 @@ PokemaniacShaneBeatenText: line "my MOON STONE…" done -UnknownText_0x1a94d6: +PokemaniacShaneAfterBattleText: text "You're working on" line "a #DEX?" diff --git a/maps/Route43.asm b/maps/Route43.asm index b3c3da115..fa04dbe53 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -35,7 +35,7 @@ TrainerCamperSpencer: CamperSpencerScript: end_if_just_battled opentext - writetext UnknownText_0x19d57e + writetext CamperSpencerAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ TrainerPokemaniacBen: PokemaniacBenScript: end_if_just_battled opentext - writetext UnknownText_0x19d2d2 + writetext PokemaniacBenAfterBattleText waitbutton closetext end @@ -162,7 +162,7 @@ TrainerPokemaniacRon: PokemaniacRonScript: end_if_just_battled opentext - writetext UnknownText_0x19d3f8 + writetext PokemaniacRonAfterBattleText waitbutton closetext end @@ -173,7 +173,7 @@ TrainerFisherMarvin: FisherMarvinScript: end_if_just_battled opentext - writetext UnknownText_0x19d4d3 + writetext FisherMarvinAfterBattleText waitbutton closetext end @@ -342,7 +342,7 @@ PokemaniacBenBeatenText: line "this to me?" done -UnknownText_0x19d2d2: +PokemaniacBenAfterBattleText: text "What else do I" line "like besides" cont "#MON?" @@ -384,7 +384,7 @@ PokemaniacRonBeatenText: line "pretty right on!" done -UnknownText_0x19d3f8: +PokemaniacRonAfterBattleText: text "It's okay for" line "people to like" @@ -411,7 +411,7 @@ FisherMarvinBeatenText: line "better anyway." done -UnknownText_0x19d4d3: +FisherMarvinAfterBattleText: text "KURT's LURE BALL" line "is the best for" @@ -434,7 +434,7 @@ CamperSpencerBeatenText: line "at all…" done -UnknownText_0x19d57e: +CamperSpencerAfterBattleText: text "What is going on" line "at LAKE OF RAGE?" diff --git a/maps/Route44.asm b/maps/Route44.asm index 48d7a2eb5..b46695bc9 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -155,7 +155,7 @@ TrainerPsychicPhil: PsychicPhilScript: end_if_just_battled opentext - writetext UnknownText_0x19dcfc + writetext PsychicPhilAfterBattleText waitbutton closetext end @@ -261,7 +261,7 @@ TrainerFisherEdgar: FisherEdgarScript: end_if_just_battled opentext - writetext UnknownText_0x19db6f + writetext FisherEdgarAfterBattleText waitbutton closetext end @@ -272,7 +272,7 @@ TrainerCooltrainerfCybil: CooltrainerfCybilScript: end_if_just_battled opentext - writetext UnknownText_0x19df4d + writetext CooltrainerfCybilAfterBattleText waitbutton closetext end @@ -283,7 +283,7 @@ TrainerPokemaniacZach: PokemaniacZachScript: end_if_just_battled opentext - writetext UnknownText_0x19dd7e + writetext PokemaniacZachAfterBattleText waitbutton closetext end @@ -294,7 +294,7 @@ TrainerCooltrainermAllen: CooltrainermAllenScript: end_if_just_battled opentext - writetext UnknownText_0x19de66 + writetext CooltrainermAllenAfterBattleText waitbutton closetext end @@ -360,7 +360,7 @@ FisherEdgarBeatenText: line "This isn't right." done -UnknownText_0x19db6f: +FisherEdgarAfterBattleText: text "That's 100 wins" line "to 101 losses." @@ -412,7 +412,7 @@ PsychicPhilBeatenText: line "shocking loss…" done -UnknownText_0x19dcfc: +PsychicPhilAfterBattleText: text "It's important to" line "have conviction" cont "on your side." @@ -429,7 +429,7 @@ PokemaniacZachBeatenText: line "are so appealing." done -UnknownText_0x19dd7e: +PokemaniacZachAfterBattleText: text "If a #MON has" line "different colors" @@ -455,7 +455,7 @@ CooltrainermAllenBeatenText: line "loss on my part." done -UnknownText_0x19de66: +CooltrainermAllenAfterBattleText: text "Wow. You have a" line "lot of BADGES." @@ -485,7 +485,7 @@ CooltrainerfCybilBeatenText: line "do at all." done -UnknownText_0x19df4d: +CooltrainerfCybilAfterBattleText: text "We all get better" line "by experiencing" cont "many battles." diff --git a/maps/Route45.asm b/maps/Route45.asm index 67459ad8b..615cb0606 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -130,7 +130,7 @@ TrainerHikerErik: HikerErikScript: end_if_just_battled opentext - writetext UnknownText_0x19e301 + writetext HikerErikAfterBattleText waitbutton closetext end @@ -141,7 +141,7 @@ TrainerHikerMichael: HikerMichaelScript: end_if_just_battled opentext - writetext UnknownText_0x19e3b1 + writetext HikerMichaelAfterBattleText waitbutton closetext end @@ -238,7 +238,7 @@ TrainerHikerTimothy: HikerTimothyScript: end_if_just_battled opentext - writetext UnknownText_0x19e4f1 + writetext HikerTimothyAfterBattleText waitbutton closetext end @@ -249,7 +249,7 @@ TrainerCooltrainermRyan: CooltrainermRyanScript: end_if_just_battled opentext - writetext UnknownText_0x19e70d + writetext CooltrainermRyanAfterBattleText waitbutton closetext end @@ -260,7 +260,7 @@ TrainerCooltrainerfKelly: CooltrainerfKellyScript: end_if_just_battled opentext - writetext UnknownText_0x19e7d1 + writetext CooltrainerfKellyAfterBattleText waitbutton closetext end @@ -328,7 +328,7 @@ HikerErikBeatenText: text "Oh, I lost that!" done -UnknownText_0x19e301: +HikerErikAfterBattleText: text "I'll head back to" line "BLACKTHORN's ICE" @@ -350,7 +350,7 @@ HikerMichaelBeatenText: line "spunky enough!" done -UnknownText_0x19e3b1: +HikerMichaelAfterBattleText: text "Boy, do I love" line "HP UP! Mmmm, yum!" @@ -397,7 +397,7 @@ HikerTimothyBeatenText: line "They're there too!" done -UnknownText_0x19e4f1: +HikerTimothyAfterBattleText: text "The best thing to" line "ever happen to me" @@ -467,7 +467,7 @@ CooltrainermRyanBeatenText: line "respect." done -UnknownText_0x19e70d: +CooltrainermRyanAfterBattleText: text "I see you're rais-" line "ing your #MON" cont "with care." @@ -490,7 +490,7 @@ CooltrainerfKellyBeatenText: text "Fine. I lost." done -UnknownText_0x19e7d1: +CooltrainerfKellyAfterBattleText: text "I'm not in favor" line "of overly power-" cont "ful moves." diff --git a/maps/Route46.asm b/maps/Route46.asm index ce4d4d5ec..f84563a6d 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -19,7 +19,7 @@ TrainerCamperTed: CamperTedScript: end_if_just_battled opentext - writetext UnknownText_0x1a9851 + writetext CamperTedAfterBattleText waitbutton closetext end @@ -153,7 +153,7 @@ TrainerHikerBailey: HikerBaileyScript: end_if_just_battled opentext - writetext UnknownText_0x1a97e8 + writetext HikerBaileyAfterBattleText waitbutton closetext end @@ -181,7 +181,7 @@ HikerBaileyBeatenText: line "me your power!" done -UnknownText_0x1a97e8: +HikerBaileyAfterBattleText: text "It's over. I don't" line "mind. We HIKERS" cont "are like that." @@ -199,7 +199,7 @@ CamperTedBeatenText: text "Wha…?" done -UnknownText_0x1a9851: +CamperTedAfterBattleText: text "I did my best but" line "came up short." diff --git a/maps/Route6.asm b/maps/Route6.asm index 335980dca..34c03ca0f 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -16,7 +16,7 @@ TrainerPokefanmRex: PokefanmRexScript: end_if_just_battled opentext - writetext UnknownText_0x1ad9ff + writetext PokefanmRexAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerPokefanmAllan: PokefanmAllanScript: end_if_just_battled opentext - writetext UnknownText_0x1ada88 + writetext PokefanmAllanAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ PokefanmRexBeatenText: text "My PHANPY!" done -UnknownText_0x1ad9ff: +PokefanmRexAfterBattleText: text "Look how adorable" line "my PHANPY acts!" @@ -82,7 +82,7 @@ PokefanmAllanBeatenText: text "My TEDDIURSA!" done -UnknownText_0x1ada88: +PokefanmAllanAfterBattleText: text "Look how adorable" line "my TEDDIURSA acts!" diff --git a/maps/Route8.asm b/maps/Route8.asm index 67318446c..3863041d9 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -19,7 +19,7 @@ TrainerBikerDwayne: BikerDwayneScript: end_if_just_battled opentext - writetext UnknownText_0x6c0c8 + writetext BikerDwayneAfterBattleText waitbutton closetext end @@ -30,7 +30,7 @@ TrainerBikerHarris: BikerHarrisScript: end_if_just_battled opentext - writetext UnknownText_0x6c143 + writetext BikerHarrisAfterBattleText waitbutton closetext end @@ -41,7 +41,7 @@ TrainerBikerZeke: BikerZekeScript: end_if_just_battled opentext - writetext UnknownText_0x6c1a3 + writetext BikerZekeAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ TrainerSupernerdSam: SupernerdSamScript: end_if_just_battled opentext - writetext UnknownText_0x6c219 + writetext SupernerdSamAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ TrainerSupernerdTom: SupernerdTomScript: end_if_just_battled opentext - writetext UnknownText_0x6c27e + writetext SupernerdTomAfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ BikerDwayneBeatenText: text "S-sorry!" done -UnknownText_0x6c0c8: +BikerDwayneAfterBattleText: text "The KANTO #MON" line "FEDERATION will" cont "never fall!" @@ -108,7 +108,7 @@ BikerHarrisBeatenText: text "F-forgive me!" done -UnknownText_0x6c143: +BikerHarrisAfterBattleText: text "Wiped out by some" line "punk from JOHTO…" done @@ -124,7 +124,7 @@ BikerZekeBeatenText: text "Yikes! Sorry!" done -UnknownText_0x6c1a3: +BikerZekeAfterBattleText: text "We'll try not to" line "disturb anyone" cont "from now on…" @@ -140,7 +140,7 @@ SupernerdSamBeatenText: line "the MAGNET TRAIN…" done -UnknownText_0x6c219: +SupernerdSamAfterBattleText: text "The power of mag-" line "nets is awesome!" done @@ -155,7 +155,7 @@ SupernerdTomBeatenText: line "You're tough!" done -UnknownText_0x6c27e: +SupernerdTomAfterBattleText: text "GYM BADGES give" line "you advantages in" cont "battles." diff --git a/maps/Route9.asm b/maps/Route9.asm index a8842e17b..baad4738d 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -19,7 +19,7 @@ TrainerCamperDean: CamperDeanScript: end_if_just_battled opentext - writetext UnknownText_0x1aafd9 + writetext CamperDeanAfterBattleText waitbutton closetext end @@ -30,7 +30,7 @@ TrainerPicnickerHeidi: PicnickerHeidiScript: end_if_just_battled opentext - writetext UnknownText_0x1ab07c + writetext PicnickerHeidiAfterBattleText waitbutton closetext end @@ -41,7 +41,7 @@ TrainerCamperSid: CamperSidScript: end_if_just_battled opentext - writetext UnknownText_0x1ab0f6 + writetext CamperSidAfterBattleText waitbutton closetext end @@ -52,7 +52,7 @@ TrainerPicnickerEdna: PicnickerEdnaScript: end_if_just_battled opentext - writetext UnknownText_0x1ab15f + writetext PicnickerEdnaAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ TrainerHikerTim: HikerTimScript: end_if_just_battled opentext - writetext UnknownText_0x1ab210 + writetext HikerTimAfterBattleText waitbutton closetext end @@ -74,7 +74,7 @@ TrainerHikerSidney: HikerSidneyScript: end_if_just_battled opentext - writetext UnknownText_0x1ab278 + writetext HikerSidneyAfterBattleText waitbutton closetext end @@ -95,7 +95,7 @@ CamperDeanBeatenText: text "Whoa! Danger, man." done -UnknownText_0x1aafd9: +CamperDeanAfterBattleText: text "My #MON were" line "hurt before even" @@ -119,7 +119,7 @@ PicnickerHeidiBeatenText: text "Ohhhh!" done -UnknownText_0x1ab07c: +PicnickerHeidiAfterBattleText: text "We bake lots of" line "goodies and share" @@ -137,7 +137,7 @@ CamperSidBeatenText: line "ing out…" done -UnknownText_0x1ab0f6: +CamperSidAfterBattleText: text "Sorry. You weren't" line "littering. It was" cont "my mistake." @@ -153,7 +153,7 @@ PicnickerEdnaBeatenText: text "Ohh… I lost…" done -UnknownText_0x1ab15f: +PicnickerEdnaAfterBattleText: text "Conserving energy" line "is important, but" @@ -175,7 +175,7 @@ HikerTimBeatenText: line "singing…" done -UnknownText_0x1ab210: +HikerTimAfterBattleText: text "Battles are about" line "concentration." done @@ -193,7 +193,7 @@ HikerSidneyBeatenText: line "I lost that…" done -UnknownText_0x1ab278: +HikerSidneyAfterBattleText: text "The POWER PLANT is" line "across a small" cont "river." diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 5159266ba..e291a3d73 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -112,7 +112,7 @@ TrainerPsychicNathan: PsychicNathanScript: end_if_just_battled opentext - writetext UnknownText_0x5830e + writetext PsychicNathanAfterBattleText waitbutton closetext end @@ -225,7 +225,7 @@ PsychicNathanBeatenText: text "…" done -UnknownText_0x5830e: +PsychicNathanAfterBattleText: text "I like thinking" line "here." done diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8e7dce341..88dec668e 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -52,7 +52,7 @@ TrainerMediumRebecca: MediumRebeccaScript: end_if_just_battled opentext - writetext UnknownText_0x18a034 + writetext MediumRebeccaAfterBattleText waitbutton closetext end @@ -63,7 +63,7 @@ TrainerPsychicFranklin: PsychicFranklinScript: end_if_just_battled opentext - writetext UnknownText_0x18a0a6 + writetext PsychicFranklinAfterBattleText waitbutton closetext end @@ -74,7 +74,7 @@ TrainerMediumDoris: MediumDorisScript: end_if_just_battled opentext - writetext UnknownText_0x18a136 + writetext MediumDorisAfterBattleText waitbutton closetext end @@ -85,7 +85,7 @@ TrainerPsychicJared: PsychicJaredScript: end_if_just_battled opentext - writetext UnknownText_0x18a1b3 + writetext PsychicJaredAfterBattleText waitbutton closetext end @@ -206,7 +206,7 @@ MediumRebeccaBeatenText: line "Far too strong…" done -UnknownText_0x18a034: +MediumRebeccaAfterBattleText: text "What is the source" line "of your power?" done @@ -222,7 +222,7 @@ PsychicFranklinBeatenText: line "power than mine!" done -UnknownText_0x18a0a6: +PsychicFranklinAfterBattleText: text "You made your soul" line "stronger, not just" cont "your abilities." @@ -241,7 +241,7 @@ MediumDorisBeatenText: line "I still lost…" done -UnknownText_0x18a136: +MediumDorisAfterBattleText: text "Darn! I forgot" line "that I predicted I" cont "would lose to you." @@ -257,7 +257,7 @@ PsychicJaredBeatenText: text "I was no match…" done -UnknownText_0x18a1b3: +PsychicJaredAfterBattleText: text "KARATE KING, the" line "master of the" diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 5714d6340..5587d486f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -25,7 +25,7 @@ TrainerGruntM29: GruntM29Script: end_if_just_battled opentext - writetext TrainerGruntM29SlowpokeProfitText + writetext GruntM29AfterBattleText waitbutton closetext end @@ -79,7 +79,7 @@ TrainerGruntM2: GruntM2Script: end_if_just_battled opentext - writetext UnknownText_0x5aaf2 + writetext GruntM2AfterBattleText waitbutton closetext end @@ -90,7 +90,7 @@ TrainerGruntF1: GruntF1Script: end_if_just_battled opentext - writetext UnknownText_0x5ab8d + writetext GruntF1AfterBattleText waitbutton closetext end @@ -207,7 +207,7 @@ GruntM29BeatenText: line "my day!" done -TrainerGruntM29SlowpokeProfitText: +GruntM29AfterBattleText: text "Sure, we've been" line "hacking the tails" @@ -266,7 +266,7 @@ GruntM2BeatenText: line "Too strong…" done -UnknownText_0x5aaf2: +GruntM2AfterBattleText: text "We need the money," line "but selling SLOW-" cont "POKETAILS?" @@ -286,7 +286,7 @@ GruntF1BeatenText: text "You rotten brat!" done -UnknownText_0x5ab8d: +GruntF1AfterBattleText: text "SLOWPOKETAILS" line "grow back fast!" diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index e32946903..a3b298052 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -31,7 +31,7 @@ TrainerSageChow: SageChowScript: end_if_just_battled opentext - writetext UnknownText_0x184583 + writetext SageChowAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ SageChowBeatenText: text "Th-Thank you!" done -UnknownText_0x184583: +SageChowAfterBattleText: text "All living beings" line "coexist through" cont "cooperation." diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 621693f99..788c7bc34 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -16,7 +16,7 @@ TrainerSageNico: SageNicoScript: end_if_just_battled opentext - writetext UnknownText_0x1847ff + writetext SageNicoAfterBattleText waitbutton closetext end @@ -27,7 +27,7 @@ TrainerSageEdmond: SageEdmondScript: end_if_just_battled opentext - writetext UnknownText_0x18486f + writetext SageEdmondAfterBattleText waitbutton closetext end @@ -49,7 +49,7 @@ SageNicoBeatenText: line "I'm too weak." done -UnknownText_0x1847ff: +SageNicoAfterBattleText: text "The flexible pil-" line "lar protects the" @@ -66,7 +66,7 @@ SageEdmondBeatenText: text "Oh, I'm weak!" done -UnknownText_0x18486f: +SageEdmondAfterBattleText: text "I tried to copy" line "BELLSPROUT's" diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index ee6420d35..f0129e5ce 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -100,7 +100,7 @@ TrainerSageJin: SageJinScript: end_if_just_battled opentext - writetext UnknownText_0x184dfa + writetext SageJinAfterBattleText waitbutton closetext end @@ -111,7 +111,7 @@ TrainerSageTroy: SageTroyScript: end_if_just_battled opentext - writetext UnknownText_0x184ea4 + writetext SageTroyAfterBattleText waitbutton closetext end @@ -122,7 +122,7 @@ TrainerSageNeal: SageNealScript: end_if_just_battled opentext - writetext UnknownText_0x184f12 + writetext SageNealAfterBattleText waitbutton closetext end @@ -274,7 +274,7 @@ SageJinBeatenText: line "incomplete…" done -UnknownText_0x184dfa: +SageJinAfterBattleText: text "As #MON grow" line "stronger, so does" cont "the trainer." @@ -297,7 +297,7 @@ SageTroyBeatenText: line "real!" done -UnknownText_0x184ea4: +SageTroyAfterBattleText: text "It is not far to" line "the ELDER." done @@ -313,7 +313,7 @@ SageNealBeatenText: line "is bright!" done -UnknownText_0x184f12: +SageNealAfterBattleText: text "Let there be light" line "on your journey." done diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index a4fff5e88..ea699ea1b 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -491,7 +491,7 @@ TrainerScientistJed: ScientistJedScript: end_if_just_battled opentext - writetext UnknownText_0x6cc16 + writetext ScientistJedAfterBattleText waitbutton closetext end @@ -502,7 +502,7 @@ TrainerGruntM16: GruntM16Script: end_if_just_battled opentext - writetext UnknownText_0x6cd1b + writetext GruntM16AfterBattleText waitbutton closetext end @@ -673,7 +673,7 @@ ScientistJedBeatenText: text "I get it…" done -UnknownText_0x6cc16: +ScientistJedAfterBattleText: text "All right. I'll" line "divulge a secret" cont "about our hideout." @@ -704,7 +704,7 @@ GruntM16BeatenText: text "Kaboom!" done -UnknownText_0x6cd1b: +GruntM16AfterBattleText: text "I don't even know" line "where the traps" cont "are planted." diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index d3e208e99..9c3e00a9b 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -199,7 +199,7 @@ TrainerGruntM17: GruntM17Script: end_if_just_battled opentext - writetext UnknownText_0x6db88 + writetext GruntM17AfterBattleText waitbutton closetext end @@ -210,7 +210,7 @@ TrainerGruntM18: GruntM18Script: end_if_just_battled opentext - writetext UnknownText_0x6dc1a + writetext GruntM18AfterBattleText waitbutton closetext end @@ -221,7 +221,7 @@ TrainerGruntM19: GruntM19Script: end_if_just_battled opentext - writetext UnknownText_0x6dcd1 + writetext GruntM19AfterBattleText waitbutton closetext end @@ -826,7 +826,7 @@ GruntM17BeatenText: text "What? I lost?" done -UnknownText_0x6db88: +GruntM17AfterBattleText: text "Heh, I'm just a" line "GRUNT." @@ -847,7 +847,7 @@ GruntM18BeatenText: text "I knew I'd lose…" done -UnknownText_0x6dc1a: +GruntM18AfterBattleText: text "I got wiped out on" line "the last mission" cont "by a kid too." @@ -871,7 +871,7 @@ GruntM19BeatenText: text "Grrrr…" done -UnknownText_0x6dcd1: +GruntM19AfterBattleText: text "Heh, only the boss" line "knows the password" cont "for that door." diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index c08d004b5..473e1d281 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -138,7 +138,7 @@ SlowpokeTailGrunt: GruntF5Script: end_if_just_battled opentext - writetext UnknownText_0x6e611 + writetext GruntF5AfterBattleText waitbutton closetext setevent EVENT_LEARNED_SLOWPOKETAIL @@ -150,7 +150,7 @@ RaticateTailGrunt: GruntM28Script: end_if_just_battled opentext - writetext UnknownText_0x6e737 + writetext GruntM28AfterBattleText waitbutton closetext setevent EVENT_LEARNED_RATICATE_TAIL @@ -162,7 +162,7 @@ TrainerScientistRoss: ScientistRossScript: end_if_just_battled opentext - writetext UnknownText_0x6e822 + writetext ScientistRossAfterBattleText waitbutton closetext end @@ -173,7 +173,7 @@ TrainerScientistMitch: ScientistMitchScript: end_if_just_battled opentext - writetext UnknownText_0x6e90a + writetext ScientistMitchAfterBattleText waitbutton closetext end @@ -456,7 +456,7 @@ GruntF5BeatenText: line "I'll tell you." done -UnknownText_0x6e611: +GruntF5AfterBattleText: text "The password to" line "the boss's room is" @@ -490,7 +490,7 @@ GruntM28BeatenText: line "You're good!" done -UnknownText_0x6e737: +GruntM28AfterBattleText: text "Hyuck-hyuck-hyuck!" para "The password to" @@ -517,7 +517,7 @@ ScientistRossBeatenText: line "error cost me…" done -UnknownText_0x6e822: +ScientistRossAfterBattleText: text "A radio signal" line "that drives #-" cont "MON mad…" @@ -544,7 +544,7 @@ ScientistMitchBeatenText: cont "battling." done -UnknownText_0x6e90a: +ScientistMitchAfterBattleText: text "If we turn up the" line "power of our radio" diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 66d9a417f..1354f2753 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -216,7 +216,7 @@ TrainerGruntM11: GruntM11Script: end_if_just_battled opentext - writetext GruntM11AfterText + writetext GruntM11AfterBattleText waitbutton closetext end @@ -227,7 +227,7 @@ TrainerGruntM25: GruntM25Script: end_if_just_battled opentext - writetext GruntM25AfterText + writetext GruntM25AfterBattleText waitbutton closetext end @@ -238,7 +238,7 @@ TrainerBurglarDuncan: BurglarDuncanScript: end_if_just_battled opentext - writetext BurglarDuncanAfterText + writetext BurglarDuncanAfterBattleText waitbutton closetext end @@ -249,7 +249,7 @@ TrainerBurglarEddie: BurglarEddieScript: end_if_just_battled opentext - writetext BurglarEddieAfterText + writetext BurglarEddieAfterBattleText waitbutton closetext end @@ -260,7 +260,7 @@ TrainerGruntM13: GruntM13Script: end_if_just_battled opentext - writetext GruntM13AfterText + writetext GruntM13AfterBattleText waitbutton closetext end @@ -271,7 +271,7 @@ TrainerGruntF3: GruntF3Script: end_if_just_battled opentext - writetext GruntF3AfterText + writetext GruntF3AfterBattleText waitbutton closetext end @@ -790,7 +790,7 @@ GruntM11BeatenText: line "by indecision!" done -GruntM11AfterText: +GruntM11AfterBattleText: text "I'm confused too…" line "The switch on the" @@ -814,7 +814,7 @@ GruntM25BeatenText: line "I blew it." done -GruntM25AfterText: +GruntM25AfterBattleText: text "All right. A hint!" para "Change the order" @@ -834,7 +834,7 @@ BurglarDuncanBeatenText: text "Mercy!" done -BurglarDuncanAfterText: +BurglarDuncanAfterBattleText: text "Steal and sell!" line "That's basic in" cont "crime, kid!" @@ -853,7 +853,7 @@ BurglarEddieBeatenText: text "Over the top!" done -BurglarEddieAfterText: +BurglarEddieAfterBattleText: text "UNDERGROUND WARE-" line "HOUSE?" @@ -878,7 +878,7 @@ GruntM13BeatenText: line "you're cool, huh?" done -GruntM13AfterText: +GruntM13AfterBattleText: text "You must have ice" line "in your veins to" cont "dis TEAM ROCKET." @@ -905,7 +905,7 @@ GruntF3BeatenText: text "How could you?" done -GruntF3AfterText: +GruntF3AfterBattleText: text "Go wherever you'd" line "like! Get lost!" cont "See if I care!" diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 943a042c1..60a87339c 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -44,7 +44,7 @@ TrainerGruntM24: GruntM24Script: end_if_just_battled opentext - writetext UnknownText_0x7da48 + writetext GruntM24AfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ TrainerGruntM14: GruntM14Script: end_if_just_battled opentext - writetext UnknownText_0x7db01 + writetext GruntM14AfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerGruntM15: GruntM15Script: end_if_just_battled opentext - writetext UnknownText_0x7db8e + writetext GruntM15AfterBattleText waitbutton closetext end @@ -113,7 +113,7 @@ GruntM24BeatenText: text "I got disposed of…" done -UnknownText_0x7da48: +GruntM24AfterBattleText: text "TEAM ROCKET will" line "keep going, wait-" cont "ing for the return" @@ -136,7 +136,7 @@ GruntM14BeatenText: text "Blast it!" done -UnknownText_0x7db01: +GruntM14AfterBattleText: text "I lost…" para "Please forgive me," @@ -156,7 +156,7 @@ GruntM15BeatenText: line "So, that's how?" done -UnknownText_0x7db8e: +GruntM15AfterBattleText: text "Hyuck-hyuck-hyuck!" line "That was a blast!" cont "I'll remember you!" diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 01875f6ae..cdf26ed82 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -22,7 +22,7 @@ TrainerPokemaniacLarry: PokemaniacLarryScript: end_if_just_battled opentext - writetext UnknownText_0x59d31 + writetext PokemaniacLarryAfterBattleText waitbutton closetext end @@ -33,7 +33,7 @@ TrainerHikerRussell: HikerRussellScript: end_if_just_battled opentext - writetext UnknownText_0x59c6c + writetext HikerRussellAfterBattleText waitbutton closetext end @@ -44,7 +44,7 @@ TrainerHikerDaniel: HikerDanielScript: end_if_just_battled opentext - writetext UnknownText_0x59dc9 + writetext HikerDanielAfterBattleText waitbutton closetext end @@ -55,7 +55,7 @@ TrainerFirebreatherBill: FirebreatherBillScript: end_if_just_battled opentext - writetext UnknownText_0x59e6f + writetext FirebreatherBillAfterBattleText waitbutton closetext end @@ -66,7 +66,7 @@ TrainerFirebreatherRay: FirebreatherRayScript: end_if_just_battled opentext - writetext UnknownText_0x59efc + writetext FirebreatherRayAfterBattleText waitbutton closetext end @@ -99,7 +99,7 @@ HikerRussellBeatenText: text "Oh, oh, oh!" done -UnknownText_0x59c6c: +HikerRussellAfterBattleText: text "All right, then!" line "I've decided." @@ -125,7 +125,7 @@ PokemaniacLarryBeatenText: line "MON…" done -UnknownText_0x59d31: +PokemaniacLarryAfterBattleText: text "Every Friday, you" line "can hear #MON" @@ -146,7 +146,7 @@ HikerDanielBeatenText: line "big time!" done -UnknownText_0x59dc9: +HikerDanielAfterBattleText: text "I was conned into" line "buying a SLOWPOKE-" cont "TAIL." @@ -168,7 +168,7 @@ FirebreatherBillBeatenText: text "I flamed out!" done -UnknownText_0x59e6f: +FirebreatherBillAfterBattleText: text "On weekends, you" line "can hear strange" @@ -189,7 +189,7 @@ FirebreatherRayBeatenText: text "FLASH!" done -UnknownText_0x59efc: +FirebreatherRayAfterBattleText: text "It's my #MON's" line "fire that lights" cont "up this cave." diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 26295aab0..e498dbeea 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -20,7 +20,7 @@ TrainerPokemaniacAndrew: PokemaniacAndrewScript: end_if_just_battled opentext - writetext UnknownText_0x5a181 + writetext PokemaniacAndrewAfterBattleText waitbutton closetext end @@ -31,7 +31,7 @@ TrainerPokemaniacCalvin: PokemaniacCalvinScript: end_if_just_battled opentext - writetext UnknownText_0x5a230 + writetext PokemaniacCalvinAfterBattleText waitbutton closetext end @@ -42,7 +42,7 @@ TrainerHikerPhillip: HikerPhillipScript: end_if_just_battled opentext - writetext UnknownText_0x5a073 + writetext HikerPhillipAfterBattleText waitbutton closetext end @@ -53,7 +53,7 @@ TrainerHikerLeonard: HikerLeonardScript: end_if_just_battled opentext - writetext UnknownText_0x5a0fb + writetext HikerLeonardAfterBattleText waitbutton closetext end @@ -80,7 +80,7 @@ HikerPhillipBeatenText: text "Uurggh…" done -UnknownText_0x5a073: +HikerPhillipAfterBattleText: text "I've been lost for" line "a long time…" @@ -99,7 +99,7 @@ HikerLeonardBeatenText: line "feisty one!" done -UnknownText_0x5a0fb: +HikerLeonardAfterBattleText: text "I live down here." para "You can, too, if" @@ -121,7 +121,7 @@ PokemaniacAndrewBeatenText: line "Go away!" done -UnknownText_0x5a181: +PokemaniacAndrewAfterBattleText: text "Just me and my" line "#MON. I'm de-" cont "lirious with joy." @@ -142,7 +142,7 @@ PokemaniacCalvinBeatenText: line "on me!" done -UnknownText_0x5a230: +PokemaniacCalvinAfterBattleText: text "I should compile" line "and announce my" cont "study findings." diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 68b3147f9..f0f49cf27 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -46,7 +46,7 @@ TrainerCooltrainermNick: CooltrainermNickScript: end_if_just_battled opentext - writetext UnknownText_0x5a3f0 + writetext CooltrainermNickAfterBattleText waitbutton closetext end @@ -57,7 +57,7 @@ TrainerCooltrainerfGwen: CooltrainerfGwenScript: end_if_just_battled opentext - writetext UnknownText_0x5a488 + writetext CooltrainerfGwenAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ TrainerCooltrainerfEmma: CooltrainerfEmmaScript: end_if_just_battled opentext - writetext UnknownText_0x5a52b + writetext CooltrainerfEmmaAfterBattleText waitbutton closetext end @@ -96,7 +96,7 @@ CooltrainermNickBeatenText: line "dazzling style!" done -UnknownText_0x5a3f0: +CooltrainermNickAfterBattleText: text "Your #MON style" line "is stunning and" cont "colorful, I admit." @@ -115,7 +115,7 @@ CooltrainerfGwenBeatenText: line "too good for me." done -UnknownText_0x5a488: +CooltrainerfGwenAfterBattleText: text "I'm going to train" line "by myself until I" cont "improve." @@ -135,7 +135,7 @@ CooltrainerfEmmaBeatenText: line "babies than this!" done -UnknownText_0x5a52b: +CooltrainerfEmmaAfterBattleText: text "Just once a week," line "a #MON comes to" cont "the water's edge." diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 4a2af8fc1..7b03bc3ff 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -50,7 +50,7 @@ TrainerGentlemanGregory: GentlemanGregoryScript: end_if_just_battled opentext - writetext UnknownText_0x1923b0 + writetext GentlemanGregoryAfterBattleText waitbutton closetext end @@ -61,7 +61,7 @@ TrainerGuitaristVincent: GuitaristVincentScript: end_if_just_battled opentext - writetext UnknownText_0x19244b + writetext GuitaristVincentAfterBattleText waitbutton closetext end @@ -72,7 +72,7 @@ TrainerJugglerHorton: JugglerHortonScript: end_if_just_battled opentext - writetext UnknownText_0x1924d6 + writetext JugglerHortonAfterBattleText waitbutton closetext end @@ -175,7 +175,7 @@ GentlemanGregoryBeatenText: cont "sir!" done -UnknownText_0x1923b0: +GentlemanGregoryAfterBattleText: text "When I was still" line "in the army, LT." @@ -198,7 +198,7 @@ GuitaristVincentBeatenText: text "Ooh, how shocking!" done -UnknownText_0x19244b: +GuitaristVincentAfterBattleText: text "If the GYM's traps" line "were working, you" @@ -217,7 +217,7 @@ JugglerHortonBeatenText: line "I was overpowered…" done -UnknownText_0x1924d6: +JugglerHortonAfterBattleText: text "Don't get too com-" line "fortable about" diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index b67784821..4fd845c36 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -72,7 +72,7 @@ TrainerBird_keeperRod: Bird_keeperRodScript: end_if_just_battled opentext - writetext UnknownText_0x68837 + writetext Bird_keeperRodAfterBattleText waitbutton closetext end @@ -83,7 +83,7 @@ TrainerBird_keeperAbe: Bird_keeperAbeScript: end_if_just_battled opentext - writetext UnknownText_0x688c7 + writetext Bird_keeperAbeAfterBattleText waitbutton closetext end @@ -226,7 +226,7 @@ Bird_keeperRodBeatenText: text "Gaaah!" done -UnknownText_0x68837: +Bird_keeperRodAfterBattleText: text "FALKNER's skills" line "are for real!" @@ -246,7 +246,7 @@ Bird_keeperAbeBeatenText: line "true!" done -UnknownText_0x688c7: +Bird_keeperAbeAfterBattleText: text "This is pathetic," line "losing to some" cont "rookie trainer…" diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 402e41294..39da084b4 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -121,7 +121,7 @@ TrainerSupernerdEric: SupernerdEricScript: end_if_just_battled opentext - writetext UnknownText_0x7c36c + writetext SupernerdEricAfterBattleText waitbutton closetext end @@ -132,7 +132,7 @@ TrainerSupernerdTeru: SupernerdTeruScript: end_if_just_battled opentext - writetext UnknownText_0x7c410 + writetext SupernerdTeruAfterBattleText waitbutton closetext end @@ -143,7 +143,7 @@ TrainerPokemaniacIssac: PokemaniacIssacScript: end_if_just_battled opentext - writetext UnknownText_0x7c498 + writetext PokemaniacIssacAfterBattleText waitbutton closetext end @@ -154,7 +154,7 @@ TrainerPokemaniacDonald: PokemaniacDonaldScript: end_if_just_battled opentext - writetext UnknownText_0x7c52f + writetext PokemaniacDonaldAfterBattleText waitbutton closetext end @@ -439,7 +439,7 @@ SupernerdEricBeatenText: text "…Grumble…" done -UnknownText_0x7c36c: +SupernerdEricAfterBattleText: text "I guess I have to" line "do things fair and" cont "square…" @@ -461,7 +461,7 @@ SupernerdTeruBeatenText: text "Ow, ow, ow!" done -UnknownText_0x7c410: +SupernerdTeruAfterBattleText: text "I know my #MON" line "type alignments." @@ -481,7 +481,7 @@ PokemaniacIssacBeatenText: text "Aiyeeee!" done -UnknownText_0x7c498: +PokemaniacIssacAfterBattleText: text "Your #MON will" line "like you more if" @@ -502,7 +502,7 @@ PokemaniacDonaldBeatenText: line "That makes me mad!" done -UnknownText_0x7c52f: +PokemaniacDonaldAfterBattleText: text "Are you making a" line "#DEX? Here's a" cont "hot tip." From 62f591394368802ba51e43f75b3ff272a9ec2a8e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 17:53:21 -0500 Subject: [PATCH 05/35] All map triggers use the `maptrigger` macro, not `dw` .MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents --- maps/AzaleaGym.asm | 4 +- maps/AzaleaPokeCenter1F.asm | 6 +- maps/AzaleaTown.asm | 16 ++- maps/BattleTower1F.asm | 2 - maps/BattleTowerBattleRoom.asm | 6 +- maps/BattleTowerElevator.asm | 2 - maps/BattleTowerHallway.asm | 2 - maps/BattleTowerOutside.asm | 2 - maps/BlackthornCity.asm | 2 - maps/BlackthornGym1F.asm | 2 - maps/BlackthornGym2F.asm | 2 - maps/BrunosRoom.asm | 13 +-- maps/BurnedTower1F.asm | 21 ++-- maps/BurnedTowerB1F.asm | 17 ++-- maps/CeladonCity.asm | 2 - maps/CeladonDeptStore6F.asm | 3 - maps/CeruleanCity.asm | 2 - maps/CeruleanGym.asm | 14 ++- maps/CherrygroveCity.asm | 12 +-- maps/CianwoodCity.asm | 12 +-- maps/CianwoodPharmacy.asm | 6 +- maps/CinnabarIsland.asm | 2 - maps/Colosseum.asm | 30 +++--- maps/CopycatsHouse2F.asm | 3 - maps/DayCare.asm | 3 - maps/DragonShrine.asm | 34 +++---- maps/DragonsDenB1F.asm | 13 +-- maps/EarlsPokemonAcademy.asm | 8 +- maps/EcruteakCity.asm | 2 - maps/EcruteakGym.asm | 10 +- maps/EcruteakHouse.asm | 13 +-- maps/EcruteakPokeCenter1F.asm | 10 +- maps/ElmsLab.asm | 45 ++++----- maps/FastShip1F.asm | 18 ++-- maps/FastShipB1F.asm | 10 +- maps/FuchsiaCity.asm | 2 - maps/FuchsiaPokeCenter1F.asm | 6 +- maps/GoldenrodCity.asm | 2 - maps/GoldenrodDeptStore5F.asm | 3 - maps/GoldenrodDeptStoreB1F.asm | 4 - maps/GoldenrodDeptStoreRoof.asm | 4 - maps/GoldenrodGameCorner.asm | 3 - maps/GoldenrodGym.asm | 10 +- maps/GoldenrodMagnetTrainStation.asm | 6 +- maps/GoldenrodPokeComCenter2FMobile.asm | 8 +- maps/HallOfFame.asm | 14 ++- maps/IcePathB1F.asm | 3 - maps/IlexForest.asm | 3 - maps/IndigoPlateauPokeCenter1F.asm | 13 +-- maps/KarensRoom.asm | 13 +-- maps/KogasRoom.asm | 13 +-- maps/KrissHouse1F.asm | 10 +- maps/KrissHouse2F.asm | 5 +- maps/KurtsHouse.asm | 17 ++-- maps/LakeOfRage.asm | 13 +-- maps/LancesRoom.asm | 29 +++--- maps/LavenderNameRater.asm | 9 +- maps/LavenderTown.asm | 2 - maps/MahoganyMart1F.asm | 21 ++-- maps/MahoganyTown.asm | 12 +-- maps/MobileBattleRoom.asm | 14 ++- maps/MobileTradeRoomMobile.asm | 14 ++- maps/MountMoon.asm | 10 +- maps/MountMoonSquare.asm | 9 +- maps/MrPokemonsHouse.asm | 10 +- maps/NewBarkTown.asm | 12 +-- maps/OlivineCity.asm | 12 +-- maps/OlivinePort.asm | 14 ++- maps/PalletTown.asm | 2 - maps/PewterCity.asm | 2 - maps/PokeCenter2F.asm | 2 - maps/PowerPlant.asm | 10 +- maps/RadioTower3F.asm | 7 +- maps/RadioTower5F.asm | 14 ++- maps/RedsHouse1F.asm | 6 +- maps/Route16.asm | 13 +-- maps/Route16Gate.asm | 6 +- maps/Route17.asm | 7 +- maps/Route1718Gate.asm | 6 +- maps/Route19.asm | 3 - maps/Route20.asm | 3 - maps/Route23.asm | 2 - maps/Route25.asm | 10 +- maps/Route27.asm | 10 +- maps/Route28FamousSpeechHouse.asm | 6 +- maps/Route29.asm | 13 +-- maps/Route31.asm | 3 - maps/Route32.asm | 17 ++-- maps/Route34.asm | 3 - maps/Route34IlexForestGate.asm | 11 +-- maps/Route35NationalParkGate.asm | 48 ++++----- maps/Route36.asm | 13 +-- maps/Route36NationalParkGate.asm | 22 ++--- maps/Route37.asm | 7 +- maps/Route40.asm | 7 +- maps/Route40BattleTowerGate.asm | 7 +- maps/Route42.asm | 10 +- maps/Route43.asm | 11 +-- maps/Route43Gate.asm | 25 ++--- maps/Route6SaffronGate.asm | 6 +- maps/RuinsOfAlphAerodactylChamber.asm | 33 +++---- maps/RuinsOfAlphHoOhChamber.asm | 33 +++---- maps/RuinsOfAlphInnerChamber.asm | 102 ++++++++++---------- maps/RuinsOfAlphKabutoChamber.asm | 35 +++---- maps/RuinsOfAlphOmanyteChamber.asm | 33 +++---- maps/RuinsOfAlphOutside.asm | 53 +++++----- maps/RuinsOfAlphResearchCenter.asm | 25 ++--- maps/SaffronCity.asm | 2 - maps/SaffronTrainStation.asm | 6 +- maps/SeafoamGym.asm | 6 +- maps/SilverCaveOutside.asm | 2 - maps/SproutTower3F.asm | 10 +- maps/TeamRocketBaseB1F.asm | 13 +-- maps/TeamRocketBaseB2F.asm | 83 ++++++++-------- maps/TeamRocketBaseB3F.asm | 48 ++++----- maps/TimeCapsule.asm | 21 ++-- maps/TinTower1F.asm | 60 ++++++------ maps/TinTowerRoof.asm | 3 - maps/TradeCenter.asm | 21 ++-- maps/TrainerHouseB1F.asm | 6 +- maps/UndergroundPathSwitchRoomEntrances.asm | 13 +-- maps/UndergroundWarehouse.asm | 3 - maps/UnionCaveB2F.asm | 3 - maps/VermilionCity.asm | 2 - maps/VermilionPort.asm | 16 ++- maps/VictoryRoad.asm | 10 +- maps/VictoryRoadGate.asm | 58 ++++++----- maps/VioletCity.asm | 2 - maps/ViridianCity.asm | 2 - maps/WarehouseEntrance.asm | 5 - maps/WhirlIslandLugiaChamber.asm | 3 - maps/WillsRoom.asm | 21 ++-- maps/WiseTriosRoom.asm | 27 +++--- 133 files changed, 659 insertions(+), 1082 deletions(-) diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 982ade9b4..2c3818f0c 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -14,7 +14,7 @@ AzaleaGym_MapScriptHeader: .MapCallbacks: db 0 -BugsyScript: +AzaleaGymBugsyScript: faceplayer opentext checkevent EVENT_BEAT_BUGSY @@ -380,7 +380,7 @@ AzaleaGym_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugsyScript, -1 + person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 2b3ca2e70..3a8a0310c 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -7,14 +7,12 @@ const_value set 2 AzaleaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger: end AzaleaPokeCenter1FNurseScript: diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 1714e0432..3ebda5298 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -15,25 +15,21 @@ const_value set 2 AzaleaTown_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .Flypoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end .Flypoint: diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 6cf6bdd50..d83e48e59 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -8,8 +8,6 @@ const_value set 2 BattleTower1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 8626a0021..4f389e970 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -5,10 +5,8 @@ const_value set 2 BattleTowerBattleRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .EnterBattleRoom, 0 - dw .DummyTrigger, 0 + maptrigger .EnterBattleRoom + maptrigger .DummyTrigger .MapCallbacks: db 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2ae68654c..4bd5b8e6f 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -4,8 +4,6 @@ const_value set 2 BattleTowerElevator_MapScriptHeader: .MapTriggers: db 2 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 03424a977..cc65fcbfd 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -4,8 +4,6 @@ const_value set 2 BattleTowerHallway_MapScriptHeader: .MapTriggers: db 2 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index eeb4bf93b..0ccd463aa 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -10,8 +10,6 @@ BattleTowerOutside_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_TILES, .Callback1 dbw MAPCALLBACK_OBJECTS, .Callback2 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index cc9abdda9..9a28c8abb 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -15,8 +15,6 @@ BlackthornCity_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Santos diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b291385ca..d507b5c3c 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -11,8 +11,6 @@ BlackthornGym1F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_TILES, .Boulders .Boulders: diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index bb6a8e5a1..9aac7c210 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,8 +14,6 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_CMDQUEUE, .Boulders .Boulders: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index ba1e8c3c8..99412cf33 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -4,23 +4,18 @@ const_value set 2 BrunosRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .BrunosRoomDoors -.Trigger0: +.LockDoor: priorityjump .BrunosDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .BrunosRoomDoors: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index c48bb3bcc..7d50f22d0 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -8,27 +8,22 @@ const_value set 2 BurnedTower1F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .EusineTrigger + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .HoleAndLadder -.Trigger0: - priorityjump .EusineTrigger +.EusineTrigger: + priorityjump .MeetEusine end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end .HoleAndLadder: @@ -42,7 +37,7 @@ BurnedTower1F_MapScriptHeader: .Done: return -.EusineTrigger: +.MeetEusine: spriteface BURNEDTOWER1F_EUSINE, DOWN showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index ece68f7df..fb386a49f 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -12,25 +12,20 @@ const_value set 2 BurnedTowerB1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .LadderCallback - ; callbacks - - dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback - -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -BurnedTowerB1FLadderCallback: +.LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange changeblock $6, $e, $2 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 461b558ff..f45332ff1 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -15,8 +15,6 @@ CeladonCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a82e45f11..a4e163ed5 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -8,9 +8,6 @@ CeladonDeptStore6F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .Callback .Callback: diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47afa867a..ad3070679 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -12,8 +12,6 @@ CeruleanCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 52e993891..b886d337b 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -9,22 +9,20 @@ const_value set 2 CeruleanGym_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x1883d9, 0 - dw UnknownScript_0x1883da, 0 + maptrigger .DummyTrigger0 + maptrigger .GruntRunsOut .MapCallbacks: db 0 -UnknownScript_0x1883d9: +.DummyTrigger0: end -UnknownScript_0x1883da: - priorityjump UnknownScript_0x1883de +.GruntRunsOut: + priorityjump .GruntRunsOutScript end -UnknownScript_0x1883de: +.GruntRunsOutScript: applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3 playsound SFX_TACKLE applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 12c3f5d9a..a6a1594d1 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -8,21 +8,17 @@ const_value set 2 CherrygroveCity_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c6b2d8d28..eb44f3ccb 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -15,21 +15,17 @@ const_value set 2 CianwoodCity_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPointAndSuicune: diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 2a3f49c9d..b9feae6fd 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -4,14 +4,12 @@ const_value set 2 CianwoodPharmacy_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw CianwoodPharmacyTrigger, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -CianwoodPharmacyTrigger: +.DummyTrigger: end CianwoodPharmacist: diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 62e79ad4f..6dfa77e3a 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -7,8 +7,6 @@ CinnabarIsland_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 25794f5c0..14766393c 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -5,32 +5,26 @@ const_value set 2 Colosseum_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .InitializeColosseum + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 2 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris + dbw MAPCALLBACK_NEWMAP, .PreparePokeCenter2F - ; callbacks - - dbw MAPCALLBACK_OBJECTS, ColosseumScript_SetWhichChris - - dbw MAPCALLBACK_NEWMAP, ColosseumScript_InitializeCB - -.Trigger0: - priorityjump ColosseumScript_Initialize +.InitializeColosseum: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end -ColosseumScript_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 @@ -42,11 +36,11 @@ ColosseumScript_SetWhichChris: appear COLOSSEUM_CHRIS2 return -ColosseumScript_InitializeCB: +.PreparePokeCenter2F: domaptrigger POKECENTER_2F, $2 return -ColosseumScript_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $2 end diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 41689241d..069930525 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -12,9 +12,6 @@ CopycatsHouse2F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Callback .Callback: diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 8f2f6e5ac..ee10f375e 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -8,9 +8,6 @@ DayCare_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index ebd833ccd..f031667b9 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -7,22 +7,20 @@ const_value set 2 DragonShrine_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DragonShrineTest + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump DragonShrineTestScript +.DragonShrineTest: + priorityjump .DragonShrineTestScript end -.Trigger1: +.DummyTrigger: end -DragonShrineTestScript: +.DragonShrineTestScript: applymovement PLAYER, MovementData_0x18d2bf applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 opentext @@ -272,10 +270,10 @@ MenuDataHeader_0x18d215: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d21d + dw .MenuData2 db 1 ; default option -MenuData2_0x18d21d: +.MenuData2: db $81 ; flags db 3 ; items db "Pal@" @@ -287,10 +285,10 @@ MenuDataHeader_0x18d234: db $40 ; flags db 04, 09 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d23c + dw .MenuData2 db 1 ; default option -MenuData2_0x18d23c: +.MenuData2: db $81 ; flags db 3 ; items db "Strategy@" @@ -302,10 +300,10 @@ MenuDataHeader_0x18d258: db $40 ; flags db 04, 05 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d260 + dw .MenuData2 db 1 ; default option -MenuData2_0x18d260: +.MenuData2: db $81 ; flags db 3 ; items db "Weak person@" @@ -317,10 +315,10 @@ MenuDataHeader_0x18d283: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d28b + dw .MenuData2 db 1 ; default option -MenuData2_0x18d28b: +.MenuData2: db $81 ; flags db 3 ; items db "Love@" @@ -332,10 +330,10 @@ MenuDataHeader_0x18d2a5: db $40 ; flags db 04, 12 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d2ad + dw .MenuData2 db 1 ; default option -MenuData2_0x18d2ad: +.MenuData2: db $81 ; flags db 3 ; items db "Tough@" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index ef6ec59ed..f8528c9b8 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -12,22 +12,17 @@ const_value set 2 DragonsDenB1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckSilver -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .CheckSilver: diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index a43e652a8..2eb9081e4 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -66,7 +66,7 @@ AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .MenuHeader + loadmenudata .BlackboardMenuData _2dmenu closewindow if_equal $1, .Poison @@ -102,14 +102,14 @@ AcademyBlackboard: waitbutton jump .Loop -.MenuHeader: +.BlackboardMenuData: db $40 ; flags db 00, 00 ; start coords db 08, 11 ; end coords - dw .Data + dw .MenuData2 db 1 ; default option -.Data: +.MenuData2: db $80 ; flags dn 3, 2 ; rows, columns db 5 ; spacing diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b15850d2e..6ffc502c6 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -13,8 +13,6 @@ EcruteakCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 0af0cf3c9..bf9d55848 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -10,19 +10,17 @@ const_value set 2 EcruteakGym_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x99d53, 0 - dw UnknownScript_0x99d57, 0 + maptrigger .ForcedToLeave + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x99d53: +.ForcedToLeave: priorityjump EcruteakGymClosed end -UnknownScript_0x99d57: +.DummyTrigger: end MortyScript_0x99d58: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 2b795ebd6..f50b39627 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -7,22 +7,17 @@ const_value set 2 EcruteakHouse_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .InitializeSages -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .InitializeSages: diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index dc578d2e0..0d711128f 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -8,19 +8,17 @@ const_value set 2 EcruteakPokeCenter1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .MeetBill + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.MeetBill: priorityjump .BillActivatesTimeCapsule end -.Trigger1: +.DummyTrigger: end .BillActivatesTimeCapsule: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c49c522fc..d8783226b 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -9,61 +9,56 @@ const_value set 2 ElmsLab_MapScriptHeader: .MapTriggers: db 6 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 - maptrigger .Trigger4 - maptrigger .Trigger5 + maptrigger .MeetElm + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 + maptrigger .DummyTrigger3 + maptrigger .DummyTrigger4 + maptrigger .DummyTrigger5 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MoveElmCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm - -.Trigger0: - priorityjump ElmsLab_AutowalkUpToElm +.MeetElm: + priorityjump .WalkUpToElm end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end -.Trigger3: +.DummyTrigger3: end -.Trigger4: +.DummyTrigger4: end -.Trigger5: +.DummyTrigger5: end -.Callback_MoveElm: +.MoveElmCallback: checktriggers iftrue .Skip moveperson ELMSLAB_ELM, $3, $4 .Skip: return -ElmsLab_AutowalkUpToElm: +.WalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 spriteface ELMSLAB_ELM, RIGHT opentext writetext ElmText_Intro -ElmsLab_RefuseLoop: +.MustSayYes: yesorno - iftrue ElmsLab_ElmGetsEmail + iftrue .ElmGetsEmail writetext ElmText_Refused - jump ElmsLab_RefuseLoop + jump .MustSayYes -ElmsLab_ElmGetsEmail: +.ElmGetsEmail: writetext ElmText_Accepted buttonsound writetext ElmText_ResearchAmbitions diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 3440cd848..9a6a93f5d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -7,26 +7,24 @@ const_value set 2 FastShip1F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .EnterFastShip + maptrigger .DummyTrigger2 .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger0: end -.Trigger1: - priorityjump .PriorityJump2 +.EnterFastShip: + priorityjump .EnterFastShipScript end -.Trigger2: +.DummyTrigger2: end -.PriorityJump2: +.EnterFastShipScript: applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index e3478657b..5744e3b37 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -15,18 +15,16 @@ const_value set 2 FastShipB1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x7673a, 0 - dw UnknownScript_0x7673b, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x7673a: +.DummyTrigger0: end -UnknownScript_0x7673b: +.DummyTrigger1: end UnknownScript_0x7673c: diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 13af9ee23..58d155454 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -10,8 +10,6 @@ FuchsiaCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 820d854c5..3759aab35 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -7,14 +7,12 @@ const_value set 2 FuchsiaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x196458, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x196458: +.DummyTrigger: end NurseScript_0x196459: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7642bf6b7..ffbfe6e7d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -21,8 +21,6 @@ GoldenrodCity_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria dbw MAPCALLBACK_OBJECTS, .MoveTutor diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index b10f019ac..8a7549be2 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -12,9 +12,6 @@ GoldenrodDeptStore5F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 769c01fb8..cd7e63446 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -14,11 +14,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index d3cb7af76..9787e69b8 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -14,11 +14,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ee0ccecb0..298485663 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -18,9 +18,6 @@ GoldenrodGameCorner_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Callback .Callback: diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index b014bc126..88156e35e 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -9,18 +9,16 @@ const_value set 2 GoldenrodGym_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5400a, 0 - dw UnknownScript_0x5400b, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x5400a: +.DummyTrigger0: end -UnknownScript_0x5400b: +.DummyTrigger1: end WhitneyScript_0x5400c: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index eea47ac8f..9818cd9ee 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -5,14 +5,12 @@ const_value set 2 GoldenrodMagnetTrainStation_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger: end OfficerScript_0x550ec: diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 56ae85b30..427dc3236 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -53,10 +53,10 @@ MenuDataHeader_0x62602: db $40 ; flags db 00, 00 ; start coords db 08, 15 ; end coords - dw MenuData2_0x6260a + dw .MenuData2 db 1 ; default option -MenuData2_0x6260a: +.MenuData2: db $80 ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB @@ -98,10 +98,10 @@ MenuDataHeader_0x6264c: db $40 ; flags db 00, 00 ; start coords db 08, 15 ; end coords - dw MenuData2_0x62654 + dw .MenuData2 db 1 ; default option -MenuData2_0x62654: +.MenuData2: db $80 ; flags db 3 ; items db "でんわ", $1f,"つかうとき@" ; Use phone diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index bf5804c42..2f4a3a200 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -4,22 +4,20 @@ const_value set 2 HallOfFame_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .EnterHallOfFame + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump HallOfFameScript +.EnterHallOfFame: + priorityjump .EnterHallOfFameScript end -.Trigger1: +.DummyTrigger: end -HallOfFameScript: +.EnterHallOfFameScript: follow HALLOFFAME_LANCE, PLAYER applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index afac65352..071133d97 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -11,9 +11,6 @@ IcePathB1F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index c1817a6cc..d1640aa11 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -17,9 +17,6 @@ IlexForest_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 4b906d818..2174552e6 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -9,21 +9,16 @@ const_value set 2 IndigoPlateauPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x180009, 0 + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .PrepareElite4 - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x18000a - -UnknownScript_0x180009: +.DummyTrigger: end -UnknownScript_0x18000a: +.PrepareElite4: domaptrigger WILLS_ROOM, $0 domaptrigger KOGAS_ROOM, $0 domaptrigger BRUNOS_ROOM, $0 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 6ab50b3fc..c944ba97f 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -4,23 +4,18 @@ const_value set 2 KarensRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .KarensRoomDoors -.Trigger0: +.LockDoor: priorityjump .KarensDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .KarensRoomDoors: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 35fcb68b7..454878bb4 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -4,23 +4,18 @@ const_value set 2 KogasRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .KogasRoomDoors -.Trigger0: +.LockDoor: priorityjump .KogasDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .KogasRoomDoors: diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 70aad1590..ed69fe9a4 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -8,18 +8,16 @@ const_value set 2 KrissHouse1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x7a4d6, 0 - dw UnknownScript_0x7a4d7, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x7a4d6: +.DummyTrigger0: end -UnknownScript_0x7a4d7: +.DummyTrigger1: end UnknownScript_0x7a4d8: diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f847f6fa0..eec62a6aa 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -10,11 +10,7 @@ KrissHouse2F_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .InitializeRoom - dbw MAPCALLBACK_TILES, .SetSpawn .Null: @@ -53,6 +49,7 @@ GameConsole: KrissHousePoster: dw EVENT_KRISS_ROOM_POSTER, .Script + .Script: describedecoration 0 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 17a278d65..e5c76fec3 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,30 +11,27 @@ KurtsHouse_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .KurtCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18e154 - -UnknownScript_0x18e154: +.KurtCallback: checkevent EVENT_CLEARED_SLOWPOKE_WELL - iffalse UnknownScript_0x18e177 + iffalse .Done checkevent EVENT_FOREST_IS_RESTLESS - iftrue UnknownScript_0x18e177 + iftrue .Done checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e16f + iftrue .MakingBalls disappear KURTSHOUSE_KURT2 appear KURTSHOUSE_KURT1 disappear KURTSHOUSE_TWIN2 appear KURTSHOUSE_TWIN1 return -UnknownScript_0x18e16f: +.MakingBalls: disappear KURTSHOUSE_KURT1 appear KURTSHOUSE_KURT2 disappear KURTSHOUSE_TWIN1 appear KURTSHOUSE_TWIN2 -UnknownScript_0x18e177: +.Done: return KurtScript_0x18e178: diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index db08e2b5f..ffcc865f7 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -15,23 +15,18 @@ const_value set 2 LakeOfRage_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Wesley -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e3572d50d..14dc9852b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -6,37 +6,32 @@ const_value set 2 LancesRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .LancesRoomDoors - ; callbacks - - dbw MAPCALLBACK_TILES, .CheckDoor - -.Trigger0: - priorityjump LancesRoom_PlayerWalksIn_DoorsCloseBehind +.LockDoor: + priorityjump .LancesDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end -.CheckDoor: +.LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - iffalse .LanceEntranceOpen + iffalse .KeepDoorsClosed changeblock $4, $16, $34 -.LanceEntranceOpen: +.KeepDoorsClosed: checkevent EVENT_LANCES_ROOM_EXIT_OPEN - iffalse .LanceExitClosed + iffalse .OpenDoors changeblock $4, $0, $b -.LanceExitClosed: +.OpenDoors: return -LancesRoom_PlayerWalksIn_DoorsCloseBehind: +.LancesDoorLocksBehindYou: applymovement PLAYER, LancesRoom_PlayerWalksInMovementData refreshscreen $86 playsound SFX_STRENGTH diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 6ac3cfb26..dfab25b6b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -4,14 +4,12 @@ const_value set 2 LavenderNameRater_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x7eaf1, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x7eaf1: +.DummyTrigger: end LavenderNameRater: @@ -22,8 +20,7 @@ LavenderNameRater: closetext end -LavenderNameRaterBookshelf: -; unused +LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf LavenderNameRater_MapEventHeader: diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 45f235d76..f0b40ad12 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -10,8 +10,6 @@ LavenderTown_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 532574644..81823061c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -8,31 +8,26 @@ const_value set 2 MahoganyMart1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x6c356, 0 - dw UnknownScript_0x6c357, 0 + maptrigger .DummyTrigger0 + maptrigger .LanceUncoversStaircase .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x6c35b - -UnknownScript_0x6c356: +.DummyTrigger0: end -UnknownScript_0x6c357: +.LanceUncoversStaircase: priorityjump UnknownScript_0x6c38f end -UnknownScript_0x6c35b: +.MahoganyMart1FStaircase: checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - iftrue UnknownScript_0x6c362 + iftrue .ShowStairs return -UnknownScript_0x6c362: +.ShowStairs: changeblock $6, $2, $1e return diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 0612b0811..62b56708e 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -7,21 +7,17 @@ const_value set 2 MahoganyTown_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 7c5628955..7a10a7299 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,22 +1,20 @@ MobileBattleRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeMobileBattleRoom + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump MobileBattleRoom_Initialize +.InitializeMobileBattleRoom: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -MobileBattleRoom_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $5 end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 60a0f72fc..3e1753832 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,22 +1,20 @@ MobileTradeRoomMobile_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeMobileTradeRoomMobile + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump MobileTradeRoomMobile_Initialize +.InitializeMobileTradeRoomMobile: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -MobileTradeRoomMobile_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $4 end diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 3a98e1b90..2d30c2ab5 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -4,19 +4,17 @@ const_value set 2 MountMoon_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .RivalEncounter + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.RivalEncounter: priorityjump .RivalBattle end -.Trigger1: +.DummyTrigger: end .RivalBattle: diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1c84c2e65..5b5c2e113 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -6,19 +6,14 @@ const_value set 2 MountMoonSquare_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw .Trigger0, 0 + maptrigger .DummyTrigger .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone dbw MAPCALLBACK_OBJECTS, .DisappearRock -.Trigger0: +.DummyTrigger: end .DisappearMoonStone: diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 6449ad404..8a322339d 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -5,19 +5,17 @@ const_value set 2 MrPokemonsHouse_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .MeetMrPokemon + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.MeetMrPokemon: priorityjump .MrPokemonEvent end -.Trigger1: +.DummyTrigger: end .MrPokemonEvent: diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index d382a4cf1..110536631 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -6,21 +6,17 @@ const_value set 2 NewBarkTown_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 87b842a39..508df854d 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -7,21 +7,17 @@ const_value set 2 OlivineCity_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index b7830eaed..200abc9e9 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -10,22 +10,20 @@ const_value set 2 OlivinePort_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x748ac, 0 - dw UnknownScript_0x748ad, 0 + maptrigger .DummyTrigger0 + maptrigger .LeaveFastShip .MapCallbacks: db 0 -UnknownScript_0x748ac: +.DummyTrigger0: end -UnknownScript_0x748ad: - priorityjump UnknownScript_0x748b1 +.LeaveFastShip: + priorityjump .LeaveFastShipScript end -UnknownScript_0x748b1: +.LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 dotrigger $0 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 45ab0c5ca..932484f8c 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -8,8 +8,6 @@ PalletTown_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index e70012447..36474b7ea 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -11,8 +11,6 @@ PewterCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 3730b6708..3cebaf902 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -7,8 +7,6 @@ const_value set 2 PokeCenter2F_MapScriptHeader: .MapTriggers: db 6 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 maptrigger .Trigger2 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 62a539eb3..317f12764 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -10,18 +10,16 @@ const_value set 2 PowerPlant_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x188dc3, 0 - dw UnknownScript_0x188dc4, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x188dc3: +.DummyTrigger0: end -UnknownScript_0x188dc4: +.DummyTrigger1: end PowerPlantGuardPhoneScript: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index fef269adf..a9fed600c 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -13,12 +13,9 @@ RadioTower3F_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .CardKeyShutterCallback - ; callbacks - - dbw MAPCALLBACK_TILES, CardKeyShutterCallback - -CardKeyShutterCallback: +.CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .Change return diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 3f8b444d4..c2fd1e9ea 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -8,22 +8,20 @@ const_value set 2 RadioTower5F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end FakeDirectorScript: diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index ae909f6da..cf7dd4b3b 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -4,14 +4,12 @@ const_value set 2 RedsHouse1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw .Trigger, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger: +.DummyTrigger: end RedsMom: diff --git a/maps/Route16.asm b/maps/Route16.asm index 4d9c02ece..7c63d184b 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -4,20 +4,17 @@ Route16_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad318 - -UnknownScript_0x1ad318: +.AlwaysOnBike: checkcode VAR_YCOORD - if_less_than $5, UnknownScript_0x1ad328 + if_less_than $5, .CanWalk checkcode VAR_XCOORD - if_greater_than $d, UnknownScript_0x1ad328 + if_greater_than $d, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return -UnknownScript_0x1ad328: +.CanWalk: clearflag ENGINE_ALWAYS_ON_BIKE return diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index e1ed8c714..17572bf14 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -4,14 +4,12 @@ const_value set 2 Route16Gate_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x733e9, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x733e9: +.DummyTrigger: end OfficerScript_0x733ea: diff --git a/maps/Route17.asm b/maps/Route17.asm index 0a20a3e78..1ea495cc3 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -10,12 +10,9 @@ Route17_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab - -UnknownScript_0x1ad0ab: +.AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_DOWNHILL return diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index e1650702b..2be96d3f0 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -4,14 +4,12 @@ const_value set 2 Route1718Gate_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x7360d, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x7360d: +.DummyTrigger: end OfficerScript_0x7360e: diff --git a/maps/Route19.asm b/maps/Route19.asm index 11e21de7f..0de9f2f1f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -12,9 +12,6 @@ Route19_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .ClearRocks .ClearRocks: diff --git a/maps/Route20.asm b/maps/Route20.asm index 5733f3f9f..ce0d45d8a 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -9,9 +9,6 @@ Route20_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: diff --git a/maps/Route23.asm b/maps/Route23.asm index a8bd39b5e..83b114ab7 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -4,8 +4,6 @@ Route23_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/Route25.asm b/maps/Route25.asm index 911017ef6..197ecd86e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -14,18 +14,16 @@ const_value set 2 Route25_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x19ee9e, 0 - dw UnknownScript_0x19ee9f, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x19ee9e: +.DummyTrigger0: end -UnknownScript_0x19ee9f: +.DummyTrigger1: end UnknownScript_0x19eea0: diff --git a/maps/Route27.asm b/maps/Route27.asm index 7781e5bbf..c944c66ee 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -12,18 +12,16 @@ const_value set 2 Route27_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x1a0871, 0 - dw UnknownScript_0x1a0872, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x1a0871: +.DummyTrigger0: end -UnknownScript_0x1a0872: +.DummyTrigger1: end UnknownScript_0x1a0873: diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 0e0f95f01..d2e121af3 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -5,14 +5,12 @@ const_value set 2 Route28FamousSpeechHouse_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw .Trigger, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger: +.DummyTrigger: end Celebrity: diff --git a/maps/Route29.asm b/maps/Route29.asm index 629c4dd77..bf4bd169a 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -11,22 +11,17 @@ const_value set 2 Route29_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Tuscany -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .Tuscany: diff --git a/maps/Route31.asm b/maps/Route31.asm index 61b67be11..829fd2830 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -13,9 +13,6 @@ Route31_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: diff --git a/maps/Route32.asm b/maps/Route32.asm index da9eb5c70..f0cebf11e 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -17,26 +17,21 @@ const_value set 2 Route32_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Frieda -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end .Frieda: diff --git a/maps/Route34.asm b/maps/Route34.asm index 7aa242199..d8935c8f3 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -19,9 +19,6 @@ Route34_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 674bca42d..fd7aad411 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -10,19 +10,16 @@ Route34IlexForestGate_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .IsForestRestless - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x62d2d - -UnknownScript_0x62d2d: +.IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS - iffalse UnknownScript_0x62d38 + iffalse .Normal disappear ROUTE34ILEXFORESTGATE_TEACHER1 appear ROUTE34ILEXFORESTGATE_TEACHER2 return -UnknownScript_0x62d38: +.Normal: disappear ROUTE34ILEXFORESTGATE_TEACHER2 appear ROUTE34ILEXFORESTGATE_TEACHER1 return diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index bb88c55d6..f7aa0b22f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -6,60 +6,54 @@ const_value set 2 Route35NationalParkGate_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - dw Route35NationalParkGate_Trigger1, 0 - dw Route35NationalParkGate_Trigger2, 0 - dw Route35NationalParkGate_Trigger3, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .LeaveContestEarly .MapCallbacks: db 2 + dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning + dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable - ; callbacks - - dbw MAPCALLBACK_NEWMAP, Route35NationalParkGate_CheckIfStillInContest - - dbw MAPCALLBACK_OBJECTS, Route35NationalParkGate_CheckIfContestDay - -Route35NationalParkGate_Trigger1: +.DummyTrigger0: end -Route35NationalParkGate_Trigger2: +.DummyTrigger1: end -Route35NationalParkGate_Trigger3: - priorityjump Route35NationalParkGate_LeavingContestEarly +.LeaveContestEarly: + priorityjump .LeavingContestEarly end -Route35NationalParkGate_CheckIfStillInContest: +.CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkGate_Yes + iftrue .BugContestIsRunning dotrigger $0 return -Route35NationalParkGate_Yes: +.BugContestIsRunning: dotrigger $2 return -Route35NationalParkGate_CheckIfContestDay: +.CheckIfContestAvailable: checkcode VAR_WEEKDAY - if_equal TUESDAY, Route35NationalParkGate_IsContestDay - if_equal THURSDAY, Route35NationalParkGate_IsContestDay - if_equal SATURDAY, Route35NationalParkGate_IsContestDay + if_equal TUESDAY, .SetContestOfficer + if_equal THURSDAY, .SetContestOfficer + if_equal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkGate_Yes + iftrue .BugContestIsRunning disappear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkGate_IsContestDay: +.SetContestOfficer: appear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkGate_LeavingContestEarly: +.LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext @@ -68,13 +62,13 @@ Route35NationalParkGate_LeavingContestEarly: RAM2MEM $0 writetext UnknownText_0x6a79a yesorno - iffalse Route35NationalParkGate_GoBackIn + iffalse .GoBackToContest writetext UnknownText_0x6a7db waitbutton closetext jumpstd bugcontestresultswarp -Route35NationalParkGate_GoBackIn: +.GoBackToContest: writetext UnknownText_0x6a823 waitbutton closetext diff --git a/maps/Route36.asm b/maps/Route36.asm index 02ca0e9cd..5b4121cc4 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -12,22 +12,17 @@ const_value set 2 Route36_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .ArthurCallback -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .ArthurCallback: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index a2cb753a1..02f980735 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -15,29 +15,23 @@ const_value set 2 Route36NationalParkGate_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .LeaveContestEarly .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: - priorityjump .LeftTheContestEarly +.LeaveContestEarly: + priorityjump .LeavingContestEarly end .CheckIfContestRunning: @@ -69,7 +63,7 @@ Route36NationalParkGate_MapScriptHeader: .Return: return -.LeftTheContestEarly: +.LeavingContestEarly: spriteface PLAYER, UP opentext checkcode VAR_CONTESTMINUTES diff --git a/maps/Route37.asm b/maps/Route37.asm index df3877226..0065917a2 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -13,12 +13,9 @@ Route37_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .Sunny - ; callbacks - - dbw MAPCALLBACK_OBJECTS, SunnyCallback - -SunnyCallback: +.Sunny: checkcode VAR_WEEKDAY if_equal SUNDAY, .SunnyAppears disappear ROUTE37_SUNNY diff --git a/maps/Route40.asm b/maps/Route40.asm index 81891c7b9..a5677f0c4 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -18,12 +18,9 @@ Route40_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MonicaCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, MonicaCallback - -MonicaCallback: +.MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 4e6cfa8cb..796d73eec 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -8,12 +8,9 @@ Route40BattleTowerGate_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ShowSailor - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x9f665 - -UnknownScript_0x9f665: +.ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return diff --git a/maps/Route42.asm b/maps/Route42.asm index cd52b8973..ee29c9d7f 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -12,18 +12,16 @@ const_value set 2 Route42_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x1a9216, 0 - dw UnknownScript_0x1a9217, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x1a9216: +.DummyTrigger0: end -UnknownScript_0x1a9217: +.DummyTrigger1: end Route42SuicuneScript: diff --git a/maps/Route43.asm b/maps/Route43.asm index fa04dbe53..126842e64 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -14,18 +14,15 @@ Route43_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19d051 - -UnknownScript_0x19d051: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19d05c + iftrue .NoRockets domaptrigger ROUTE_43_GATE, $0 return -UnknownScript_0x19d05c: +.NoRockets: domaptrigger ROUTE_43_GATE, $1 return diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index ee54a42c7..99ca71a58 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -6,36 +6,31 @@ const_value set 2 Route43Gate_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .RocketShakedown + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, GateScript_CheckIfRockets - -.Trigger0: - priorityjump GateScript_RocketTakeover +.RocketShakedown: + priorityjump .RocketTakeover end -.Trigger1: +.DummyTrigger: end -GateScript_CheckIfRockets: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue GateScript_NoRockets + iftrue .NoRockets domaptrigger ROUTE_43, $0 return -GateScript_NoRockets: +.NoRockets: domaptrigger ROUTE_43, $1 return -GateScript_RocketTakeover: +.RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 9e3275d97..b9081eccd 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -4,14 +4,12 @@ const_value set 2 Route6SaffronGate_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x1926e9, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x1926e9: +.DummyTrigger: end OfficerScript_0x1926ea: diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index f68d0302b..d6e6bc0d8 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,45 +1,40 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x58dad, 0 - dw UnknownScript_0x58db8, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58db9 - -UnknownScript_0x58dad: +.CheckWall: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58db4 + iftrue .OpenWall end -UnknownScript_0x58db4: - priorityjump UnknownScript_0x58dd3 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58db8: +.DummyTrigger: end -UnknownScript_0x58db9: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58dc3 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58dc3: +.WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE - iffalse UnknownScript_0x58dca + iffalse .FloorClosed return -UnknownScript_0x58dca: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58dd3: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 74e11cf4d..2ff478945 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,46 +1,41 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5856d, 0 - dw UnknownScript_0x5857b, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x5857c - -UnknownScript_0x5856d: +.CheckWall: special SpecialHoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58577 + iftrue .OpenWall end -UnknownScript_0x58577: - priorityjump UnknownScript_0x58596 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x5857b: +.DummyTrigger: end -UnknownScript_0x5857c: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58586 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58586: +.WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE - iffalse UnknownScript_0x5858d + iffalse .FloorClosed return -UnknownScript_0x5858d: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58596: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 1348995c3..e949611e2 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -6,26 +6,22 @@ const_value set 2 RuinsOfAlphInnerChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x58f69, 0 - dw UnknownScript_0x58f6a, 0 + maptrigger .DummyTrigger0 + maptrigger .UnownAppear .MapCallbacks: db 0 -UnknownScript_0x58f69: +.DummyTrigger0: end -UnknownScript_0x58f6a: - priorityjump UnknownScript_0x58f6e - -UnknownScript_0x58f6d: +.UnownAppear: + priorityjump .StrangePresenceScript end -UnknownScript_0x58f6e: +.StrangePresenceScript: opentext - writetext UnknownText_0x58f89 + writetext RuinsOfAlphStrangePresenceText waitbutton closetext dotrigger $0 @@ -33,30 +29,30 @@ UnknownScript_0x58f6e: clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end -FisherScript_0x58f7d: - jumptextfaceplayer UnknownText_0x58fac +RuinsOfAlphInnerChamberFisherScript: + jumptextfaceplayer RuinsOfAlphInnerChamberFisherText -TeacherScript_0x58f80: - jumptextfaceplayer UnknownText_0x58fda +RuinsOfAlphInnerChamberTeacherScript: + jumptextfaceplayer RuinsOfAlphInnerChamberTeacherText -GrampsScript_0x58f83: - jumptextfaceplayer UnknownText_0x59024 +RuinsOfAlphInnerChamberGrampsScript: + jumptextfaceplayer RuinsOfAlphInnerChamberGrampsText -RuinsOfAlphInnerChamberStatueScript: - jumptext UnknownText_0x59072 +RuinsOfAlphInnerChamberStatue: + jumptext RuinsOfAlphInnerChamberStatueText -UnknownText_0x58f89: +RuinsOfAlphStrangePresenceText: text "There is a strange" line "presence here…" done -UnknownText_0x58fac: +RuinsOfAlphInnerChamberFisherText: text "This is a big" line "room, but there's" cont "nothing here." done -UnknownText_0x58fda: +RuinsOfAlphInnerChamberTeacherText: text "This place has a" line "mystical quality" cont "to it." @@ -65,7 +61,7 @@ UnknownText_0x58fda: line "ethereal even." done -UnknownText_0x59024: +RuinsOfAlphInnerChamberGrampsText: text "Ancient buildings" line "are often tombs of" cont "kings." @@ -74,7 +70,7 @@ UnknownText_0x59024: line "for instance." done -UnknownText_0x59072: +RuinsOfAlphInnerChamberStatueText: text "It's a replica of" line "an ancient #-" cont "MON." @@ -101,35 +97,35 @@ RuinsOfAlphInnerChamber_MapEventHeader: .Signposts: db 26 - signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue .PersonEvents: db 3 - person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index fdd7e0b3b..ba03172aa 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -5,47 +5,40 @@ const_value set 2 RuinsOfAlphKabutoChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5872b, 0 - dw UnknownScript_0x58736, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58737 - -UnknownScript_0x5872b: +.CheckWall: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x58732 + iftrue .OpenWall end -UnknownScript_0x58732: - priorityjump UnknownScript_0x58751 - -UnknownScript_0x58735: +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58736: +.DummyTrigger: end -UnknownScript_0x58737: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x58741 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58741: +.WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE - iffalse UnknownScript_0x58748 + iffalse .FloorClosed return -UnknownScript_0x58748: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58751: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 09738ed3a..fbf806070 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,46 +1,41 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x58be9, 0 - dw UnknownScript_0x58bf7, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58bf8 - -UnknownScript_0x58be9: +.CheckWall: special SpecialOmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58bf3 + iftrue .OpenWall end -UnknownScript_0x58bf3: - priorityjump UnknownScript_0x58c12 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58bf7: +.DummyTrigger: end -UnknownScript_0x58bf8: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58c02 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58c02: +.WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE - iffalse UnknownScript_0x58c09 + iffalse .FloorClosed return -UnknownScript_0x58c09: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58c12: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index e291a3d73..402860251 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -8,52 +8,47 @@ const_value set 2 RuinsOfAlphOutside_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5800d, 0 - dw UnknownScript_0x5800e, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ScientistCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5800f - -UnknownScript_0x5800d: +.DummyTrigger0: end -UnknownScript_0x5800e: +.DummyTrigger1: end -UnknownScript_0x5800f: +.ScientistCallback: checkflag ENGINE_UNOWN_DEX - iftrue UnknownScript_0x5802c + iftrue .NoScientist checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - iftrue UnknownScript_0x5801e - jump UnknownScript_0x5802c + iftrue .MaybeScientist + jump .NoScientist -UnknownScript_0x5801e: +.MaybeScientist: checkcode VAR_UNOWNCOUNT - if_greater_than $2, UnknownScript_0x58027 - jump UnknownScript_0x5802c + if_greater_than $2, .YesScientist + jump .NoScientist -UnknownScript_0x58027: +.YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $1 return -UnknownScript_0x5802c: +.NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $0 return -UnknownScript_0x58031: +RuinsOfAlphOutsideScientistTrigger1: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP spriteface PLAYER, DOWN jump UnknownScript_0x58044 -UnknownScript_0x5803a: +RuinsOfAlphOutsideScientistTrigger2: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT spriteface PLAYER, RIGHT jump UnknownScript_0x58044 @@ -130,13 +125,13 @@ UnknownScript_0x580a9: end -MapRuinsOfAlphOutsideSignpost0Script: +RuinsOfAlphOutsideSignpost0Script: jumptext UnknownText_0x58325 -MapRuinsOfAlphOutsideSignpost1Script: +RuinsOfAlphOutsideSignpost1Script: jumptext UnknownText_0x58342 -MapRuinsOfAlphOutsideSignpost2Script: +RuinsOfAlphOutsideSignpost2Script: jumptext UnknownText_0x58362 MovementData_0x580ba: @@ -307,14 +302,14 @@ RuinsOfAlphOutside_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $e, $b, $0, UnknownScript_0x58031, $0, $0 - xy_trigger 1, $f, $a, $0, UnknownScript_0x5803a, $0, $0 + xy_trigger 1, $e, $b, $0, RuinsOfAlphOutsideScientistTrigger1, $0, $0 + xy_trigger 1, $f, $a, $0, RuinsOfAlphOutsideScientistTrigger2, $0, $0 .Signposts: db 3 - signpost 8, 16, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost0Script - signpost 16, 12, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost1Script - signpost 12, 18, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost2Script + signpost 8, 16, SIGNPOST_READ, RuinsOfAlphOutsideSignpost0Script + signpost 16, 12, SIGNPOST_READ, RuinsOfAlphOutsideSignpost1Script + signpost 12, 18, SIGNPOST_READ, RuinsOfAlphOutsideSignpost2Script .PersonEvents: db 5 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index c81f5eef1..4899b44ac 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -6,36 +6,31 @@ const_value set 2 RuinsOfAlphResearchCenter_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x59180, 0 - dw UnknownScript_0x59181, 0 + maptrigger .DummyTrigger0 + maptrigger .GetUnownDex .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ScientistCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x59185 - -UnknownScript_0x59180: +.DummyTrigger0: end -UnknownScript_0x59181: - priorityjump UnknownScript_0x59192 +.GetUnownDex: + priorityjump .GetUnownDexScript end -UnknownScript_0x59185: +.ScientistCallback: checktriggers - if_equal $1, UnknownScript_0x5918b + if_equal $1, .ShowScientist return -UnknownScript_0x5918b: +.ShowScientist: moveperson RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return -UnknownScript_0x59192: +.GetUnownDexScript: applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f playsound SFX_BOOT_PC pause 60 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 121273939..758d49b98 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -14,8 +14,6 @@ SaffronCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 5b14dc196..3101a4af1 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -7,14 +7,12 @@ const_value set 2 SaffronTrainStation_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger: end OfficerScript_0x18a81e: diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index e9193a2fa..e63cd13c8 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -5,14 +5,12 @@ const_value set 2 SeafoamGym_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x1ab4fa, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x1ab4fa: +.DummyTrigger: end BlaineScript_0x1ab4fb: diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 37e24d730..4b4657f1e 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -4,8 +4,6 @@ SilverCaveOutside_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index f0129e5ce..74c0004af 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -10,18 +10,16 @@ const_value set 2 SproutTower3F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x184945, 0 - dw UnknownScript_0x184946, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x184945: +.DummyTrigger0: end -UnknownScript_0x184946: +.DummyTrigger1: end UnknownScript_0x184947: diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index ea699ea1b..ae826ed1f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -9,21 +9,16 @@ const_value set 2 TeamRocketBaseB1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback1 - -.Trigger0: +.DummyTrigger: end -.Callback1: +.HideSecurityGrunt: disappear TEAMROCKETBASEB1F_ROCKET1 return diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9c3e00a9b..7930866cd 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -17,33 +17,28 @@ const_value set 2 TeamRocketBaseB2F_MapScriptHeader: .MapTriggers: db 4 - - ; triggers - dw UnknownScript_0x6cf85, 0 - dw UnknownScript_0x6cf86, 0 - dw UnknownScript_0x6cf87, 0 - dw UnknownScript_0x6cf88, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 + maptrigger .DummyTrigger3 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .TransmitterDoorCallback - ; callbacks - - dbw MAPCALLBACK_TILES, TransmitterDoorCallback - -UnknownScript_0x6cf85: +.DummyTrigger0: end -UnknownScript_0x6cf86: +.DummyTrigger1: end -UnknownScript_0x6cf87: +.DummyTrigger2: end -UnknownScript_0x6cf88: +.DummyTrigger3: end -TransmitterDoorCallback: +.TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER iftrue .Change return @@ -319,12 +314,10 @@ UnknownScript_0x6d184: setevent EVENT_SECURITY_CAMERA_5 end -MapTeamRocketBaseB2FSignpostPtr1: - dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - dw MapTeamRocketBaseB2FSignpost1Script +TeamRocketBaseB2FLockedDoor: + dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script - -MapTeamRocketBaseB2FSignpost1Script: +.Script: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 @@ -344,16 +337,16 @@ UnknownScript_0x6d1e8: waitsfx end -MapTeamRocketBaseB2FSignpost21Script: +TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x6d207 + iftrue .Deactivated writetext UnknownText_0x6dda7 waitbutton closetext end -UnknownScript_0x6d207: +.Deactivated: writetext UnknownText_0x6de03 waitbutton closetext @@ -942,28 +935,28 @@ TeamRocketBaseB2F_MapEventHeader: .Signposts: db 23 - signpost 12, 14, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 - signpost 12, 15, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 - signpost 9, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 12, 14, SIGNPOST_IFNOTSET, TeamRocketBaseB2FLockedDoor + signpost 12, 15, SIGNPOST_IFNOTSET, TeamRocketBaseB2FLockedDoor + signpost 9, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 16, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 15, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 14, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 13, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 8, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 7, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 6, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 5, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 13, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 14, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 15, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 16, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 5, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 6, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 7, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 8, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript signpost 7, 26, SIGNPOST_ITEM, TeamRocketBaseB2FHiddenFullHeal .PersonEvents: diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 473e1d281..98d0c543d 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -17,31 +17,26 @@ const_value set 2 TeamRocketBaseB3F_MapScriptHeader: .MapTriggers: db 4 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 + maptrigger .LanceGetsPassword + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 + maptrigger .DummyTrigger3 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckGiovanniDoor -.Trigger0: +.LanceGetsPassword: priorityjump LanceGetPasswordScript end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end -.Trigger3: +.DummyTrigger3: end .CheckGiovanniDoor: @@ -178,9 +173,8 @@ ScientistMitchScript: closetext end -BossDoor: - dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - dw .Script +TeamRocketBaseB3FLockedDoor: + dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script .Script: opentext @@ -207,7 +201,7 @@ BossDoor: waitsfx end -MapTeamRocketBaseB3FSignpost9Script: +TeamRocketBaseB3FOathScript: jumpstd teamrocketoath TeamRocketBaseB3FProtein: @@ -590,16 +584,16 @@ TeamRocketBaseB3F_MapEventHeader: .Signposts: db 10 - signpost 9, 10, SIGNPOST_IFNOTSET, BossDoor - signpost 9, 11, SIGNPOST_IFNOTSET, BossDoor - signpost 1, 10, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 11, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 12, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 13, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 4, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 5, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 6, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 7, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 9, 10, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor + signpost 9, 11, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor + signpost 1, 10, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 1, 11, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 1, 12, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 1, 13, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 4, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 5, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 6, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 7, SIGNPOST_READ, TeamRocketBaseB3FOathScript .PersonEvents: db 14 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 014e0d26b..ed34b3f5c 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -5,26 +5,21 @@ const_value set 2 TimeCapsule_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeTimeCapsule + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TimeCapsule_SetWhichChris - -.Trigger0: - priorityjump TimeCapsule_Initialize +.InitializeTimeCapsule: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -TimeCapsule_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 @@ -36,7 +31,7 @@ TimeCapsule_SetWhichChris: appear TIMECAPSULE_CHRIS2 return -TimeCapsule_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $3 end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index c2b88b2a1..b48d41ff7 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -13,68 +13,62 @@ const_value set 2 TinTower1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x18502a, 0 - dw UnknownScript_0x18502e, 0 + maptrigger .FaceSuicune + maptrigger .DummyTrigger .MapCallbacks: db 2 + dbw MAPCALLBACK_OBJECTS, .NPCsCallback + dbw MAPCALLBACK_TILES, .StairsCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f - - dbw MAPCALLBACK_TILES, TinTowerStairsCallback - -UnknownScript_0x18502a: - priorityjump SuicuneBattle +.FaceSuicune: + priorityjump .SuicuneBattle end -UnknownScript_0x18502e: +.DummyTrigger: end -UnknownScript_0x18502f: +.NPCsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x185047 + iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR - iffalse UnknownScript_0x185050 + iffalse .FaceBeasts special SpecialBeastsCheck - iffalse UnknownScript_0x185050 + iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 -UnknownScript_0x185047: +.GotRainbowWing: checkevent EVENT_FOUGHT_HO_OH iffalse .Done appear TINTOWER1F_EUSINE .Done: return -UnknownScript_0x185050: +.FaceBeasts: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x185077 + iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU special SpecialMonCheck - iftrue UnknownScript_0x185065 + iftrue .NoRaikou appear TINTOWER1F_RAIKOU - jump UnknownScript_0x185067 + jump .CheckEntei -UnknownScript_0x185065: +.NoRaikou: disappear TINTOWER1F_RAIKOU -UnknownScript_0x185067: +.CheckEntei: writebyte ENTEI special SpecialMonCheck - iftrue UnknownScript_0x185074 + iftrue .NoEntei appear TINTOWER1F_ENTEI - jump UnknownScript_0x185076 + jump .BeastsDone -UnknownScript_0x185074: +.NoEntei: disappear TINTOWER1F_ENTEI -UnknownScript_0x185076: +.BeastsDone: return -UnknownScript_0x185077: +.FoughtSuicune: disappear TINTOWER1F_SUICUNE disappear TINTOWER1F_RAIKOU disappear TINTOWER1F_ENTEI @@ -82,14 +76,14 @@ UnknownScript_0x185077: setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return -TinTowerStairsCallback: +.StairsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue .NoChange + iftrue .DontHideStairs changeblock $a, $2, $9 -.NoChange: +.DontHideStairs: return -SuicuneBattle: +.SuicuneBattle: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index f1ab17ccf..befbf1f3b 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -7,9 +7,6 @@ TinTowerRoof_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .HoOh .HoOh: diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 36f476de4..07cb18136 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -5,26 +5,21 @@ const_value set 2 TradeCenter_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeTradeCenter + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris - -.Trigger0: - priorityjump TradeCenter_Initialize +.InitializeTradeCenter: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -TradeCenter_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 @@ -36,7 +31,7 @@ TradeCenter_SetWhichChris: appear TRADECENTER_CHRIS2 return -TradeCenter_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $1 end diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c96f5973b..1f6302623 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -5,14 +5,12 @@ const_value set 2 TrainerHouseB1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw Trigger0, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -Trigger0: +.DummyTrigger: end TrainerHouseReceptionistScript: diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 1354f2753..d329dade7 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -46,22 +46,17 @@ const_value set 2 UndergroundPathSwitchRoomEntrances_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .UpdateDoorPositions -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .UpdateDoorPositions: diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 60a87339c..67f5632ca 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -13,9 +13,6 @@ UndergroundWarehouse_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index f0f49cf27..80ea5a6d6 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -12,9 +12,6 @@ UnionCaveB2F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Lapras .Lapras: diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 2840e4ca3..28b189eac 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -12,8 +12,6 @@ VermilionCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 4cbb78604..3bf754db4 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -6,29 +6,25 @@ const_value set 2 VermilionPort_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .LeaveFastShip .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: - priorityjump UnknownScript_0x74da6 +.LeaveFastShip: + priorityjump .LeaveFastShipScript end .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION return -UnknownScript_0x74da6: +.LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 dotrigger $0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 46f59f5c3..4320621f2 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -9,18 +9,16 @@ const_value set 2 VictoryRoad_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x74490, 0 - dw UnknownScript_0x74491, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x74490: +.DummyTrigger0: end -UnknownScript_0x74491: +.DummyTrigger1: end UnknownScript_0x74492: diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 08737c111..36c57fd61 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -6,62 +6,60 @@ const_value set 2 VictoryRoadGate_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x9b9fb, 0 - dw UnknownScript_0x9b9fc, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x9b9fb: +.DummyTrigger0: end -UnknownScript_0x9b9fc: +.DummyTrigger1: end -UnknownScript_0x9b9fd: +VictoryRoadGateBadgeCheckTrigger: spriteface PLAYER, LEFT - jump UnknownScript_0x9ba04 + jump VictoryRoadGateBadgeCheckScript -OfficerScript_0x9ba03: +VictoryRoadGateOfficerScript: faceplayer -UnknownScript_0x9ba04: +VictoryRoadGateBadgeCheckScript: opentext - writetext UnknownText_0x9ba29 + writetext VictoryRoadGateOfficerText buttonsound checkcode VAR_BADGES - if_greater_than 7, UnknownScript_0x9ba19 - writetext UnknownText_0x9ba5f + if_greater_than 7, .AllEightBadges + writetext VictoryRoadGateNotEnoughBadgesText waitbutton closetext - applymovement PLAYER, MovementData_0x9ba27 + applymovement PLAYER, VictoryRoadGateStepDownMovement end -UnknownScript_0x9ba19: - writetext UnknownText_0x9bab4 +.AllEightBadges: + writetext VictoryRoadGateEightBadgesText waitbutton closetext dotrigger $1 end -BlackBeltScript_0x9ba21: - jumptextfaceplayer UnknownText_0x9baf1 +VictoryRoadGateLeftBlackBeltScript: + jumptextfaceplayer VictoryRoadGateLeftBlackBeltText -BlackBeltScript_0x9ba24: - jumptextfaceplayer UnknownText_0x9bb37 +VictoryRoadGateRightBlackBeltScript: + jumptextfaceplayer VictoryRoadGateRightBlackBeltText -MovementData_0x9ba27: +VictoryRoadGateStepDownMovement: step DOWN step_end -UnknownText_0x9ba29: +VictoryRoadGateOfficerText: text "Only trainers who" line "have proven them-" cont "selves may pass." done -UnknownText_0x9ba5f: +VictoryRoadGateNotEnoughBadgesText: text "You don't have all" line "the GYM BADGES of" cont "JOHTO." @@ -71,7 +69,7 @@ UnknownText_0x9ba5f: cont "through." done -UnknownText_0x9bab4: +VictoryRoadGateEightBadgesText: text "Oh! The eight" line "BADGES of JOHTO!" @@ -79,7 +77,7 @@ UnknownText_0x9bab4: line "on through!" done -UnknownText_0x9baf1: +VictoryRoadGateLeftBlackBeltText: text "This way leads to" line "MT.SILVER." @@ -88,7 +86,7 @@ UnknownText_0x9baf1: cont "there." done -UnknownText_0x9bb37: +VictoryRoadGateRightBlackBeltText: text "Off to the #MON" line "LEAGUE, are you?" @@ -116,13 +114,13 @@ VictoryRoadGate_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $b, $a, $0, UnknownScript_0x9b9fd, $0, $0 + xy_trigger 0, $b, $a, $0, VictoryRoadGateBadgeCheckTrigger, $0, $0 .Signposts: db 0 .PersonEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 87ec32077..14f97ae1b 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -14,8 +14,6 @@ VioletCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index ced89061b..3d86ae488 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -10,8 +10,6 @@ ViridianCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 39da084b4..fa6213a64 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -15,13 +15,8 @@ WarehouseEntrance_MapScriptHeader: .MapCallbacks: db 3 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ResetSwitches - dbw MAPCALLBACK_TILES, .CheckBasementKey - dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek .ResetSwitches: diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 79b9eb2aa..9a4db5f15 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -7,9 +7,6 @@ WhirlIslandLugiaChamber_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Lugia .Lugia: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index bb8b8b974..69493a773 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -4,34 +4,29 @@ const_value set 2 WillsRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .WillsRoomDoors -.Trigger0: +.LockDoor: priorityjump .WillsDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorClosed + iffalse .KeepDoorsClosed changeblock $4, $e, $2a -.KeepDoorClosed: +.KeepDoorsClosed: checkevent EVENT_WILLS_ROOM_EXIT_OPEN - iffalse .OpenDoor + iffalse .OpenDoors changeblock $4, $2, $16 -.OpenDoor: +.OpenDoors: return .WillsDoorLocksBehindYou: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 2aab72239..dee082bd8 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -9,41 +9,36 @@ const_value set 2 WiseTriosRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x98572, 0 - dw UnknownScript_0x98573, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x98574 - -UnknownScript_0x98572: +.DummyTrigger0: end -UnknownScript_0x98573: +.DummyTrigger1: end -UnknownScript_0x98574: +.WiseTrioCallback: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x98593 + iftrue .NoWiseTrio checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x9858c + iftrue .WiseTrio2 checkitem CLEAR_BELL - iftrue UnknownScript_0x9858c + iftrue .WiseTrio2 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -UnknownScript_0x9858c: +.WiseTrio2: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -UnknownScript_0x98593: +.NoWiseTrio: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return From 0f16ba854a3a53733e28fd61fea1b880d9bc1f4c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 20:05:34 -0500 Subject: [PATCH 06/35] Comment palette colors and roof map groups --- tilesets/battle_tower.pal | 15 ++++--- tilesets/bg.pal | 90 +++++++++++++++++++++++---------------- tilesets/house.pal | 15 ++++--- tilesets/ice_path.pal | 15 ++++--- tilesets/ob.pal | 68 +++++++++++++++++------------ tilesets/pokecom.pal | 15 ++++--- tilesets/roof.pal | 48 ++++++++++----------- tilesets/roofs.asm | 24 +++++------ 8 files changed, 162 insertions(+), 128 deletions(-) diff --git a/tilesets/battle_tower.pal b/tilesets/battle_tower.pal index f7daec67a..4e71a5575 100644 --- a/tilesets/battle_tower.pal +++ b/tilesets/battle_tower.pal @@ -1,38 +1,39 @@ +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 18, 24, 09 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water (blue) RGB 30, 28, 26 RGB 15, 16, 31 RGB 09, 09, 31 RGB 07, 07, 07 - +; yellow RGB 30, 28, 26 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 26, 24, 17 RGB 21, 17, 07 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof RGB 05, 05, 16 RGB 08, 19, 28 RGB 00, 00, 00 RGB 31, 31, 31 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/bg.pal b/tilesets/bg.pal index 03b01b47c..3cd14d142 100644 --- a/tilesets/bg.pal +++ b/tilesets/bg.pal @@ -1,208 +1,226 @@ +; morn + +; gray RGB 28, 31, 16 RGB 21, 21, 21 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 28, 31, 16 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; water RGB 31, 31, 31 RGB 08, 12, 31 RGB 01, 04, 31 RGB 07, 07, 07 - +; yellow RGB 28, 31, 16 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 28, 31, 16 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 - +; roof RGB 28, 31, 16 RGB 15, 31, 31 RGB 05, 17, 31 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; day + +; gray RGB 27, 31, 27 RGB 21, 21, 21 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 27, 31, 27 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; water RGB 31, 31, 31 RGB 08, 12, 31 RGB 01, 04, 31 RGB 07, 07, 07 - +; yellow RGB 27, 31, 27 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 27, 31, 27 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 - +; roof RGB 27, 31, 27 RGB 15, 31, 31 RGB 05, 17, 31 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; nite + +; gray RGB 15, 14, 24 RGB 11, 11, 19 RGB 07, 07, 12 RGB 00, 00, 00 - +; red RGB 15, 14, 24 RGB 14, 07, 17 RGB 13, 00, 08 RGB 00, 00, 00 - +; green RGB 15, 14, 24 RGB 08, 13, 19 RGB 00, 11, 13 RGB 00, 00, 00 - +; water RGB 15, 14, 24 RGB 05, 05, 17 RGB 03, 03, 10 RGB 00, 00, 00 - +; yellow RGB 30, 30, 11 RGB 16, 14, 18 RGB 16, 14, 10 RGB 00, 00, 00 - +; brown RGB 15, 14, 24 RGB 12, 09, 15 RGB 08, 04, 05 RGB 00, 00, 00 - +; roof RGB 15, 14, 24 RGB 13, 12, 23 RGB 11, 09, 20 RGB 00, 00, 00 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; dark + +; gray RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; red RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; green RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; water RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; yellow RGB 30, 30, 11 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; brown RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; roof RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; indoor + +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 18, 24, 09 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water RGB 30, 28, 26 RGB 15, 16, 31 RGB 09, 09, 31 RGB 07, 07, 07 - +; yellow RGB 30, 28, 26 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 26, 24, 17 RGB 21, 17, 07 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof RGB 30, 28, 26 RGB 17, 19, 31 RGB 14, 16, 31 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; overworld water + +; morn/day RGB 23, 23, 31 RGB 18, 19, 31 RGB 13, 12, 31 RGB 07, 07, 07 - +; nite RGB 15, 13, 27 RGB 10, 09, 20 RGB 04, 03, 18 diff --git a/tilesets/house.pal b/tilesets/house.pal index 2d6d51790..a9f8b74b6 100644 --- a/tilesets/house.pal +++ b/tilesets/house.pal @@ -1,38 +1,39 @@ +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 30, 28, 26 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water (blue) RGB 30, 28, 26 RGB 15, 16, 31 RGB 09, 09, 31 RGB 07, 07, 07 - +; yellow RGB 30, 28, 26 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 26, 24, 17 RGB 21, 17, 07 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof (glass) RGB 30, 28, 26 RGB 31, 19, 24 RGB 16, 13, 03 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/ice_path.pal b/tilesets/ice_path.pal index f92281d79..cb7659f50 100644 --- a/tilesets/ice_path.pal +++ b/tilesets/ice_path.pal @@ -1,38 +1,39 @@ +; gray RGB 15, 14, 24 RGB 11, 11, 19 RGB 07, 07, 12 RGB 00, 00, 00 - +; red RGB 15, 14, 24 RGB 14, 07, 17 RGB 13, 00, 08 RGB 00, 00, 00 - +; green (ice) RGB 22, 29, 31 RGB 10, 27, 31 RGB 31, 31, 31 RGB 05, 00, 09 - +; water RGB 15, 14, 24 RGB 05, 05, 17 RGB 03, 03, 10 RGB 00, 00, 00 - +; yellow RGB 30, 30, 11 RGB 16, 14, 18 RGB 16, 14, 10 RGB 00, 00, 00 - +; brown RGB 15, 14, 24 RGB 12, 09, 15 RGB 08, 04, 05 RGB 00, 00, 00 - +; roof (snow) RGB 25, 31, 31 RGB 09, 28, 31 RGB 16, 11, 31 RGB 05, 00, 09 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/ob.pal b/tilesets/ob.pal index f9fa6699e..bb7db6ab0 100644 --- a/tilesets/ob.pal +++ b/tilesets/ob.pal @@ -1,158 +1,170 @@ +; morn + +; red RGB 28, 31, 16 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 28, 31, 16 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 28, 31, 16 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 28, 31, 16 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 28, 31, 16 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; rock RGB 28, 31, 16 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 +; day + +; red RGB 27, 31, 27 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 27, 31, 27 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 27, 31, 27 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 27, 31, 27 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 27, 31, 27 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; rock RGB 27, 31, 27 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 +; nite + +; red RGB 15, 14, 24 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 15, 14, 24 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 15, 14, 24 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 15, 14, 24 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 15, 14, 24 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 15, 14, 24 RGB 08, 13, 19 RGB 00, 11, 13 RGB 00, 00, 00 - +; rock RGB 15, 14, 24 RGB 12, 09, 15 RGB 08, 04, 05 RGB 00, 00, 00 +; dark + +; red RGB 01, 01, 02 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 01, 01, 02 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 01, 01, 02 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 01, 01, 02 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 01, 01, 02 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; rock RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 diff --git a/tilesets/pokecom.pal b/tilesets/pokecom.pal index 7b89faf62..9fe7b765a 100644 --- a/tilesets/pokecom.pal +++ b/tilesets/pokecom.pal @@ -1,38 +1,39 @@ +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 18, 24, 09 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water (blue) RGB 30, 28, 26 RGB 17, 19, 31 RGB 14, 16, 31 RGB 07, 07, 07 - +; yellow RGB 31, 26, 21 RGB 31, 20, 01 RGB 14, 16, 31 RGB 07, 07, 07 - +; brown RGB 21, 17, 07 RGB 17, 19, 31 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof RGB 05, 05, 16 RGB 08, 19, 28 RGB 00, 00, 00 RGB 31, 31, 31 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/roof.pal b/tilesets/roof.pal index 67d59ed4d..ba65fc7d2 100644 --- a/tilesets/roof.pal +++ b/tilesets/roof.pal @@ -4,13 +4,13 @@ RGB 21, 21, 21 RGB 11, 11, 11 -; group 1 +; group 1 (Olivine) RGB 14, 17, 31 RGB 07, 11, 15 RGB 09, 09, 17 RGB 05, 07, 13 -; group 2 +; group 2 (Mahogany) RGB 12, 19, 00 RGB 06, 10, 00 RGB 06, 09, 07 @@ -22,97 +22,97 @@ RGB 21, 21, 21 RGB 17, 08, 07 -; group 4 +; group 4 (Ecruteak) RGB 31, 19, 00 RGB 27, 10, 05 RGB 15, 07, 02 RGB 11, 04, 02 -; group 5 +; group 5 (Blackthorn) RGB 11, 10, 16 RGB 05, 06, 07 RGB 03, 04, 08 RGB 00, 00, 00 -; group 6 +; group 6 (Cinnabar) RGB 31, 10, 00 RGB 18, 06, 00 RGB 18, 05, 09 RGB 17, 08, 07 -; group 7 +; group 7 (Cerulean) RGB 17, 27, 31 RGB 05, 15, 31 RGB 07, 08, 22 RGB 07, 07, 16 -; group 8 +; group 8 (Azalea) RGB 22, 20, 10 RGB 17, 14, 03 RGB 11, 11, 05 RGB 10, 09, 07 -; group 9 +; group 9 (Lake of Rage) RGB 31, 08, 04 RGB 09, 09, 08 RGB 18, 05, 09 RGB 09, 09, 08 -; group 10 +; group 10 (Violet) RGB 24, 14, 31 RGB 13, 07, 21 RGB 12, 03, 18 RGB 09, 03, 15 -; group 11 +; group 11 (Goldenrod) RGB 25, 25, 00 RGB 20, 17, 08 RGB 12, 12, 00 RGB 10, 09, 05 -; group 12 +; group 12 (Vermilion) RGB 27, 23, 01 RGB 23, 11, 00 RGB 15, 11, 01 RGB 11, 10, 01 -; group 13 +; group 13 (Pallet) RGB 27, 28, 31 RGB 17, 19, 22 RGB 14, 14, 18 RGB 10, 09, 13 -; group 14 +; group 14 (Pewter) RGB 19, 19, 16 RGB 10, 12, 15 RGB 09, 09, 11 RGB 04, 05, 07 -; group 15 +; group 15 (Mount Moon Square) RGB 14, 17, 31 RGB 07, 11, 15 RGB 09, 13, 19 RGB 07, 07, 16 -; group 16 +; group 16 (Route 23) RGB 21, 21, 21 RGB 13, 13, 13 RGB 11, 11, 19 RGB 07, 07, 12 -; group 17 +; group 17 (Fuchsia) RGB 31, 18, 29 RGB 17, 13, 20 RGB 14, 06, 12 RGB 11, 03, 10 -; group 18 +; group 18 (Lavender) RGB 23, 15, 31 RGB 16, 05, 31 RGB 12, 07, 17 RGB 08, 06, 10 -; group 19 +; group 19 (Route 28) RGB 21, 21, 25 RGB 16, 16, 16 RGB 13, 13, 13 @@ -124,37 +124,37 @@ RGB 21, 21, 21 RGB 11, 11, 11 -; group 21 +; group 21 (Celadon) RGB 19, 31, 15 RGB 31, 22, 02 RGB 12, 13, 09 RGB 09, 12, 03 -; group 22 +; group 22 (Cianwood) RGB 15, 10, 31 RGB 07, 05, 15 RGB 06, 05, 17 RGB 02, 02, 08 -; group 23 +; group 23 (Viridian) RGB 21, 31, 07 RGB 13, 25, 04 RGB 09, 14, 08 RGB 06, 10, 04 -; group 24 +; group 24 (New Bark) RGB 20, 31, 14 RGB 11, 23, 05 RGB 09, 13, 08 RGB 06, 09, 04 -; group 25 +; group 25 (Saffron) RGB 31, 26, 00 RGB 31, 15, 00 RGB 13, 13, 01 RGB 08, 08, 01 -; group 26 +; group 26 (Cherrygrove) RGB 31, 14, 28 RGB 31, 05, 21 RGB 14, 07, 17 diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index 2f9b99d2d..d17d4464e 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -19,17 +19,17 @@ LoadMapGroupRoof:: ; 1c000 MapGroupRoofs: ; 1c021i db -1 ; group 0 (unused) - db 3 ; group 1 - db 2 ; group 2 + db 3 ; group 1 (Olivine) + db 2 ; group 2 (Mahogany) db -1 ; group 3 - db 1 ; group 4 - db 2 ; group 5 + db 1 ; group 4 (Ecruteak) + db 2 ; group 5 (Blackthorn) db -1 ; group 6 db -1 ; group 7 - db 2 ; group 8 - db 2 ; group 9 - db 1 ; group 10 - db 4 ; group 11 + db 2 ; group 8 (Azalea) + db 2 ; group 9 (Lake of Rage) + db 1 ; group 10 (Violet) + db 4 ; group 11 (Goldenrod) db -1 ; group 12 db -1 ; group 13 db -1 ; group 14 @@ -37,14 +37,14 @@ MapGroupRoofs: ; 1c021i db -1 ; group 16 db -1 ; group 17 db -1 ; group 18 - db 0 ; group 19 + db 0 ; group 19 (Silver Cave) db -1 ; group 20 db -1 ; group 21 - db 3 ; group 22 + db 3 ; group 22 (Cianwood) db -1 ; group 23 - db 0 ; group 24 + db 0 ; group 24 (New Bark) db -1 ; group 25 - db 0 ; group 26 + db 0 ; group 26 (Cherrygrove) ; 1c03c Roofs: ; 1c03c From a0bef01a1ddcd80eb098e88dc0514d07a4f1bc50 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 20:10:39 -0500 Subject: [PATCH 07/35] Define more palette constants --- battle/objects/data.asm | 376 +++++++++++++++--------------- battle/objects/functions.asm | 24 +- constants/animation_constants.asm | 27 ++- constants/sprite_constants.asm | 11 + 4 files changed, 230 insertions(+), 208 deletions(-) diff --git a/battle/objects/data.asm b/battle/objects/data.asm index c72b81027..fca986f68 100755 --- a/battle/objects/data.asm +++ b/battle/objects/data.asm @@ -19,567 +19,567 @@ RELATIVE_X EQU $01 ; ANIM_OBJ_00 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_01 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_02 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_03 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_04 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_05 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_02, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_06 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_03, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_03, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_07 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_04, BATTLEANIMFUNC_1B, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_04, BATTLEANIMFUNC_1B, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_08 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_09 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_06, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_06, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_0A - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_07, BATTLEANIMFUNC_09, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_07, BATTLEANIMFUNC_09, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_0B - battleanimobj RELATIVE_X, $aa, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_10, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $aa, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_10, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0C - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0E, BATTLEANIMFUNC_04, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0E, BATTLEANIMFUNC_04, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0D - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_03, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_03, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0E - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_08, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_08, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_0F - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_0A, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_0A, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_BURNED - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_BLIZZARD - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, PAL_BATTLE_BLUE, $0a + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_12 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, PAL_BATTLE_BLUE, $0a + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_ICE_BEAM - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, PAL_BATTLE_BLUE, $0a + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_RAZOR_LEAF - battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_RAZOR_LEAF, PAL_BATTLE_GREEN, $06 + battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_RAZOR_LEAF, PAL_BATTLE_OB_GREEN, $06 ; ANIM_OBJ_POKE_BALL - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, PAL_BATTLE_RED, $0b + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, PAL_BATTLE_OB_RED, $0b ; ANIM_OBJ_POKE_BALL_BLOCKED - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, PAL_BATTLE_RED, $0b + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, PAL_BATTLE_OB_RED, $0b ; ANIM_OBJ_17 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_RED, $08 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_OB_RED, $08 ; ANIM_OBJ_18 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_RED, $08 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_18, BATTLEANIMFUNC_00, PAL_BATTLE_OB_RED, $08 ; ANIM_OBJ_19 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_1D, BATTLEANIMFUNC_06, PAL_BATTLE_GRAY, $0c + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_1D, BATTLEANIMFUNC_06, PAL_BATTLE_OB_GRAY, $0c ; ANIM_OBJ_1A - battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_1F, BATTLEANIMFUNC_38, PAL_BATTLE_GRAY, $0c + battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_1F, BATTLEANIMFUNC_38, PAL_BATTLE_OB_GRAY, $0c ; ANIM_OBJ_1B - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $07 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $07 ; ANIM_OBJ_BALL_POOF - battleanimobj RELATIVE_X, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $07 + battleanimobj RELATIVE_X, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $07 ; ANIM_OBJ_1D - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_07, PAL_BATTLE_BROWN, $09 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_07, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_1E - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_1A, BATTLEANIMFUNC_07, PAL_BATTLE_BROWN, $09 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_1A, BATTLEANIMFUNC_07, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_1F - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_1B, BATTLEANIMFUNC_36, PAL_BATTLE_BROWN, $09 + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_1B, BATTLEANIMFUNC_36, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_20 - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, PAL_BATTLE_BLUE, $21 + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, PAL_BATTLE_OB_BLUE, $21 ; ANIM_OBJ_BUBBLE - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, PAL_BATTLE_BLUE, $0d + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, PAL_BATTLE_OB_BLUE, $0d ; ANIM_OBJ_22 - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_23, BATTLEANIMFUNC_0D, PAL_BATTLE_BLUE, $0d + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_23, BATTLEANIMFUNC_0D, PAL_BATTLE_OB_BLUE, $0d ; ANIM_OBJ_23 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_0E, PAL_BATTLE_GRAY, $0e + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_0E, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_24 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_27, BATTLEANIMFUNC_0F, PAL_BATTLE_BLUE, $04 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_27, BATTLEANIMFUNC_0F, PAL_BATTLE_OB_BLUE, $04 ; ANIM_OBJ_25 - battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_2A, BATTLEANIMFUNC_00, PAL_BATTLE_BLUE, $04 + battleanimobj RELATIVE_X, $b4, BATTLEANIMFRAMESET_2A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $04 ; ANIM_OBJ_26 - battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_2B, BATTLEANIMFUNC_11, PAL_BATTLE_GREEN, $0f + battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_2B, BATTLEANIMFUNC_11, PAL_BATTLE_OB_GREEN, $0f ; ANIM_OBJ_27 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2C, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $10 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_28 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_YELLOW, $10 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_ICE_BUILDUP - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, PAL_BATTLE_BLUE, $0a + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_FROZEN - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, PAL_BATTLE_BLUE, $0a + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $0a ; ANIM_OBJ_MASTER_BALL_SPARKLE - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, PAL_BATTLE_BROWN, $11 + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, PAL_BATTLE_OB_BROWN, $11 ; ANIM_OBJ_2C - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_14, PAL_BATTLE_YELLOW, $0d + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_14, PAL_BATTLE_OB_YELLOW, $0d ; ANIM_OBJ_2D - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_31, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_31, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_2E - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_32, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_32, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_2F - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_33, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_33, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_30 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_15, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_15, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_31 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_36, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_LIGHTNING_BOLT - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, PAL_BATTLE_GRAY, $08 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_37, BATTLEANIMFUNC_03, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_33 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_38, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_38, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_34 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_39, BATTLEANIMFUNC_03, PAL_BATTLE_GRAY, $08 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_39, BATTLEANIMFUNC_03, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_35 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_3A, BATTLEANIMFUNC_16, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_3A, BATTLEANIMFUNC_16, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_36 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_3C, BATTLEANIMFUNC_17, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_3C, BATTLEANIMFUNC_17, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_37 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3E, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_38 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3F, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_3F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_39 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_40, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_40, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_3A - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_41, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_41, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_3B - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_42, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_42, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_3C - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_18, PAL_BATTLE_GREEN, $12 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_18, PAL_BATTLE_OB_GREEN, $12 ; ANIM_OBJ_3D - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_44, BATTLEANIMFUNC_00, PAL_BATTLE_GREEN, $12 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_44, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GREEN, $12 ; ANIM_OBJ_GUST - battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_45, BATTLEANIMFUNC_19, PAL_BATTLE_GRAY, $13 + battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_45, BATTLEANIMFUNC_19, PAL_BATTLE_OB_GRAY, $13 ; ANIM_OBJ_3F - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_46, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_46, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_40 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_47, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_47, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_41 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_48, BATTLEANIMFUNC_1A, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_48, BATTLEANIMFUNC_1A, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_42 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_49, BATTLEANIMFUNC_1A, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_49, BATTLEANIMFUNC_1A, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_43 - battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_01, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_44 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_ABSORB - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, PAL_BATTLE_GREEN, $12 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, PAL_BATTLE_OB_GREEN, $12 ; ANIM_OBJ_46 - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_4D, BATTLEANIMFUNC_1D, PAL_BATTLE_GRAY, $15 + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_4D, BATTLEANIMFUNC_1D, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_47 - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_51, BATTLEANIMFUNC_1E, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_51, BATTLEANIMFUNC_1E, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_48 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_52, BATTLEANIMFUNC_1F, PAL_BATTLE_GREEN, $16 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_52, BATTLEANIMFUNC_1F, PAL_BATTLE_OB_GREEN, $16 ; ANIM_OBJ_49 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, PAL_BATTLE_GREEN, $16 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, PAL_BATTLE_OB_GREEN, $16 ; ANIM_OBJ_LEECH_SEED - battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, PAL_BATTLE_GREEN, $06 + battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, PAL_BATTLE_OB_GREEN, $06 ; ANIM_OBJ_4B - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, PAL_BATTLE_GRAY, $0e + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_4C - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_5C, BATTLEANIMFUNC_02, PAL_BATTLE_GRAY, $17 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_5C, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $17 ; ANIM_OBJ_4D - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_5D, BATTLEANIMFUNC_22, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_5D, BATTLEANIMFUNC_22, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_4E - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_5F, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $10 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_5F, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_4F - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_YELLOW, $10 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $88, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, PAL_BATTLE_OB_YELLOW, $10 ; ANIM_OBJ_50 - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $18 + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $18 ; ANIM_OBJ_51 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $18 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_60, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $18 ; ANIM_OBJ_CHICK - battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_61, BATTLEANIMFUNC_23, PAL_BATTLE_YELLOW, $19 + battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_61, BATTLEANIMFUNC_23, PAL_BATTLE_OB_YELLOW, $19 ; ANIM_OBJ_53 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_63, BATTLEANIMFUNC_24, PAL_BATTLE_GRAY, $19 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_63, BATTLEANIMFUNC_24, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_54 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_66, BATTLEANIMFUNC_25, PAL_BATTLE_GRAY, $19 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_66, BATTLEANIMFUNC_25, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_SKULL - battleanimobj RELATIVE_X, $50, BATTLEANIMFRAMESET_1C, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $0c + battleanimobj RELATIVE_X, $50, BATTLEANIMFRAMESET_1C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $0c ; ANIM_OBJ_56 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_67, BATTLEANIMFUNC_26, PAL_BATTLE_BROWN, $1a + battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_67, BATTLEANIMFUNC_26, PAL_BATTLE_OB_BROWN, $1a ; ANIM_OBJ_57 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_68, BATTLEANIMFUNC_00, PAL_BATTLE_BROWN, $1a + battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_68, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BROWN, $1a ; ANIM_OBJ_58 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_69, BATTLEANIMFUNC_01, PAL_BATTLE_GRAY, $1a + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_69, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $1a ; ANIM_OBJ_PARALYZED - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6D, BATTLEANIMFUNC_28, PAL_BATTLE_YELLOW, $19 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6D, BATTLEANIMFUNC_28, PAL_BATTLE_OB_YELLOW, $19 ; ANIM_OBJ_5A - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, PAL_BATTLE_GRAY, $1b + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, PAL_BATTLE_OB_GRAY, $1b ; ANIM_OBJ_HAZE - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_GRAY, $1c + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_MIST - battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_GRAY, $1c + battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_SMOG - battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_GRAY, $1c + battleanimobj RELATIVE_X | X_FLIP, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_POISON_GAS - battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_GRAY, $1c + battleanimobj RELATIVE_X | X_FLIP, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_HORN - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_HORN, PAL_BATTLE_GRAY, $1d + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_HORN, PAL_BATTLE_OB_GRAY, $1d ; ANIM_OBJ_60 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, PAL_BATTLE_GRAY, $1d + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, PAL_BATTLE_OB_GRAY, $1d ; ANIM_OBJ_61 - battleanimobj RELATIVE_X, $48, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_2D, PAL_BATTLE_RED, $1e + battleanimobj RELATIVE_X, $48, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_2D, PAL_BATTLE_OB_RED, $1e ; ANIM_OBJ_62 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_06, PAL_BATTLE_GRAY, $15 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_06, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_63 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_2E, PAL_BATTLE_BROWN, $19 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_2E, PAL_BATTLE_OB_BROWN, $19 ; ANIM_OBJ_64 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_02, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_4A, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_65 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, PAL_BATTLE_GRAY, $11 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_GRAY, $11 ; ANIM_OBJ_66 - battleanimobj RELATIVE_X, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_RED, $23 + battleanimobj RELATIVE_X, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_POISON_GAS, PAL_BATTLE_OB_RED, $23 ; ANIM_OBJ_67 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_68 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_02, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_69 - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_6A - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_08, PAL_BATTLE_YELLOW, $23 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_08, PAL_BATTLE_OB_YELLOW, $23 ; ANIM_OBJ_6B - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_79, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_79, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_6C - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_6D - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_7A, BATTLEANIMFUNC_31, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_SKY_ATTACK_FEAROW - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, PAL_BATTLE_GRAY, $20 + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_7B, BATTLEANIMFUNC_32, PAL_BATTLE_OB_GRAY, $20 ; ANIM_OBJ_LICK - battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $04 + battleanimobj RELATIVE_X | X_FLIP, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $04 ; ANIM_OBJ_WITHDRAW - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $18 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $18 ; ANIM_OBJ_71 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_2F, PAL_BATTLE_BLUE, $0d + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_BLUE, $0d ; ANIM_OBJ_72 - battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_7E, BATTLEANIMFUNC_33, PAL_BATTLE_YELLOW, $12 + battleanimobj RELATIVE_X, $b0, BATTLEANIMFRAMESET_7E, BATTLEANIMFUNC_33, PAL_BATTLE_OB_YELLOW, $12 ; ANIM_OBJ_73 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_2F, PAL_BATTLE_GRAY, $08 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_2F, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_74 - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_34, PAL_BATTLE_GRAY, $1c + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_34, PAL_BATTLE_OB_GRAY, $1c ; ANIM_OBJ_75 - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_35, PAL_BATTLE_GRAY, $15 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_35, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_76 - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_80, BATTLEANIMFUNC_33, PAL_BATTLE_GRAY, $14 + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_80, BATTLEANIMFUNC_33, PAL_BATTLE_OB_GRAY, $14 ; ANIM_OBJ_77 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_81, BATTLEANIMFUNC_37, PAL_BATTLE_GRAY, $11 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_81, BATTLEANIMFUNC_37, PAL_BATTLE_OB_GRAY, $11 ; ANIM_OBJ_78 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_85, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $22 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_85, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $22 ; ANIM_OBJ_79 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_86, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $22 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_86, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $22 ; ANIM_OBJ_7A - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_87, BATTLEANIMFUNC_39, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_87, BATTLEANIMFUNC_39, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_7B - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_3A, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_3A, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_7C - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_34, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_7D - battleanimobj RELATIVE_X | X_FLIP | BEHIND_BG, $88, BATTLEANIMFRAMESET_88, BATTLEANIMFUNC_3B, PAL_BATTLE_BLUE, $13 + battleanimobj RELATIVE_X | X_FLIP | BEHIND_BG, $88, BATTLEANIMFRAMESET_88, BATTLEANIMFUNC_3B, PAL_BATTLE_OB_BLUE, $13 ; ANIM_OBJ_HEART - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_25, PAL_BATTLE_RED, $23 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_25, PAL_BATTLE_OB_RED, $23 ; ANIM_OBJ_7F - battleanimobj RELATIVE_X, $98, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_34, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $98, BATTLEANIMFRAMESET_10, BATTLEANIMFUNC_34, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_80 - battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_COTTON_SPORE - battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_SPRIAL_DESCENT, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_82 - battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_83 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_8C, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_8C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_84 - battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_8D, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $1f + battleanimobj RELATIVE_X | X_FLIP, $50, BATTLEANIMFRAMESET_8D, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $1f ; ANIM_OBJ_85 - battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_40, PAL_BATTLE_GRAY, $0e + battleanimobj RELATIVE_X, $40, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_40, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_86 - battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_8E, BATTLEANIMFUNC_41, PAL_BATTLE_RED, $1f + battleanimobj RELATIVE_X | X_FLIP, $a8, BATTLEANIMFRAMESET_8E, BATTLEANIMFUNC_41, PAL_BATTLE_OB_RED, $1f ; ANIM_OBJ_87 - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_8F, BATTLEANIMFUNC_3E, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_8F, BATTLEANIMFUNC_3E, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_88 - battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_93, BATTLEANIMFUNC_3E, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $88, BATTLEANIMFRAMESET_93, BATTLEANIMFUNC_3E, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_89 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_97, BATTLEANIMFUNC_3D, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_97, BATTLEANIMFUNC_3D, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_8A - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_3D, PAL_BATTLE_YELLOW, $23 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_3D, PAL_BATTLE_OB_YELLOW, $23 ; ANIM_OBJ_8B - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_2E, PAL_BATTLE_GRAY, $19 + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_2E, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_8C - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_02, PAL_BATTLE_GRAY, $15 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_02, PAL_BATTLE_OB_GRAY, $15 ; ANIM_OBJ_8D - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, PAL_BATTLE_RED, $19 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_99, BATTLEANIMFUNC_35, PAL_BATTLE_OB_RED, $19 ; ANIM_OBJ_SPIKES - battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, PAL_BATTLE_GRAY, $1f + battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_8B, BATTLEANIMFUNC_3F, PAL_BATTLE_OB_GRAY, $1f ; ANIM_OBJ_8F - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_15, BATTLEANIMFUNC_08, PAL_BATTLE_GRAY, $0a + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_15, BATTLEANIMFUNC_08, PAL_BATTLE_OB_GRAY, $0a ; ANIM_OBJ_90 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_02, PAL_BATTLE_RED, $03 + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_02, PAL_BATTLE_OB_RED, $03 ; ANIM_OBJ_91 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_42, PAL_BATTLE_GRAY, $08 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_7F, BATTLEANIMFUNC_42, PAL_BATTLE_OB_GRAY, $08 ; ANIM_OBJ_92 - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_9A, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $1b + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_9A, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $1b ; ANIM_OBJ_93 - battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_9B, BATTLEANIMFUNC_35, PAL_BATTLE_RED, $23 + battleanimobj RELATIVE_X | X_FLIP, $a0, BATTLEANIMFRAMESET_9B, BATTLEANIMFUNC_35, PAL_BATTLE_OB_RED, $23 ; ANIM_OBJ_94 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_23, PAL_BATTLE_GRAY, $25 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_23, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_95 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9D, BATTLEANIMFUNC_25, PAL_BATTLE_GRAY, $25 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9D, BATTLEANIMFUNC_25, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_96 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $25 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_97 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9E, BATTLEANIMFUNC_00, PAL_BATTLE_BLUE, $25 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_9E, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $25 ; ANIM_OBJ_98 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_9F, BATTLEANIMFUNC_3A, PAL_BATTLE_GREEN, $23 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $80, BATTLEANIMFRAMESET_9F, BATTLEANIMFUNC_3A, PAL_BATTLE_OB_GREEN, $23 ; ANIM_OBJ_99 - battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_A0, BATTLEANIMFUNC_16, PAL_BATTLE_GRAY, $23 + battleanimobj RELATIVE_X | X_FLIP, $80, BATTLEANIMFRAMESET_A0, BATTLEANIMFUNC_16, PAL_BATTLE_OB_GRAY, $23 ; ANIM_OBJ_9A - battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_43, PAL_BATTLE_YELLOW, $23 + battleanimobj RELATIVE_X | X_FLIP, $70, BATTLEANIMFRAMESET_78, BATTLEANIMFUNC_43, PAL_BATTLE_OB_YELLOW, $23 ; ANIM_OBJ_9B - battleanimobj RELATIVE_X | X_FLIP, $c0, BATTLEANIMFRAMESET_A2, BATTLEANIMFUNC_01, PAL_BATTLE_GRAY, $25 + battleanimobj RELATIVE_X | X_FLIP, $c0, BATTLEANIMFRAMESET_A2, BATTLEANIMFUNC_01, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_9C - battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_A3, BATTLEANIMFUNC_44, PAL_BATTLE_YELLOW, $24 + battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_A3, BATTLEANIMFUNC_44, PAL_BATTLE_OB_YELLOW, $24 ; ANIM_OBJ_9D - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A4, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $24 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A4, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $24 ; ANIM_OBJ_9E - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A5, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $24 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_A5, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $24 ; ANIM_OBJ_9F - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_45, PAL_BATTLE_RED, $12 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_43, BATTLEANIMFUNC_45, PAL_BATTLE_OB_RED, $12 ; ANIM_OBJ_A0 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A6, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_A1 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A7, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $02 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_A7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $02 ; ANIM_OBJ_A2 - battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B4, BATTLEANIMFUNC_4A, PAL_BATTLE_BROWN, $0f + battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B4, BATTLEANIMFUNC_4A, PAL_BATTLE_OB_BROWN, $0f ; ANIM_OBJ_A3 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_A8, BATTLEANIMFUNC_02, PAL_BATTLE_YELLOW, $05 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_A8, BATTLEANIMFUNC_02, PAL_BATTLE_OB_YELLOW, $05 ; ANIM_OBJ_A4 - battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_11, PAL_BATTLE_GRAY, $25 + battleanimobj RELATIVE_X | X_FLIP, $40, BATTLEANIMFRAMESET_9C, BATTLEANIMFUNC_11, PAL_BATTLE_OB_GRAY, $25 ; ANIM_OBJ_A5 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, PAL_BATTLE_GRAY, $23 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $90, BATTLEANIMFRAMESET_A9, BATTLEANIMFUNC_46, PAL_BATTLE_OB_GRAY, $23 ; ANIM_OBJ_PERISH_SONG - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, PAL_BATTLE_GRAY, $0e + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_47, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_A7 - battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_AA, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $24 + battleanimobj RELATIVE_X, $80, BATTLEANIMFRAMESET_AA, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $24 ; ANIM_OBJ_A8 - battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_AB, BATTLEANIMFUNC_48, PAL_BATTLE_GRAY, $13 + battleanimobj RELATIVE_X | X_FLIP, $b8, BATTLEANIMFRAMESET_AB, BATTLEANIMFUNC_48, PAL_BATTLE_OB_GRAY, $13 ; ANIM_OBJ_A9 - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AC, BATTLEANIMFUNC_44, PAL_BATTLE_GRAY, $13 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AC, BATTLEANIMFUNC_44, PAL_BATTLE_OB_GRAY, $13 ; ANIM_OBJ_AA - battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_05, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_AB - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_43, PAL_BATTLE_GRAY, $0e + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_24, BATTLEANIMFUNC_43, PAL_BATTLE_OB_GRAY, $0e ; ANIM_OBJ_AC - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_AD, BATTLEANIMFUNC_00, PAL_BATTLE_BLUE, $17 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_AD, BATTLEANIMFUNC_00, PAL_BATTLE_OB_BLUE, $17 ; ANIM_OBJ_AD - battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_AE, BATTLEANIMFUNC_49, PAL_BATTLE_GRAY, $01 + battleanimobj RELATIVE_X, $a8, BATTLEANIMFRAMESET_AE, BATTLEANIMFUNC_49, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_AE - battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AF, BATTLEANIMFUNC_01, PAL_BATTLE_YELLOW, $11 + battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_AF, BATTLEANIMFUNC_01, PAL_BATTLE_OB_YELLOW, $11 ; ANIM_OBJ_AF - battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B0, BATTLEANIMFUNC_4A, PAL_BATTLE_GRAY, $04 + battleanimobj RELATIVE_X | X_FLIP, $00, BATTLEANIMFRAMESET_B0, BATTLEANIMFUNC_4A, PAL_BATTLE_OB_GRAY, $04 ; ANIM_OBJ_B0 - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_4B, PAL_BATTLE_RED, $1c + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_4B, PAL_BATTLE_OB_RED, $1c ; ANIM_OBJ_B1 - battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_B1, BATTLEANIMFUNC_4C, PAL_BATTLE_GRAY, $19 + battleanimobj RELATIVE_X, $88, BATTLEANIMFRAMESET_B1, BATTLEANIMFUNC_4C, PAL_BATTLE_OB_GRAY, $19 ; ANIM_OBJ_B2 - battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4D, PAL_BATTLE_BROWN, $09 + battleanimobj RELATIVE_X, $b8, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4D, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_B3 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_B3, BATTLEANIMFUNC_00, PAL_BATTLE_YELLOW, $27 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_B3, BATTLEANIMFUNC_00, PAL_BATTLE_OB_YELLOW, $27 ; ANIM_OBJ_B4 - battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_04, PAL_BATTLE_BLUE, $15 + battleanimobj RELATIVE_X | X_FLIP | Y_FLIP, $98, BATTLEANIMFRAMESET_74, BATTLEANIMFUNC_04, PAL_BATTLE_OB_BLUE, $15 ; ANIM_OBJ_B5 - battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4E, PAL_BATTLE_BROWN, $09 + battleanimobj RELATIVE_X | X_FLIP, $ff, BATTLEANIMFRAMESET_19, BATTLEANIMFUNC_4E, PAL_BATTLE_OB_BROWN, $09 ; ANIM_OBJ_FLOWER - battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_08, PAL_BATTLE_RED, $1e + battleanimobj RELATIVE_X, $90, BATTLEANIMFRAMESET_73, BATTLEANIMFUNC_08, PAL_BATTLE_OB_RED, $1e ; ANIM_OBJ_COTTON - battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, PAL_BATTLE_RED, $1f + battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, PAL_BATTLE_OB_RED, $1f ; ANIM_OBJ_PLAYERFEETFOLLOW - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, PAL_BATTLE_ENEMY, $28 + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_ENEMYFEETFOLLOW - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_PLAYER, $29 + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_BA - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_ENEMY, $28 + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_BB - battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_PLAYER, $29 + battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ccfbe diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 3f988a2cc..3af7b6dad 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -451,18 +451,18 @@ GetBallAnimPal: ; cd249 (33:5249) ; cd26c (33:526c) .balls - db MASTER_BALL, PAL_BATTLE_GREEN - db ULTRA_BALL, PAL_BATTLE_YELLOW - db GREAT_BALL, PAL_BATTLE_BLUE - db POKE_BALL, PAL_BATTLE_RED - db HEAVY_BALL, PAL_BATTLE_GRAY - db LEVEL_BALL, PAL_BATTLE_BROWN - db LURE_BALL, PAL_BATTLE_BLUE - db FAST_BALL, PAL_BATTLE_BLUE - db FRIEND_BALL, PAL_BATTLE_YELLOW - db MOON_BALL, PAL_BATTLE_GRAY - db LOVE_BALL, PAL_BATTLE_RED - db -1, PAL_BATTLE_GRAY + db MASTER_BALL, PAL_BATTLE_OB_GREEN + db ULTRA_BALL, PAL_BATTLE_OB_YELLOW + db GREAT_BALL, PAL_BATTLE_OB_BLUE + db POKE_BALL, PAL_BATTLE_OB_RED + db HEAVY_BALL, PAL_BATTLE_OB_GRAY + db LEVEL_BALL, PAL_BATTLE_OB_BROWN + db LURE_BALL, PAL_BATTLE_OB_BLUE + db FAST_BALL, PAL_BATTLE_OB_BLUE + db FRIEND_BALL, PAL_BATTLE_OB_YELLOW + db MOON_BALL, PAL_BATTLE_OB_GRAY + db LOVE_BALL, PAL_BATTLE_OB_RED + db -1, PAL_BATTLE_OB_GRAY ; cd284 BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 8802cd579..21247a87f 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -824,13 +824,24 @@ const_value SET 1 const BG_EFFECT_STRUCT_BATTLE_TURN const BG_EFFECT_STRUCT_03 +; battle palettes + const_def + const PAL_BATTLE_BG_PLAYER ; 0 + const PAL_BATTLE_BG_ENEMY ; 1 + const PAL_BATTLE_BG_PLAYER_HP ; 2 + const PAL_BATTLE_BG_ENEMY_HP ; 3 + const PAL_BATTLE_BG_EXP ; 4 + const PAL_BATTLE_BG_5 ; 5 + const PAL_BATTLE_BG_6 ; 6 + const PAL_BATTLE_BG_TEXT ; 7 + ; animation object palettes const_def - const PAL_BATTLE_ENEMY ; 0 - const PAL_BATTLE_PLAYER ; 1 - const PAL_BATTLE_GRAY ; 2 - const PAL_BATTLE_YELLOW ; 3 - const PAL_BATTLE_RED ; 4 - const PAL_BATTLE_GREEN ; 5 - const PAL_BATTLE_BLUE ; 6 - const PAL_BATTLE_BROWN ; 7 + const PAL_BATTLE_OB_ENEMY ; 0 + const PAL_BATTLE_OB_PLAYER ; 1 + const PAL_BATTLE_OB_GRAY ; 2 + const PAL_BATTLE_OB_YELLOW ; 3 + const PAL_BATTLE_OB_RED ; 4 + const PAL_BATTLE_OB_GREEN ; 5 + const PAL_BATTLE_OB_BLUE ; 6 + const PAL_BATTLE_OB_BROWN ; 7 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index b0e20fd15..1a716f51b 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -193,6 +193,17 @@ const_value SET 1 const PAL_OW_TREE ; 6 const PAL_OW_ROCK ; 7 +; person_events set bit 3 so as not to use the sprite's default palette +const_value set (1 << 3) + const PAL_NPC_RED ; 8 + const PAL_NPC_BLUE ; 9 + const PAL_NPC_GREEN ; a + const PAL_NPC_BROWN ; b + const PAL_NPC_PINK ; c + const PAL_NPC_SILVER ; d + const PAL_NPC_TREE ; e + const PAL_NPC_ROCK ; f + ; SpriteMovementData indexes (see data/map_objects.asm) const_def const SPRITEMOVEDATA_00 ; 00 From b4261d27d8a6ed20c13dd1ff723f7d3f28833a58 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 20:50:08 -0500 Subject: [PATCH 08/35] Use new palette constants --- battle/anim_commands.asm | 10 +- constants/animation_constants.asm | 4 +- constants/music_constants.asm | 4 +- engine/battle_start.asm | 16 +- engine/color.asm | 2 +- engine/player_object.asm | 4 +- event/unown.asm | 2 +- gbhw.asm | 7 +- home/map.asm | 4 +- macros.asm | 1 + macros/pals.asm | 2 +- maps/AzaleaGym.asm | 14 +- maps/AzaleaMart.asm | 2 +- maps/AzaleaTown.asm | 4 +- maps/BattleTower1F.asm | 6 +- maps/BattleTowerOutside.asm | 6 +- maps/BillsHouse.asm | 2 +- maps/BlackthornCity.asm | 10 +- maps/BlackthornDragonSpeechHouse.asm | 2 +- maps/BlackthornEmysHouse.asm | 2 +- maps/BlackthornGym1F.asm | 10 +- maps/BlackthornGym2F.asm | 4 +- maps/BlackthornMart.asm | 2 +- maps/BlackthornPokeCenter1F.asm | 4 +- maps/BrunosRoom.asm | 2 +- maps/BurnedTower1F.asm | 4 +- maps/BurnedTowerB1F.asm | 14 +- maps/CeladonCafe.asm | 4 +- maps/CeladonCity.asm | 18 +- maps/CeladonDeptStore1F.asm | 4 +- maps/CeladonDeptStore2F.asm | 8 +- maps/CeladonDeptStore3F.asm | 10 +- maps/CeladonDeptStore4F.asm | 4 +- maps/CeladonDeptStore5F.asm | 10 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CeladonGameCorner.asm | 18 +- maps/CeladonGameCornerPrizeRoom.asm | 4 +- maps/CeladonGym.asm | 12 +- maps/CeladonMansion1F.asm | 2 +- maps/CeladonMansion3F.asm | 8 +- maps/CeladonMansionRoof.asm | 2 +- maps/CeladonMansionRoofHouse.asm | 2 +- maps/CeladonPokeCenter1F.asm | 6 +- maps/CeruleanCity.asm | 10 +- maps/CeruleanGym.asm | 10 +- maps/CeruleanMart.asm | 4 +- maps/CeruleanPokeCenter1F.asm | 2 +- maps/CeruleanPoliceStation.asm | 6 +- maps/CeruleanTradeSpeechHouse.asm | 6 +- maps/CharcoalKiln.asm | 2 +- maps/CherrygroveCity.asm | 6 +- maps/CherrygroveEvolutionSpeechHouse.asm | 4 +- maps/CherrygroveGymSpeechHouse.asm | 2 +- maps/CherrygroveMart.asm | 2 +- maps/CherrygrovePokeCenter1F.asm | 4 +- maps/CianwoodCity.asm | 6 +- maps/CianwoodCityPhotoStudio.asm | 2 +- maps/CianwoodGym.asm | 10 +- maps/CianwoodLugiaSpeechHouse.asm | 4 +- maps/CianwoodPharmacy.asm | 2 +- maps/CianwoodPokeCenter1F.asm | 6 +- maps/CinnabarPokeCenter1F.asm | 4 +- maps/CopycatsHouse1F.asm | 2 +- maps/CopycatsHouse2F.asm | 12 +- maps/DanceTheatre.asm | 14 +- maps/DayCare.asm | 2 +- maps/DragonShrine.asm | 2 +- maps/DragonsDenB1F.asm | 10 +- maps/EarlsPokemonAcademy.asm | 6 +- maps/EcruteakCity.asm | 8 +- maps/EcruteakGym.asm | 14 +- maps/EcruteakItemfinderHouse.asm | 2 +- maps/EcruteakMart.asm | 2 +- maps/EcruteakPokeCenter1F.asm | 2 +- maps/ElmsHouse.asm | 2 +- maps/ElmsLab.asm | 4 +- maps/FastShipB1F.asm | 24 +-- maps/FastShipCabins_NNW_NNE_NE.asm | 14 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 18 +- maps/FastShipCabins_SW_SSW_NW.asm | 8 +- maps/FightingDojo.asm | 2 +- maps/FuchsiaBillSpeechHouse.asm | 2 +- maps/FuchsiaCity.asm | 6 +- maps/FuchsiaGym.asm | 12 +- maps/FuchsiaMart.asm | 4 +- maps/FuchsiaPokeCenter1F.asm | 4 +- maps/GoldenrodBikeShop.asm | 2 +- maps/GoldenrodBillsHouse.asm | 2 +- maps/GoldenrodCity.asm | 8 +- maps/GoldenrodDeptStore1F.asm | 2 +- maps/GoldenrodDeptStore2F.asm | 2 +- maps/GoldenrodDeptStore3F.asm | 2 +- maps/GoldenrodDeptStore5F.asm | 4 +- maps/GoldenrodDeptStore6F.asm | 4 +- maps/GoldenrodDeptStoreB1F.asm | 8 +- maps/GoldenrodDeptStoreRoof.asm | 12 +- maps/GoldenrodFlowerShop.asm | 2 +- maps/GoldenrodGameCorner.asm | 24 +-- maps/GoldenrodGym.asm | 12 +- maps/GoldenrodHappinessRater.asm | 4 +- maps/GoldenrodPPSpeechHouse.asm | 2 +- maps/GoldenrodPokeCenter1F.asm | 6 +- maps/GoldenrodPokeComCenter2FMobile.asm | 6 +- maps/IlexForest.asm | 8 +- maps/IlexForestAzaleaGate.asm | 4 +- maps/IndigoPlateauPokeCenter1F.asm | 4 +- maps/KarensRoom.asm | 2 +- maps/KogasRoom.asm | 2 +- maps/KrissHouse1F.asm | 2 +- maps/KrissNeighborsHouse.asm | 4 +- maps/LakeOfRage.asm | 10 +- maps/LancesRoom.asm | 2 +- maps/LavRadioTower1F.asm | 6 +- maps/LavenderMart.asm | 2 +- maps/LavenderNameRater.asm | 2 +- maps/LavenderPokeCenter1F.asm | 4 +- maps/LavenderTown.asm | 6 +- maps/LavenderTownSpeechHouse.asm | 2 +- maps/MahoganyGym.asm | 14 +- maps/MahoganyPokeCenter1F.asm | 4 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 2 +- maps/MahoganyTown.asm | 2 +- maps/MountMortar1FInside.asm | 4 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 2 +- maps/MrFujisHouse.asm | 6 +- maps/MrPsychicsHouse.asm | 2 +- maps/NationalPark.asm | 14 +- maps/NationalParkBugContest.asm | 20 +- maps/NewBarkTown.asm | 2 +- maps/OaksLab.asm | 6 +- maps/OlivineCity.asm | 2 +- maps/OlivineGoodRodHouse.asm | 2 +- maps/OlivineGym.asm | 4 +- maps/OlivineLighthouse2F.asm | 4 +- maps/OlivineLighthouse3F.asm | 6 +- maps/OlivineLighthouse4F.asm | 4 +- maps/OlivineLighthouse5F.asm | 4 +- maps/OlivineLighthouse6F.asm | 4 +- maps/OlivineMart.asm | 2 +- maps/OlivinePokeCenter1F.asm | 2 +- maps/OlivineTimsHouse.asm | 2 +- maps/PalletTown.asm | 2 +- maps/PewterCity.asm | 6 +- maps/PewterGym.asm | 6 +- maps/PewterMart.asm | 2 +- maps/PewterNidoranSpeechHouse.asm | 4 +- maps/PewterPokeCenter1F.asm | 6 +- maps/PewterSnoozeSpeechHouse.asm | 2 +- maps/PokeCenter2F.asm | 16 +- maps/PokeSeersHouse.asm | 2 +- maps/PokemonFanClub.asm | 4 +- maps/PowerPlant.asm | 14 +- maps/RadioTower1F.asm | 10 +- maps/RadioTower2F.asm | 10 +- maps/RadioTower3F.asm | 8 +- maps/RadioTower4F.asm | 10 +- maps/RadioTower5F.asm | 4 +- maps/Route1.asm | 4 +- maps/Route10PokeCenter1F.asm | 4 +- maps/Route10South.asm | 4 +- maps/Route11.asm | 8 +- maps/Route12.asm | 8 +- maps/Route12SuperRodHouse.asm | 2 +- maps/Route13.asm | 10 +- maps/Route14.asm | 8 +- maps/Route15.asm | 12 +- maps/Route15FuchsiaGate.asm | 2 +- maps/Route16FuchsiaSpeechHouse.asm | 2 +- maps/Route16Gate.asm | 2 +- maps/Route17.asm | 8 +- maps/Route1718Gate.asm | 2 +- maps/Route18.asm | 4 +- maps/Route19.asm | 12 +- maps/Route19FuchsiaGate.asm | 2 +- maps/Route2.asm | 6 +- maps/Route20.asm | 6 +- maps/Route21.asm | 6 +- maps/Route25.asm | 20 +- maps/Route26.asm | 12 +- maps/Route26HealSpeechHouse.asm | 2 +- maps/Route27.asm | 12 +- maps/Route28FamousSpeechHouse.asm | 4 +- maps/Route29.asm | 10 +- maps/Route2946Gate.asm | 4 +- maps/Route2Gate.asm | 2 +- maps/Route2NuggetSpeechHouse.asm | 2 +- maps/Route3.asm | 8 +- maps/Route30.asm | 14 +- maps/Route30BerrySpeechHouse.asm | 2 +- maps/Route31.asm | 2 +- maps/Route31VioletGate.asm | 4 +- maps/Route32.asm | 16 +- maps/Route32PokeCenter1F.asm | 4 +- maps/Route32RuinsOfAlphGate.asm | 6 +- maps/Route33.asm | 4 +- maps/Route34.asm | 18 +- maps/Route34IlexForestGate.asm | 8 +- maps/Route35.asm | 18 +- maps/Route35GoldenrodGate.asm | 6 +- maps/Route35NationalParkGate.asm | 6 +- maps/Route36.asm | 8 +- maps/Route36NationalParkGate.asm | 24 +-- maps/Route36RuinsOfAlphGate.asm | 4 +- maps/Route37.asm | 6 +- maps/Route38.asm | 12 +- maps/Route38EcruteakGate.asm | 2 +- maps/Route39.asm | 10 +- maps/Route39Barn.asm | 2 +- maps/Route39Farmhouse.asm | 4 +- maps/Route4.asm | 6 +- maps/Route40.asm | 12 +- maps/Route40BattleTowerGate.asm | 4 +- maps/Route41.asm | 20 +- maps/Route42.asm | 8 +- maps/Route42EcruteakGate.asm | 2 +- maps/Route43.asm | 12 +- maps/Route43Gate.asm | 2 +- maps/Route43MahoganyGate.asm | 2 +- maps/Route44.asm | 14 +- maps/Route45.asm | 16 +- maps/Route46.asm | 6 +- maps/Route5.asm | 2 +- maps/Route5CleanseTagSpeechHouse.asm | 4 +- maps/Route5SaffronCityGate.asm | 2 +- maps/Route5UndergroundEntrance.asm | 2 +- maps/Route6.asm | 6 +- maps/Route6SaffronGate.asm | 2 +- maps/Route7SaffronGate.asm | 2 +- maps/Route8.asm | 10 +- maps/Route8SaffronGate.asm | 2 +- maps/Route9.asm | 12 +- maps/RuinsOfAlphInnerChamber.asm | 4 +- maps/RuinsOfAlphKabutoChamber.asm | 2 +- maps/RuinsOfAlphOutside.asm | 6 +- maps/RuinsOfAlphResearchCenter.asm | 6 +- maps/SafariZoneWardensHome.asm | 2 +- maps/SaffronCity.asm | 16 +- maps/SaffronGym.asm | 12 +- maps/SaffronMart.asm | 4 +- maps/SaffronPokeCenter1F.asm | 6 +- maps/SaffronTrainStation.asm | 2 +- maps/SeafoamGym.asm | 4 +- maps/SilphCo1F.asm | 4 +- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 6 +- maps/SoulHouse.asm | 8 +- maps/SproutTower1F.asm | 6 +- maps/SproutTower2F.asm | 4 +- maps/SproutTower3F.asm | 8 +- maps/TeamRocketBaseB1F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 2 +- maps/TeamRocketBaseB3F.asm | 8 +- maps/TinTower1F.asm | 8 +- maps/TinTowerRoof.asm | 2 +- maps/TrainerHouse1F.asm | 6 +- maps/TrainerHouseB1F.asm | 4 +- maps/UndergroundPathSwitchRoomEntrances.asm | 6 +- maps/UnionCave1F.asm | 10 +- maps/UnionCaveB1F.asm | 8 +- maps/UnionCaveB2F.asm | 8 +- maps/VermilionCity.asm | 6 +- maps/VermilionGym.asm | 10 +- .../VermilionHouseDiglettsCaveSpeechHouse.asm | 2 +- maps/VermilionHouseFishingSpeechHouse.asm | 2 +- maps/VermilionMagnetTrainSpeechHouse.asm | 2 +- maps/VermilionMart.asm | 4 +- maps/VermilionPokeCenter1F.asm | 6 +- maps/VioletCity.asm | 8 +- maps/VioletGym.asm | 8 +- maps/VioletMart.asm | 2 +- maps/VioletNicknameSpeechHouse.asm | 4 +- maps/VioletOnixTradeHouse.asm | 2 +- maps/VioletPokeCenter1F.asm | 6 +- maps/ViridianCity.asm | 6 +- maps/ViridianGym.asm | 2 +- maps/ViridianNicknameSpeechHouse.asm | 8 +- maps/ViridianPokeCenter1F.asm | 6 +- maps/WarehouseEntrance.asm | 16 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WillsRoom.asm | 2 +- maps/map_headers.asm | 10 +- predef/cgb.asm | 178 +++++++++--------- 283 files changed, 947 insertions(+), 937 deletions(-) diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index b4633d8dd..fa0ae0a71 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1437,13 +1437,13 @@ BattleAnim_SetBGPals: ; cc91a ld de, UnknBGPals ld a, [rBGP] ld b, a - ld c, $7 + ld c, 7 call CopyPals ld hl, OBPals ld de, UnknOBPals ld a, [rBGP] ld b, a - ld c, $2 + ld c, 2 call CopyPals pop af ld [rSVBK], a @@ -1461,11 +1461,11 @@ BattleAnim_SetOBPals: ; cc94b push af ld a, $5 ld [rSVBK], a - ld hl, OBPals + $10 - ld de, UnknOBPals + $10 + ld hl, OBPals palette PAL_BATTLE_OB_GRAY + ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY ld a, [rOBP0] ld b, a - ld c, $2 + ld c, 2 call CopyPals pop af ld [rSVBK], a diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm index 21247a87f..e7c844c12 100644 --- a/constants/animation_constants.asm +++ b/constants/animation_constants.asm @@ -828,8 +828,8 @@ const_value SET 1 const_def const PAL_BATTLE_BG_PLAYER ; 0 const PAL_BATTLE_BG_ENEMY ; 1 - const PAL_BATTLE_BG_PLAYER_HP ; 2 - const PAL_BATTLE_BG_ENEMY_HP ; 3 + const PAL_BATTLE_BG_ENEMY_HP ; 2 + const PAL_BATTLE_BG_PLAYER_HP ; 3 const PAL_BATTLE_BG_EXP ; 4 const PAL_BATTLE_BG_5 ; 5 const PAL_BATTLE_BG_6 ; 6 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 9536ae837..453bf9098 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -110,5 +110,7 @@ ; GetMapHeaderMusic picks music for this value (see home/map.asm) MUSIC_MAHOGANY_MART EQU $64 + ; GetMapHeaderMusic picks music for this bit flag -RADIO_TOWER_MUSIC EQU 7 +RADIO_TOWER_MUSIC_F EQU 7 +RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 9097e74ed..962948386 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -651,11 +651,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ld [rSVBK], a call .copypals push hl - ld de, UnknBGPals + 7 palettes + ld de, UnknBGPals palette PAL_BG_TEXT ld bc, 1 palettes call CopyBytes pop hl - ld de, BGPals + 7 palettes + ld de, BGPals palette PAL_BG_TEXT ld bc, 1 palettes call CopyBytes pop af @@ -670,17 +670,17 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ret .copypals ; 8c677 (23:4677) - ld de, UnknBGPals + 7 palettes + ld de, UnknBGPals palette PAL_BG_TEXT call .copy - ld de, BGPals + 7 palettes + ld de, BGPals palette PAL_BG_TEXT call .copy - ld de, UnknOBPals + 6 palettes + ld de, UnknOBPals palette PAL_OW_TREE call .copy - ld de, OBPals + 6 palettes + ld de, OBPals palette PAL_OW_TREE call .copy - ld de, UnknOBPals + 7 palettes + ld de, UnknOBPals palette PAL_OW_ROCK call .copy - ld de, OBPals + 7 palettes + ld de, OBPals palette PAL_OW_ROCK .copy ; 8c698 (23:4698) push hl diff --git a/engine/color.asm b/engine/color.asm index 3bc431d22..6e99e9cb7 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -2267,7 +2267,7 @@ Palettes_b789: RGB 18, 18, 18 RGB 00, 00, 00 -Palettes_b7a9: +SlotMachinePals: RGB 31, 31, 31 RGB 24, 25, 28 RGB 24, 24, 09 diff --git a/engine/player_object.asm b/engine/player_object.asm index 6b38a6328..a4796043b 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -29,14 +29,14 @@ SpawnPlayer: ; 8029 call GetMapObject ld hl, MAPOBJECT_COLOR add hl, bc - ln e, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT + ln e, PAL_NPC_RED, PERSONTYPE_SCRIPT ld a, [wPlayerSpriteSetupFlags] bit 2, a jr nz, .ok ld a, [PlayerGender] bit 0, a jr z, .ok - ln e, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT + ln e, PAL_NPC_BLUE, PERSONTYPE_SCRIPT .ok ld [hl], e diff --git a/event/unown.asm b/event/unown.asm index c30c06bfc..efd4c74f5 100644 --- a/event/unown.asm +++ b/event/unown.asm @@ -222,7 +222,7 @@ endm cp $ff ret z cp $60 - ld a, (1 << 3) | PAL_BG_BROWN + ld a, VRAM_BANK_1 | PAL_BG_BROWN jr c, .got_pal ld a, PAL_BG_BROWN diff --git a/gbhw.asm b/gbhw.asm index 3ee05432c..4f7e7747f 100644 --- a/gbhw.asm +++ b/gbhw.asm @@ -36,9 +36,10 @@ OAM_X_FLIP EQU 5 OAM_Y_FLIP EQU 6 OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) -X_FLIP EQU 1 << OAM_X_FLIP -Y_FLIP EQU 1 << OAM_Y_FLIP -BEHIND_BG EQU 1 << OAM_PRIORITY +VRAM_BANK_1 EQU 1 << OAM_TILE_BANK +X_FLIP EQU 1 << OAM_X_FLIP +Y_FLIP EQU 1 << OAM_Y_FLIP +BEHIND_BG EQU 1 << OAM_PRIORITY ; Hardware registers rJOYP EQU $ff00 ; Joypad (R/W) diff --git a/home/map.asm b/home/map.asm index b66faa9ae..baf42cb19 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2291,7 +2291,7 @@ GetMapHeaderMusic:: ; 2cbd ld a, c cp MUSIC_MAHOGANY_MART jr z, .mahoganymart - bit RADIO_TOWER_MUSIC, c + bit RADIO_TOWER_MUSIC_F, c jr nz, .radiotower callba Function8b342 ld e, c @@ -2311,7 +2311,7 @@ GetMapHeaderMusic:: ; 2cbd .clearedradiotower ; the rest of the byte ld a, c - and 1 << RADIO_TOWER_MUSIC - 1 + and RADIO_TOWER_MUSIC - 1 ld e, a ld d, 0 jr .done diff --git a/macros.asm b/macros.asm index 13aff261d..9ada1e62a 100644 --- a/macros.asm +++ b/macros.asm @@ -224,6 +224,7 @@ endr ENDM palettes EQUS "* 8" +palette EQUS "+ 8 *" ldpixel: MACRO if _NARG >= 5 diff --git a/macros/pals.asm b/macros/pals.asm index 44f1f7944..72bb4c96d 100755 --- a/macros/pals.asm +++ b/macros/pals.asm @@ -1,6 +1,6 @@ tilepal: MACRO ; vram bank, pals -x = \1 << 3 +x = \1 << OAM_TILE_BANK rept (_NARG +- 1) / 2 dn (x | PAL_BG_\3), (x | PAL_BG_\2) shift diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 2c3818f0c..a39010e4e 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -380,10 +380,10 @@ AzaleaGym_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 - person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 - person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 - person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 - person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 - person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 + person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 + person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 + person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 + person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 + person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 + person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 + person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 104a5a57a..06044e78d 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -64,4 +64,4 @@ AzaleaMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 - person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 + person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 3ebda5298..e592d0715 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -492,8 +492,8 @@ AzaleaTown_MapEventHeader: db 12 person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 - person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 + person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index d83e48e59..9238d5dbd 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -813,7 +813,7 @@ BattleTower1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1 - person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 - person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 - person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 + person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1 + person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1 + person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1 person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 0ccd463aa..4c38ed4e7 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -146,7 +146,7 @@ BattleTowerOutside_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 - person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 + person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 + person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1 person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 9a0aae54b..e6264e7c9 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -370,4 +370,4 @@ BillsHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BillsGrandpa, -1 + person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BillsGrandpa, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 9a28c8abb..465f1597e 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -342,12 +342,12 @@ BlackthornCity_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM - person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN - person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 + person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1 + person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1 person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1 person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY - person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 + person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 333f05129..1126e1d2d 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -63,4 +63,4 @@ BlackthornDragonSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1 + person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Dratini, -1 diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 9bd9522d4..9869fe720 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -38,4 +38,4 @@ BlackthornEmysHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Emy, -1 + person_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Emy, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d507b5c3c..baae2fe8e 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -410,8 +410,8 @@ BlackthornGym1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 - person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 - person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 - person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 + person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1 + person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1 + person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1 + person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1 + person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 9aac7c210..92b623b2a 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -147,8 +147,8 @@ BlackthornGym2F_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 - person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 + person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermCody, -1 + person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1 person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index e78bd8a74..972ae6f64 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -65,4 +65,4 @@ BlackthornMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195a5d, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195a64, -1 - person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x195a67, -1 + person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x195a67, -1 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 32085c67f..3f5cbf3cb 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -69,5 +69,5 @@ BlackthornPokeCenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x195b79, -1 person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x195b7c, -1 - person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x195b7f, -1 - person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195b82, -1 + person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x195b7f, -1 + person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x195b82, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 99412cf33..c1e09e6ee 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -143,4 +143,4 @@ BrunosRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 7d50f22d0..f90a5caba 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -312,7 +312,7 @@ BurnedTower1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE + person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER - person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY + person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index fb386a49f..6879526e8 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -258,11 +258,11 @@ BurnedTowerB1F_MapEventHeader: .PersonEvents: db 9 person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 - person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 - person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE - person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER + person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 11b768765..881e43281 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -226,8 +226,8 @@ CeladonCafe_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCafeChef, -1 + person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCafeChef, -1 person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 - person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 + person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher3, -1 person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeTeacher, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index f45332ff1..7b560e05a 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -266,12 +266,12 @@ CeladonCity_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9f43, -1 - person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f50, -1 - person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f53, -1 - person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f56, -1 - person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f59, -1 - person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f5c, -1 - person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f5f, -1 - person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x1a9f62, -1 + person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1 + person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f50, -1 + person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f53, -1 + person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9f56, -1 + person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f59, -1 + person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9f5c, -1 + person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a9f5f, -1 + person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x1a9f62, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 0abf50524..60fc6064f 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -94,6 +94,6 @@ CeladonDeptStore1F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x709e0, -1 + person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x709e0, -1 person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x709e3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x709e6, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x709e6, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index cd93776ab..f77747aea 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -88,7 +88,7 @@ CeladonDeptStore2F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 - person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x70bbd, -1 - person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70bc0, -1 + person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1 + person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1 + person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x70bbd, -1 + person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70bc0, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index b40fddf50..a4ff77955 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -114,8 +114,8 @@ CeladonDeptStore3F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70d31, -1 - person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d34, -1 - person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d3f, -1 - person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70d4a, -1 + person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70d31, -1 + person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d34, -1 + person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d3f, -1 + person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70d4a, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index b3cb00655..7acaa69db 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -70,6 +70,6 @@ CeladonDeptStore4F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70f15, -1 + person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1 + person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x70f15, -1 person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x70f18, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index a49c573d1..6ee0fce13 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -91,8 +91,8 @@ CeladonDeptStore5F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 - person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71014, -1 - person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x71017, -1 - person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7101a, -1 + person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1 + person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1 + person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71014, -1 + person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x71017, -1 + person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7101a, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a4e163ed5..a25b5e591 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -170,4 +170,4 @@ CeladonDeptStore6F_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7117a, -1 - person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7117d, -1 + person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7117d, -1 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index b44c66dcc..2e009e5b7 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -336,12 +336,12 @@ CeladonGameCorner_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7211d, -1 - person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x72120, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 - person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 - person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 + person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7211d, -1 + person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x72120, -1 + person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 + person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 + person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 + person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 4dd5de28b..cd817457a 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -288,5 +288,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 - person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 + person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1 + person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 96681f351..67b8a86fc 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -286,9 +286,9 @@ CeladonGym_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 - person_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassMichelle, -1 - person_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 - person_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBeautyJulia, -1 - person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 - person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 + person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1 + person_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassMichelle, -1 + person_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 + person_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBeautyJulia, -1 + person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 + person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index e06fe71cc..ee5a5659a 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -100,4 +100,4 @@ CeladonMansion1F_MapEventHeader: person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansionManager, -1 person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 - person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 + person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 10ba88dfe..95ede4ab7 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -212,7 +212,7 @@ CeladonMansion3F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 - person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x716bc, -1 - person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x716bf, -1 + person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1 + person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1 + person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x716bc, -1 + person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x716bf, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 3ea8d275b..07ac72267 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -52,4 +52,4 @@ CeladonMansionRoof_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x71a39, -1 + person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x71a39, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 84a0cb069..73a1cbadf 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -133,4 +133,4 @@ CeladonMansionRoofHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 + person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 9bd47c4fc..653094a51 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -165,6 +165,6 @@ CeladonPokeCenter1F_MapEventHeader: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x71e22, -1 person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1 - person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1 - person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH + person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71e2b, -1 + person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x71e28, -1 + person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index ad3070679..7ef51c16e 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -305,9 +305,9 @@ CeruleanCity_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x184009, -1 - person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x18401d, -1 + person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x184009, -1 + person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x18401d, -1 person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18402a, -1 - person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18404a, -1 - person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x184064, -1 + person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18402a, -1 + person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18404a, -1 + person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x184064, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index b886d337b..4ae52bfa6 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -384,8 +384,8 @@ CeruleanGym_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET - person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index abbab5b5a..4692f0081 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -63,5 +63,5 @@ CeruleanMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1 - person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 - person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 + person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 + person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 2705fc418..50cc90001 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -82,4 +82,4 @@ CeruleanPokeCenter1F_MapEventHeader: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18820f, -1 person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18821e, -1 + person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18821e, -1 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 2787899b7..452f35444 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -60,6 +60,6 @@ CeruleanPoliceStation_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18804a, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18804d, -1 - person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 + person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x18804a, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18804d, -1 + person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index f499d8c1f..13c4b86ca 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -70,7 +70,7 @@ CeruleanTradeSpeechHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x188133, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x188136, -1 - person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 + person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x188133, -1 + person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x188136, -1 + person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1 person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 8abeb8c1b..67ebe06d0 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -170,4 +170,4 @@ CharcoalKiln_MapEventHeader: db 3 person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE - person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D + person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index a6a1594d1..61418fc82 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -574,6 +574,6 @@ CherrygroveCity_MapEventHeader: db 5 person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY - person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 - person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1 + person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1 + person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1 + person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index b737313f9..ffe465800 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -60,5 +60,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 + person_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x196cb9, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index c556d8cb7..fdc765707 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -64,4 +64,4 @@ CherrygroveGymSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196ae1, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x196ae4, -1 + person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x196ae4, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index fe8a733eb..99e15d905 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -90,4 +90,4 @@ CherrygroveMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1 person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196831, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196831, -1 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index d3056b177..0e8ffe952 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -87,6 +87,6 @@ CherrygrovePokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x196970, -1 + person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x196970, -1 person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x196973, -1 - person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 + person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index eb44f3ccb..63c83d83d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -411,7 +411,7 @@ CianwoodCity_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 + person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 person_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityLass, -1 person_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 @@ -421,5 +421,5 @@ CianwoodCity_MapEventHeader: person_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1 person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 - person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE - person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE + person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 026050f6a..6cfa2d522 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -65,4 +65,4 @@ CianwoodCityPhotoStudio_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 + person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 6e7f508ec..276e9fb21 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -324,11 +324,11 @@ CianwoodGym_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 - person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 - person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 - person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 - person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 + person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1 + person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1 + person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltLao, -1 + person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltNob, -1 + person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerBlackbeltLung, -1 person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 0ab10dd82..9faa5e897 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -81,5 +81,5 @@ CianwoodLugiaSpeechHouse_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9e1b0, -1 - person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9e1b3, -1 - person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TwinScript_0x9e1b6, -1 + person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9e1b3, -1 + person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TwinScript_0x9e1b6, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index b9feae6fd..68de864bb 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -91,4 +91,4 @@ CianwoodPharmacy_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CianwoodPharmacist, -1 + person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 7cd5818d5..e1d89bca6 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -150,6 +150,6 @@ CianwoodPokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9dbd2, -1 - person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x9dbea, -1 + person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9dbd2, -1 + person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1 + person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x9dbea, -1 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index a97aae5c6..434969870 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -53,5 +53,5 @@ CinnabarPokeCenter1F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1ab32f, -1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ab332, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1ab32f, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ab332, -1 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index cf8bd771c..af89fb903 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -91,5 +91,5 @@ CopycatsHouse1F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x18ad13, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1 person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 069930525..854b7011c 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -378,9 +378,9 @@ CopycatsHouse2F_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 - person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL - person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 + person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1 + person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CopycatsDodrio, -1 + person_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL + person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index ce7ea5958..f2e5aea81 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -356,12 +356,12 @@ DanceTheatre_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1 - person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1 - person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1 - person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1 - person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 + person_event SPRITE_KIMONO_GIRL, 2, 0, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlNaoko2, -1 + person_event SPRITE_KIMONO_GIRL, 1, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlSayo, -1 + person_event SPRITE_KIMONO_GIRL, 2, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerKimono_girlZuki, -1 + person_event SPRITE_KIMONO_GIRL, 1, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerKimono_girlKuni, -1 + person_event SPRITE_KIMONO_GIRL, 2, 11, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerKimono_girlMiki, -1 person_event SPRITE_GENTLEMAN, 10, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x994c6, -1 - person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x99525, -1 + person_event SPRITE_RHYDON, 8, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RhydonScript_0x9951b, -1 + person_event SPRITE_COOLTRAINER_M, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x99525, -1 person_event SPRITE_GRANNY, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99528, -1 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index ee10f375e..75a409b65 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -177,4 +177,4 @@ DayCare_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Inside, EVENT_DAY_CARE_MAN_IN_DAY_CARE - person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1 + person_event SPRITE_GRANNY, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, DayCareLadyScript, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index f031667b9..33e86f258 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -688,4 +688,4 @@ DragonShrine_MapEventHeader: person_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + person_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index f8528c9b8..b50d1f3a5 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -429,11 +429,11 @@ DragonsDenB1F_MapEventHeader: .PersonEvents: db 9 person_event SPRITE_POKE_BALL, 16, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG - person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR + person_event SPRITE_CLAIR, 30, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR person_event SPRITE_SILVER, 23, 20, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN - person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 - person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 - person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 - person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 + person_event SPRITE_COOLTRAINER_M, 8, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1 + person_event SPRITE_COOLTRAINER_F, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1 + person_event SPRITE_TWIN, 17, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1 + person_event SPRITE_TWIN, 18, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsLeaandpia2, -1 person_event SPRITE_POKE_BALL, 4, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FCalcium, EVENT_DRAGONS_DEN_B1F_CALCIUM person_event SPRITE_POKE_BALL, 20, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DragonsDenB1FMaxElixer, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 2eb9081e4..91d9689ef 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -433,9 +433,9 @@ EarlsPokemonAcademy_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a83, -1 + person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a83, -1 person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a86, -1 - person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a91, -1 + person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a91, -1 person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x68a9c, -1 person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 6ffc502c6..bbe5ae1ce 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -299,8 +299,8 @@ EcruteakCity_MapEventHeader: db 7 person_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a4009, -1 person_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400c, -1 - person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4012, -1 + person_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4012, -1 person_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - person_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS + person_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + person_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a403d, -1 + person_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index bf9d55848..d2bdc64eb 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -436,10 +436,10 @@ EcruteakGym_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 - person_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSageJeffrey, -1 - person_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSagePing, -1 - person_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumMartha, -1 - person_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumGrace, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS + person_event SPRITE_MORTY, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x99d58, -1 + person_event SPRITE_SAGE, 7, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSageJeffrey, -1 + person_event SPRITE_SAGE, 13, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSagePing, -1 + person_event SPRITE_GRANNY, 5, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumMartha, -1 + person_event SPRITE_GRANNY, 9, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerMediumGrace, -1 + person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1 + person_event SPRITE_GRAMPS, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index f053c9442..3a9745647 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -180,5 +180,5 @@ EcruteakItemfinderHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1 + person_event SPRITE_COOLTRAINER_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9a5fb, -1 person_event SPRITE_POKEDEX, 3, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 052b4c40d..deb35aeef 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -63,5 +63,5 @@ EcruteakMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x99c42, -1 + person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x99c42, -1 person_event SPRITE_GRANNY, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x99c45, -1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 0d711128f..b47eda902 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -227,5 +227,5 @@ EcruteakPokeCenter1F_MapEventHeader: person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FNurseScript, -1 person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FPokefanMScript, -1 person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FCooltrainerFScript, -1 - person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FGymGuyScript, -1 + person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FGymGuyScript, -1 person_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 2c5403b42..dbd8d270a 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -103,5 +103,5 @@ ElmsHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ElmsWife, -1 + person_event SPRITE_TEACHER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ElmsWife, -1 person_event SPRITE_BUG_CATCHER, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index d8783226b..c64997e71 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1412,8 +1412,8 @@ ElmsLab_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ProfElmScript, -1 - person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB + person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 5744e3b37..fb0ff9bf7 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -468,15 +468,15 @@ FastShipB1F_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT - person_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - person_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_SAILOR, 6, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + person_event SPRITE_SAILOR, 6, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + person_event SPRITE_SAILOR, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 9, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 4, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_FISHER, 8, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_BLACK_BELT, 11, 15, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SAILOR, 4, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_TEACHER, 11, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 28cdc79f0..682fe8596 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -287,10 +287,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR - person_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_COOLTRAINER_M, 3, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_COOLTRAINER_F, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SUPER_NERD, 5, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_M, 17, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 26, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + person_event SPRITE_GENTLEMAN, 30, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_PHARMACIST, 30, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 6850eb85c..c8fa4300b 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -484,14 +484,14 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + person_event SPRITE_CAPTAIN, 25, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CaptainScript_0x75ea7, -1 + person_event SPRITE_GENTLEMAN, 17, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN person_event SPRITE_TWIN, 17, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 person_event SPRITE_TWIN, 25, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 - person_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_POKEFAN_M, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_F, 5, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_SUPER_NERD, 15, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 88dac7f49..0cd7dbe90 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -245,7 +245,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - person_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - person_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - person_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index dc6a99a99..2487adefd 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -61,5 +61,5 @@ FightingDojo_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 + person_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 7abec5a1e..9d415f2f8 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -44,5 +44,5 @@ FuchsiaBillSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1963bd, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1963bd, -1 person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1963c0, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 58d155454..2ebbf37aa 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -158,7 +158,7 @@ FuchsiaCity_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 - person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 + person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 + person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index b7660e9f1..23c33965f 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -399,9 +399,9 @@ FuchsiaGym_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 - person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassAliceScript, -1 - person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassLindaScript, -1 - person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PicnickerCindyScript, -1 - person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CamperBarryScript, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 + person_event SPRITE_JANINE, 10, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymJanineScript, -1 + person_event SPRITE_FUCHSIA_GYM_1, 7, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassAliceScript, -1 + person_event SPRITE_FUCHSIA_GYM_2, 11, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassLindaScript, -1 + person_event SPRITE_FUCHSIA_GYM_3, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PicnickerCindyScript, -1 + person_event SPRITE_FUCHSIA_GYM_4, 2, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CamperBarryScript, -1 + person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index fdf0bc045..423dfdc1a 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -55,5 +55,5 @@ FuchsiaMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x195cf2, -1 + person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x195cef, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x195cf2, -1 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 3759aab35..dc31d472a 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -106,7 +106,7 @@ FuchsiaPokeCenter1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NurseScript_0x196459, -1 person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19645c, -1 person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19645f, -1 - person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + person_event SPRITE_JANINE_IMPERSONATOR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 456f5aaa0..1f094228d 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -128,4 +128,4 @@ GoldenrodBikeShop_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 + person_event SPRITE_CLERK, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 6d33b5ce0..045c5d57f 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -264,4 +264,4 @@ GoldenrodBillsHouse_MapEventHeader: db 3 person_event SPRITE_BILL, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BillsHouseBill, EVENT_MET_BILL person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BillsMom, -1 - person_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BillsSister, -1 + person_event SPRITE_TWIN, 4, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BillsSister, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index ffbfe6e7d..362d2c37d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -598,10 +598,10 @@ GoldenrodCity_MapEventHeader: db 15 person_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT person_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER @@ -610,4 +610,4 @@ GoldenrodCity_MapEventHeader: person_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR + person_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 455d66b79..51c387d07 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -101,5 +101,5 @@ GoldenrodDeptStore1F_MapEventHeader: db 4 person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x55981, -1 person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x55987, -1 - person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x5598a, -1 + person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x5598a, -1 person_event SPRITE_GENTLEMAN, 5, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55984, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index ba7c74a18..b6cda7cb1 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -123,5 +123,5 @@ GoldenrodDeptStore2F_MapEventHeader: person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b5d, -1 person_event SPRITE_CLERK, 6, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55b65, -1 person_event SPRITE_YOUNGSTER, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x55b6d, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x55b70, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x55b70, -1 person_event SPRITE_GENTLEMAN, 6, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x55b73, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index e9db446a0..a9cd1dc15 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -77,5 +77,5 @@ GoldenrodDeptStore3F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x55dc0, -1 + person_event SPRITE_SUPER_NERD, 5, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x55dc0, -1 person_event SPRITE_ROCKER, 5, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x55dc3, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 8a7549be2..247322ea6 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -241,5 +241,5 @@ GoldenrodDeptStore5F_MapEventHeader: person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x56130, -1 person_event SPRITE_COOLTRAINER_M, 3, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Mike, -1 person_event SPRITE_POKEFAN_M, 5, 13, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5613a, -1 - person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 - person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + person_event SPRITE_TWIN, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Carrie, -1 + person_event SPRITE_RECEPTIONIST, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 10e233381..b8b683561 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -173,5 +173,5 @@ GoldenrodDeptStore6F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x564bf, -1 - person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x564c2, -1 + person_event SPRITE_LASS, 2, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x564bf, -1 + person_event SPRITE_SUPER_NERD, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x564c2, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index cd7e63446..859e5e6dd 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -131,7 +131,7 @@ GoldenrodDeptStoreB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL - person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 - person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 - person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 - person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 + person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1 + person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1 + person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1 + person_event SPRITE_MACHOP, 7, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 9787e69b8..ed61d935f 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -232,10 +232,10 @@ GoldenrodDeptStoreRoof_MapEventHeader: .PersonEvents: db 8 person_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56746, -1 - person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56746, -1 + person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 + person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index ae813c34d..3f37d842a 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -177,4 +177,4 @@ GoldenrodFlowerShop_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FlowerShopTeacherScript, -1 - person_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP + person_event SPRITE_LASS, 6, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 298485663..f55a82539 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -490,15 +490,15 @@ GoldenrodGameCorner_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 - person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 - person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 - person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 - person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 - person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 - person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 - person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 + person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 + person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 + person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 + person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 + person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 + person_event SPRITE_COOLTRAINER_F, 3, 10, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1 + person_event SPRITE_GENTLEMAN, 10, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1 + person_event SPRITE_POKEFAN_M, 9, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1 + person_event SPRITE_POKEFAN_M, 10, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 88156e35e..ac7776769 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -399,9 +399,9 @@ GoldenrodGym_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 - person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCarrie, -1 - person_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassBridget, -1 - person_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - person_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautySamantha, -1 - person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 + person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCarrie, -1 + person_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassBridget, -1 + person_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + person_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index cebfef9f2..9b082c082 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -156,6 +156,6 @@ GoldenrodHappinessRater_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 + person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x54953, -1 person_event SPRITE_POKEFAN_M, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x54997, -1 - person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x5499a, -1 + person_event SPRITE_TWIN, 6, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x5499a, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 710959645..809970862 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -71,5 +71,5 @@ GoldenrodPPSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x5564a, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x5564a, -1 person_event SPRITE_LASS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x5564d, -1 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index ed027321d..5bfe40fea 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -826,7 +826,7 @@ GoldenrodPokeCenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x60f91, -1 - person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x6101e, -1 + person_event SPRITE_LINK_RECEPTIONIST, 8, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + person_event SPRITE_GAMEBOY_KID, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x6101e, -1 person_event SPRITE_LASS, 4, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x61021, -1 - person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 + person_event SPRITE_POKEFAN_F, 5, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 427dc3236..289284ee5 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -288,6 +288,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d1, -1 - person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d4, -1 - person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d7, -1 + person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d1, -1 + person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d4, -1 + person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d7, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d1640aa11..95a8e8b66 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -962,14 +962,14 @@ IlexForest_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD - person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE + person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD + person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalApprenticeScript, EVENT_ILEX_FOREST_APPRENTICE person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestCharcoalMasterScript, EVENT_ILEX_FOREST_CHARCOAL_MASTER person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, IlexForestHeadbuttGuyScript, -1 person_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE person_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT - person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS - person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 + person_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS + person_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 person_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK person_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE person_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 25ffdfcd0..8105d6f32 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -49,5 +49,5 @@ IlexForestAzaleaGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x62c7a, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62c7d, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x62c7a, -1 + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x62c7d, -1 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 2174552e6..ddb073880 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -327,5 +327,5 @@ IndigoPlateauPokeCenter1F_MapEventHeader: person_event SPRITE_CLERK, 7, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18012f, -1 person_event SPRITE_COOLTRAINER_M, 11, 11, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x180136, -1 person_event SPRITE_SILVER, 9, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL - person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - person_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY + person_event SPRITE_GRAMPS, 9, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + person_event SPRITE_JYNX, 9, 0, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index c944ba97f..dce334d9c 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -151,4 +151,4 @@ KarensRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KarenScript_Battle, -1 + person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, KarenScript_Battle, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 454878bb4..9d6eeb937 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -148,4 +148,4 @@ KogasRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1 + person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index ed69fe9a4..600a0aa35 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -413,4 +413,4 @@ KrissHouse1F_MapEventHeader: person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, 1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, 4, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR + person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 70fc3794e..215a9fdf2 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -118,5 +118,5 @@ KrissNeighborsHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1 + person_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index ffcc865f7..c6d56a03b 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -522,11 +522,11 @@ LakeOfRage_MapEventHeader: person_event SPRITE_GRAMPS, 26, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7008e, -1 person_event SPRITE_SUPER_NERD, 13, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x700a2, -1 person_event SPRITE_COOLTRAINER_F, 29, 25, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x700a5, -1 - person_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS - person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS + person_event SPRITE_FISHER, 23, 30, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_FISHER, 26, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_M, 15, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 7, 36, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_GYARADOS, 22, 18, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS person_event SPRITE_SUPER_NERD, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY person_event SPRITE_POKE_BALL, 10, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER person_event SPRITE_POKE_BALL, 2, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 14dc9852b..fd083d28b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -359,5 +359,5 @@ LancesRoom_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_LANCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + person_event SPRITE_TEACHER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY person_event SPRITE_OAK, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 0669cf956..1ad1bd35e 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -240,8 +240,8 @@ LavRadioTower1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x7ee63, -1 - person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7ee66, -1 - person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ee69, -1 + person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x7ee63, -1 + person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7ee66, -1 + person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ee69, -1 person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index fa753ab1b..499e1187e 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -65,5 +65,5 @@ LavenderMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x7eb23, -1 + person_event SPRITE_POKEFAN_M, 6, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x7eb23, -1 person_event SPRITE_ROCKER, 2, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x7eb26, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index dfab25b6b..30204878b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LavenderNameRater, -1 + person_event SPRITE_GENTLEMAN, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 6cf383773..d93e3f9ed 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -100,5 +100,5 @@ LavenderPokeCenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x7e6a0, -1 person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7e6a3, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7e6a6, -1 - person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7e6a6, -1 + person_event SPRITE_YOUNGSTER, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index f0b40ad12..e98be87b5 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -133,7 +133,7 @@ LavenderTown_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1ad6e4, -1 - person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ad6e7, -1 + person_event SPRITE_POKEFAN_M, 7, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1ad6e4, -1 + person_event SPRITE_TEACHER, 15, 2, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ad6e7, -1 person_event SPRITE_GRAMPS, 12, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1ad6ea, -1 - person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 1, YoungsterScript_0x1ad6ed, -1 + person_event SPRITE_YOUNGSTER, 11, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 1, YoungsterScript_0x1ad6ed, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index ad4d0e23c..7ba3064e2 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -47,4 +47,4 @@ LavenderTownSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x7ea47, -1 + person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x7ea47, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index fb78311eb..67fb89372 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -391,10 +391,10 @@ MahoganyGym_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 - person_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 - person_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderRonald, -1 - person_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerSkierClarissa, -1 - person_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderBrad, -1 - person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 + person_event SPRITE_PRYCE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PryceScript_0x199a9e, -1 + person_event SPRITE_BUENA, 6, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerSkierRoxanne, -1 + person_event SPRITE_ROCKER, 17, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderRonald, -1 + person_event SPRITE_BUENA, 17, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerSkierClarissa, -1 + person_event SPRITE_ROCKER, 9, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderBrad, -1 + person_event SPRITE_ROCKER, 4, 2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBoarderDouglas, -1 + person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index eab6b6299..be0d896b4 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -72,6 +72,6 @@ MahoganyPokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19a359, -1 - person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19a35c, -1 + person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19a359, -1 + person_event SPRITE_YOUNGSTER, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19a35c, -1 person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x19a35f, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index a2681e9bf..c03e07361 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -78,4 +78,4 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x19997f, -1 - person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 + person_event SPRITE_TEACHER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 62b56708e..79232b02e 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -272,5 +272,5 @@ MahoganyTown_MapEventHeader: db 4 person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 4335f190f..d5c1fdf10 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -145,7 +145,7 @@ MountMortar1FInside_MapEventHeader: person_event SPRITE_POKE_BALL, 27, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideHyperPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION person_event SPRITE_POKE_BALL, 20, 22, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideMaxPotion, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION person_event SPRITE_POKE_BALL, 19, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideNugget, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET - person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 - person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 + person_event SPRITE_SUPER_NERD, 43, 33, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacMiller, -1 + person_event SPRITE_SUPER_NERD, 28, 24, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdMarkus, -1 person_event SPRITE_POKE_BALL, 16, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideIron, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON person_event SPRITE_POKE_BALL, 17, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar1FInsideUltraBall, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 1d1da1da1..2c57b863a 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -91,4 +91,4 @@ MountMortar2FInside_MapEventHeader: person_event SPRITE_POKE_BALL, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideDragonScale, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE person_event SPRITE_POKE_BALL, 11, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideElixer, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER person_event SPRITE_POKE_BALL, 5, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortar2FInsideEscapeRope, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE - person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 + person_event SPRITE_SUPER_NERD, 26, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 06ebd10cc..306189b5a 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -156,7 +156,7 @@ MountMortarB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 12, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION person_event SPRITE_POKE_BALL, 16, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS person_event SPRITE_BOULDER, 10, 9, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 - person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 + person_event SPRITE_BLACK_BELT, 4, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 person_event SPRITE_POKE_BALL, 24, 34, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE person_event SPRITE_POKE_BALL, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER person_event SPRITE_POKE_BALL, 26, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 89ebc1568..a439b7b54 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -98,8 +98,8 @@ MrFujisHouse_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7e8ca, -1 + person_event SPRITE_SUPER_NERD, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7e8ca, -1 person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x7e8cd, -1 person_event SPRITE_RHYDON, 4, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MrFujisPsyduck, -1 - person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MrFujisNidorino, -1 - person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MrFujisPidgey, -1 + person_event SPRITE_GROWLITHE, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFujisNidorino, -1 + person_event SPRITE_MOLTRES, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MrFujisPidgey, -1 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 04b570bdf..e961a319d 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -66,4 +66,4 @@ MrPsychicsHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, MrPsychic, -1 + person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index f174a8efe..6298f3e34 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -537,17 +537,17 @@ NationalPark_MapEventHeader: .PersonEvents: db 14 - person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x5c002, -1 + person_event SPRITE_LASS, 24, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x5c002, -1 person_event SPRITE_POKEFAN_F, 4, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x5c005, -1 - person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 + person_event SPRITE_TEACHER, 40, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c008, -1 person_event SPRITE_YOUNGSTER, 41, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c023, -1 - person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c026, -1 + person_event SPRITE_YOUNGSTER, 41, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c026, -1 person_event SPRITE_TEACHER, 41, 17, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5c029, -1 person_event SPRITE_GROWLITHE, 40, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NationalParkPersian, -1 - person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 - person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 - person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 - person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1 + person_event SPRITE_YOUNGSTER, 23, 27, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJack1, -1 + person_event SPRITE_POKEFAN_F, 29, 18, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanfBeverly1, -1 + person_event SPRITE_POKEFAN_M, 9, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerPokefanmWilliam, -1 + person_event SPRITE_LASS, 14, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassKrise, -1 person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_GAMEBOY_KID, 6, 26, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x5c037, -1 person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index eccc3295c..2ad457444 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -244,15 +244,15 @@ NationalParkBugContest_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A - person_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A - person_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A - person_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A - person_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A - person_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A - person_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A - person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A - person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A - person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A + person_event SPRITE_YOUNGSTER, 29, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A + person_event SPRITE_YOUNGSTER, 22, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A + person_event SPRITE_ROCKER, 18, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + person_event SPRITE_POKEFAN_M, 13, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + person_event SPRITE_YOUNGSTER, 9, 23, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + person_event SPRITE_YOUNGSTER, 13, 27, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A + person_event SPRITE_LASS, 23, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A + person_event SPRITE_YOUNGSTER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + person_event SPRITE_YOUNGSTER, 34, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A person_event SPRITE_POKE_BALL, 12, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestParlyzHeal, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_POKE_BALL, 43, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, NationalParkBugContestTMDig, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 110536631..050582f6d 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -307,5 +307,5 @@ NewBarkTown_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 - person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 9162692a6..e89ccd43b 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -290,6 +290,6 @@ OaksLab_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_OAK, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Oak, -1 - person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1 - person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1 - person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1 + person_event SPRITE_SCIENTIST, 8, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant1Script, -1 + person_event SPRITE_SCIENTIST, 9, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant2Script, -1 + person_event SPRITE_SCIENTIST, 4, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OaksAssistant3Script, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 508df854d..eff8b7ea3 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -323,6 +323,6 @@ OlivineCity_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_SAILOR, 27, 26, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88a3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 person_event SPRITE_SAILOR, 21, 17, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SailorScript_0x1a88ba, -1 person_event SPRITE_OLIVINE_RIVAL, 11, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 59b20b95e..572c4b4ed 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -99,4 +99,4 @@ OlivineGoodRodHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GoodRodGuru, -1 + person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index a429b0fdc..14d412df6 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -216,5 +216,5 @@ OlivineGym_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 + person_event SPRITE_JASMINE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 9348dce9f..24cafdc2c 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -225,5 +225,5 @@ OlivineLighthouse2F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorHuey1, -1 - person_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 + person_event SPRITE_SAILOR, 3, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorHuey1, -1 + person_event SPRITE_GENTLEMAN, 8, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 531492190..7282c6e80 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -136,7 +136,7 @@ OlivineLighthouse3F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 + person_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSailorTerrell, -1 + person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 + person_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 person_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index ec20af243..c1a3911e5 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -106,5 +106,5 @@ OlivineLighthouse4F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorKent, -1 - person_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassConnie, -1 + person_event SPRITE_SAILOR, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorKent, -1 + person_event SPRITE_LASS, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 963dfd2eb..6dd14f384 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -114,8 +114,8 @@ OlivineLighthouse5F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1 - person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 + person_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSailorErnest, -1 + person_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 person_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY person_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL person_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index f99085ea2..335adeec9 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -275,6 +275,6 @@ OlivineLighthouse6F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE - person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 + person_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + person_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 person_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 06c999876..d54546111 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -63,5 +63,5 @@ OlivineMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9cace, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9cace, -1 person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x9cad1, -1 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index e0f0dbb69..db4ab7be4 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -67,5 +67,5 @@ OlivinePokeCenter1F_MapEventHeader: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9c002, -1 person_event SPRITE_FISHING_GURU, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x9c008, -1 + person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x9c008, -1 person_event SPRITE_TEACHER, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x9c00b, -1 diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 311f0543a..0d9a2862c 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -38,4 +38,4 @@ OlivineTimsHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Tim, -1 + person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 932484f8c..53dd04022 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -92,4 +92,4 @@ PalletTown_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_TEACHER, 8, 3, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1ac6d5, -1 - person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ac6d8, -1 + person_event SPRITE_FISHER, 14, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x1ac6d8, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 36474b7ea..a05154912 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -179,8 +179,8 @@ PewterCity_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18c009, -1 - person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18c00c, -1 - person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 + person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18c009, -1 + person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x18c00c, -1 + person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index fd5f9d74a..d1549a7eb 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -227,6 +227,6 @@ PewterGym_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperJerry, -1 - person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + person_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperJerry, -1 + person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 6ee67b720..553733889 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -64,4 +64,4 @@ PewterMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x1a2dcb, -1 person_event SPRITE_YOUNGSTER, 2, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a2dd2, -1 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2dd5, -1 + person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2dd5, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 4bc958979..394613336 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -45,5 +45,5 @@ PewterNidoranSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2807, -1 - person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 + person_event SPRITE_SUPER_NERD, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1a2807, -1 + person_event SPRITE_GROWLITHE, 5, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PewterNidoran, -1 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 90aac7428..a1aa61ae7 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -86,7 +86,7 @@ PewterPokeCenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a2eea, -1 + person_event SPRITE_TEACHER, 6, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1a2eea, -1 person_event SPRITE_JIGGLYPUFF, 3, 1, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PewterJigglypuff, -1 - person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x1a2ef7, -1 - person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 + person_event SPRITE_BUG_CATCHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x1a2ef7, -1 + person_event SPRITE_POKEFAN_M, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Chris, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 41d0c10ba..49257b8c2 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -39,4 +39,4 @@ PewterSnoozeSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a3059, -1 + person_event SPRITE_GRAMPS, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a3059, -1 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 3cebaf902..4ba8555fd 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -435,7 +435,7 @@ PokeCenter2F_CheckGender: closetext playsound SFX_TINGLE applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_RED << 4) + writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB @@ -462,7 +462,7 @@ Script_WalkOutOfLinkTradeRoom: clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_BLUE << 4) + writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite @@ -484,7 +484,7 @@ Script_WalkOutOfLinkBattleRoom: clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_BLUE << 4) + writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite @@ -543,7 +543,7 @@ TimeCapsuleScript_CheckPlayerGender: closetext playsound SFX_TINGLE applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_RED << 4) + writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown faceperson PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST @@ -572,7 +572,7 @@ Script_LeftTimeCapsule: clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight - writebyte (1 << 7) | (PAL_OW_BLUE << 4) + writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite @@ -1044,7 +1044,7 @@ PokeCenter2F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 - person_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 - person_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 + person_event SPRITE_LINK_RECEPTIONIST, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1 + person_event SPRITE_LINK_RECEPTIONIST, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1 + person_event SPRITE_LINK_RECEPTIONIST, 3, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1 person_event SPRITE_OFFICER, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 40c039f83..ad60c2d3e 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -33,4 +33,4 @@ PokeSeersHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SeerScript, -1 + person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SeerScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 7424f9b73..72215ae42 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -316,8 +316,8 @@ PokemonFanClub_MapEventHeader: .PersonEvents: db 6 person_event SPRITE_GENTLEMAN, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x191821, -1 + person_event SPRITE_RECEPTIONIST, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x191821, -1 person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FisherScript_0x191824, -1 person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x19186b, -1 person_event SPRITE_FAIRY, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyDoll, EVENT_VERMILION_FAN_CLUB_DOLL - person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 + person_event SPRITE_ODDISH, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FanClubBayleef, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 317f12764..193bc7434 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -408,10 +408,10 @@ PowerPlant_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 - person_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 - person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 - person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 - person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 - person_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PowerPlantManager, -1 - person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Forest, -1 + person_event SPRITE_OFFICER, 14, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188df5, -1 + person_event SPRITE_GYM_GUY, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e15, -1 + person_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e29, -1 + person_event SPRITE_OFFICER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x188e3d, -1 + person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188e51, -1 + person_event SPRITE_FISHER, 10, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PowerPlantManager, -1 + person_event SPRITE_GYM_GUY, 5, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Forest, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 8fe22d242..2e9524b9c 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -492,9 +492,9 @@ RadioTower1F_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_RECEPTIONIST, 6, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5cd29, -1 + person_event SPRITE_LASS, 4, 16, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 4, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 6, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 093ad758c..0df11fdce 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -733,14 +733,14 @@ RadioTower2F_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS - person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 + person_event SPRITE_SUPER_NERD, 6, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_TEACHER, 2, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 person_event SPRITE_ROCKET, 4, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 4, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 5, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_BLACK_BELT, 1, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS person_event SPRITE_BLACK_BELT, 1, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_JIGGLYPUFF, 1, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RadioTowerJigglypuff, -1 - person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_BUENA, 5, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Buena, -1 + person_event SPRITE_RECEPTIONIST, 7, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index a9fed600c..ae2b1b1bf 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -349,10 +349,10 @@ RadioTower3F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 - person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 + person_event SPRITE_SUPER_NERD, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 + person_event SPRITE_COOLTRAINER_F, 3, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 person_event SPRITE_ROCKET, 1, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 6, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 6, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 353977c3d..f29ab1dac 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -266,10 +266,10 @@ RadioTower4F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER - person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 - person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 + person_event SPRITE_FISHER, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 + person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, RadioTowerMeowth, -1 person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index c2fd1e9ea..a2a7ea2f3 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -446,6 +446,6 @@ RadioTower5F_MapEventHeader: db 5 person_event SPRITE_GENTLEMAN, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Director, -1 person_event SPRITE_ROCKET, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_ROCKET_GIRL, 2, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKER, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_POKE_BALL, 5, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, RadioTower5FUltraBall, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/Route1.asm b/maps/Route1.asm index 90377eb9b..3bda2934f 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -96,6 +96,6 @@ Route1_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 - person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 + person_event SPRITE_YOUNGSTER, 12, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 + person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 person_event SPRITE_FRUIT_TREE, 7, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 720421fda..95780ed5e 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -99,6 +99,6 @@ Route10PokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x188bd7, -1 - person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + person_event SPRITE_GENTLEMAN, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x188bd7, -1 + person_event SPRITE_GYM_GUY, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 person_event SPRITE_COOLTRAINER_F, 3, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x188bee, -1 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index c923c44d3..db5c7c5e9 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -92,5 +92,5 @@ Route10South_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerJim, -1 - person_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 + person_event SPRITE_POKEFAN_M, 3, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerJim, -1 + person_event SPRITE_POKEFAN_M, 10, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index 444800a0d..ca6159c38 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -163,8 +163,8 @@ Route11_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 - person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJason, -1 - person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicHerman, -1 - person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFidel, -1 + person_event SPRITE_YOUNGSTER, 14, 22, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterOwen, -1 + person_event SPRITE_YOUNGSTER, 4, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJason, -1 + person_event SPRITE_YOUNGSTER, 7, 28, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicHerman, -1 + person_event SPRITE_YOUNGSTER, 6, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFidel, -1 person_event SPRITE_FRUIT_TREE, 2, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index cc5397534..00c00f15f 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -186,9 +186,9 @@ Route12_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherMartin, -1 - person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1 - person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1 - person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1 + person_event SPRITE_FISHER, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherMartin, -1 + person_event SPRITE_FISHER, 23, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherStephen, -1 + person_event SPRITE_FISHER, 38, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerFisherBarney, -1 + person_event SPRITE_FISHER, 7, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherKyle, -1 person_event SPRITE_POKE_BALL, 43, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Calcium, EVENT_ROUTE_12_CALCIUM person_event SPRITE_POKE_BALL, 51, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route12Nugget, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index f19594e20..c14324c06 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -96,4 +96,4 @@ Route12SuperRodHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 + person_event SPRITE_FISHING_GURU, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 966bb61f5..baa220c44 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -211,8 +211,8 @@ Route13_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 - person_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 - person_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 - person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerHikerKenny, -1 - person_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 + person_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 + person_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 + person_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 + person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerHikerKenny, -1 + person_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 0a42a2a8e..0b4372bd6 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -130,7 +130,7 @@ Route14_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 - person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 - person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 - person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1 + person_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 + person_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 + person_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 + person_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 48a56dba9..3d78e29a2 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -219,10 +219,10 @@ Route15_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 - person_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 - person_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 - person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 - person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 - person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 + person_event SPRITE_YOUNGSTER, 10, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSchoolboyKipp, -1 + person_event SPRITE_YOUNGSTER, 13, 15, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyTommy, -1 + person_event SPRITE_YOUNGSTER, 10, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyJohnny, -1 + person_event SPRITE_YOUNGSTER, 10, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyBilly, -1 + person_event SPRITE_TEACHER, 12, 30, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerTeacherColette, -1 + person_event SPRITE_TEACHER, 10, 20, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerTeacherHillary, -1 person_event SPRITE_POKE_BALL, 5, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route15PPUp, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 00ba666bb..920a07d97 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -38,4 +38,4 @@ Route15FuchsiaGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19679e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19679e, -1 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 76cc7fa15..911cc1111 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -41,4 +41,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x73373, -1 + person_event SPRITE_SUPER_NERD, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x73373, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 17572bf14..d04e8a61d 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -81,4 +81,4 @@ Route16Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x733ea, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x733ea, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index 1ea495cc3..03cfd3e4b 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -153,7 +153,7 @@ Route17_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerRiley, -1 - person_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerBikerJoel, -1 - person_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBikerGlenn, -1 - person_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerCharles, -1 + person_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerRiley, -1 + person_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerBikerJoel, -1 + person_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBikerGlenn, -1 + person_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerCharles, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 2be96d3f0..fae494532 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -72,4 +72,4 @@ Route1718Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7360e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7360e, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index c51cb389d..8c02559f4 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -95,5 +95,5 @@ Route18_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 - person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 + person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 + person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 0de9f2f1f..18bffe3e4 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -252,9 +252,9 @@ Route19_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 - person_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 - person_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 - person_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 - person_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 - person_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 0, TrainerSwimmerfDawn, -1 + person_event SPRITE_SWIMMER_GUY, 28, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 + person_event SPRITE_SWIMMER_GUY, 17, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 + person_event SPRITE_SWIMMER_GUY, 23, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 + person_event SPRITE_FISHER, 5, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 + person_event SPRITE_FISHER, 5, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index fcdbc9be1..d8321cef9 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -64,4 +64,4 @@ Route19FuchsiaGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 14d025c09..be4069932 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -172,9 +172,9 @@ Route2_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 - person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 - person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 + person_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 + person_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 + person_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 person_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT person_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION person_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS diff --git a/maps/Route20.asm b/maps/Route20.asm index ce0d45d8a..c849e516c 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -129,6 +129,6 @@ Route20_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 - person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 - person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 + person_event SPRITE_SWIMMER_GIRL, 8, 52, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 + person_event SPRITE_SWIMMER_GIRL, 13, 45, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 + person_event SPRITE_SWIMMER_GUY, 13, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index 8fd1ab52e..28b17d11d 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -104,6 +104,6 @@ Route21_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 - person_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 - person_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherArnold, -1 + person_event SPRITE_SWIMMER_GIRL, 16, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfNikki, -1 + person_event SPRITE_SWIMMER_GUY, 30, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSeth, -1 + person_event SPRITE_FISHER, 22, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherArnold, -1 diff --git a/maps/Route25.asm b/maps/Route25.asm index 197ecd86e..6bccab1f6 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -450,14 +450,14 @@ Route25_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 - person_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassEllen, -1 - person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 - person_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassLaura, -1 - person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperLloyd, -1 - person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 - person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 + person_event SPRITE_MISTY, 9, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + person_event SPRITE_COOLTRAINER_M, 10, 46, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSchoolboyDudley, -1 + person_event SPRITE_LASS, 11, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassEllen, -1 + person_event SPRITE_YOUNGSTER, 8, 21, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyJoe, -1 + person_event SPRITE_LASS, 6, 22, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerLassLaura, -1 + person_event SPRITE_YOUNGSTER, 4, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperLloyd, -1 + person_event SPRITE_LASS, 11, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassShannon, -1 + person_event SPRITE_SUPER_NERD, 7, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerSupernerdPat, -1 + person_event SPRITE_COOLTRAINER_M, 8, 37, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 person_event SPRITE_POKE_BALL, 4, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index dc0538fb3..589ed25d0 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -431,11 +431,11 @@ Route26_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 - person_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 - person_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 - person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1 - person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1 + person_event SPRITE_COOLTRAINER_M, 24, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 + person_event SPRITE_COOLTRAINER_M, 38, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 + person_event SPRITE_COOLTRAINER_F, 56, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfBeth1, -1 + person_event SPRITE_YOUNGSTER, 79, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicRichard, -1 + person_event SPRITE_FISHER, 92, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherScott, -1 person_event SPRITE_FRUIT_TREE, 54, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a4ec2, -1 person_event SPRITE_POKE_BALL, 15, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route26MaxElixer, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 050493637..464835a5f 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -67,4 +67,4 @@ Route26HealSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 + person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index c944c66ee..2210dc24c 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -488,12 +488,12 @@ Route27_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 - person_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 - person_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 - person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 - person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 - person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 + person_event SPRITE_COOLTRAINER_M, 7, 48, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 + person_event SPRITE_COOLTRAINER_M, 6, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainermBrian, -1 + person_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 + person_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 + person_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 + person_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 person_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM person_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY person_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index d2e121af3..65a36d872 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -89,5 +89,5 @@ Route28FamousSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Celebrity, -1 - person_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CelebritysFearow, -1 + person_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Celebrity, -1 + person_event SPRITE_MOLTRES, 5, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index bf4bd169a..8ead09afc 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -435,11 +435,11 @@ Route29_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 - person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route29YoungsterScript, -1 - person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route29TeacherScript, -1 + person_event SPRITE_COOLTRAINER_M, 12, 50, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 + person_event SPRITE_YOUNGSTER, 16, 27, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route29YoungsterScript, -1 + person_event SPRITE_TEACHER, 11, 15, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route29TeacherScript, -1 person_event SPRITE_FRUIT_TREE, 2, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route29FruitTree, -1 - person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route29FisherScript, -1 - person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + person_event SPRITE_FISHER, 3, 25, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route29FisherScript, -1 + person_event SPRITE_COOLTRAINER_M, 4, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 person_event SPRITE_TEACHER, 12, 29, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY person_event SPRITE_POKE_BALL, 2, 48, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 2101fbe64..be5068078 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -55,5 +55,5 @@ Route2946Gate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7b5be, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7b5bb, -1 + person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x7b5be, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index f567dd3ae..c3674b074 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -44,4 +44,4 @@ Route2Gate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x9b952, -1 + person_event SPRITE_SCIENTIST, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x9b952, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 2c37f8ff6..b7f6fc8e9 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -69,4 +69,4 @@ Route2NuggetSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 + person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index 339e0c2b1..96159e7e3 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -149,7 +149,7 @@ Route3_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 - person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 - person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 - person_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 + person_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 + person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 + person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 + person_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index e4f1f03d3..725c0b25f 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -429,13 +429,13 @@ Route30_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE - person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY - person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 - person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 - person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Route30YoungsterScript, -1 - person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE - person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + person_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE + person_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY + person_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 + person_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 + person_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route30YoungsterScript, -1 + person_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + person_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE person_event SPRITE_FRUIT_TREE, 39, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree1, -1 person_event SPRITE_FRUIT_TREE, 5, 11, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30FruitTree2, -1 person_event SPRITE_COOLTRAINER_F, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route30CooltrainerFScript, -1 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index d05258f3f..332ee58e7 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -65,4 +65,4 @@ Route30BerrySpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 + person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index 829fd2830..14729ecd9 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -438,7 +438,7 @@ Route31_MapEventHeader: db 7 person_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 person_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31YoungsterScript, -1 - person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 + person_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 person_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 person_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route31FruitTree, -1 person_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 68155a705..28b43d2d8 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -46,5 +46,5 @@ Route31VioletGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x197634, -1 - person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x197637, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x197634, -1 + person_event SPRITE_COOLTRAINER_F, 2, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x197637, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index f0cebf11e..1c0579d70 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -957,15 +957,15 @@ Route32_MapEventHeader: .PersonEvents: db 14 - person_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherJustin, -1 - person_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherRalph1, -1 - person_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherHenry, -1 - person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 - person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 - person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperRoland, -1 - person_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 + person_event SPRITE_FISHER, 49, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherJustin, -1 + person_event SPRITE_FISHER, 56, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerFisherRalph1, -1 + person_event SPRITE_FISHER, 48, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherHenry, -1 + person_event SPRITE_YOUNGSTER, 22, 12, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterAlbert, -1 + person_event SPRITE_YOUNGSTER, 63, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterGordon, -1 + person_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperRoland, -1 + person_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 person_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 - person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 + person_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 person_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL person_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index ae1b641ff..ca303b029 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -113,5 +113,5 @@ Route32PokeCenter1F_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x69b80, -1 + person_event SPRITE_FISHING_GURU, 4, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x69b80, -1 diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index efce725b2..b530cbf5f 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -65,6 +65,6 @@ Route32RuinsOfAlphGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 2, 8, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69a33, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index 383f32e67..54d84b82b 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -211,6 +211,6 @@ Route33_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerAnthony, -1 - person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route33LassScript, -1 + person_event SPRITE_POKEFAN_M, 13, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerAnthony, -1 + person_event SPRITE_LASS, 16, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route33LassScript, -1 person_event SPRITE_FRUIT_TREE, 16, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index d8935c8f3..b7127454e 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -787,16 +787,16 @@ Route34_MapEventHeader: .PersonEvents: db 13 - person_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperTodd1, -1 - person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 - person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterIan, -1 - person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 - person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1 - person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 + person_event SPRITE_YOUNGSTER, 7, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperTodd1, -1 + person_event SPRITE_YOUNGSTER, 32, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterSamuel, -1 + person_event SPRITE_YOUNGSTER, 20, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterIan, -1 + person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerGina1, -1 + person_event SPRITE_OFFICER, 11, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerKeithScript, -1 + person_event SPRITE_POKEFAN_M, 28, 18, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerPokefanmBrandon, -1 person_event SPRITE_GRAMPS, 16, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareManScript_Outside, EVENT_DAY_CARE_MAN_ON_ROUTE_34 person_event SPRITE_DAY_CARE_MON_1, 18, 14, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon1Script, EVENT_DAY_CARE_MON_1 person_event SPRITE_DAY_CARE_MON_2, 19, 17, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DayCareMon2Script, EVENT_DAY_CARE_MON_2 - person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 - person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 - person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 + person_event SPRITE_COOLTRAINER_F, 48, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfIrene, -1 + person_event SPRITE_COOLTRAINER_F, 48, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfJenn, -1 + person_event SPRITE_COOLTRAINER_F, 51, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerCooltrainerfKate, -1 person_event SPRITE_POKE_BALL, 30, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route34Nugget, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index fd7aad411..bed78d12a 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -155,7 +155,7 @@ Route34IlexForestGate_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 - person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + person_event SPRITE_TEACHER, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + person_event SPRITE_BUTTERFREE, 4, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, IlexGateButterfree, -1 + person_event SPRITE_LASS, 4, 3, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + person_event SPRITE_TEACHER, 7, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index 05abdc63e..8ce6adde7 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -482,14 +482,14 @@ Route35_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperIvan, -1 - person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperElliot, -1 - person_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 - person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerKim, -1 - person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 - person_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 - person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 - person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 + person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperIvan, -1 + person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperElliot, -1 + person_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 + person_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerKim, -1 + person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 + person_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 + person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 + person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 + person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route35TMRollout, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 0fd120473..e68250183 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -214,6 +214,6 @@ Route35GoldenrodGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 - person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x69dda, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x69d37, -1 + person_event SPRITE_POKEFAN_F, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x69dc6, -1 + person_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x69dda, -1 diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index f7aa0b22f..1214827f8 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -457,6 +457,6 @@ Route35NationalParkGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index 5b4121cc4..918f04645 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -684,12 +684,12 @@ Route36_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1 - person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 + person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1 + person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 person_event SPRITE_WEIRD_TREE, 9, 35, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO person_event SPRITE_LASS, 8, 51, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 person_event SPRITE_FISHER, 9, 44, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 person_event SPRITE_FRUIT_TREE, 4, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route36FruitTree, -1 person_event SPRITE_YOUNGSTER, 6, 46, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY - person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO - person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + person_event SPRITE_LASS, 12, 33, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route36FloriaScript, EVENT_FLORIA_AT_SUDOWOODO + person_event SPRITE_SUICUNE, 6, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 02f980735..e6423cc36 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -870,15 +870,15 @@ Route36NationalParkGate_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B - person_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B - person_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B - person_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B - person_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B - person_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B - person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B - person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B - person_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B - person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - person_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + person_event SPRITE_YOUNGSTER, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + person_event SPRITE_ROCKER, 6, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + person_event SPRITE_POKEFAN_M, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + person_event SPRITE_YOUNGSTER, 7, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + person_event SPRITE_YOUNGSTER, 6, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + person_event SPRITE_LASS, 6, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + person_event SPRITE_YOUNGSTER, 7, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + person_event SPRITE_OFFICER, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index b0bac8ca0..e9fe6d2f5 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -53,5 +53,5 @@ Route36RuinsOfAlphGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6aa1a, -1 + person_event SPRITE_GRAMPS, 5, 7, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x6aa1d, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 0065917a2..2b6ad223a 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -255,9 +255,9 @@ Route37_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 - person_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 - person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicGreg, -1 + person_event SPRITE_WEIRD_TREE, 12, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne1, -1 + person_event SPRITE_WEIRD_TREE, 12, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAnnandanne2, -1 + person_event SPRITE_YOUNGSTER, 6, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicGreg, -1 person_event SPRITE_FRUIT_TREE, 5, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e09, -1 person_event SPRITE_BUG_CATCHER, 8, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY person_event SPRITE_FRUIT_TREE, 5, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a8e0b, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index 2ef07dee0..a496ec99f 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -491,10 +491,10 @@ Route38_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 - person_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassDana1, -1 - person_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 - person_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyValerie, -1 - person_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSailorHarry, -1 + person_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 + person_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassDana1, -1 + person_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 + person_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyValerie, -1 + person_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerSailorHarry, -1 person_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 - person_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 + person_event SPRITE_BUENA, 8, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 7e376b413..3516c72c9 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -43,4 +43,4 @@ Route38EcruteakGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9cbd7, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9cbd7, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index eb90889a5..48690345e 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -365,13 +365,13 @@ Route39_MapEventHeader: .PersonEvents: db 10 - person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1 - person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 - person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 + person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1 + person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1 + person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1 person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1 - person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1 + person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1 person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1 - person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 + person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index a057f2b5f..82fcfcd1a 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -206,5 +206,5 @@ Route39Barn_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_TWIN, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 - person_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 + person_event SPRITE_TWIN, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 person_event SPRITE_TAUROS, 3, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 72a675718..c9d0c3b9e 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -211,5 +211,5 @@ Route39Farmhouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 - person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 + person_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index 1bd5ae694..b674afdad 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -139,7 +139,7 @@ Route4_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 - person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1 - person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 + person_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 + person_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerHope, -1 + person_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 person_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index a5677f0c4..bbf90ab75 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -355,15 +355,15 @@ Route40_MapEventHeader: .PersonEvents: db 12 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 - person_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 - person_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 + person_event SPRITE_OLIVINE_RIVAL, 15, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 + person_event SPRITE_OLIVINE_RIVAL, 30, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 + person_event SPRITE_SWIMMER_GIRL, 19, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 + person_event SPRITE_SWIMMER_GIRL, 25, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfPaula, -1 person_event SPRITE_ROCK, 11, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_ROCK, 9, 6, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_ROCK, 8, 7, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route40Rock, -1 person_event SPRITE_LASS, 13, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61c4, -1 person_event SPRITE_BUENA, 10, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_LASS, 4, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x1a61d3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 9, 16, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 796d73eec..0f8b139c7 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -89,5 +89,5 @@ Route40BattleTowerGate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TwinScript_0x9f66c, -1 + person_event SPRITE_ROCKER, 3, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_TWIN, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 27c4a400e..174909216 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -361,13 +361,13 @@ Route41_MapEventHeader: .PersonEvents: db 10 - person_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 - person_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 - person_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 - person_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 - person_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 - person_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 - person_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 - person_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 - person_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 + person_event SPRITE_OLIVINE_RIVAL, 6, 32, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermCharlie, -1 + person_event SPRITE_OLIVINE_RIVAL, 8, 46, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermGeorge, -1 + person_event SPRITE_OLIVINE_RIVAL, 26, 20, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermBerke, -1 + person_event SPRITE_OLIVINE_RIVAL, 30, 32, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermKirk, -1 + person_event SPRITE_OLIVINE_RIVAL, 46, 19, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermMathew, -1 + person_event SPRITE_SWIMMER_GIRL, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfKaylee, -1 + person_event SPRITE_SWIMMER_GIRL, 19, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfSusie, -1 + person_event SPRITE_SWIMMER_GIRL, 34, 27, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDenise, -1 + person_event SPRITE_SWIMMER_GIRL, 28, 44, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerSwimmerfKara, -1 + person_event SPRITE_SWIMMER_GIRL, 50, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index ee29c9d7f..8c190d88a 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -345,12 +345,12 @@ Route42_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherTully1, -1 - person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 - person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 + person_event SPRITE_FISHER, 10, 40, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherTully1, -1 + person_event SPRITE_POKEFAN_M, 9, 51, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerBenjamin, -1 + person_event SPRITE_SUPER_NERD, 8, 47, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacShane, -1 person_event SPRITE_FRUIT_TREE, 16, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934d, -1 person_event SPRITE_FRUIT_TREE, 16, 28, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a934f, -1 person_event SPRITE_FRUIT_TREE, 16, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9351, -1 person_event SPRITE_POKE_BALL, 4, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42UltraBall, EVENT_ROUTE_42_ULTRA_BALL person_event SPRITE_POKE_BALL, 8, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route42SuperPotion, EVENT_ROUTE_42_SUPER_POTION - person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + person_event SPRITE_SUICUNE, 16, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index df7927010..e014340e4 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -38,4 +38,4 @@ Route42EcruteakGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19a4b5, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19a4b5, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index 126842e64..dcb0d70be 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -523,11 +523,11 @@ Route43_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 - person_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 - person_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 - person_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 4, TrainerFisherMarvin, -1 - person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 - person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1 + person_event SPRITE_SUPER_NERD, 5, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacBen, -1 + person_event SPRITE_SUPER_NERD, 20, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacBrent1, -1 + person_event SPRITE_SUPER_NERD, 7, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacRon, -1 + person_event SPRITE_FISHER, 16, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 4, TrainerFisherMarvin, -1 + person_event SPRITE_LASS, 25, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTiffany3, -1 + person_event SPRITE_YOUNGSTER, 40, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperSpencer, -1 person_event SPRITE_FRUIT_TREE, 26, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19d266, -1 person_event SPRITE_POKE_BALL, 32, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route43MaxEther, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 99ca71a58..39d5c9273 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -264,6 +264,6 @@ Route43Gate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_GuardWithSludgeBomb, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS person_event SPRITE_ROCKET, 4, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_MakingABundle, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index b60e5e160..37192979f 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -57,4 +57,4 @@ Route43MahoganyGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index b46695bc9..dc24e8ddb 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -526,13 +526,13 @@ Route44_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherWilton1, -1 - person_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherEdgar, -1 - person_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicPhil, -1 - person_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 - person_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 - person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 - person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 + person_event SPRITE_FISHER, 3, 35, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherWilton1, -1 + person_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerFisherEdgar, -1 + person_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicPhil, -1 + person_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 + person_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 + person_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 + person_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 person_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 person_event SPRITE_POKE_BALL, 8, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44MaxRevive, EVENT_ROUTE_44_MAX_REVIVE person_event SPRITE_POKE_BALL, 4, 45, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route44UltraBall, EVENT_ROUTE_44_ULTRA_BALL diff --git a/maps/Route45.asm b/maps/Route45.asm index 615cb0606..8caac5aa6 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -550,16 +550,16 @@ Route45_MapEventHeader: .PersonEvents: db 13 - person_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerErik, -1 - person_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerMichael, -1 - person_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerParry, -1 - person_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerTimothy, -1 - person_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 - person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 - person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 + person_event SPRITE_POKEFAN_M, 16, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerErik, -1 + person_event SPRITE_POKEFAN_M, 65, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerMichael, -1 + person_event SPRITE_POKEFAN_M, 28, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerParry, -1 + person_event SPRITE_POKEFAN_M, 65, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerTimothy, -1 + person_event SPRITE_BLACK_BELT, 50, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltKenji, -1 + person_event SPRITE_COOLTRAINER_M, 18, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermRyan, -1 + person_event SPRITE_COOLTRAINER_F, 36, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfKelly, -1 person_event SPRITE_FRUIT_TREE, 82, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x19e294, -1 person_event SPRITE_POKE_BALL, 51, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Nugget, EVENT_ROUTE_45_NUGGET person_event SPRITE_POKE_BALL, 66, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Revive, EVENT_ROUTE_45_REVIVE person_event SPRITE_POKE_BALL, 20, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45Elixer, EVENT_ROUTE_45_ELIXER person_event SPRITE_POKE_BALL, 33, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route45MaxPotion, EVENT_ROUTE_45_MAX_POTION - person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 + person_event SPRITE_YOUNGSTER, 70, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index f84563a6d..0a1a52d9e 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -269,9 +269,9 @@ Route46_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerBailey, -1 - person_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperTed, -1 - person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 + person_event SPRITE_POKEFAN_M, 19, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerBailey, -1 + person_event SPRITE_YOUNGSTER, 14, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerCamperTed, -1 + person_event SPRITE_LASS, 13, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 person_event SPRITE_FRUIT_TREE, 5, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a978f, -1 person_event SPRITE_FRUIT_TREE, 6, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a9791, -1 person_event SPRITE_POKE_BALL, 15, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, Route46XSpeed, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 951bba75c..d534faefd 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -60,4 +60,4 @@ Route5_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 16, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 299d80c76..9dec30107 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -79,5 +79,5 @@ Route5CleanseTagSpeechHouse_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b64f, -1 + person_event SPRITE_GRANNY, 5, 2, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1 + person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b64f, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index cefe24e47..fd3707ff2 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -39,4 +39,4 @@ Route5SaffronCityGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18b5b9, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18b5b9, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index a9051d75b..b43587d4d 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -37,4 +37,4 @@ Route5UndergroundEntrance_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b555, -1 + person_event SPRITE_TEACHER, 2, 2, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18b555, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 34c03ca0f..583398c9b 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -109,6 +109,6 @@ Route6_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH - person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1 - person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 + person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1 + person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index b9081eccd..bac8fb91c 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -76,4 +76,4 @@ Route6SaffronGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 + person_event SPRITE_OFFICER, 4, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index df494e313..b5f0704ca 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -64,4 +64,4 @@ Route7SaffronGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 3863041d9..840547185 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -191,9 +191,9 @@ Route8_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 5, TrainerBikerDwayne, -1 - person_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerBikerHarris, -1 - person_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerBikerZeke, -1 - person_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdSam, -1 - person_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerSupernerdTom, -1 + person_event SPRITE_BIKER, 8, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 5, TrainerBikerDwayne, -1 + person_event SPRITE_BIKER, 9, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerBikerHarris, -1 + person_event SPRITE_BIKER, 10, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerBikerZeke, -1 + person_event SPRITE_SUPER_NERD, 2, 23, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdSam, -1 + person_event SPRITE_SUPER_NERD, 12, 31, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerSupernerdTom, -1 person_event SPRITE_FRUIT_TREE, 5, 33, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 6f871c5fd..a7947b4de 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -38,4 +38,4 @@ Route8SaffronGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7f416, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x7f416, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index baad4738d..e5c0df2db 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -224,9 +224,9 @@ Route9_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperDean, -1 - person_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 - person_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperSid, -1 - person_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 - person_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerTim, -1 - person_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerHikerSidney, -1 + person_event SPRITE_YOUNGSTER, 11, 23, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerCamperDean, -1 + person_event SPRITE_LASS, 8, 39, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerPicnickerHeidi, -1 + person_event SPRITE_YOUNGSTER, 4, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 5, TrainerCamperSid, -1 + person_event SPRITE_LASS, 15, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerPicnickerEdna, -1 + person_event SPRITE_POKEFAN_M, 3, 28, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerTim, -1 + person_event SPRITE_POKEFAN_M, 15, 36, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index e949611e2..791a6deeb 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -126,6 +126,6 @@ RuinsOfAlphInnerChamber_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index ba03172aa..b91d46275 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -282,4 +282,4 @@ RuinsOfAlphKabutoChamber_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_RECEPTIONIST, 5, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 + person_event SPRITE_SCIENTIST, 1, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 402860251..87f134f3f 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -315,6 +315,6 @@ RuinsOfAlphOutside_MapEventHeader: db 5 person_event SPRITE_YOUNGSTER, 20, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerPsychicNathan, -1 person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST - person_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER - person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS - person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + person_event SPRITE_FISHER, 17, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + person_event SPRITE_YOUNGSTER, 11, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + person_event SPRITE_YOUNGSTER, 8, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 4899b44ac..36e60a437 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -412,6 +412,6 @@ RuinsOfAlphResearchCenter_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 - person_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + person_event SPRITE_SCIENTIST, 5, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591e5, -1 + person_event SPRITE_SCIENTIST, 2, 5, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x59214, -1 + person_event SPRITE_SCIENTIST, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index f26931fd8..403967b01 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -97,4 +97,4 @@ SafariZoneWardensHome_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, WardensGranddaughter, -1 + person_event SPRITE_LASS, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 758d49b98..8fd105754 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -303,11 +303,11 @@ SaffronCity_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x19932a, -1 - person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x199352, -1 - person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x199355, -1 - person_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936c, -1 - person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936f, -1 - person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x199372, -1 + person_event SPRITE_LASS, 14, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LassScript_0x19932a, -1 + person_event SPRITE_POKEFAN_M, 30, 19, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x19933e, -1 + person_event SPRITE_COOLTRAINER_M, 7, 32, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x199352, -1 + person_event SPRITE_COOLTRAINER_F, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x199355, -1 + person_event SPRITE_FISHER, 12, 27, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x199358, -1 + person_event SPRITE_YOUNGSTER, 19, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936c, -1 + person_event SPRITE_YOUNGSTER, 22, 35, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x19936f, -1 + person_event SPRITE_LASS, 8, 19, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x199372, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 88dec668e..b8c4932d7 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -338,9 +338,9 @@ SaffronGym_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 - person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerMediumRebecca, -1 - person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 - person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerMediumDoris, -1 - person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicJared, -1 - person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 + person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerMediumRebecca, -1 + person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 + person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerMediumDoris, -1 + person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicJared, -1 + person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index ed13ef074..5d81bee19 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -55,5 +55,5 @@ SaffronMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18a3c9, -1 + person_event SPRITE_COOLTRAINER_M, 2, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x18a3c6, -1 + person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18a3c9, -1 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index aecafd6b7..6c46cada6 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -130,6 +130,6 @@ SaffronPokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 - person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 - person_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x18a4a0, -1 + person_event SPRITE_TEACHER, 2, 7, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 + person_event SPRITE_FISHER, 6, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 + person_event SPRITE_YOUNGSTER, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x18a4a0, -1 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 3101a4af1..cfbbc078e 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -238,4 +238,4 @@ SaffronTrainStation_MapEventHeader: person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION - person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index e63cd13c8..0b162323d 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -173,5 +173,5 @@ SeafoamGym_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY + person_event SPRITE_BLAINE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BlaineScript_0x1ab4fb, -1 + person_event SPRITE_GYM_GUY, 5, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index dd3ea9dab..cb3b87a23 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -72,5 +72,5 @@ SilphCo1F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SilphCoReceptionist, -1 - person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 + person_event SPRITE_RECEPTIONIST, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SilphCoReceptionist, -1 + person_event SPRITE_OFFICER, 1, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 82575a93a..dde8def54 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -66,4 +66,4 @@ SilverCaveRoom3_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER + person_event SPRITE_RED, 10, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Red, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 5587d486f..be5d0eace 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -340,9 +340,9 @@ SlowpokeWellB1F_MapEventHeader: person_event SPRITE_ROCKET, 7, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_ROCKET, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES - person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_ROCKET_GIRL, 4, 10, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_SLOWPOKE, 4, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_SLOWPOKE, 2, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES person_event SPRITE_KURT, 14, 16, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_BOULDER, 2, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SlowpokeWellB1FBoulder, -1 person_event SPRITE_POKE_BALL, 3, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SlowpokeWellB1FSuperPotion, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 37041c88d..9b77f4306 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -89,7 +89,7 @@ SoulHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 - person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ec4a, -1 - person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x7ec4d, -1 - person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7ec50, -1 + person_event SPRITE_GRAMPS, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, MrFuji, -1 + person_event SPRITE_TEACHER, 3, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ec4a, -1 + person_event SPRITE_LASS, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, LassScript_0x7ec4d, -1 + person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7ec50, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index a3b298052..5287ef850 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -124,9 +124,9 @@ SproutTower1F_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x1844fe, -1 - person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x184501, -1 + person_event SPRITE_SAGE, 4, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x1844fe, -1 + person_event SPRITE_SAGE, 7, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageScript_0x184501, -1 person_event SPRITE_GRANNY, 12, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x184504, -1 person_event SPRITE_TEACHER, 9, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x184507, -1 - person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 + person_event SPRITE_SAGE, 5, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageChow, -1 person_event SPRITE_POKE_BALL, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 788c7bc34..1833c1372 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -104,6 +104,6 @@ SproutTower2F_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1 - person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1 + person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1 + person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1 person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 74c0004af..016374442 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -352,10 +352,10 @@ SproutTower3F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageJin, -1 - person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 - person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 + person_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageJin, -1 + person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 + person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 + person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index ae826ed1f..93fe00132 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -791,7 +791,7 @@ TeamRocketBaseB1F_MapEventHeader: db 6 person_event SPRITE_ROCKET, 0, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS person_event SPRITE_ROCKET, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 12, 18, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_POKE_BALL, 6, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FHyperPotion, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION person_event SPRITE_POKE_BALL, 15, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FNugget, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET person_event SPRITE_POKE_BALL, 12, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB1FGuardSpec, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 7930866cd..c7feb4446 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -962,7 +962,7 @@ TeamRocketBaseB2F_MapEventHeader: .PersonEvents: db 14 person_event SPRITE_ROCKET, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE - person_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + person_event SPRITE_ROCKET_GIRL, 16, 20, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE person_event SPRITE_LANCE, 13, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE person_event SPRITE_DRAGON, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE person_event SPRITE_VOLTORB, 5, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 98d0c543d..85d3765e2 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -599,11 +599,11 @@ TeamRocketBaseB3F_MapEventHeader: db 14 person_event SPRITE_LANCE, 14, 25, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, LanceGetPasswordScript, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS person_event SPRITE_ROCKET, 3, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE - person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_MOLTRES, 2, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, RocketBaseMurkrow, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET_GIRL, 7, 21, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, SlowpokeTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, RaticateTailGrunt, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION - person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 11, 23, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_ROCKET, 14, 24, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_SILVER, 5, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index b48d41ff7..73b5f3554 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -540,10 +540,10 @@ TinTower1F_MapEventHeader: .PersonEvents: db 10 - person_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE - person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU - person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI - person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE + person_event SPRITE_SUICUNE, 9, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + person_event SPRITE_RAIKOU, 9, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + person_event SPRITE_ENTEI, 9, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + person_event SPRITE_SUPER_NERD, 3, 8, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TinTowerEusine, EVENT_TIN_TOWER_1F_EUSINE person_event SPRITE_SAGE, 9, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 person_event SPRITE_SAGE, 6, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index befbf1f3b..fcf3964fa 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH + person_event SPRITE_HO_OH, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, TinTowerHoOh, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d196d9a47..98b0960f1 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -158,8 +158,8 @@ TrainerHouse1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9af67, -1 + person_event SPRITE_RECEPTIONIST, 11, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9af67, -1 person_event SPRITE_COOLTRAINER_M, 11, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9af6a, -1 - person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9af6d, -1 - person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9af70, -1 + person_event SPRITE_COOLTRAINER_F, 2, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9af6d, -1 + person_event SPRITE_YOUNGSTER, 8, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9af70, -1 person_event SPRITE_GENTLEMAN, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x9af73, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 1f6302623..cd36ae136 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -186,5 +186,5 @@ TrainerHouseB1F_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 - person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 + person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index d329dade7..f4015232c 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -963,12 +963,12 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_PHARMACIST, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_PHARMACIST, 8, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 2, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_TEACHER, 27, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7ca7d, -1 person_event SPRITE_SUPER_NERD, 27, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7ca7a, -1 person_event SPRITE_POKE_BALL, 12, 1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundPathSwitchRoomEntrancesSmokeBall, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index cdf26ed82..fbcaa23e9 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -218,11 +218,11 @@ UnionCave1F_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerDaniel, -1 - person_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 - person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1 - person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 - person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 + person_event SPRITE_POKEFAN_M, 6, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerHikerDaniel, -1 + person_event SPRITE_SUPER_NERD, 21, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacLarry, -1 + person_event SPRITE_POKEFAN_M, 8, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerHikerRussell, -1 + person_event SPRITE_FISHER, 27, 15, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherRay, -1 + person_event SPRITE_FISHER, 19, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 4, TrainerFirebreatherBill, -1 person_event SPRITE_POKE_BALL, 21, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FGreatBall, EVENT_UNION_CAVE_1F_GREAT_BALL person_event SPRITE_POKE_BALL, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FXAttack, EVENT_UNION_CAVE_1F_X_ATTACK person_event SPRITE_POKE_BALL, 17, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCave1FPotion, EVENT_UNION_CAVE_1F_POTION diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index e498dbeea..1608b6884 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -172,10 +172,10 @@ UnionCaveB1F_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerPhillip, -1 - person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1 - person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 - person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 + person_event SPRITE_POKEFAN_M, 4, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerPhillip, -1 + person_event SPRITE_POKEFAN_M, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerHikerLeonard, -1 + person_event SPRITE_SUPER_NERD, 32, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacAndrew, -1 + person_event SPRITE_SUPER_NERD, 30, 17, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacCalvin, -1 person_event SPRITE_POKE_BALL, 16, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FTMSwift, EVENT_UNION_CAVE_B1F_TM_SWIFT person_event SPRITE_BOULDER, 10, 7, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, UnionCaveB1FBoulder, -1 person_event SPRITE_POKE_BALL, 23, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB1FXDefend, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 80ea5a6d6..55c5fde36 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -157,9 +157,9 @@ UnionCaveB2F_MapEventHeader: .PersonEvents: db 6 - person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 - person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 - person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 + person_event SPRITE_ROCKER, 19, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermNick, -1 + person_event SPRITE_COOLTRAINER_F, 13, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfGwen, -1 + person_event SPRITE_COOLTRAINER_F, 30, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 person_event SPRITE_POKE_BALL, 2, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER person_event SPRITE_POKE_BALL, 19, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS + person_event SPRITE_SURF, 31, 11, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 28b189eac..64c740516 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -302,7 +302,7 @@ VermilionCity_MapEventHeader: db 6 person_event SPRITE_TEACHER, 9, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x1aa983, -1 person_event SPRITE_GRAMPS, 6, 23, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionMachopOwner, -1 - person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1aa99b, -1 + person_event SPRITE_MACHOP, 7, 26, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VermilionMachop, -1 + person_event SPRITE_SUPER_NERD, 16, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x1aa99b, -1 person_event SPRITE_BIG_SNORLAX, 8, 34, SPRITEMOVEDATA_SNORLAX, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX - person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 + person_event SPRITE_POKEFAN_M, 12, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 7b03bc3ff..f5cf8e96a 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -294,8 +294,8 @@ VermilionGym_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 - person_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 - person_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 - person_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerJugglerHorton, -1 - person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 + person_event SPRITE_SURGE, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, SurgeScript_0x1920a5, -1 + person_event SPRITE_GENTLEMAN, 8, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerGentlemanGregory, -1 + person_event SPRITE_ROCKER, 7, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 3, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerGuitaristVincent, -1 + person_event SPRITE_SUPER_NERD, 10, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 4, TrainerJugglerHorton, -1 + person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 1f1f42e66..53360680c 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -37,4 +37,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x192031, -1 + person_event SPRITE_GENTLEMAN, 3, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x192031, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 3571d066f..83d7dfd4e 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -68,4 +68,4 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FishingDude, -1 + person_event SPRITE_FISHING_GURU, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index c07f6ca28..763f89755 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -53,4 +53,4 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x191eb7, -1 - person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x191eba, -1 + person_event SPRITE_YOUNGSTER, 3, 0, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x191eba, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 7da93f1e2..e5092c8ca 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -54,5 +54,5 @@ VermilionMart_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x191f88, -1 + person_event SPRITE_SUPER_NERD, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x191f85, -1 + person_event SPRITE_BUENA, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BuenaScript_0x191f88, -1 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index f3cc2d248..674b7d984 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -95,6 +95,6 @@ VermilionPokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x191603, -1 - person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x19161a, -1 - person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x19161d, -1 + person_event SPRITE_FISHING_GURU, 2, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x191606, -1 + person_event SPRITE_SAILOR, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SailorScript_0x19161a, -1 + person_event SPRITE_BUG_CATCHER, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x19161d, -1 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 14f97ae1b..8a2a658d2 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -309,11 +309,11 @@ VioletCity_MapEventHeader: .PersonEvents: db 8 - person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL - person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 - person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 + person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL + person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 + person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 4fd845c36..a1f6beeb7 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -300,7 +300,7 @@ VioletGym_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 - person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + person_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + person_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 + person_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 + person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 0513be044..35b0d5593 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -67,4 +67,4 @@ VioletMart_MapEventHeader: db 3 person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x68295, -1 person_event SPRITE_GRANNY, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x6829f, -1 + person_event SPRITE_COOLTRAINER_M, 2, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x6829f, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 7717c7136..e10c41d0a 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -62,5 +62,5 @@ VioletNicknameSpeechHouse_MapEventHeader: .PersonEvents: db 3 person_event SPRITE_TEACHER, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x693e9, -1 - person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x693ec, -1 - person_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 + person_event SPRITE_LASS, 4, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x693ec, -1 + person_event SPRITE_BIRD, 2, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 5824d6f4b..8e6e44426 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -50,4 +50,4 @@ VioletOnixTradeHouse_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x6998d, -1 - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 + person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Kyle, -1 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 607c8e915..d2f6423b4 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -234,7 +234,7 @@ VioletPokeCenter1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokeCenterNurse, -1 - person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 + person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 - person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 + person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 3d86ae488..a117be25b 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -242,6 +242,6 @@ ViridianCity_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_GRAMPS, 5, 18, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a4c, -1 - person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 - person_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9a90, -1 + person_event SPRITE_GRAMPS, 8, 30, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x1a9a61, -1 + person_event SPRITE_FISHER, 23, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x1a9a75, -1 + person_event SPRITE_YOUNGSTER, 21, 17, SPRITEMOVEDATA_WANDER, 3, 3, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1a9a90, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f67289df9..7bb9b2d98 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -189,4 +189,4 @@ ViridianGym_MapEventHeader: .PersonEvents: db 2 person_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8166fb3a1..b28c14ac1 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -78,7 +78,7 @@ ViridianNicknameSpeechHouse_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ae3a, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9ae3d, -1 - person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 - person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 + person_event SPRITE_POKEFAN_M, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x9ae3a, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x9ae3d, -1 + person_event SPRITE_MOLTRES, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, Speary, -1 + person_event SPRITE_GROWLITHE, 3, 6, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Rattey, -1 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index a19338f05..7c63655bd 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -90,6 +90,6 @@ ViridianPokeCenter1F_MapEventHeader: .PersonEvents: db 4 person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9b690, -1 - person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9b6a7, -1 - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9b6aa, -1 + person_event SPRITE_COOLTRAINER_M, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x9b693, -1 + person_event SPRITE_COOLTRAINER_F, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9b6a7, -1 + person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9b6aa, -1 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index fa6213a64..6acaa08b2 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -675,12 +675,12 @@ WarehouseEntrance_MapEventHeader: .PersonEvents: db 9 - person_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdEric, -1 - person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 - person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 - person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 + person_event SPRITE_SUPER_NERD, 31, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerSupernerdEric, -1 + person_event SPRITE_SUPER_NERD, 9, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerSupernerdTeru, -1 + person_event SPRITE_SUPER_NERD, 27, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerPokemaniacIssac, -1 + person_event SPRITE_SUPER_NERD, 6, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerPokemaniacDonald, -1 person_event SPRITE_POKE_BALL, 25, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, WarehouseEntranceCoinCase, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE - person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS - person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER - person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER - person_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY + person_event SPRITE_GRAMPS, 11, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS + person_event SPRITE_SUPER_NERD, 14, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + person_event SPRITE_SUPER_NERD, 15, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + person_event SPRITE_GRANNY, 21, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 9a4db5f15..c71817cfc 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + person_event SPRITE_LUGIA, 5, 9, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Lugia, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 69493a773..ce539ac59 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -146,4 +146,4 @@ WillsRoom_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WillScript_Battle, -1 + person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, WillScript_Battle, -1 diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 529ec7e05..e50ab8e6a 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -72,11 +72,11 @@ MapGroup3: map_header BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, 1, PALETTE_NITE, FISHGROUP_SHORE map_header NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, (1 << RADIO_TOWER_MUSIC) | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 0, PALETTE_AUTO, FISHGROUP_POND map_header RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE map_header RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, 1, PALETTE_DAY, FISHGROUP_SHORE diff --git a/predef/cgb.asm b/predef/cgb.asm index af762221e..7ede2768f 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -69,15 +69,15 @@ Predef_LoadSGBLayoutCGB: ; 8d59 _CGB_BattleGrayscale: ; 8db8 ld hl, PalPacket_9c66 + 1 ld de, UnknBGPals - ld c, $4 + ld c, 4 call CopyPalettes ld hl, PalPacket_9c66 + 1 - ld de, UnknBGPals + 4 palettes - ld c, $4 + ld de, UnknBGPals palette PAL_BATTLE_BG_EXP + ld c, 4 call CopyPalettes ld hl, PalPacket_9c66 + 1 ld de, UnknOBPals - ld c, $2 + ld c, 2 call CopyPalettes jr _CGB_FinishBattleScreenLayout @@ -85,10 +85,10 @@ _CGB_BattleColors: ; 8ddb ld de, UnknBGPals call GetBattlemonBackpicPalettePointer push hl - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_PLAYER call GetEnemyFrontpicPalettePointer push hl - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY ld a, [EnemyHPPal] ld l, a ld h, $0 @@ -96,7 +96,7 @@ _CGB_BattleColors: ; 8ddb add hl, hl ld bc, Palettes_a8be add hl, bc - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_ENEMY_HP ld a, [PlayerHPPal] ld l, a ld h, $0 @@ -104,14 +104,14 @@ _CGB_BattleColors: ; 8ddb add hl, hl ld bc, Palettes_a8be add hl, bc - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_PLAYER_HP ld hl, Palettes_a8ca - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_BG_EXP ld de, UnknOBPals pop hl - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_ENEMY pop hl - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; PAL_BATTLE_OB_PLAYER ld a, SCGB_BATTLE_COLORS ld [SGBPredef], a call ApplyPals @@ -119,34 +119,34 @@ _CGB_FinishBattleScreenLayout: ; 8e23 call InitPartyMenuBGPal7 hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, $2 + ld a, PAL_BATTLE_BG_ENEMY_HP call ByteFill hlcoord 0, 4, AttrMap lb bc, 8, 10 - ld a, $0 + ld a, PAL_BATTLE_BG_PLAYER call FillBoxCGB hlcoord 10, 0, AttrMap lb bc, 7, 10 - ld a, $1 + ld a, PAL_BATTLE_BG_ENEMY call FillBoxCGB hlcoord 0, 0, AttrMap lb bc, 4, 10 - ld a, $2 + ld a, PAL_BATTLE_BG_ENEMY_HP call FillBoxCGB hlcoord 10, 7, AttrMap lb bc, 5, 10 - ld a, $3 + ld a, PAL_BATTLE_BG_PLAYER_HP call FillBoxCGB hlcoord 10, 11, AttrMap lb bc, 1, 9 - ld a, $4 + ld a, PAL_BATTLE_BG_EXP call FillBoxCGB hlcoord 0, 12, AttrMap ld bc, 6 * SCREEN_WIDTH - ld a, $7 + ld a, PAL_BATTLE_BG_TEXT call ByteFill ld hl, Palettes_979c - ld de, UnknOBPals + 2 palettes + ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY ld bc, 6 palettes ld a, $5 call FarCopyWRAM @@ -162,7 +162,7 @@ Mobile_InitPartyMenuBGPal7: ; 8e8b jr nc, .not_mobile ld hl, Palette_b309 .not_mobile - ld de, UnknBGPals + 8 * 7 + ld de, UnknBGPals palette 7 ld bc, 1 palettes ld a, $5 call FarCopyWRAM @@ -175,7 +175,7 @@ InitPartyMenuBGPal0: ; 8e9f jr nc, .not_mobile ld hl, Palette_b309 .not_mobile - ld de, UnknBGPals + ld de, UnknBGPals palette 0 ld bc, 1 palettes ld a, $5 call FarCopyWRAM @@ -211,43 +211,43 @@ _CGB_StatsScreenHPPals: ; 8edb add hl, hl ld bc, Palettes_a8be add hl, bc - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; hp palette ld a, [CurPartySpecies] ld bc, TempMonDVs call GetPlayerOrMonPalettePointer - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; mon palette ld hl, Palettes_a8ca - call LoadPalette_White_Col1_Col2_Black - ld hl, Palette8f52 - ld de, UnknBGPals + 8 * 3 - ld bc, 3 palettes + call LoadPalette_White_Col1_Col2_Black ; exp palette + ld hl, StatsScreenPagePals + ld de, UnknBGPals palette 3 + ld bc, 3 palettes ; pink, green, and blue page palettes ld a, $5 call FarCopyWRAM call WipeAttrMap hlcoord 0, 0, AttrMap lb bc, 8, SCREEN_WIDTH - ld a, $1 + ld a, $1 ; mon palette call FillBoxCGB hlcoord 10, 16, AttrMap ld bc, 10 - ld a, $2 + ld a, $2 ; exp palette call ByteFill hlcoord 13, 5, AttrMap lb bc, 2, 2 - ld a, $3 + ld a, $3 ; pink page palette call FillBoxCGB hlcoord 15, 5, AttrMap lb bc, 2, 2 - ld a, $4 + ld a, $4 ; green page palette call FillBoxCGB hlcoord 17, 5, AttrMap lb bc, 2, 2 - ld a, $5 + ld a, $5 ; blue page palette call FillBoxCGB call ApplyAttrMap @@ -257,17 +257,18 @@ _CGB_StatsScreenHPPals: ; 8edb ret ; 8f52 -Palette8f52: ; 8f52 +StatsScreenPagePals: ; 8f52 +; pink RGB 31, 31, 31 RGB 31, 19, 31 RGB 31, 15, 31 RGB 00, 00, 00 - +; green RGB 31, 31, 31 RGB 21, 31, 14 RGB 17, 31, 00 RGB 00, 00, 00 - +; blue RGB 31, 31, 31 RGB 17, 31, 31 RGB 17, 31, 31 @@ -275,10 +276,11 @@ Palette8f52: ; 8f52 ; 8f6a StatsScreenPals: ; 8f6a +; pink RGB 31, 19, 31 - +; green RGB 21, 31, 14 - +; blue RGB 17, 31, 31 ; 8f70 @@ -286,26 +288,26 @@ _CGB_Pokedex: ; 8f70 ld de, UnknBGPals ld a, $1d call GetPredefPal - call LoadHLPaletteIntoDE + call LoadHLPaletteIntoDE ; dex interface palette ld a, [CurPartySpecies] cp $ff jr nz, .is_pokemon - ld hl, Palette8fba - call LoadHLPaletteIntoDE + ld hl, .PokedexQuestionMarkPalette + call LoadHLPaletteIntoDE ; green question mark palette jr .got_palette .is_pokemon call GetMonPalettePointer_ - call LoadPalette_White_Col1_Col2_Black + call LoadPalette_White_Col1_Col2_Black ; mon palette .got_palette call WipeAttrMap hlcoord 1, 1, AttrMap lb bc, 7, 7 - ld a, $1 + ld a, $1 ; green question mark palette call FillBoxCGB call InitPartyMenuOBPals - ld hl, Palette8fc2 - ld de, UnknOBPals + 7 palettes + ld hl, .PokedexCursorPalette + ld de, UnknOBPals palette 7 ; green cursor palette ld bc, 1 palettes ld a, $5 call FarCopyWRAM @@ -316,13 +318,13 @@ _CGB_Pokedex: ; 8f70 ret ; 8fba -Palette8fba: ; 8fba +.PokedexQuestionMarkPalette: ; 8fba RGB 11, 23, 00 RGB 07, 17, 00 RGB 06, 16, 03 RGB 05, 12, 01 -Palette8fc2: ; 8fc2 +.PokedexCursorPalette: ; 8fc2 RGB 00, 00, 00 RGB 11, 23, 00 RGB 07, 17, 00 @@ -337,7 +339,7 @@ _CGB_BillsPC: ; 8fca ld a, [CurPartySpecies] cp $ff jr nz, .GetMonPalette - ld hl, Palette9036 + ld hl, .BillsPCOrangePalette call LoadHLPaletteIntoDE jr .Resume @@ -359,8 +361,8 @@ _CGB_BillsPC: ; 8fca ret ; 9009 -Function9009: ; 9009 - ld hl, Palette9036 +.Function9009: ; 9009 + ld hl, .BillsPCOrangePalette call LoadHLPaletteIntoDE jr .asm_901a @@ -382,7 +384,7 @@ Function9009: ; 9009 ret ; 9036 -Palette9036: ; 9036 +.BillsPCOrangePalette: ; 9036 RGB 31, 15, 00 RGB 23, 12, 00 RGB 15, 07, 00 @@ -411,9 +413,9 @@ _CGB_PokedexUnownMode: ; 903e ; 906e _CGB_SlotMachine: ; 906e - ld hl, Palettes_b7a9 + ld hl, SlotMachinePals ld de, UnknBGPals - ld bc, $80 + ld bc, 16 palettes ld a, $5 call FarCopyWRAM call WipeAttrMap @@ -485,7 +487,7 @@ _CGB06: ; 90f8 _CGB07: ; 9122 ld b, 0 - ld hl, Jumptable_912d + ld hl, .Jumptable add hl, bc add hl, bc ld a, [hli] @@ -494,17 +496,17 @@ _CGB07: ; 9122 jp hl ; 912d -Jumptable_912d: ; 912d - dw Function9133 - dw Function9166 - dw Function9180 +.Jumptable: ; 912d + dw .Function9133 + dw .Function9166 + dw .Function9180 ; 9133 -Function9133: ; 9133 - ld hl, Palette_914e +.Function9133: ; 9133 + ld hl, .Palette_914e ld de, UnknBGPals call LoadHLPaletteIntoDE - ld hl, Palette_9156 + ld hl, .Palette_9156 ld de, UnknOBPals ld bc, 2 palettes ld a, $5 @@ -513,13 +515,13 @@ Function9133: ; 9133 ret ; 914e -Palette_914e: ; 914e +.Palette_914e: ; 914e RGB 19, 31, 19 RGB 18, 23, 31 RGB 11, 21, 28 RGB 04, 16, 24 -Palette_9156: ; 9156 +.Palette_9156: ; 9156 RGB 29, 29, 29 RGB 20, 19, 20 RGB 19, 06, 04 @@ -531,7 +533,7 @@ Palette_9156: ; 9156 RGB 03, 04, 06 ; 9166 -Function9166: ; 9166 +.Function9166: ; 9166 ld de, UnknBGPals ld a, $38 call GetPredefPal @@ -545,7 +547,7 @@ Function9166: ; 9166 ret ; 9180 -Function9180: ; 9180 +.Function9180: ; 9180 ld hl, PalPacket_9c36 + 1 call CopyFourPalettes ld de, UnknOBPals @@ -620,7 +622,7 @@ _CGB_Evolution: ; 91e4 call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black ld hl, Palettes_979c - ld de, UnknOBPals + 2 palettes + ld de, UnknOBPals palette 2 ld bc, 6 palettes ld a, $5 call FarCopyWRAM @@ -686,82 +688,86 @@ _CGB_UnownPuzzle: ; 925e _CGB_TrainerCard: ; 9289 ld de, UnknBGPals - xor a + xor a ; CHRIS call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $1 + ld a, FALKNER ; KRIS call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $3 + ld a, BUGSY call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $2 + ld a, WHITNEY call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $4 + ld a, MORTY call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $7 + ld a, CHUCK call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $6 + ld a, JASMINE call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black - ld a, $5 + ld a, PRYCE call GetTrainerPalettePointer call LoadPalette_White_Col1_Col2_Black ld a, $24 call GetPredefPal call LoadHLPaletteIntoDE + ; fill screen with opposite-gender palette for the card border hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, [PlayerGender] and a - ld a, $1 + ld a, $1 ; kris jr z, .got_gender - ld a, $0 + ld a, $0 ; chris .got_gender call ByteFill + ; fill trainer sprite area with same-gender palette hlcoord 14, 1, AttrMap lb bc, 7, 5 ld a, [PlayerGender] and a - ld a, $0 + ld a, $0 ; chris jr z, .got_gender2 - ld a, $1 + ld a, $1 ; kris .got_gender2 call FillBoxCGB + ; top-right corner still uses the border's palette hlcoord 18, 1, AttrMap ld [hl], $1 hlcoord 2, 11, AttrMap lb bc, 2, 4 - ld a, $1 + ld a, $1 ; falkner call FillBoxCGB hlcoord 6, 11, AttrMap lb bc, 2, 4 - ld a, $2 + ld a, $2 ; bugsy call FillBoxCGB hlcoord 10, 11, AttrMap lb bc, 2, 4 - ld a, $3 + ld a, $3 ; whitney call FillBoxCGB hlcoord 14, 11, AttrMap lb bc, 2, 4 - ld a, $4 + ld a, $4 ; morty call FillBoxCGB hlcoord 2, 14, AttrMap lb bc, 2, 4 - ld a, $5 + ld a, $5 ; chuck call FillBoxCGB hlcoord 6, 14, AttrMap lb bc, 2, 4 - ld a, $6 + ld a, $6 ; jasmine call FillBoxCGB hlcoord 10, 14, AttrMap lb bc, 2, 4 - ld a, $7 + ld a, $7 ; pryce call FillBoxCGB + ; clair uses kris's palette ld a, [PlayerGender] and a push af @@ -1011,7 +1017,7 @@ _CGB_GamefreakLogo: ; 94fa ld de, UnknOBPals call LoadHLPaletteIntoDE ld hl, .Palette - ld de, UnknOBPals + 1 palettes + ld de, UnknOBPals palette 1 call LoadHLPaletteIntoDE call WipeAttrMap call ApplyAttrMap @@ -1056,7 +1062,7 @@ _CGB_TradeTube: ; 9555 ld bc, 1 palettes ld a, $5 call FarCopyWRAM - ld de, UnknOBPals + 7 palettes + ld de, UnknOBPals palette 7 ld a, $1c call GetPredefPal call LoadHLPaletteIntoDE From a827c02757ce4b214afb0e079ed68242430a671c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 21:00:05 -0500 Subject: [PATCH 09/35] Use MORN/DAY/NITE shifts for time-based person_events --- maps/CeladonGameCorner.asm | 4 ++-- maps/KrissHouse1F.asm | 6 +++--- maps/MountMoonGiftShop.asm | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 2e009e5b7..4bfe984f4 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -341,7 +341,7 @@ CeladonGameCorner_MapEventHeader: person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 4, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 600a0aa35..da8478d56 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -410,7 +410,7 @@ KrissHouse1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, 1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, 4, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << NITE), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 1df1c2279..f36c0836f 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -44,7 +44,7 @@ MountMoonGiftShop_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, 1, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, 1, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, 2, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 From a551e345df45897dd17c7cd5c7423851f8f210ba Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 22:34:42 -0500 Subject: [PATCH 10/35] =?UTF-8?q?PokeCenter=20=E2=86=92=20Pokecenter=20(co?= =?UTF-8?q?nsistent=20with=20the=20POKECENTER=20map=20constants)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/pokecenter_pc.asm | 24 +-- engine/std_scripts.asm | 10 +- main.asm | 6 +- maps.asm | 66 +++--- ...okeCenter1F.asm => AzaleaPokecenter1F.asm} | 34 +-- maps/AzaleaTown.asm | 4 +- ...nHouse.blk => BetaPokecenterMainHouse.blk} | 0 ...ion.blk => BetaPokecenterTradeStation.blk} | 0 maps/BlackthornCity.asm | 4 +- ...enter1F.asm => BlackthornPokecenter1F.asm} | 4 +- maps/CeladonCity.asm | 4 +- ...keCenter1F.asm => CeladonPokecenter1F.asm} | 4 +- ...2FBeta.asm => CeladonPokecenter2FBeta.asm} | 4 +- maps/CeruleanCity.asm | 4 +- ...eCenter1F.asm => CeruleanPokecenter1F.asm} | 4 +- ...FBeta.asm => CeruleanPokecenter2FBeta.asm} | 4 +- maps/CherrygroveCity.asm | 8 +- ...nter1F.asm => CherrygrovePokecenter1F.asm} | 4 +- maps/CianwoodCity.asm | 4 +- ...eCenter1F.asm => CianwoodPokecenter1F.asm} | 4 +- maps/CinnabarIsland.asm | 4 +- ...eCenter1F.asm => CinnabarPokecenter1F.asm} | 4 +- ...FBeta.asm => CinnabarPokecenter2FBeta.asm} | 4 +- maps/Colosseum.asm | 8 +- maps/EcruteakCity.asm | 4 +- ...eCenter1F.asm => EcruteakPokecenter1F.asm} | 56 ++--- maps/FuchsiaCity.asm | 4 +- ...keCenter1F.asm => FuchsiaPokecenter1F.asm} | 4 +- ...2FBeta.asm => FuchsiaPokecenter2FBeta.asm} | 4 +- maps/GoldenrodCity.asm | 4 +- ...Center1F.asm => GoldenrodPokecenter1F.asm} | 12 +- ...er1F.asm => IndigoPlateauPokecenter1F.asm} | 4 +- ...er1F.blk => IndigoPlateauPokecenter1F.blk} | 0 ...eCenter1F.asm => LavenderPokecenter1F.asm} | 4 +- ...FBeta.asm => LavenderPokecenter2FBeta.asm} | 4 +- maps/LavenderTown.asm | 4 +- ...eCenter1F.asm => MahoganyPokecenter1F.asm} | 4 +- maps/MahoganyTown.asm | 4 +- maps/MobileBattleRoom.asm | 4 +- maps/MobileTradeRoomMobile.asm | 4 +- maps/OlivineCity.asm | 4 +- ...keCenter1F.asm => OlivinePokecenter1F.asm} | 4 +- maps/PewterCity.asm | 4 +- ...okeCenter1F.asm => PewterPokecenter1F.asm} | 4 +- ...r2FBeta.asm => PewterPokecenter2FBeta.asm} | 4 +- maps/{PokeCenter1F.blk => Pokecenter1F.blk} | 0 maps/{PokeCenter2F.asm => Pokecenter2F.asm} | 200 +++++++++--------- maps/{PokeCenter2F.blk => Pokecenter2F.blk} | 0 maps/Route10North.asm | 4 +- ...keCenter1F.asm => Route10Pokecenter1F.asm} | 4 +- ...2FBeta.asm => Route10Pokecenter2FBeta.asm} | 4 +- maps/Route32.asm | 4 +- ...keCenter1F.asm => Route32Pokecenter1F.asm} | 4 +- maps/SaffronCity.asm | 4 +- ...keCenter1F.asm => SaffronPokecenter1F.asm} | 4 +- ...2FBeta.asm => SaffronPokecenter2FBeta.asm} | 4 +- maps/SilverCaveOutside.asm | 4 +- ...enter1F.asm => SilverCavePokecenter1F.asm} | 4 +- maps/TimeCapsule.asm | 4 +- maps/TradeCenter.asm | 4 +- maps/VermilionCity.asm | 4 +- ...Center1F.asm => VermilionPokecenter1F.asm} | 4 +- ...Beta.asm => VermilionPokecenter2FBeta.asm} | 4 +- maps/VioletCity.asm | 4 +- ...okeCenter1F.asm => VioletPokecenter1F.asm} | 12 +- maps/ViridianCity.asm | 4 +- ...eCenter1F.asm => ViridianPokecenter1F.asm} | 4 +- ...FBeta.asm => ViridianPokecenter2FBeta.asm} | 4 +- maps/blockdata.asm | 80 +++---- maps/map_headers.asm | 66 +++--- maps/second_map_headers.asm | 66 +++--- text/stdtext.asm | 2 +- 72 files changed, 429 insertions(+), 429 deletions(-) rename maps/{AzaleaPokeCenter1F.asm => AzaleaPokecenter1F.asm} (66%) rename maps/{BetaPokeCenterMainHouse.blk => BetaPokecenterMainHouse.blk} (100%) rename maps/{BetaPokeCenterTradeStation.blk => BetaPokecenterTradeStation.blk} (100%) rename maps/{BlackthornPokeCenter1F.asm => BlackthornPokecenter1F.asm} (95%) rename maps/{CeladonPokeCenter1F.asm => CeladonPokecenter1F.asm} (97%) rename maps/{CeladonPokeCenter2FBeta.asm => CeladonPokecenter2FBeta.asm} (69%) rename maps/{CeruleanPokeCenter1F.asm => CeruleanPokecenter1F.asm} (95%) rename maps/{CeruleanPokeCenter2FBeta.asm => CeruleanPokecenter2FBeta.asm} (68%) rename maps/{CherrygrovePokeCenter1F.asm => CherrygrovePokecenter1F.asm} (95%) rename maps/{CianwoodPokeCenter1F.asm => CianwoodPokecenter1F.asm} (97%) rename maps/{CinnabarPokeCenter1F.asm => CinnabarPokecenter1F.asm} (94%) rename maps/{CinnabarPokeCenter2FBeta.asm => CinnabarPokecenter2FBeta.asm} (68%) rename maps/{EcruteakPokeCenter1F.asm => EcruteakPokecenter1F.asm} (74%) rename maps/{FuchsiaPokeCenter1F.asm => FuchsiaPokecenter1F.asm} (97%) rename maps/{FuchsiaPokeCenter2FBeta.asm => FuchsiaPokecenter2FBeta.asm} (69%) rename maps/{GoldenrodPokeCenter1F.asm => GoldenrodPokecenter1F.asm} (98%) rename maps/{IndigoPlateauPokeCenter1F.asm => IndigoPlateauPokecenter1F.asm} (98%) rename maps/{IndigoPlateauPokeCenter1F.blk => IndigoPlateauPokecenter1F.blk} (100%) rename maps/{LavenderPokeCenter1F.asm => LavenderPokecenter1F.asm} (96%) rename maps/{LavenderPokeCenter2FBeta.asm => LavenderPokecenter2FBeta.asm} (68%) rename maps/{MahoganyPokeCenter1F.asm => MahoganyPokecenter1F.asm} (95%) rename maps/{OlivinePokeCenter1F.asm => OlivinePokecenter1F.asm} (95%) rename maps/{PewterPokeCenter1F.asm => PewterPokecenter1F.asm} (96%) rename maps/{PewterPokeCenter2FBeta.asm => PewterPokecenter2FBeta.asm} (69%) rename maps/{PokeCenter1F.blk => Pokecenter1F.blk} (100%) rename maps/{PokeCenter2F.asm => Pokecenter2F.asm} (75%) rename maps/{PokeCenter2F.blk => Pokecenter2F.blk} (100%) rename maps/{Route10PokeCenter1F.asm => Route10Pokecenter1F.asm} (96%) rename maps/{Route10PokeCenter2FBeta.asm => Route10Pokecenter2FBeta.asm} (69%) rename maps/{Route32PokeCenter1F.asm => Route32Pokecenter1F.asm} (96%) rename maps/{SaffronPokeCenter1F.asm => SaffronPokecenter1F.asm} (97%) rename maps/{SaffronPokeCenter2FBeta.asm => SaffronPokecenter2FBeta.asm} (69%) rename maps/{SilverCavePokeCenter1F.asm => SilverCavePokecenter1F.asm} (92%) rename maps/{VermilionPokeCenter1F.asm => VermilionPokecenter1F.asm} (96%) rename maps/{VermilionPokeCenter2FBeta.asm => VermilionPokecenter2FBeta.asm} (68%) rename maps/{VioletPokeCenter1F.asm => VioletPokecenter1F.asm} (94%) rename maps/{ViridianPokeCenter1F.asm => ViridianPokecenter1F.asm} (96%) rename maps/{ViridianPokeCenter2FBeta.asm => ViridianPokecenter2FBeta.asm} (68%) diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm index f6b970ede..8203ffa19 100755 --- a/engine/pokecenter_pc.asm +++ b/engine/pokecenter_pc.asm @@ -2,9 +2,9 @@ PokemonCenterPC: ; 1559a call PC_CheckPartyForPokemon ret c call PC_PlayBootSound - ld hl, PokeCenterPCText_BootedUpPC + ld hl, PokecenterPCText_BootedUpPC call PC_DisplayText - ld hl, PokeCenterPCText_AccessWhosePC + ld hl, PokecenterPCText_AccessWhosePC call PC_DisplayTextWaitMenu ld hl, .TopMenu call LoadMenuDataHeader @@ -103,7 +103,7 @@ PC_CheckPartyForPokemon: ; 15650 BillsPC: ; 15668 call PC_PlayChoosePCSound - ld hl, PokeCenterPCText_AccessedBillsPC + ld hl, PokecenterPCText_AccessedBillsPC call PC_DisplayText callba _BillsPC and a @@ -112,7 +112,7 @@ BillsPC: ; 15668 PlayersPC: ; 15679 call PC_PlayChoosePCSound - ld hl, PokeCenterPCText_AccessedOwnPC + ld hl, PokecenterPCText_AccessedOwnPC call PC_DisplayText ld b, $0 call _PlayersPC @@ -122,7 +122,7 @@ PlayersPC: ; 15679 OaksPC: ; 15689 call PC_PlayChoosePCSound - ld hl, PokeCenterPCText_AccessedOaksPC + ld hl, PokecenterPCText_AccessedOaksPC call PC_DisplayText callba ProfOaksPC and a @@ -139,7 +139,7 @@ HallOfFamePC: ; 1569a ; 156ab TurnOffPC: ; 156ab - ld hl, PokeCenterPCText_LinkClosed + ld hl, PokecenterPCText_LinkClosed call PrintText scf ret @@ -641,37 +641,37 @@ PC_DisplayText: ; 15a20 ret ; 15a27 -PokeCenterPCText_BootedUpPC: ; 0x15a27 +PokecenterPCText_BootedUpPC: ; 0x15a27 ; turned on the PC. text_jump UnknownText_0x1c144d db "@" ; 0x15a2c -PokeCenterPCText_AccessWhosePC: ; 0x15a2c +PokecenterPCText_AccessWhosePC: ; 0x15a2c ; Access whose PC? text_jump UnknownText_0x1c1462 db "@" ; 0x15a31 -PokeCenterPCText_AccessedBillsPC: ; 0x15a31 +PokecenterPCText_AccessedBillsPC: ; 0x15a31 ; BILL's PC accessed. #MON Storage System opened. text_jump UnknownText_0x1c1474 db "@" ; 0x15a36 -PokeCenterPCText_AccessedOwnPC: ; 0x15a36 +PokecenterPCText_AccessedOwnPC: ; 0x15a36 ; Accessed own PC. Item Storage System opened. text_jump UnknownText_0x1c14a4 db "@" ; 0x15a3b -PokeCenterPCText_AccessedOaksPC: ; 0x15a3b +PokecenterPCText_AccessedOaksPC: ; 0x15a3b ; PROF.OAK's PC accessed. #DEX Rating System opened. text_jump UnknownText_0x1c14d2 db "@" ; 0x15a40 -PokeCenterPCText_LinkClosed: ; 0x15a40 +PokecenterPCText_LinkClosed: ; 0x15a40 ; … Link closed… text_jump UnknownText_0x1c1505 db "@" diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 629f16fc0..020875ff7 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -1,5 +1,5 @@ StdScripts:: - dba PokeCenterNurseScript + dba PokecenterNurseScript dba DifficultBookshelfScript dba PictureBookshelfScript dba MagazineBookshelfScript @@ -15,7 +15,7 @@ StdScripts:: dba TrashCanScript dba StrengthBoulderScript dba SmashRockScript - dba PokeCenterSignScript + dba PokecenterSignScript dba MartSignScript dba GoldenrodRocketsScript dba RadioTowerRocketsScript @@ -52,7 +52,7 @@ StdScripts:: dba GameCornerCoinVendorScript dba HappinessCheckScript -PokeCenterNurseScript: +PokecenterNurseScript: ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set opentext @@ -236,8 +236,8 @@ StrengthBoulderScript: SmashRockScript: farjump AskRockSmashScript -PokeCenterSignScript: - farjumptext PokeCenterSignText +PokecenterSignScript: + farjumptext PokecenterSignText MartSignScript farjumptext MartSignText diff --git a/main.asm b/main.asm index 5ff629015..525fa26b9 100644 --- a/main.asm +++ b/main.asm @@ -3118,17 +3118,17 @@ SetBoxmonOrEggmonCaughtData: ; 4db53 ld a, [MapNumber] ld c, a cp MAP_POKECENTER_2F - jr nz, .NotPokeCenter2F + jr nz, .NotPokecenter2F ld a, b cp GROUP_POKECENTER_2F - jr nz, .NotPokeCenter2F + jr nz, .NotPokecenter2F ld a, [BackupMapGroup] ld b, a ld a, [BackupMapNumber] ld c, a -.NotPokeCenter2F: +.NotPokecenter2F: call GetWorldMapLocation ld b, a ld a, [PlayerGender] diff --git a/maps.asm b/maps.asm index ed36ef4cc..80ded93fc 100644 --- a/maps.asm +++ b/maps.asm @@ -74,7 +74,7 @@ SECTION "Map Scripts 4", ROMX INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse6F.asm" -INCLUDE "maps/GoldenrodPokeCenter1F.asm" +INCLUDE "maps/GoldenrodPokecenter1F.asm" INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" @@ -88,10 +88,10 @@ INCLUDE "maps/VioletMart.asm" INCLUDE "maps/VioletGym.asm" INCLUDE "maps/EarlsPokemonAcademy.asm" INCLUDE "maps/VioletNicknameSpeechHouse.asm" -INCLUDE "maps/VioletPokeCenter1F.asm" +INCLUDE "maps/VioletPokecenter1F.asm" INCLUDE "maps/VioletOnixTradeHouse.asm" INCLUDE "maps/Route32RuinsOfAlphGate.asm" -INCLUDE "maps/Route32PokeCenter1F.asm" +INCLUDE "maps/Route32Pokecenter1F.asm" INCLUDE "maps/Route35GoldenrodGate.asm" INCLUDE "maps/Route35NationalParkGate.asm" INCLUDE "maps/Route36RuinsOfAlphGate.asm" @@ -123,8 +123,8 @@ INCLUDE "maps/CeladonMansion2F.asm" INCLUDE "maps/CeladonMansion3F.asm" INCLUDE "maps/CeladonMansionRoof.asm" INCLUDE "maps/CeladonMansionRoofHouse.asm" -INCLUDE "maps/CeladonPokeCenter1F.asm" -INCLUDE "maps/CeladonPokeCenter2FBeta.asm" +INCLUDE "maps/CeladonPokecenter1F.asm" +INCLUDE "maps/CeladonPokecenter2FBeta.asm" INCLUDE "maps/CeladonGameCorner.asm" INCLUDE "maps/CeladonGameCornerPrizeRoom.asm" INCLUDE "maps/CeladonGym.asm" @@ -189,8 +189,8 @@ INCLUDE "maps/IcePathB1F.asm" INCLUDE "maps/IcePathB2FMahoganySide.asm" INCLUDE "maps/IcePathB2FBlackthornSide.asm" INCLUDE "maps/IcePathB3F.asm" -INCLUDE "maps/LavenderPokeCenter1F.asm" -INCLUDE "maps/LavenderPokeCenter2FBeta.asm" +INCLUDE "maps/LavenderPokecenter1F.asm" +INCLUDE "maps/LavenderPokecenter2FBeta.asm" INCLUDE "maps/MrFujisHouse.asm" INCLUDE "maps/LavenderTownSpeechHouse.asm" INCLUDE "maps/LavenderNameRater.asm" @@ -205,7 +205,7 @@ SECTION "Map Scripts 11", ROMX INCLUDE "maps/EcruteakHouse.asm" INCLUDE "maps/WiseTriosRoom.asm" -INCLUDE "maps/EcruteakPokeCenter1F.asm" +INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" INCLUDE "maps/DanceTheatre.asm" INCLUDE "maps/EcruteakMart.asm" @@ -216,8 +216,8 @@ INCLUDE "maps/ViridianNicknameSpeechHouse.asm" INCLUDE "maps/TrainerHouse1F.asm" INCLUDE "maps/TrainerHouseB1F.asm" INCLUDE "maps/ViridianMart.asm" -INCLUDE "maps/ViridianPokeCenter1F.asm" -INCLUDE "maps/ViridianPokeCenter2FBeta.asm" +INCLUDE "maps/ViridianPokecenter1F.asm" +INCLUDE "maps/ViridianPokecenter2FBeta.asm" INCLUDE "maps/Route2NuggetSpeechHouse.asm" INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" @@ -225,7 +225,7 @@ INCLUDE "maps/VictoryRoadGate.asm" SECTION "Map Scripts 12", ROMX -INCLUDE "maps/OlivinePokeCenter1F.asm" +INCLUDE "maps/OlivinePokecenter1F.asm" INCLUDE "maps/OlivineGym.asm" INCLUDE "maps/OlivineTimsHouse.asm" INCLUDE "maps/OlivineHouseBeta.asm" @@ -238,7 +238,7 @@ INCLUDE "maps/Route39Barn.asm" INCLUDE "maps/Route39Farmhouse.asm" INCLUDE "maps/ManiasHouse.asm" INCLUDE "maps/CianwoodGym.asm" -INCLUDE "maps/CianwoodPokeCenter1F.asm" +INCLUDE "maps/CianwoodPokecenter1F.asm" INCLUDE "maps/CianwoodPharmacy.asm" INCLUDE "maps/CianwoodCityPhotoStudio.asm" INCLUDE "maps/CianwoodLugiaSpeechHouse.asm" @@ -253,7 +253,7 @@ INCLUDE "maps/BattleTowerOutside.asm" SECTION "Map Scripts 13", ROMX -INCLUDE "maps/IndigoPlateauPokeCenter1F.asm" +INCLUDE "maps/IndigoPlateauPokecenter1F.asm" INCLUDE "maps/WillsRoom.asm" INCLUDE "maps/KogasRoom.asm" INCLUDE "maps/BrunosRoom.asm" @@ -286,19 +286,19 @@ SECTION "Map Scripts 15", ROMX INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm" INCLUDE "maps/CeruleanPoliceStation.asm" INCLUDE "maps/CeruleanTradeSpeechHouse.asm" -INCLUDE "maps/CeruleanPokeCenter1F.asm" -INCLUDE "maps/CeruleanPokeCenter2FBeta.asm" +INCLUDE "maps/CeruleanPokecenter1F.asm" +INCLUDE "maps/CeruleanPokecenter2FBeta.asm" INCLUDE "maps/CeruleanGym.asm" INCLUDE "maps/CeruleanMart.asm" -INCLUDE "maps/Route10PokeCenter1F.asm" -INCLUDE "maps/Route10PokeCenter2FBeta.asm" +INCLUDE "maps/Route10Pokecenter1F.asm" +INCLUDE "maps/Route10Pokecenter2FBeta.asm" INCLUDE "maps/PowerPlant.asm" INCLUDE "maps/BillsHouse.asm" INCLUDE "maps/FightingDojo.asm" INCLUDE "maps/SaffronGym.asm" INCLUDE "maps/SaffronMart.asm" -INCLUDE "maps/SaffronPokeCenter1F.asm" -INCLUDE "maps/SaffronPokeCenter2FBeta.asm" +INCLUDE "maps/SaffronPokecenter1F.asm" +INCLUDE "maps/SaffronPokecenter2FBeta.asm" INCLUDE "maps/MrPsychicsHouse.asm" INCLUDE "maps/SaffronTrainStation.asm" INCLUDE "maps/SilphCo1F.asm" @@ -330,7 +330,7 @@ INCLUDE "maps/DragonsDen1F.asm" INCLUDE "maps/DragonsDenB1F.asm" INCLUDE "maps/DragonShrine.asm" INCLUDE "maps/TohjoFalls.asm" -INCLUDE "maps/AzaleaPokeCenter1F.asm" +INCLUDE "maps/AzaleaPokecenter1F.asm" INCLUDE "maps/CharcoalKiln.asm" INCLUDE "maps/AzaleaMart.asm" INCLUDE "maps/KurtsHouse.asm" @@ -342,8 +342,8 @@ SECTION "Map Scripts 17", ROMX INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/Route32.asm" INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" -INCLUDE "maps/VermilionPokeCenter1F.asm" -INCLUDE "maps/VermilionPokeCenter2FBeta.asm" +INCLUDE "maps/VermilionPokecenter1F.asm" +INCLUDE "maps/VermilionPokecenter2FBeta.asm" INCLUDE "maps/PokemonFanClub.asm" INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" INCLUDE "maps/VermilionMart.asm" @@ -351,7 +351,7 @@ INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6UndergroundEntrance.asm" -INCLUDE "maps/PokeCenter2F.asm" +INCLUDE "maps/Pokecenter2F.asm" INCLUDE "maps/TradeCenter.asm" INCLUDE "maps/Colosseum.asm" INCLUDE "maps/TimeCapsule.asm" @@ -368,18 +368,18 @@ INCLUDE "maps/BlackthornGym2F.asm" INCLUDE "maps/BlackthornDragonSpeechHouse.asm" INCLUDE "maps/BlackthornEmysHouse.asm" INCLUDE "maps/BlackthornMart.asm" -INCLUDE "maps/BlackthornPokeCenter1F.asm" +INCLUDE "maps/BlackthornPokecenter1F.asm" INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" INCLUDE "maps/FuchsiaBillSpeechHouse.asm" -INCLUDE "maps/FuchsiaPokeCenter1F.asm" -INCLUDE "maps/FuchsiaPokeCenter2FBeta.asm" +INCLUDE "maps/FuchsiaPokecenter1F.asm" +INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" INCLUDE "maps/Route15FuchsiaGate.asm" INCLUDE "maps/CherrygroveMart.asm" -INCLUDE "maps/CherrygrovePokeCenter1F.asm" +INCLUDE "maps/CherrygrovePokecenter1F.asm" INCLUDE "maps/CherrygroveGymSpeechHouse.asm" INCLUDE "maps/GuideGentsHouse.asm" INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" @@ -395,7 +395,7 @@ INCLUDE "maps/GoldenrodCity.asm" INCLUDE "maps/SaffronCity.asm" INCLUDE "maps/MahoganyRedGyaradosSpeechHouse.asm" INCLUDE "maps/MahoganyGym.asm" -INCLUDE "maps/MahoganyPokeCenter1F.asm" +INCLUDE "maps/MahoganyPokecenter1F.asm" INCLUDE "maps/Route42EcruteakGate.asm" INCLUDE "maps/LakeOfRageHiddenPowerHouse.asm" INCLUDE "maps/LakeOfRageMagikarpHouse.asm" @@ -429,8 +429,8 @@ INCLUDE "maps/Route13.asm" INCLUDE "maps/PewterNidoranSpeechHouse.asm" INCLUDE "maps/PewterGym.asm" INCLUDE "maps/PewterMart.asm" -INCLUDE "maps/PewterPokeCenter1F.asm" -INCLUDE "maps/PewterPokeCenter2FBeta.asm" +INCLUDE "maps/PewterPokecenter1F.asm" +INCLUDE "maps/PewterPokecenter2FBeta.asm" INCLUDE "maps/PewterSnoozeSpeechHouse.asm" @@ -460,8 +460,8 @@ INCLUDE "maps/CeladonCity.asm" INCLUDE "maps/Route15.asm" INCLUDE "maps/VermilionCity.asm" INCLUDE "maps/Route9.asm" -INCLUDE "maps/CinnabarPokeCenter1F.asm" -INCLUDE "maps/CinnabarPokeCenter2FBeta.asm" +INCLUDE "maps/CinnabarPokecenter1F.asm" +INCLUDE "maps/CinnabarPokecenter2FBeta.asm" INCLUDE "maps/Route19FuchsiaGate.asm" INCLUDE "maps/SeafoamGym.asm" @@ -488,7 +488,7 @@ INCLUDE "maps/Route3.asm" INCLUDE "maps/Route4.asm" INCLUDE "maps/Route10South.asm" INCLUDE "maps/Route23.asm" -INCLUDE "maps/SilverCavePokeCenter1F.asm" +INCLUDE "maps/SilverCavePokecenter1F.asm" INCLUDE "maps/Route28FamousSpeechHouse.asm" diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokecenter1F.asm similarity index 66% rename from maps/AzaleaPokeCenter1F.asm rename to maps/AzaleaPokecenter1F.asm index 3a8a0310c..bc09c2e09 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const AZALEAPOKECENTER1F_FISHING_GURU const AZALEAPOKECENTER1F_POKEFAN_F -AzaleaPokeCenter1F_MapScriptHeader: +AzaleaPokecenter1F_MapScriptHeader: .MapTriggers: db 1 maptrigger .DummyTrigger @@ -15,19 +15,19 @@ AzaleaPokeCenter1F_MapScriptHeader: .DummyTrigger: end -AzaleaPokeCenter1FNurseScript: +AzaleaPokecenter1FNurseScript: jumpstd pokecenternurse -AzaleaPokeCenter1FGentlemanScript: - jumptextfaceplayer AzaleaPokeCenter1FGentlemanText +AzaleaPokecenter1FGentlemanScript: + jumptextfaceplayer AzaleaPokecenter1FGentlemanText -AzaleaPokeCenter1FFishingGuruScript: - jumptextfaceplayer AzaleaPokeCenter1FFishingGuruText +AzaleaPokecenter1FFishingGuruScript: + jumptextfaceplayer AzaleaPokecenter1FFishingGuruText -AzaleaPokeCenter1FPokefanFScript: - jumptextfaceplayer AzaleaPokeCenter1FPokefanFText +AzaleaPokecenter1FPokefanFScript: + jumptextfaceplayer AzaleaPokecenter1FPokefanFText -AzaleaPokeCenter1FGentlemanText: +AzaleaPokecenter1FGentlemanText: text "Do your #MON" line "know HM moves?" @@ -38,7 +38,7 @@ AzaleaPokeCenter1FGentlemanText: line "fainted." done -AzaleaPokeCenter1FUnusedText: +AzaleaPokecenter1FUnusedText: text "This BILL guy" line "created the system" @@ -50,13 +50,13 @@ AzaleaPokeCenter1FUnusedText: cont "#MON per BOX." done -AzaleaPokeCenter1FFishingGuruText: +AzaleaPokecenter1FFishingGuruText: text "BILL's PC can" line "store up to 20" cont "#MON per BOX." done -AzaleaPokeCenter1FPokefanFText: +AzaleaPokecenter1FPokefanFText: text "Do you know about" line "APRICORNS?" @@ -76,7 +76,7 @@ AzaleaPokeCenter1FPokefanFText: line "APRICORNS." done -AzaleaPokeCenter1F_MapEventHeader: +AzaleaPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -94,7 +94,7 @@ AzaleaPokeCenter1F_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FNurseScript, -1 - person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FGentlemanScript, -1 - person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FFishingGuruScript, -1 - person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokeCenter1FPokefanFScript, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1 + person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1 + person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1 + person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index e592d0715..db1f5e0d1 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -201,7 +201,7 @@ CharcoalKilnSign: AzaleaTownIlextForestSign: jumptext AzaleaTownIlexForestSignText -AzaleaTownPokeCenterSign: +AzaleaTownPokecenterSign: jumpstd pokecentersign AzaleaTownMartSign: @@ -483,7 +483,7 @@ AzaleaTown_MapEventHeader: signpost 15, 14, SIGNPOST_READ, AzaleaGymSign signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign - signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign + signpost 9, 16, SIGNPOST_READ, AzaleaTownPokecenterSign signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal diff --git a/maps/BetaPokeCenterMainHouse.blk b/maps/BetaPokecenterMainHouse.blk similarity index 100% rename from maps/BetaPokeCenterMainHouse.blk rename to maps/BetaPokecenterMainHouse.blk diff --git a/maps/BetaPokeCenterTradeStation.blk b/maps/BetaPokecenterTradeStation.blk similarity index 100% rename from maps/BetaPokeCenterTradeStation.blk rename to maps/BetaPokecenterTradeStation.blk diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 465f1597e..c2b23c591 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -138,7 +138,7 @@ DragonDensSign: BlackthornCityTrainerTips: jumptext BlackthornCityTrainerTipsText -BlackthornCityPokeCenterSign: +BlackthornCityPokecenterSign: jumpstd pokecentersign BlackthornCityMartSign: @@ -338,7 +338,7 @@ BlackthornCity_MapEventHeader: signpost 3, 21, SIGNPOST_READ, DragonDensSign signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign - signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign + signpost 29, 22, SIGNPOST_READ, BlackthornCityPokecenterSign .PersonEvents: db 9 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokecenter1F.asm similarity index 95% rename from maps/BlackthornPokeCenter1F.asm rename to maps/BlackthornPokecenter1F.asm index 3f5cbf3cb..6da357319 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const BLACKTHORNPOKECENTER1F_TWIN const BLACKTHORNPOKECENTER1F_COOLTRAINER_M -BlackthornPokeCenter1F_MapScriptHeader: +BlackthornPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -49,7 +49,7 @@ UnknownText_0x195bfd: cont "forget an HM move." done -BlackthornPokeCenter1F_MapEventHeader: +BlackthornPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 7b560e05a..a46e01da5 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -71,7 +71,7 @@ CeladonCityGameCornerSign: CeladonCityTrainerTips: jumptext CeladonCityTrainerTipsText -CeladonCityPokeCenterSign: +CeladonCityPokecenterSign: jumpstd pokecentersign CeladonCityHiddenPpUp: @@ -261,7 +261,7 @@ CeladonCity_MapEventHeader: signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips - signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign + signpost 9, 30, SIGNPOST_READ, CeladonCityPokecenterSign signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp .PersonEvents: diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokecenter1F.asm similarity index 97% rename from maps/CeladonPokeCenter1F.asm rename to maps/CeladonPokecenter1F.asm index 653094a51..03912f623 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const CELADONPOKECENTER1F_COOLTRAINER_F const CELADONPOKECENTER1F_EUSINE -CeladonPokeCenter1F_MapScriptHeader: +CeladonPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -145,7 +145,7 @@ NoBeastsText: line "you, !" done -CeladonPokeCenter1F_MapEventHeader: +CeladonPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm similarity index 69% rename from maps/CeladonPokeCenter2FBeta.asm rename to maps/CeladonPokecenter2FBeta.asm index 9c8d25332..70b3cfbd6 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CeladonPokeCenter2FBeta_MapScriptHeader: +CeladonPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -CeladonPokeCenter2FBeta_MapEventHeader: +CeladonPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 7ef51c16e..9c781cb43 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -140,7 +140,7 @@ CeruleanCapeSign: CeruleanLockedDoor: jumptext CeruleanLockedDoorText -CeruleanCityPokeCenterSign: +CeruleanCityPokecenterSign: jumpstd pokecentersign CeruleanCityMartSign: @@ -299,7 +299,7 @@ CeruleanCity_MapEventHeader: signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor - signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign + signpost 21, 20, SIGNPOST_READ, CeruleanCityPokecenterSign signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokecenter1F.asm similarity index 95% rename from maps/CeruleanPokeCenter1F.asm rename to maps/CeruleanPokecenter1F.asm index 50cc90001..7933c6386 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY -CeruleanPokeCenter1F_MapScriptHeader: +CeruleanPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -62,7 +62,7 @@ UnknownText_0x1882ff: line "JOHTO accessible." done -CeruleanPokeCenter1F_MapEventHeader: +CeruleanPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm similarity index 68% rename from maps/CeruleanPokeCenter2FBeta.asm rename to maps/CeruleanPokecenter2FBeta.asm index 4479a484f..96c924b71 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CeruleanPokeCenter2FBeta_MapScriptHeader: +CeruleanPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -CeruleanPokeCenter2FBeta_MapEventHeader: +CeruleanPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 61418fc82..ef13130bc 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -40,7 +40,7 @@ CherrygroveCityGuideGent: follow CHERRYGROVECITY_GRAMPS, PLAYER applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement1 opentext - writetext GuideGentPokeCenterText + writetext GuideGentPokecenterText waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2 @@ -231,7 +231,7 @@ CherrygroveCitySign: GuideGentsHouseSign: jumptext GuideGentsHouseSignText -CherrygroveCityPokeCenterSign: +CherrygroveCityPokecenterSign: jumpstd pokecentersign CherrygroveCityMartSign: @@ -354,7 +354,7 @@ GuideGentTourText1: line "Follow me!" done -GuideGentPokeCenterText: +GuideGentPokecenterText: text "This is a #MON" line "CENTER. They heal" @@ -568,7 +568,7 @@ CherrygroveCity_MapEventHeader: signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign - signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign + signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokecenterSign .PersonEvents: db 5 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokecenter1F.asm similarity index 95% rename from maps/CherrygrovePokeCenter1F.asm rename to maps/CherrygrovePokecenter1F.asm index 0e8ffe952..e3c9893fa 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CHERRYGROVEPOKECENTER1F_GENTLEMAN const CHERRYGROVEPOKECENTER1F_TEACHER -CherrygrovePokeCenter1F_MapScriptHeader: +CherrygrovePokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -68,7 +68,7 @@ UnknownText_0x196a46: line "there already!" done -CherrygrovePokeCenter1F_MapEventHeader: +CherrygrovePokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 63c83d83d..f86e9dcca 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -138,7 +138,7 @@ CianwoodPhotoStudioSign: CianwoodPokeSeerSign: jumptext CianwoodPokeSeerSignText -CianwoodPokeCenterSign: +CianwoodPokecenterSign: jumpstd pokecentersign CianwoodCityRock: @@ -402,7 +402,7 @@ CianwoodCity_MapEventHeader: db 8 signpost 34, 20, SIGNPOST_READ, CianwoodCitySign signpost 45, 7, SIGNPOST_READ, CianwoodGymSign - signpost 43, 24, SIGNPOST_READ, CianwoodPokeCenterSign + signpost 43, 24, SIGNPOST_READ, CianwoodPokecenterSign signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokecenter1F.asm similarity index 97% rename from maps/CianwoodPokeCenter1F.asm rename to maps/CianwoodPokecenter1F.asm index e1d89bca6..4671836b7 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const CIANWOODPOKECENTER1F_GYM_GUY const CIANWOODPOKECENTER1F_SUPER_NERD -CianwoodPokeCenter1F_MapScriptHeader: +CianwoodPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -131,7 +131,7 @@ UnknownText_0x9ded7: line "off my #MON!" done -CianwoodPokeCenter1F_MapEventHeader: +CianwoodPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 6dfa77e3a..c4a742826 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -31,7 +31,7 @@ CinnabarIslandGymSign: CinnabarIslandSign: jumptext CinnabarIslandSignText -CinnabarIslandPokeCenterSign: +CinnabarIslandPokecenterSign: jumpstd pokecentersign CinnabarIslandHiddenRareCandy: @@ -140,7 +140,7 @@ CinnabarIsland_MapEventHeader: .Signposts: db 4 - signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign + signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokecenterSign signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokecenter1F.asm similarity index 94% rename from maps/CinnabarPokeCenter1F.asm rename to maps/CinnabarPokecenter1F.asm index 434969870..97f240011 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER -CinnabarPokeCenter1F_MapScriptHeader: +CinnabarPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -34,7 +34,7 @@ UnknownText_0x1ab37f: cont "erupted." done -CinnabarPokeCenter1F_MapEventHeader: +CinnabarPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm similarity index 68% rename from maps/CinnabarPokeCenter2FBeta.asm rename to maps/CinnabarPokecenter2FBeta.asm index fb9d96b7a..1a0c4c695 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -CinnabarPokeCenter2FBeta_MapScriptHeader: +CinnabarPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -CinnabarPokeCenter2FBeta_MapEventHeader: +CinnabarPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 14766393c..abc3a63e7 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -12,10 +12,10 @@ Colosseum_MapScriptHeader: .MapCallbacks: db 2 dbw MAPCALLBACK_OBJECTS, .SetWhichChris - dbw MAPCALLBACK_NEWMAP, .PreparePokeCenter2F + dbw MAPCALLBACK_NEWMAP, .PreparePokecenter2F .InitializeColosseum: - priorityjump .InitializeAndPreparePokeCenter2F + priorityjump .InitializeAndPreparePokecenter2F end .DummyTrigger1: @@ -36,11 +36,11 @@ Colosseum_MapScriptHeader: appear COLOSSEUM_CHRIS2 return -.PreparePokeCenter2F: +.PreparePokecenter2F: domaptrigger POKECENTER_2F, $2 return -.InitializeAndPreparePokeCenter2F: +.InitializeAndPreparePokecenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $2 end diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index bbe5ae1ce..9e2c8fa08 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -81,7 +81,7 @@ EcruteakDanceTheaterSign: BurnedTowerSign: jumptext BurnedTowerSignText -EcruteakCityPokeCenterSign: +EcruteakCityPokecenterSign: jumpstd pokecentersign EcruteakCityMartSign: @@ -291,7 +291,7 @@ EcruteakCity_MapEventHeader: signpost 28, 8, SIGNPOST_READ, EcruteakGymSign signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign signpost 10, 2, SIGNPOST_READ, BurnedTowerSign - signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign + signpost 27, 24, SIGNPOST_READ, EcruteakCityPokecenterSign signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokecenter1F.asm similarity index 74% rename from maps/EcruteakPokeCenter1F.asm rename to maps/EcruteakPokecenter1F.asm index b47eda902..704b378bd 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const ECRUTEAKPOKECENTER1F_GYM_GUY const ECRUTEAKPOKECENTER1F_BILL -EcruteakPokeCenter1F_MapScriptHeader: +EcruteakPokecenter1F_MapScriptHeader: .MapTriggers: db 2 maptrigger .MeetBill @@ -26,8 +26,8 @@ EcruteakPokeCenter1F_MapScriptHeader: playsound SFX_EXIT_BUILDING appear ECRUTEAKPOKECENTER1F_BILL waitsfx - applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokeCenter1FBillMovement1 - applymovement PLAYER, EcruteakPokeCenter1FPlayerMovement1 + applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1 + applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1 spriteface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN @@ -39,16 +39,16 @@ EcruteakPokeCenter1F_MapScriptHeader: spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN pause 10 opentext - writetext EcruteakPokeCenter1F_BillText1 + writetext EcruteakPokecenter1F_BillText1 buttonsound jump .PointlessJump .PointlessJump: - writetext EcruteakPokeCenter1F_BillText2 + writetext EcruteakPokecenter1F_BillText2 waitbutton closetext spriteface PLAYER, DOWN - applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokeCenter1FBillMovement2 + applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2 playsound SFX_EXIT_BUILDING disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL @@ -57,24 +57,24 @@ EcruteakPokeCenter1F_MapScriptHeader: waitsfx end -EcruteakPokeCenter1FNurseScript: +EcruteakPokecenter1FNurseScript: jumpstd pokecenternurse -EcruteakPokeCenter1FPokefanMScript: +EcruteakPokecenter1FPokefanMScript: special Mobile_DummyReturnFalse iftrue .mobile - jumptextfaceplayer EcruteakPokeCenter1FPokefanMText + jumptextfaceplayer EcruteakPokecenter1FPokefanMText .mobile - jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile + jumptextfaceplayer EcruteakPokecenter1FPokefanMTextMobile -EcruteakPokeCenter1FCooltrainerFScript: - jumptextfaceplayer EcruteakPokeCenter1FCooltrainerFText +EcruteakPokecenter1FCooltrainerFScript: + jumptextfaceplayer EcruteakPokecenter1FCooltrainerFText -EcruteakPokeCenter1FGymGuyScript: - jumptextfaceplayer EcruteakPokeCenter1FGymGuyText +EcruteakPokecenter1FGymGuyScript: + jumptextfaceplayer EcruteakPokecenter1FGymGuyText -EcruteakPokeCenter1FBillMovement1: +EcruteakPokecenter1FBillMovement1: step UP step UP step UP @@ -85,7 +85,7 @@ EcruteakPokeCenter1FBillMovement1: turn_head UP step_end -EcruteakPokeCenter1FBillMovement2: +EcruteakPokecenter1FBillMovement2: step RIGHT step DOWN step DOWN @@ -93,13 +93,13 @@ EcruteakPokeCenter1FBillMovement2: step DOWN step_end -EcruteakPokeCenter1FPlayerMovement1: +EcruteakPokecenter1FPlayerMovement1: step UP step UP step UP step_end -EcruteakPokeCenter1F_BillText1: +EcruteakPokecenter1F_BillText1: text "Hi, I'm BILL. And" line "who are you?" @@ -108,7 +108,7 @@ EcruteakPokeCenter1F_BillText1: cont "right time." done -EcruteakPokeCenter1F_BillText2: +EcruteakPokecenter1F_BillText2: text "I just finished" line "adjustments on my" cont "TIME CAPSULE." @@ -162,7 +162,7 @@ EcruteakPokeCenter1F_BillText2: para "Buh-bye!" done -EcruteakPokeCenter1FPokefanMText: +EcruteakPokecenter1FPokefanMText: text "The way the KIMONO" line "GIRLS dance is" @@ -171,7 +171,7 @@ EcruteakPokeCenter1FPokefanMText: cont "use their #MON." done -EcruteakPokeCenter1FPokefanMTextMobile: +EcruteakPokecenter1FPokefanMTextMobile: text "You must be hoping" line "to battle more" @@ -187,7 +187,7 @@ EcruteakPokeCenter1FPokefanMTextMobile: line "OLIVINE CITY." done -EcruteakPokeCenter1FCooltrainerFText: +EcruteakPokecenter1FCooltrainerFText: text "MORTY, the GYM" line "LEADER, is soooo" cont "cool." @@ -196,7 +196,7 @@ EcruteakPokeCenter1FCooltrainerFText: line "really tough too." done -EcruteakPokeCenter1FGymGuyText: +EcruteakPokecenter1FGymGuyText: text "LAKE OF RAGE…" para "The appearance of" @@ -206,7 +206,7 @@ EcruteakPokeCenter1FGymGuyText: line "acy. I know it!" done -EcruteakPokeCenter1F_MapEventHeader: +EcruteakPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -224,8 +224,8 @@ EcruteakPokeCenter1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FNurseScript, -1 - person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FPokefanMScript, -1 - person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FCooltrainerFScript, -1 - person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokeCenter1FGymGuyScript, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1 + person_event SPRITE_POKEFAN_M, 6, 7, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1 + person_event SPRITE_COOLTRAINER_F, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1 + person_event SPRITE_GYM_GUY, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1 person_event SPRITE_BILL, 7, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 2ebbf37aa..f13245e68 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -43,7 +43,7 @@ SafariZoneClosedSign: NoLitteringSign: jumptext NoLitteringSignText -FuchsiaCityPokeCenterSign: +FuchsiaCityPokecenterSign: jumpstd pokecentersign FuchsiaCityMartSign: @@ -153,7 +153,7 @@ FuchsiaCity_MapEventHeader: signpost 29, 27, SIGNPOST_READ, WardensHomeSign signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign signpost 15, 13, SIGNPOST_READ, NoLitteringSign - signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign + signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokecenterSign signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign .PersonEvents: diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokecenter1F.asm similarity index 97% rename from maps/FuchsiaPokeCenter1F.asm rename to maps/FuchsiaPokecenter1F.asm index dc31d472a..422661e0b 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR -FuchsiaPokeCenter1F_MapScriptHeader: +FuchsiaPokecenter1F_MapScriptHeader: .MapTriggers: db 1 maptrigger .DummyTrigger @@ -88,7 +88,7 @@ UnknownText_0x19654e: line "like her now!" done -FuchsiaPokeCenter1F_MapEventHeader: +FuchsiaPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm similarity index 69% rename from maps/FuchsiaPokeCenter2FBeta.asm rename to maps/FuchsiaPokecenter2FBeta.asm index 7ba5508a9..a8deeae42 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -FuchsiaPokeCenter2FBeta_MapScriptHeader: +FuchsiaPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -FuchsiaPokeCenter2FBeta_MapEventHeader: +FuchsiaPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 362d2c37d..48959cac8 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -266,7 +266,7 @@ GoldenrodCityUndergroundSignNorth: GoldenrodCityUndergroundSignSouth: jumptext GoldenrodCityUndergroundSignSouthText -GoldenrodCityPokeCenterSign: +GoldenrodCityPokecenterSign: jumpstd pokecentersign GoldenrodCityFlowerShopSign: @@ -591,7 +591,7 @@ GoldenrodCity_MapEventHeader: signpost 7, 12, SIGNPOST_READ, GoldenrodCityNameRaterSign signpost 6, 8, SIGNPOST_READ, GoldenrodCityUndergroundSignNorth signpost 30, 12, SIGNPOST_READ, GoldenrodCityUndergroundSignSouth - signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokeCenterSign + signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokecenterSign signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign .PersonEvents: diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokecenter1F.asm similarity index 98% rename from maps/GoldenrodPokeCenter1F.asm rename to maps/GoldenrodPokecenter1F.asm index 5bfe40fea..2189b4d7e 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const GOLDENRODPOKECENTER1F_LASS const GOLDENRODPOKECENTER1F_POKEFAN_F -GoldenrodPokeCenter1F_MapScriptHeader: +GoldenrodPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -15,7 +15,7 @@ GoldenrodPokeCenter1F_MapScriptHeader: NurseScript_0x60f91: jumpstd pokecenternurse -GoldenrodPokeCenter1F_GSBallTriggerLeft: +GoldenrodPokecenter1F_GSBallTriggerLeft: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball @@ -47,7 +47,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: .cancel end -GoldenrodPokeCenter1F_GSBallTriggerRight: +GoldenrodPokecenter1F_GSBallTriggerRight: writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball @@ -804,7 +804,7 @@ UnknownText_0x62549: line "the EON MAIL." done -GoldenrodPokeCenter1F_MapEventHeader: +GoldenrodPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -817,8 +817,8 @@ GoldenrodPokeCenter1F_MapEventHeader: .XYTriggers: db 2 - xy_trigger 0, $7, $3, $0, GoldenrodPokeCenter1F_GSBallTriggerLeft, $0, $0 - xy_trigger 0, $7, $4, $0, GoldenrodPokeCenter1F_GSBallTriggerRight, $0, $0 + xy_trigger 0, $7, $3, $0, GoldenrodPokecenter1F_GSBallTriggerLeft, $0, $0 + xy_trigger 0, $7, $4, $0, GoldenrodPokecenter1F_GSBallTriggerRight, $0, $0 .Signposts: db 0 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm similarity index 98% rename from maps/IndigoPlateauPokeCenter1F.asm rename to maps/IndigoPlateauPokecenter1F.asm index ddb073880..5721e6bfc 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -6,7 +6,7 @@ const_value set 2 const INDIGOPLATEAUPOKECENTER1F_GRAMPS const INDIGOPLATEAUPOKECENTER1F_ABRA -IndigoPlateauPokeCenter1F_MapScriptHeader: +IndigoPlateauPokecenter1F_MapScriptHeader: .MapTriggers: db 1 maptrigger .DummyTrigger @@ -302,7 +302,7 @@ AbraText: text "ABRA: Aabra…" done -IndigoPlateauPokeCenter1F_MapEventHeader: +IndigoPlateauPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/IndigoPlateauPokeCenter1F.blk b/maps/IndigoPlateauPokecenter1F.blk similarity index 100% rename from maps/IndigoPlateauPokeCenter1F.blk rename to maps/IndigoPlateauPokecenter1F.blk diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokecenter1F.asm similarity index 96% rename from maps/LavenderPokeCenter1F.asm rename to maps/LavenderPokecenter1F.asm index d93e3f9ed..c961364d5 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const LAVENDERPOKECENTER1F_TEACHER const LAVENDERPOKECENTER1F_YOUNGSTER -LavenderPokeCenter1F_MapScriptHeader: +LavenderPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -80,7 +80,7 @@ UnknownText_0x7e7ed: cont "smoothly again." done -LavenderPokeCenter1F_MapEventHeader: +LavenderPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm similarity index 68% rename from maps/LavenderPokeCenter2FBeta.asm rename to maps/LavenderPokecenter2FBeta.asm index 9d31d8d4e..3958e0657 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -LavenderPokeCenter2FBeta_MapScriptHeader: +LavenderPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -LavenderPokeCenter2FBeta_MapEventHeader: +LavenderPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index e98be87b5..65bb780f2 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -40,7 +40,7 @@ VolunteerPokemonHouseSign: SoulHouseSign: jumptext SoulHouseSignText -LavenderPokeCenterSignText: +LavenderPokecenterSignText: jumpstd pokecentersign LavenderMartSignText: @@ -128,7 +128,7 @@ LavenderTown_MapEventHeader: signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign signpost 9, 3, SIGNPOST_READ, VolunteerPokemonHouseSign signpost 13, 15, SIGNPOST_READ, SoulHouseSign - signpost 5, 6, SIGNPOST_READ, LavenderPokeCenterSignText + signpost 5, 6, SIGNPOST_READ, LavenderPokecenterSignText signpost 5, 2, SIGNPOST_READ, LavenderMartSignText .PersonEvents: diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokecenter1F.asm similarity index 95% rename from maps/MahoganyPokeCenter1F.asm rename to maps/MahoganyPokecenter1F.asm index be0d896b4..73c978836 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const MAHOGANYPOKECENTER1F_YOUNGSTER const MAHOGANYPOKECENTER1F_COOLTRAINER_F -MahoganyPokeCenter1F_MapScriptHeader: +MahoganyPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -53,7 +53,7 @@ UnknownText_0x19a418: cont "more slowly." done -MahoganyPokeCenter1F_MapEventHeader: +MahoganyPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 79232b02e..1ac3c1a4b 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -118,7 +118,7 @@ MahoganyTownRagecandybarSign: MahoganyGymSign: jumptext MahoganyGymSignText -MahoganyTownPokeCenterSign: +MahoganyTownPokecenterSign: jumpstd pokecentersign MovementData_0x1900a4: @@ -266,7 +266,7 @@ MahoganyTown_MapEventHeader: signpost 5, 1, SIGNPOST_READ, MahoganyTownSign signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign signpost 13, 3, SIGNPOST_READ, MahoganyGymSign - signpost 13, 16, SIGNPOST_READ, MahoganyTownPokeCenterSign + signpost 13, 16, SIGNPOST_READ, MahoganyTownPokecenterSign .PersonEvents: db 4 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 7a10a7299..aeb0cebad 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -8,13 +8,13 @@ MobileBattleRoom_MapScriptHeader: db 0 .InitializeMobileBattleRoom: - priorityjump .InitializeAndPreparePokeCenter2F + priorityjump .InitializeAndPreparePokecenter2F end .DummyTrigger: end -.InitializeAndPreparePokeCenter2F: +.InitializeAndPreparePokecenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $5 end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 3e1753832..69f762254 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -8,13 +8,13 @@ MobileTradeRoomMobile_MapScriptHeader: db 0 .InitializeMobileTradeRoomMobile: - priorityjump .InitializeAndPreparePokeCenter2F + priorityjump .InitializeAndPreparePokecenter2F end .DummyTrigger: end -.InitializeAndPreparePokeCenter2F: +.InitializeAndPreparePokecenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $4 end diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index eff8b7ea3..605bd0da2 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -109,7 +109,7 @@ OlivineLighthouseSign: OlivineCityBattleTowerSign: jumptext OlivineCityBattleTowerSignText -OlivineCityPokeCenterSign: +OlivineCityPokecenterSign: jumpstd pokecentersign OlivineCityMartSign: @@ -317,7 +317,7 @@ OlivineCity_MapEventHeader: signpost 11, 7, SIGNPOST_READ, OlivineGymSign signpost 28, 30, SIGNPOST_READ, OlivineLighthouseSign signpost 23, 3, SIGNPOST_READ, OlivineCityBattleTowerSign - signpost 21, 14, SIGNPOST_READ, OlivineCityPokeCenterSign + signpost 21, 14, SIGNPOST_READ, OlivineCityPokecenterSign signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign .PersonEvents: diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokecenter1F.asm similarity index 95% rename from maps/OlivinePokeCenter1F.asm rename to maps/OlivinePokecenter1F.asm index db4ab7be4..f331c95db 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const OLIVINEPOKECENTER1F_FISHER const OLIVINEPOKECENTER1F_TEACHER -OlivinePokeCenter1F_MapScriptHeader: +OlivinePokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -47,7 +47,7 @@ UnknownText_0x9c086: cont "rare #MON." done -OlivinePokeCenter1F_MapEventHeader: +OlivinePokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index a05154912..9194cc4ec 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -56,7 +56,7 @@ PewterCityMtMoonGiftShopSign: PewterCityWelcomeSign: jumptext PewterCityWelcomeSignText -PewterCityPokeCenterSign: +PewterCityPokecenterSign: jumpstd pokecentersign PewterCityMartSign: @@ -174,7 +174,7 @@ PewterCity_MapEventHeader: signpost 9, 15, SIGNPOST_READ, PewterMuseumSign signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign - signpost 25, 14, SIGNPOST_READ, PewterCityPokeCenterSign + signpost 25, 14, SIGNPOST_READ, PewterCityPokecenterSign signpost 17, 24, SIGNPOST_READ, PewterCityMartSign .PersonEvents: diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokecenter1F.asm similarity index 96% rename from maps/PewterPokeCenter1F.asm rename to maps/PewterPokecenter1F.asm index a1aa61ae7..b0ef93e16 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -5,7 +5,7 @@ const_value set 2 const PEWTERPOKECENTER1F_BUG_CATCHER const PEWTERPOKECENTER1F_CHRIS -PewterPokeCenter1F_MapScriptHeader: +PewterPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -67,7 +67,7 @@ UnknownText_0x1a2f75: line "#MON is asleep." done -PewterPokeCenter1F_MapEventHeader: +PewterPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/PewterPokeCenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm similarity index 69% rename from maps/PewterPokeCenter2FBeta.asm rename to maps/PewterPokecenter2FBeta.asm index b2530ed8b..af81dfc4b 100644 --- a/maps/PewterPokeCenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -PewterPokeCenter2FBeta_MapScriptHeader: +PewterPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -PewterPokeCenter2FBeta_MapEventHeader: +PewterPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/PokeCenter1F.blk b/maps/Pokecenter1F.blk similarity index 100% rename from maps/PokeCenter1F.blk rename to maps/Pokecenter1F.blk diff --git a/maps/PokeCenter2F.asm b/maps/Pokecenter2F.asm similarity index 75% rename from maps/PokeCenter2F.asm rename to maps/Pokecenter2F.asm index 4ba8555fd..28f519a5f 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -4,7 +4,7 @@ const_value set 2 const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST const POKECENTER2F_OFFICER -PokeCenter2F_MapScriptHeader: +Pokecenter2F_MapScriptHeader: .MapTriggers: db 6 maptrigger .Trigger0 @@ -23,7 +23,7 @@ PokeCenter2F_MapScriptHeader: clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Trigger0Done - priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy + priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy .Trigger0Done: end @@ -48,7 +48,7 @@ PokeCenter2F_MapScriptHeader: priorityjump Script_LeftMobileBattleRoom end -PokeCenter2F_AppearMysteryGiftDeliveryGuy: +Pokecenter2F_AppearMysteryGiftDeliveryGuy: appear POKECENTER2F_OFFICER setevent EVENT_RECEIVED_BALLS_FROM_KURT end @@ -102,7 +102,7 @@ LinkReceptionistScript_Trade: writetext Text_PleaseComeIn2 waitbutton closetext - scall PokeCenter2F_CheckGender + scall Pokecenter2F_CheckGender warpcheck end @@ -167,8 +167,8 @@ LinkReceptionistScript_Trade: end BattleTradeMobile_WalkIn: - applymovement2 PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown - applymovement PLAYER, PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom + applymovement2 Pokecenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown + applymovement PLAYER, Pokecenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom end LinkReceptionistScript_Battle: @@ -204,7 +204,7 @@ LinkReceptionistScript_Battle: writetext Text_PleaseComeIn2 waitbutton closetext - scall PokeCenter2F_CheckGender + scall Pokecenter2F_CheckGender warpcheck end @@ -388,9 +388,9 @@ Script_LeftMobileTradeRoom: end Script_WalkOutOfMobileTradeRoom: - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown end Script_LeftCableColosseum: @@ -408,36 +408,36 @@ Script_LeftMobileBattleRoom: end Script_WalkOutOfMobileBattleRoom: - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown end -PokeCenter2F_CheckGender: +Pokecenter2F_CheckGender: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Female - applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsUp + applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp end .Female: - applymovement2 PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp + applymovement2 Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp opentext writetext Text_OhPleaseWait waitbutton closetext - applymovement2 PokeCenter2FMovementData_ReceptionistLooksRight + applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight spriteface PLAYER, LEFT opentext writetext Text_ChangeTheLook waitbutton closetext playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite opentext @@ -445,51 +445,51 @@ PokeCenter2F_CheckGender: waitbutton closetext showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp end Script_WalkOutOfLinkTradeRoom: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end .Female: - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown_2 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2 - applymovement POKECENTER2F_TRADE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 + applymovement POKECENTER2F_TRADE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end Script_WalkOutOfLinkBattleRoom: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesThreeStepsDown - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsDown + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end .Female: - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown_2 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown_2 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2 - applymovement POKECENTER2F_BATTLE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightAndDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2 + applymovement POKECENTER2F_BATTLE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightAndDown end TimeCapsuleScript_CheckPlayerGender: @@ -498,36 +498,36 @@ TimeCapsuleScript_CheckPlayerGender: checkcode VAR_FACING if_equal LEFT, .MaleFacingLeft if_equal RIGHT, .MaleFacingRight - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2 + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2 end .MaleFacingLeft: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksLeftAndUp + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksLeftAndUp end .MaleFacingRight: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksDown - applymovement PLAYER, PokeCenter2FMovementData_PlayerWalksRightAndUp + applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerWalksRightAndUp end .Female: checkcode VAR_FACING if_equal RIGHT, .FemaleFacingRight if_equal LEFT, .FemaleFacingLeft - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2 + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2 jump .FemaleContinue .FemaleFacingRight: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepRight + applymovement2 Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepRight jump .FemaleContinue .FemaleFacingLeft: - applymovement2 PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepLeft + applymovement2 Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepLeft .FemaleContinue: opentext writetext Text_OhPleaseWait @@ -542,10 +542,10 @@ TimeCapsuleScript_CheckPlayerGender: waitbutton closetext playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_RED << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown faceperson PLAYER, POKECENTER2F_TIME_CAPSULE_RECEPTIONIST setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite @@ -554,36 +554,36 @@ TimeCapsuleScript_CheckPlayerGender: waitbutton closetext showemote EMOTE_SHOCK, PLAYER, 15 - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepUp_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2 end Script_LeftTimeCapsule: special WaitForOtherPlayerToExit checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesTwoStepsDown - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2 + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 jump .Done .Female: - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight writebyte (PAL_NPC_BLUE << 4) special Special_SetPlayerPalette - applymovement PLAYER, PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft + applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft special ReplaceKrisSprite - applymovement PLAYER, PokeCenter2FMovementData_PlayerTakesOneStepDown - applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2 + applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown + applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 .Done: dotrigger $0 domaptrigger TIME_CAPSULE, $0 end -MapPokeCenter2FSignpost0Script: +MapPokecenter2FSignpost0Script: refreshscreen $0 special Special_DisplayLinkRecord closetext @@ -622,137 +622,137 @@ OfficerScript_0x192c9a: closetext end -PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight: +Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown: +Pokecenter2FMobileMobileMovementData_ReceptionistWalksUpAndLeft_LookDown: slow_step UP slow_step LEFT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsLeftLooksDown: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksDown: slow_step LEFT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksDown: +Pokecenter2FMovementData_ReceptionistStepsRightLooksDown: slow_step RIGHT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2: +Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight_2: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_ReceptionistLooksRight: +Pokecenter2FMovementData_ReceptionistLooksRight: turn_head RIGHT step_end -PokeCenter2FMovementData_PlayerTakesThreeStepsUp: +Pokecenter2FMovementData_PlayerTakesThreeStepsUp: step UP step UP step UP step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsUp: +Pokecenter2FMovementData_PlayerTakesTwoStepsUp: step UP step UP step_end -PokeCenter2FMovementData_PlayerTakesOneStepUp: +Pokecenter2FMovementData_PlayerTakesOneStepUp: step UP step_end -PokeCenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom: +Pokecenter2FMobileMovementData_PlayerWalksIntoMobileBattleRoom: step UP step UP step RIGHT step UP step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsUp_2: +Pokecenter2FMovementData_PlayerTakesTwoStepsUp_2: step UP step UP step_end -PokeCenter2FMovementData_PlayerWalksLeftAndUp: +Pokecenter2FMovementData_PlayerWalksLeftAndUp: step LEFT step UP step_end -PokeCenter2FMovementData_PlayerWalksRightAndUp: +Pokecenter2FMovementData_PlayerWalksRightAndUp: step RIGHT step UP step_end -PokeCenter2FMovementData_PlayerTakesThreeStepsDown: +Pokecenter2FMovementData_PlayerTakesThreeStepsDown: step DOWN step DOWN step DOWN step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsDown: +Pokecenter2FMovementData_PlayerTakesTwoStepsDown: step DOWN step DOWN step_end -PokeCenter2FMovementData_PlayerTakesOneStepDown: +Pokecenter2FMovementData_PlayerTakesOneStepDown: step DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightAndDown: +Pokecenter2FMovementData_ReceptionistStepsRightAndDown: slow_step RIGHT slow_step DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_2: +Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2: slow_step RIGHT turn_head DOWN step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksDown_3: +Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_3: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight: slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMobileMovementData_ReceptionistWalksUpAndLeft: +Pokecenter2FMobileMovementData_ReceptionistWalksUpAndLeft: slow_step UP slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_PlayerWalksOutOfMobileRoom: +Pokecenter2FMovementData_PlayerWalksOutOfMobileRoom: step DOWN step LEFT step DOWN step DOWN step_end -PokeCenter2FMobileMovementData_ReceptionistWalksRightAndDown: +Pokecenter2FMobileMovementData_ReceptionistWalksRightAndDown: slow_step RIGHT slow_step DOWN step_end -PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight: +Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight: turn_head DOWN turn_head LEFT turn_head UP turn_head RIGHT step_end -PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: +Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: turn_head DOWN turn_head LEFT turn_head UP @@ -760,7 +760,7 @@ PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft: turn_head LEFT step_end -PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: +Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: turn_head DOWN turn_head LEFT turn_head UP @@ -768,33 +768,33 @@ PokeCenter2FMovementData_PlayerSpinsClockwiseEndsFacingDown: turn_head DOWN step_end -PokeCenter2FMovementData_PlayerTakesOneStepDown_2: +Pokecenter2FMovementData_PlayerTakesOneStepDown_2: step DOWN step_end -PokeCenter2FMovementData_PlayerTakesTwoStepsDown_2: +Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2: step DOWN step DOWN step_end -PokeCenter2FMovementData_PlayerTakesOneStepUp_2: +Pokecenter2FMovementData_PlayerTakesOneStepUp_2: step UP step_end -PokeCenter2FMovementData_PlayerTakesOneStepRight: +Pokecenter2FMovementData_PlayerTakesOneStepRight: step RIGHT step_end -PokeCenter2FMovementData_PlayerTakesOneStepLeft: +Pokecenter2FMovementData_PlayerTakesOneStepLeft: step LEFT step_end -PokeCenter2FMovementData_ReceptionistStepsLeftLooksRight_2: +Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2: slow_step LEFT turn_head RIGHT step_end -PokeCenter2FMovementData_ReceptionistStepsRightLooksLeft_2: +Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2: slow_step RIGHT turn_head LEFT step_end @@ -1022,7 +1022,7 @@ Text_BrokeStadiumRules: line "when you're ready." done -PokeCenter2F_MapEventHeader: +Pokecenter2F_MapEventHeader: ; filler db 0, 0 @@ -1040,7 +1040,7 @@ PokeCenter2F_MapEventHeader: .Signposts: db 1 - signpost 3, 7, SIGNPOST_READ, MapPokeCenter2FSignpost0Script + signpost 3, 7, SIGNPOST_READ, MapPokecenter2FSignpost0Script .PersonEvents: db 4 diff --git a/maps/PokeCenter2F.blk b/maps/Pokecenter2F.blk similarity index 100% rename from maps/PokeCenter2F.blk rename to maps/Pokecenter2F.blk diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 29b345fed..97094ff05 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -8,7 +8,7 @@ Route10North_MapScriptHeader: PowerPlantSign: jumptext PowerPlantSignText -Route10PokeCenterSign: +Route10PokecenterSign: jumpstd pokecentersign PowerPlantSignText: @@ -30,7 +30,7 @@ Route10North_MapEventHeader: .Signposts: db 2 signpost 11, 5, SIGNPOST_READ, PowerPlantSign - signpost 1, 12, SIGNPOST_READ, Route10PokeCenterSign + signpost 1, 12, SIGNPOST_READ, Route10PokecenterSign .PersonEvents: db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10Pokecenter1F.asm similarity index 96% rename from maps/Route10PokeCenter1F.asm rename to maps/Route10Pokecenter1F.asm index 95780ed5e..18f1bd8ab 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const ROUTE10POKECENTER1F_GYM_GUY const ROUTE10POKECENTER1F_COOLTRAINER_F -Route10PokeCenter1F_MapScriptHeader: +Route10Pokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -80,7 +80,7 @@ UnknownText_0x188d0c: line "PLANT." done -Route10PokeCenter1F_MapEventHeader: +Route10Pokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm similarity index 69% rename from maps/Route10PokeCenter2FBeta.asm rename to maps/Route10Pokecenter2FBeta.asm index a4a4aed6f..f3c247241 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,11 +1,11 @@ -Route10PokeCenter2FBeta_MapScriptHeader: +Route10Pokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -Route10PokeCenter2FBeta_MapEventHeader: +Route10Pokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index 1c0579d70..ded343998 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -502,7 +502,7 @@ Route32RuinsSign: Route32UnionCaveSign: jumptext Route32UnionCaveSignText -Route32PokeCenterSign: +Route32PokecenterSign: jumpstd pokecentersign Route32HiddenGreatBall: @@ -951,7 +951,7 @@ Route32_MapEventHeader: signpost 5, 13, SIGNPOST_READ, Route32Sign signpost 1, 9, SIGNPOST_READ, Route32RuinsSign signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign - signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign + signpost 73, 12, SIGNPOST_READ, Route32PokecenterSign signpost 67, 12, SIGNPOST_ITEM, Route32HiddenGreatBall signpost 40, 11, SIGNPOST_ITEM, Route32HiddenSuperPotion diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32Pokecenter1F.asm similarity index 96% rename from maps/Route32PokeCenter1F.asm rename to maps/Route32Pokecenter1F.asm index ca303b029..18c9622ee 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -3,7 +3,7 @@ const_value set 2 const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F -Route32PokeCenter1F_MapScriptHeader: +Route32Pokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -94,7 +94,7 @@ UnknownText_0x69cac: cont "power…" done -Route32PokeCenter1F_MapEventHeader: +Route32Pokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 8fd105754..4b50f427c 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -101,7 +101,7 @@ MrPsychicsHouseSign: SaffronCityMagnetTrainStationSign: jumptext SaffronCityMagnetTrainStationSignText -SaffronCityPokeCenterSign: +SaffronCityPokecenterSign: jumpstd pokecentersign SaffronCityMartSign: @@ -298,7 +298,7 @@ SaffronCity_MapEventHeader: signpost 21, 15, SIGNPOST_READ, SilphCoSign signpost 29, 25, SIGNPOST_READ, MrPsychicsHouseSign signpost 5, 11, SIGNPOST_READ, SaffronCityMagnetTrainStationSign - signpost 29, 10, SIGNPOST_READ, SaffronCityPokeCenterSign + signpost 29, 10, SIGNPOST_READ, SaffronCityPokecenterSign signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign .PersonEvents: diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokecenter1F.asm similarity index 97% rename from maps/SaffronPokeCenter1F.asm rename to maps/SaffronPokecenter1F.asm index 6c46cada6..975ea587c 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const SAFFRONPOKECENTER1F_FISHER const SAFFRONPOKECENTER1F_YOUNGSTER -SaffronPokeCenter1F_MapScriptHeader: +SaffronPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -111,7 +111,7 @@ UnknownText_0x18a6c5: line "SAFFRON." done -SaffronPokeCenter1F_MapEventHeader: +SaffronPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm similarity index 69% rename from maps/SaffronPokeCenter2FBeta.asm rename to maps/SaffronPokecenter2FBeta.asm index 987236d0b..3c1381ba6 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -SaffronPokeCenter2FBeta_MapScriptHeader: +SaffronPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -SaffronPokeCenter2FBeta_MapEventHeader: +SaffronPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 4b4657f1e..86354d742 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -10,7 +10,7 @@ SilverCaveOutside_MapScriptHeader: setflag ENGINE_FLYPOINT_SILVER_CAVE return -MtSilverPokeCenterSign: +MtSilverPokecenterSign: jumpstd pokecentersign MtSilverSign: @@ -37,7 +37,7 @@ SilverCaveOutside_MapEventHeader: .Signposts: db 3 - signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign + signpost 19, 24, SIGNPOST_READ, MtSilverPokecenterSign signpost 13, 17, SIGNPOST_READ, MtSilverSign signpost 25, 9, SIGNPOST_ITEM, SilverCaveOutsideHiddenFullRestore diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokecenter1F.asm similarity index 92% rename from maps/SilverCavePokeCenter1F.asm rename to maps/SilverCavePokecenter1F.asm index 7aba170fe..ab6eab65a 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -2,7 +2,7 @@ const_value set 2 const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY -SilverCavePokeCenter1F_MapScriptHeader: +SilverCavePokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -29,7 +29,7 @@ UnknownText_0x1ae5a0: line "anywhere…" done -SilverCavePokeCenter1F_MapEventHeader: +SilverCavePokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index ed34b3f5c..e9f10d578 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -13,7 +13,7 @@ TimeCapsule_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: - priorityjump .InitializeAndPreparePokeCenter2F + priorityjump .InitializeAndPreparePokecenter2F end .DummyTrigger: @@ -31,7 +31,7 @@ TimeCapsule_MapScriptHeader: appear TIMECAPSULE_CHRIS2 return -.InitializeAndPreparePokeCenter2F: +.InitializeAndPreparePokecenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $3 end diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 07cb18136..e0c984b36 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -13,7 +13,7 @@ TradeCenter_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: - priorityjump .InitializeAndPreparePokeCenter2F + priorityjump .InitializeAndPreparePokecenter2F end .DummyTrigger: @@ -31,7 +31,7 @@ TradeCenter_MapScriptHeader: appear TRADECENTER_CHRIS2 return -.InitializeAndPreparePokeCenter2F: +.InitializeAndPreparePokecenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $1 end diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 64c740516..ea794dd6a 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -116,7 +116,7 @@ VermilionCityDiglettsCaveSign: VermilionCityPortSign: jumptext VermilionCityPortSignText -VermilionCityPokeCenterSign: +VermilionCityPokecenterSign: jumpstd pokecentersign VermilionCityMartSign: @@ -294,7 +294,7 @@ VermilionCity_MapEventHeader: signpost 13, 5, SIGNPOST_READ, PokemonFanClubSign signpost 9, 33, SIGNPOST_READ, VermilionCityDiglettsCaveSign signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign - signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign + signpost 5, 10, SIGNPOST_READ, VermilionCityPokecenterSign signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign signpost 19, 12, SIGNPOST_ITEM, VermilionCityHiddenFullHeal diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokecenter1F.asm similarity index 96% rename from maps/VermilionPokeCenter1F.asm rename to maps/VermilionPokecenter1F.asm index 674b7d984..f4bbd0140 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const VERMILIONPOKECENTER1F_SAILOR const VERMILIONPOKECENTER1F_BUG_CATCHER -VermilionPokeCenter1F_MapScriptHeader: +VermilionPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -76,7 +76,7 @@ UnknownText_0x19173b: line "got them in JOHTO." done -VermilionPokeCenter1F_MapEventHeader: +VermilionPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm similarity index 68% rename from maps/VermilionPokeCenter2FBeta.asm rename to maps/VermilionPokecenter2FBeta.asm index 3d8ad1efc..9a9aeec2c 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -VermilionPokeCenter2FBeta_MapScriptHeader: +VermilionPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -VermilionPokeCenter2FBeta_MapEventHeader: +VermilionPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 8a2a658d2..2d503853b 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -82,7 +82,7 @@ SproutTowerSign: EarlsPokemonAcademySign: jumptext EarlsPokemonAcademySignText -VioletCityPokeCenterSign: +VioletCityPokecenterSign: jumpstd pokecentersign VioletCityMartSign: @@ -303,7 +303,7 @@ VioletCity_MapEventHeader: signpost 17, 15, SIGNPOST_READ, VioletGymSign signpost 8, 24, SIGNPOST_READ, SproutTowerSign signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign - signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign + signpost 25, 32, SIGNPOST_READ, VioletCityPokecenterSign signpost 17, 10, SIGNPOST_READ, VioletCityMartSign signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokecenter1F.asm similarity index 94% rename from maps/VioletPokeCenter1F.asm rename to maps/VioletPokecenter1F.asm index d2f6423b4..46afff49a 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -5,17 +5,17 @@ const_value set 2 const VIOLETPOKECENTER1F_YOUNGSTER const VIOLETPOKECENTER1F_SCIENTIST -VioletPokeCenter1F_MapScriptHeader: +VioletPokecenter1F_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -VioletPokeCenterNurse: +VioletPokecenterNurse: jumpstd pokecenternurse -VioletPokeCenter1F_ElmsAideScript: +VioletPokecenter1F_ElmsAideScript: faceplayer opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE @@ -215,7 +215,7 @@ UnknownText_0x698b8: line "they please." done -VioletPokeCenter1F_MapEventHeader: +VioletPokecenter1F_MapEventHeader: ; filler db 0, 0 @@ -233,8 +233,8 @@ VioletPokeCenter1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokeCenterNurse, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index a117be25b..a6b30627a 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -81,7 +81,7 @@ ViridianCityWelcomeSign: TrainerHouseSign: jumptext TrainerHouseSignText -ViridianCityPokeCenterSign: +ViridianCityPokecenterSign: jumpstd pokecentersign ViridianCityMartSign: @@ -236,7 +236,7 @@ ViridianCity_MapEventHeader: signpost 7, 27, SIGNPOST_READ, ViridianGymSign signpost 1, 19, SIGNPOST_READ, ViridianCityWelcomeSign signpost 15, 21, SIGNPOST_READ, TrainerHouseSign - signpost 25, 24, SIGNPOST_READ, ViridianCityPokeCenterSign + signpost 25, 24, SIGNPOST_READ, ViridianCityPokecenterSign signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign .PersonEvents: diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokecenter1F.asm similarity index 96% rename from maps/ViridianPokeCenter1F.asm rename to maps/ViridianPokecenter1F.asm index 7c63655bd..35c634f03 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -4,7 +4,7 @@ const_value set 2 const VIRIDIANPOKECENTER1F_COOLTRAINER_F const VIRIDIANPOKECENTER1F_BUG_CATCHER -ViridianPokeCenter1F_MapScriptHeader: +ViridianPokecenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -71,7 +71,7 @@ UnknownText_0x9b7c8: line "come a GYM LEADER." done -ViridianPokeCenter1F_MapEventHeader: +ViridianPokecenter1F_MapEventHeader: ; filler db 0, 0 diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm similarity index 68% rename from maps/ViridianPokeCenter2FBeta.asm rename to maps/ViridianPokecenter2FBeta.asm index c545a50bc..84551d7f2 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,11 +1,11 @@ -ViridianPokeCenter2FBeta_MapScriptHeader: +ViridianPokecenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -ViridianPokeCenter2FBeta_MapEventHeader: +ViridianPokecenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/blockdata.asm b/maps/blockdata.asm index d1e7b39b7..e6c3e7ae9 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -54,18 +54,18 @@ BetaBlackthornCity_BlockData: Route10South_BlockData: INCBIN "maps/Route10South.blk" -PokeCenter2F_BlockData: -CinnabarPokeCenter2FBeta_BlockData: -CeruleanPokeCenter2FBeta_BlockData: -Route10PokeCenter2FBeta_BlockData: -VermilionPokeCenter2FBeta_BlockData: -PewterPokeCenter2FBeta_BlockData: -FuchsiaPokeCenter2FBeta_BlockData: -LavenderPokeCenter2FBeta_BlockData: -CeladonPokeCenter2FBeta_BlockData: -ViridianPokeCenter2FBeta_BlockData: -SaffronPokeCenter2FBeta_BlockData: - INCBIN "maps/PokeCenter2F.blk" +Pokecenter2F_BlockData: +CinnabarPokecenter2FBeta_BlockData: +CeruleanPokecenter2FBeta_BlockData: +Route10Pokecenter2FBeta_BlockData: +VermilionPokecenter2FBeta_BlockData: +PewterPokecenter2FBeta_BlockData: +FuchsiaPokecenter2FBeta_BlockData: +LavenderPokecenter2FBeta_BlockData: +CeladonPokecenter2FBeta_BlockData: +ViridianPokecenter2FBeta_BlockData: +SaffronPokecenter2FBeta_BlockData: + INCBIN "maps/Pokecenter2F.blk" Route41_BlockData: INCBIN "maps/Route41.blk" @@ -121,8 +121,8 @@ Route20_BlockData: BetaSproutTower6_BlockData: INCBIN "maps/BetaSproutTower6.blk" -BetaPokeCenterMainHouse_BlockData: - INCBIN "maps/BetaPokeCenterMainHouse.blk" +BetaPokecenterMainHouse_BlockData: + INCBIN "maps/BetaPokecenterMainHouse.blk" Route30_BlockData: INCBIN "maps/Route30.blk" @@ -340,28 +340,28 @@ Route10North_BlockData: BetaLakeOfRage_BlockData: INCBIN "maps/BetaLakeOfRage.blk" -OlivinePokeCenter1F_BlockData: -MahoganyPokeCenter1F_BlockData: -EcruteakPokeCenter1F_BlockData: -BlackthornPokeCenter1F_BlockData: -CinnabarPokeCenter1F_BlockData: -CeruleanPokeCenter1F_BlockData: -Route10PokeCenter1F_BlockData: -AzaleaPokeCenter1F_BlockData: -VioletPokeCenter1F_BlockData: -Route32PokeCenter1F_BlockData: -GoldenrodPokeCenter1F_BlockData: -VermilionPokeCenter1F_BlockData: -PewterPokeCenter1F_BlockData: -FuchsiaPokeCenter1F_BlockData: -LavenderPokeCenter1F_BlockData: -SilverCavePokeCenter1F_BlockData: -CeladonPokeCenter1F_BlockData: -CianwoodPokeCenter1F_BlockData: -ViridianPokeCenter1F_BlockData: -SaffronPokeCenter1F_BlockData: -CherrygrovePokeCenter1F_BlockData: - INCBIN "maps/PokeCenter1F.blk" +OlivinePokecenter1F_BlockData: +MahoganyPokecenter1F_BlockData: +EcruteakPokecenter1F_BlockData: +BlackthornPokecenter1F_BlockData: +CinnabarPokecenter1F_BlockData: +CeruleanPokecenter1F_BlockData: +Route10Pokecenter1F_BlockData: +AzaleaPokecenter1F_BlockData: +VioletPokecenter1F_BlockData: +Route32Pokecenter1F_BlockData: +GoldenrodPokecenter1F_BlockData: +VermilionPokecenter1F_BlockData: +PewterPokecenter1F_BlockData: +FuchsiaPokecenter1F_BlockData: +LavenderPokecenter1F_BlockData: +SilverCavePokecenter1F_BlockData: +CeladonPokecenter1F_BlockData: +CianwoodPokecenter1F_BlockData: +ViridianPokecenter1F_BlockData: +SaffronPokecenter1F_BlockData: +CherrygrovePokecenter1F_BlockData: + INCBIN "maps/Pokecenter1F.blk" BetaPewterMuseumOfScience1F_BlockData: INCBIN "maps/BetaPewterMuseumOfScience1F.blk" @@ -466,8 +466,8 @@ Route6UndergroundEntrance_BlockData: Route5UndergroundEntrance_BlockData: INCBIN "maps/UndergroundPathEntrance.blk" -BetaPokeCenterTradeStation_BlockData: - INCBIN "maps/BetaPokeCenterTradeStation.blk" +BetaPokecenterTradeStation_BlockData: + INCBIN "maps/BetaPokecenterTradeStation.blk" KurtsHouse_BlockData: INCBIN "maps/KurtsHouse.blk" @@ -713,8 +713,8 @@ TeamRocketBaseB3F_BlockData: BetaRoute23EarlyVersion_BlockData: INCBIN "maps/BetaRoute23EarlyVersion.blk" -IndigoPlateauPokeCenter1F_BlockData: - INCBIN "maps/IndigoPlateauPokeCenter1F.blk" +IndigoPlateauPokecenter1F_BlockData: + INCBIN "maps/IndigoPlateauPokecenter1F.blk" WillsRoom_BlockData: INCBIN "maps/WillsRoom.blk" diff --git a/maps/map_headers.asm b/maps/map_headers.asm index e50ab8e6a..9d58c7cbe 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -29,7 +29,7 @@ MapGroupPointers:: MapGroup1: - map_header OlivinePokeCenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -48,7 +48,7 @@ MapGroup1: MapGroup2: map_header MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyPokeCenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_LAKE map_header Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_POND @@ -152,7 +152,7 @@ MapGroup3: MapGroup4: map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header WiseTriosRoom, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakPokeCenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakLugiaSpeechHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header DanceTheatre, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -167,7 +167,7 @@ MapGroup5: map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header BlackthornPokeCenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_DRATINI_2 map_header Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -175,8 +175,8 @@ MapGroup5: MapGroup6: - map_header CinnabarPokeCenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CinnabarPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -189,12 +189,12 @@ MapGroup7: map_header CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPokeCenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeruleanPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_NONE map_header CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route10PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route10PokeCenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE @@ -206,7 +206,7 @@ MapGroup7: MapGroup8: - map_header AzaleaPokeCenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -234,10 +234,10 @@ MapGroup10: map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletPokeCenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route32PokeCenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -264,7 +264,7 @@ MapGroup11: map_header GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header GoldenrodPokeCenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -276,8 +276,8 @@ MapGroup12: map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPokeCenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VermilionPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -302,8 +302,8 @@ MapGroup14: map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokeCenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -324,7 +324,7 @@ MapGroup15: MapGroup16: map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header IndigoPlateauPokeCenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE map_header KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -343,8 +343,8 @@ MapGroup17: map_header SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaPokeCenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header FuchsiaPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -354,8 +354,8 @@ MapGroup18: map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE map_header LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header LavenderPokeCenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header LavenderPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderTownSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -369,12 +369,12 @@ MapGroup18: MapGroup19: map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND - map_header SilverCavePokeCenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE MapGroup20: - map_header PokeCenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -399,8 +399,8 @@ MapGroup21: map_header CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonPokeCenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CeladonPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -417,7 +417,7 @@ MapGroup22: map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header CianwoodPokeCenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodCityPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -439,8 +439,8 @@ MapGroup23: map_header TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianPokeCenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ViridianPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -468,8 +468,8 @@ MapGroup25: map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronPokeCenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header SaffronPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -485,7 +485,7 @@ MapGroup26: map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CherrygrovePokeCenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 3f4bcbac0..b58895f4b 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -360,7 +360,7 @@ map_header_2 DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0 map_header_2 DragonShrine, DRAGON_SHRINE, $0, 0 map_header_2 TohjoFalls, TOHJO_FALLS, $9, 0 - map_header_2 OlivinePokeCenter1F, OLIVINE_POKECENTER_1F, $0, 0 + map_header_2 OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $0, 0 map_header_2 OlivineGym, OLIVINE_GYM, $0, 0 map_header_2 OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $0, 0 map_header_2 OlivineHouseBeta, OLIVINE_HOUSE_BETA, $0, 0 @@ -373,7 +373,7 @@ map_header_2 Route39Farmhouse, ROUTE_39_FARMHOUSE, $0, 0 map_header_2 MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $0, 0 map_header_2 MahoganyGym, MAHOGANY_GYM, $0, 0 - map_header_2 MahoganyPokeCenter1F, MAHOGANY_POKECENTER_1F, $0, 0 + map_header_2 MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $0, 0 map_header_2 Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $0, 0 map_header_2 DiglettsCave, DIGLETTS_CAVE, $9, 0 map_header_2 MountMoon, MOUNT_MOON, $9, 0 @@ -385,7 +385,7 @@ map_header_2 VictoryRoad, VICTORY_ROAD, $1d, 0 map_header_2 EcruteakHouse, ECRUTEAK_HOUSE, $0, 0 map_header_2 WiseTriosRoom, WISE_TRIOS_ROOM, $0, 0 - map_header_2 EcruteakPokeCenter1F, ECRUTEAK_POKECENTER_1F, $0, 0 + map_header_2 EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $0, 0 map_header_2 EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $0, 0 map_header_2 DanceTheatre, DANCE_THEATRE, $0, 0 map_header_2 EcruteakMart, ECRUTEAK_MART, $0, 0 @@ -396,24 +396,24 @@ map_header_2 BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $0, 0 map_header_2 BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $0, 0 map_header_2 BlackthornMart, BLACKTHORN_MART, $0, 0 - map_header_2 BlackthornPokeCenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 + map_header_2 BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $0, 0 map_header_2 MoveDeletersHouse, MOVE_DELETERS_HOUSE, $0, 0 - map_header_2 CinnabarPokeCenter1F, CINNABAR_POKECENTER_1F, $0, 0 - map_header_2 CinnabarPokeCenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0 + map_header_2 CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $0, 0 + map_header_2 CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $0, 0 map_header_2 Route19FuchsiaGate, ROUTE_19___FUCHSIA_GATE, $0, 0 map_header_2 SeafoamGym, SEAFOAM_GYM, $9, 0 map_header_2 CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $0, 0 map_header_2 CeruleanPoliceStation, CERULEAN_POLICE_STATION, $0, 0 map_header_2 CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $0, 0 - map_header_2 CeruleanPokeCenter1F, CERULEAN_POKECENTER_1F, $0, 0 - map_header_2 CeruleanPokeCenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0 + map_header_2 CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $0, 0 + map_header_2 CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $0, 0 map_header_2 CeruleanGym, CERULEAN_GYM, $0, 0 map_header_2 CeruleanMart, CERULEAN_MART, $0, 0 - map_header_2 Route10PokeCenter1F, ROUTE_10_POKECENTER_1F, $0, 0 - map_header_2 Route10PokeCenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0 + map_header_2 Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $0, 0 + map_header_2 Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $0, 0 map_header_2 PowerPlant, POWER_PLANT, $0, 0 map_header_2 BillsHouse, BILLS_HOUSE, $0, 0 - map_header_2 AzaleaPokeCenter1F, AZALEA_POKECENTER_1F, $0, 0 + map_header_2 AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $0, 0 map_header_2 CharcoalKiln, CHARCOAL_KILN, $0, 0 map_header_2 AzaleaMart, AZALEA_MART, $0, 0 map_header_2 KurtsHouse, KURTS_HOUSE, $0, 0 @@ -426,10 +426,10 @@ map_header_2 VioletGym, VIOLET_GYM, $0, 0 map_header_2 EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $0, 0 map_header_2 VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $0, 0 - map_header_2 VioletPokeCenter1F, VIOLET_POKECENTER_1F, $0, 0 + map_header_2 VioletPokecenter1F, VIOLET_POKECENTER_1F, $0, 0 map_header_2 VioletOnixTradeHouse, VIOLET_ONIX_TRADE_HOUSE, $0, 0 map_header_2 Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $0, 0 - map_header_2 Route32PokeCenter1F, ROUTE_32_POKECENTER_1F, $0, 0 + map_header_2 Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $0, 0 map_header_2 Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $0, 0 map_header_2 Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $0, 0 map_header_2 Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $0, 0 @@ -451,14 +451,14 @@ map_header_2 GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $0, 0 map_header_2 GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_header_2 GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $0, 0 - map_header_2 GoldenrodPokeCenter1F, GOLDENROD_POKECENTER_1F, $0, 0 + map_header_2 GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $0, 0 map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, 0 map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, 0 map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, 0 map_header_2 DayCare, DAY_CARE, $0, 0 map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, 0 - map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, 0 - map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 + map_header_2 VermilionPokecenter1F, VERMILION_POKECENTER_1F, $0, 0 + map_header_2 VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, 0 map_header_2 PokemonFanClub, POKEMON_FAN_CLUB, $0, 0 map_header_2 VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $0, 0 map_header_2 VermilionMart, VERMILION_MART, $0, 0 @@ -473,8 +473,8 @@ map_header_2 PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $0, 0 map_header_2 PewterGym, PEWTER_GYM, $0, 0 map_header_2 PewterMart, PEWTER_MART, $0, 0 - map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0 - map_header_2 PewterPokeCenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 + map_header_2 PewterPokecenter1F, PEWTER_POKECENTER_1F, $0, 0 + map_header_2 PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 map_header_2 VermilionPort, VERMILION_PORT, $a, 0 @@ -488,7 +488,7 @@ map_header_2 MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0 map_header_2 MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $0, 0 map_header_2 TinTowerRoof, TIN_TOWER_ROOF, $0, 0 - map_header_2 IndigoPlateauPokeCenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0 + map_header_2 IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $0, 0 map_header_2 WillsRoom, WILLS_ROOM, $0, 0 map_header_2 KogasRoom, KOGAS_ROOM, $0, 0 map_header_2 BrunosRoom, BRUNOS_ROOM, $0, 0 @@ -499,12 +499,12 @@ map_header_2 SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $0, 0 map_header_2 FuchsiaGym, FUCHSIA_GYM, $0, 0 map_header_2 FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $0, 0 - map_header_2 FuchsiaPokeCenter1F, FUCHSIA_POKECENTER_1F, $0, 0 - map_header_2 FuchsiaPokeCenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0 + map_header_2 FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $0, 0 + map_header_2 FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $0, 0 map_header_2 SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $0, 0 map_header_2 Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $0, 0 - map_header_2 LavenderPokeCenter1F, LAVENDER_POKECENTER_1F, $0, 0 - map_header_2 LavenderPokeCenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0 + map_header_2 LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $0, 0 + map_header_2 LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $0, 0 map_header_2 MrFujisHouse, MR_FUJIS_HOUSE, $0, 0 map_header_2 LavenderTownSpeechHouse, LAVENDER_TOWN_SPEECH_HOUSE, $0, 0 map_header_2 LavenderNameRater, LAVENDER_NAME_RATER, $0, 0 @@ -513,9 +513,9 @@ map_header_2 LavRadioTower1F, LAV_RADIO_TOWER_1F, $0, 0 map_header_2 Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $0, 0 map_header_2 Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $0, 0 - map_header_2 SilverCavePokeCenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0 + map_header_2 SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $0, 0 map_header_2 Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $0, 0 - map_header_2 PokeCenter2F, POKECENTER_2F, $0, 0 + map_header_2 Pokecenter2F, POKECENTER_2F, $0, 0 map_header_2 TradeCenter, TRADE_CENTER, $0, 0 map_header_2 Colosseum, COLOSSEUM, $0, 0 map_header_2 TimeCapsule, TIME_CAPSULE, $0, 0 @@ -533,8 +533,8 @@ map_header_2 CeladonMansion3F, CELADON_MANSION_3F, $0, 0 map_header_2 CeladonMansionRoof, CELADON_MANSION_ROOF, $1, 0 map_header_2 CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $0, 0 - map_header_2 CeladonPokeCenter1F, CELADON_POKECENTER_1F, $0, 0 - map_header_2 CeladonPokeCenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0 + map_header_2 CeladonPokecenter1F, CELADON_POKECENTER_1F, $0, 0 + map_header_2 CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $0, 0 map_header_2 CeladonGameCorner, CELADON_GAME_CORNER, $0, 0 map_header_2 CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $0, 0 map_header_2 CeladonGym, CELADON_GYM, $0, 0 @@ -545,7 +545,7 @@ map_header_2 Route1718Gate, ROUTE_17_18_GATE, $0, 0 map_header_2 ManiasHouse, MANIAS_HOUSE, $0, 0 map_header_2 CianwoodGym, CIANWOOD_GYM, $0, 0 - map_header_2 CianwoodPokeCenter1F, CIANWOOD_POKECENTER_1F, $0, 0 + map_header_2 CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $0, 0 map_header_2 CianwoodPharmacy, CIANWOOD_PHARMACY, $0, 0 map_header_2 CianwoodCityPhotoStudio, CIANWOOD_CITY_PHOTO_STUDIO, $0, 0 map_header_2 CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $0, 0 @@ -561,8 +561,8 @@ map_header_2 TrainerHouse1F, TRAINER_HOUSE_1F, $0, 0 map_header_2 TrainerHouseB1F, TRAINER_HOUSE_B1F, $0, 0 map_header_2 ViridianMart, VIRIDIAN_MART, $0, 0 - map_header_2 ViridianPokeCenter1F, VIRIDIAN_POKECENTER_1F, $0, 0 - map_header_2 ViridianPokeCenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0 + map_header_2 ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $0, 0 + map_header_2 ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $0, 0 map_header_2 Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $0, 0 map_header_2 Route2Gate, ROUTE_2_GATE, $0, 0 map_header_2 VictoryRoadGate, VICTORY_ROAD_GATE, $0, 0 @@ -578,8 +578,8 @@ map_header_2 FightingDojo, FIGHTING_DOJO, $0, 0 map_header_2 SaffronGym, SAFFRON_GYM, $0, 0 map_header_2 SaffronMart, SAFFRON_MART, $0, 0 - map_header_2 SaffronPokeCenter1F, SAFFRON_POKECENTER_1F, $0, 0 - map_header_2 SaffronPokeCenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 + map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0 + map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0 map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, 0 map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0 @@ -589,7 +589,7 @@ map_header_2 Route5SaffronCityGate, ROUTE_5_SAFFRON_CITY_GATE, $0, 0 map_header_2 Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $0, 0 map_header_2 CherrygroveMart, CHERRYGROVE_MART, $0, 0 - map_header_2 CherrygrovePokeCenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0 + map_header_2 CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $0, 0 map_header_2 CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $0, 0 map_header_2 GuideGentsHouse, GUIDE_GENTS_HOUSE, $0, 0 map_header_2 CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $0, 0 diff --git a/text/stdtext.asm b/text/stdtext.asm index 33827694f..7b558cc49 100644 --- a/text/stdtext.asm +++ b/text/stdtext.asm @@ -202,7 +202,7 @@ TrashCanText: line "can break this." done -PokeCenterSignText: +PokecenterSignText: text "Heal Your #MON!" line "#MON CENTER" done From 08b14e593e07555c8d3a445d78d9bcb82a10ddf3 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 23:42:15 -0500 Subject: [PATCH 11/35] Rename tilesets, consistent with constant names --- constants/tilemap_constants.asm | 8 +- data/sprite_engine.asm | 2 +- gfx/tilesets/01.2bpp.lz.0c7e555a | Bin 3080 -> 0 bytes gfx/tilesets/01.png | Bin 2084 -> 0 bytes ... => aerodactyl_word_room.2bpp.lz.8b42470b} | Bin .../{26.png => aerodactyl_word_room.png} | Bin ...467b6a2d => battle_tower.2bpp.lz.467b6a2d} | Bin gfx/tilesets/{22.png => battle_tower.png} | Bin ... => battle_tower_outside.2bpp.lz.391603fb} | Bin .../{02.png => battle_tower_outside.png} | Bin ...42470b => beta_word_room.2bpp.lz.8b42470b} | Bin gfx/tilesets/{32.png => beta_word_room.png} | Bin ...2bpp.lz.3437812a => cave.2bpp.lz.3437812a} | Bin gfx/tilesets/{24.png => cave.png} | Bin ...414d4 => celadon_mansion.2bpp.lz.63b414d4} | Bin gfx/tilesets/{13.png => celadon_mansion.png} | Bin ....71d29a2f => game_corner.2bpp.lz.71d29a2f} | Bin gfx/tilesets/{14.png => game_corner.png} | Bin ...2bpp.lz.f5a55006 => gate.2bpp.lz.f5a55006} | Bin gfx/tilesets/{08.png => gate.png} | Bin ...bpp.lz.c1f2ed8f => gym_1.2bpp.lz.c1f2ed8f} | Bin gfx/tilesets/{15.png => gym_1.png} | Bin ...2470b => ho_oh_word_room.2bpp.lz.8b42470b} | Bin gfx/tilesets/{33.png => ho_oh_word_room.png} | Bin ...p.lz.c848ef13 => house_1.2bpp.lz.c848ef13} | Bin gfx/tilesets/{05.png => house_1.png} | Bin ....lz.e23bc89f => ice_path.2bpp.lz.e23bc89f} | Bin gfx/tilesets/{29.png => ice_path.png} | Bin ....6b0ac896 => ilex_forest.2bpp.lz.6b0ac896} | Bin gfx/tilesets/{31.png => ilex_forest.png} | Bin ...p.lz.0c7e555a => johto_1.2bpp.lz.0c7e555a} | Bin gfx/tilesets/{00.png => johto_1.png} | Bin ...p.lz.391603fb => johto_2.2bpp.lz.391603fb} | Bin gfx/tilesets/{04.png => johto_2.png} | Bin ...470b => kabuto_word_room.2bpp.lz.8b42470b} | Bin gfx/tilesets/{34.png => kabuto_word_room.png} | Bin ...bpp.lz.a29f5d51 => kanto.2bpp.lz.a29f5d51} | Bin gfx/tilesets/{03.png => kanto.png} | Bin ....dd51d079 => kurts_house.2bpp.lz.dd51d079} | Bin gfx/tilesets/{16.png => kurts_house.png} | Bin ....2bpp.lz.b8d0f547 => lab.2bpp.lz.b8d0f547} | Bin gfx/tilesets/{10.png => lab.png} | Bin ...z.0c1544c1 => lighthouse.2bpp.lz.0c1544c1} | Bin gfx/tilesets/{19.png => lighthouse.png} | Bin ...2bpp.lz.e2e94f92 => mart.2bpp.lz.e2e94f92} | Bin gfx/tilesets/{12.png => mart.png} | Bin ....93800351 => olivine_gym.2bpp.lz.93800351} | Bin gfx/tilesets/{18.png => olivine_gym.png} | Bin ...70b => omanyte_word_room.2bpp.lz.8b42470b} | Bin .../{35.png => omanyte_word_room.png} | Bin ...2bpp.lz.7fcb81d6 => park.2bpp.lz.7fcb81d6} | Bin gfx/tilesets/{25.png => park.png} | Bin ...52cbd8f => players_house.2bpp.lz.252cbd8f} | Bin gfx/tilesets/{06.png => players_house.png} | Bin ...1007 => players_house_2f.2bpp.lz.35e51007} | Bin gfx/tilesets/{20.png => players_house_2f.png} | Bin ...z.e1c4014c => pokecenter.2bpp.lz.e1c4014c} | Bin gfx/tilesets/{07.png => pokecenter.png} | Bin ...bbc4ec => pokecom_center.2bpp.lz.febbc4ec} | Bin gfx/tilesets/{21.png => pokecom_center.png} | Bin ...2bpp.lz.56b1a405 => port.2bpp.lz.56b1a405} | Bin gfx/tilesets/{09.png => port.png} | Bin ....454cfd8b => power_plant.2bpp.lz.454cfd8b} | Bin gfx/tilesets/{11.png => power_plant.png} | Bin ....27cdd9ad => radio_tower.2bpp.lz.27cdd9ad} | Bin gfx/tilesets/{27.png => radio_tower.png} | Bin ...b42470b => ruins_of_alph.2bpp.lz.8b42470b} | Bin gfx/tilesets/{36.png => ruins_of_alph.png} | Bin ...bc56789c => sprout_tower.2bpp.lz.bc56789c} | Bin gfx/tilesets/{23.png => sprout_tower.png} | Bin ...600ca86 => train_station.2bpp.lz.1600ca86} | Bin gfx/tilesets/{17.png => train_station.png} | Bin ....cace291c => underground.2bpp.lz.cace291c} | Bin gfx/tilesets/{28.png => underground.png} | Bin ...5b9c4b6 => whirl_islands.2bpp.lz.25b9c4b6} | Bin gfx/tilesets/{30.png => whirl_islands.png} | Bin home/map.asm | 4 +- maps/map_headers.asm | 34 +- tilesets/00_collision.bin | Bin 256 -> 0 bytes tilesets/00_metatiles.bin | Bin 1024 -> 0 bytes tilesets/01_palette_map.asm | 29 -- ...bin => aerodactyl_word_room_collision.bin} | Bin ...bin => aerodactyl_word_room_metatiles.bin} | 0 ...m => aerodactyl_word_room_palette_map.asm} | 0 tilesets/animations.asm | 74 +-- ...llision.bin => battle_tower_collision.bin} | Bin ...tatiles.bin => battle_tower_metatiles.bin} | Bin ...bin => battle_tower_outside_collision.bin} | Bin ...bin => battle_tower_outside_metatiles.bin} | Bin ...m => battle_tower_outside_palette_map.asm} | 0 ...e_map.asm => battle_tower_palette_map.asm} | 0 ...ision.bin => beta_word_room_collision.bin} | Bin ...tiles.bin => beta_word_room_metatiles.bin} | 0 ...map.asm => beta_word_room_palette_map.asm} | 0 .../{24_collision.bin => cave_collision.bin} | Bin .../{24_metatiles.bin => cave_metatiles.bin} | 0 ...4_palette_map.asm => cave_palette_map.asm} | 0 ...sion.bin => celadon_mansion_collision.bin} | Bin ...iles.bin => celadon_mansion_metatiles.bin} | 0 ...ap.asm => celadon_mansion_palette_map.asm} | 0 tilesets/data.asm | 422 +++++++++--------- ...ollision.bin => game_corner_collision.bin} | Bin ...etatiles.bin => game_corner_metatiles.bin} | Bin ...te_map.asm => game_corner_palette_map.asm} | 0 .../{08_collision.bin => gate_collision.bin} | Bin .../{08_metatiles.bin => gate_metatiles.bin} | Bin ...8_palette_map.asm => gate_palette_map.asm} | 0 .../{15_collision.bin => gym_1_collision.bin} | Bin .../{15_metatiles.bin => gym_1_metatiles.bin} | Bin ..._palette_map.asm => gym_1_palette_map.asm} | 0 ...sion.bin => ho_oh_word_room_collision.bin} | Bin ...iles.bin => ho_oh_word_room_metatiles.bin} | 0 ...ap.asm => ho_oh_word_room_palette_map.asm} | 0 ...05_collision.bin => house_1_collision.bin} | Bin ...05_metatiles.bin => house_1_metatiles.bin} | Bin ...alette_map.asm => house_1_palette_map.asm} | 0 ...9_collision.bin => ice_path_collision.bin} | Bin ...9_metatiles.bin => ice_path_metatiles.bin} | 0 ...lette_map.asm => ice_path_palette_map.asm} | 0 ...ollision.bin => ilex_forest_collision.bin} | Bin ...etatiles.bin => ilex_forest_metatiles.bin} | 0 ...te_map.asm => ilex_forest_palette_map.asm} | 0 ...01_collision.bin => johto_1_collision.bin} | Bin ...01_metatiles.bin => johto_1_metatiles.bin} | Bin ...alette_map.asm => johto_1_palette_map.asm} | 0 ...02_collision.bin => johto_2_collision.bin} | Bin ...02_metatiles.bin => johto_2_metatiles.bin} | Bin ...alette_map.asm => johto_2_palette_map.asm} | 0 ...ion.bin => kabuto_word_room_collision.bin} | Bin ...les.bin => kabuto_word_room_metatiles.bin} | 0 ...p.asm => kabuto_word_room_palette_map.asm} | 0 .../{03_collision.bin => kanto_collision.bin} | Bin .../{03_metatiles.bin => kanto_metatiles.bin} | Bin ..._palette_map.asm => kanto_palette_map.asm} | 0 ...ollision.bin => kurts_house_collision.bin} | Bin ...etatiles.bin => kurts_house_metatiles.bin} | Bin ...te_map.asm => kurts_house_palette_map.asm} | 0 .../{10_collision.bin => lab_collision.bin} | Bin .../{10_metatiles.bin => lab_metatiles.bin} | Bin ...10_palette_map.asm => lab_palette_map.asm} | 0 ...collision.bin => lighthouse_collision.bin} | Bin ...metatiles.bin => lighthouse_metatiles.bin} | Bin ...tte_map.asm => lighthouse_palette_map.asm} | 0 .../{12_collision.bin => mart_collision.bin} | Bin .../{12_metatiles.bin => mart_metatiles.bin} | 0 ...2_palette_map.asm => mart_palette_map.asm} | 0 ...ollision.bin => olivine_gym_collision.bin} | Bin ...etatiles.bin => olivine_gym_metatiles.bin} | 0 ...te_map.asm => olivine_gym_palette_map.asm} | 0 ...on.bin => omanyte_word_room_collision.bin} | Bin ...es.bin => omanyte_word_room_metatiles.bin} | 0 ....asm => omanyte_word_room_palette_map.asm} | 0 tilesets/palette_maps.asm | 134 +++--- .../{25_collision.bin => park_collision.bin} | Bin .../{25_metatiles.bin => park_metatiles.bin} | Bin ...5_palette_map.asm => park_palette_map.asm} | 0 ...ion.bin => players_house_2f_collision.bin} | Bin ...les.bin => players_house_2f_metatiles.bin} | Bin ...p.asm => players_house_2f_palette_map.asm} | 0 ...lision.bin => players_house_collision.bin} | Bin ...atiles.bin => players_house_metatiles.bin} | Bin ..._map.asm => players_house_palette_map.asm} | 0 ...collision.bin => pokecenter_collision.bin} | Bin ...metatiles.bin => pokecenter_metatiles.bin} | Bin ...tte_map.asm => pokecenter_palette_map.asm} | 0 ...ision.bin => pokecom_center_collision.bin} | Bin ...tiles.bin => pokecom_center_metatiles.bin} | 0 ...map.asm => pokecom_center_palette_map.asm} | 0 .../{09_collision.bin => port_collision.bin} | Bin .../{09_metatiles.bin => port_metatiles.bin} | 0 ...9_palette_map.asm => port_palette_map.asm} | 0 ...ollision.bin => power_plant_collision.bin} | Bin ...etatiles.bin => power_plant_metatiles.bin} | 0 ...te_map.asm => power_plant_palette_map.asm} | 0 ...ollision.bin => radio_tower_collision.bin} | Bin ...etatiles.bin => radio_tower_metatiles.bin} | Bin ...te_map.asm => radio_tower_palette_map.asm} | 0 ...lision.bin => ruins_of_alph_collision.bin} | Bin ...atiles.bin => ruins_of_alph_metatiles.bin} | Bin ..._map.asm => ruins_of_alph_palette_map.asm} | 0 ...llision.bin => sprout_tower_collision.bin} | Bin ...tatiles.bin => sprout_tower_metatiles.bin} | 0 ...e_map.asm => sprout_tower_palette_map.asm} | 0 tilesets/tileset_headers.asm | 78 ++-- ...lision.bin => train_station_collision.bin} | Bin ...atiles.bin => train_station_metatiles.bin} | Bin ..._map.asm => train_station_palette_map.asm} | 0 ...ollision.bin => underground_collision.bin} | Bin ...etatiles.bin => underground_metatiles.bin} | 0 ...te_map.asm => underground_palette_map.asm} | 0 ...bin => unused_whirl_islands_collision.bin} | Bin ...bin => unused_whirl_islands_metatiles.bin} | Bin ...lision.bin => whirl_islands_collision.bin} | Bin ...atiles.bin => whirl_islands_metatiles.bin} | 0 ..._map.asm => whirl_islands_palette_map.asm} | 0 195 files changed, 378 insertions(+), 407 deletions(-) delete mode 100644 gfx/tilesets/01.2bpp.lz.0c7e555a delete mode 100644 gfx/tilesets/01.png rename gfx/tilesets/{26.2bpp.lz.8b42470b => aerodactyl_word_room.2bpp.lz.8b42470b} (100%) rename gfx/tilesets/{26.png => aerodactyl_word_room.png} (100%) rename gfx/tilesets/{22.2bpp.lz.467b6a2d => battle_tower.2bpp.lz.467b6a2d} (100%) rename gfx/tilesets/{22.png => battle_tower.png} (100%) rename gfx/tilesets/{02.2bpp.lz.391603fb => battle_tower_outside.2bpp.lz.391603fb} (100%) rename gfx/tilesets/{02.png => battle_tower_outside.png} (100%) rename gfx/tilesets/{32.2bpp.lz.8b42470b => beta_word_room.2bpp.lz.8b42470b} (100%) rename gfx/tilesets/{32.png => beta_word_room.png} (100%) rename gfx/tilesets/{24.2bpp.lz.3437812a => cave.2bpp.lz.3437812a} (100%) rename gfx/tilesets/{24.png => cave.png} (100%) rename gfx/tilesets/{13.2bpp.lz.63b414d4 => celadon_mansion.2bpp.lz.63b414d4} (100%) rename gfx/tilesets/{13.png => celadon_mansion.png} (100%) rename gfx/tilesets/{14.2bpp.lz.71d29a2f => game_corner.2bpp.lz.71d29a2f} (100%) rename gfx/tilesets/{14.png => game_corner.png} (100%) rename gfx/tilesets/{08.2bpp.lz.f5a55006 => gate.2bpp.lz.f5a55006} (100%) rename gfx/tilesets/{08.png => gate.png} (100%) rename gfx/tilesets/{15.2bpp.lz.c1f2ed8f => gym_1.2bpp.lz.c1f2ed8f} (100%) rename gfx/tilesets/{15.png => gym_1.png} (100%) rename gfx/tilesets/{33.2bpp.lz.8b42470b => ho_oh_word_room.2bpp.lz.8b42470b} (100%) rename gfx/tilesets/{33.png => ho_oh_word_room.png} (100%) rename gfx/tilesets/{05.2bpp.lz.c848ef13 => house_1.2bpp.lz.c848ef13} (100%) rename gfx/tilesets/{05.png => house_1.png} (100%) rename gfx/tilesets/{29.2bpp.lz.e23bc89f => ice_path.2bpp.lz.e23bc89f} (100%) rename gfx/tilesets/{29.png => ice_path.png} (100%) rename gfx/tilesets/{31.2bpp.lz.6b0ac896 => ilex_forest.2bpp.lz.6b0ac896} (100%) rename gfx/tilesets/{31.png => ilex_forest.png} (100%) rename gfx/tilesets/{00.2bpp.lz.0c7e555a => johto_1.2bpp.lz.0c7e555a} (100%) rename gfx/tilesets/{00.png => johto_1.png} (100%) rename gfx/tilesets/{04.2bpp.lz.391603fb => johto_2.2bpp.lz.391603fb} (100%) rename gfx/tilesets/{04.png => johto_2.png} (100%) rename gfx/tilesets/{34.2bpp.lz.8b42470b => kabuto_word_room.2bpp.lz.8b42470b} (100%) rename gfx/tilesets/{34.png => kabuto_word_room.png} (100%) rename gfx/tilesets/{03.2bpp.lz.a29f5d51 => kanto.2bpp.lz.a29f5d51} (100%) rename gfx/tilesets/{03.png => kanto.png} (100%) rename gfx/tilesets/{16.2bpp.lz.dd51d079 => kurts_house.2bpp.lz.dd51d079} (100%) rename gfx/tilesets/{16.png => kurts_house.png} (100%) rename gfx/tilesets/{10.2bpp.lz.b8d0f547 => lab.2bpp.lz.b8d0f547} (100%) rename gfx/tilesets/{10.png => lab.png} (100%) rename gfx/tilesets/{19.2bpp.lz.0c1544c1 => lighthouse.2bpp.lz.0c1544c1} (100%) rename gfx/tilesets/{19.png => lighthouse.png} (100%) rename gfx/tilesets/{12.2bpp.lz.e2e94f92 => mart.2bpp.lz.e2e94f92} (100%) rename gfx/tilesets/{12.png => mart.png} (100%) rename gfx/tilesets/{18.2bpp.lz.93800351 => olivine_gym.2bpp.lz.93800351} (100%) rename gfx/tilesets/{18.png => olivine_gym.png} (100%) rename gfx/tilesets/{35.2bpp.lz.8b42470b => omanyte_word_room.2bpp.lz.8b42470b} (100%) rename gfx/tilesets/{35.png => omanyte_word_room.png} (100%) rename gfx/tilesets/{25.2bpp.lz.7fcb81d6 => park.2bpp.lz.7fcb81d6} (100%) rename gfx/tilesets/{25.png => park.png} (100%) rename gfx/tilesets/{06.2bpp.lz.252cbd8f => players_house.2bpp.lz.252cbd8f} (100%) rename gfx/tilesets/{06.png => players_house.png} (100%) rename gfx/tilesets/{20.2bpp.lz.35e51007 => players_house_2f.2bpp.lz.35e51007} (100%) rename gfx/tilesets/{20.png => players_house_2f.png} (100%) rename gfx/tilesets/{07.2bpp.lz.e1c4014c => pokecenter.2bpp.lz.e1c4014c} (100%) rename gfx/tilesets/{07.png => pokecenter.png} (100%) rename gfx/tilesets/{21.2bpp.lz.febbc4ec => pokecom_center.2bpp.lz.febbc4ec} (100%) rename gfx/tilesets/{21.png => pokecom_center.png} (100%) rename gfx/tilesets/{09.2bpp.lz.56b1a405 => port.2bpp.lz.56b1a405} (100%) rename gfx/tilesets/{09.png => port.png} (100%) rename gfx/tilesets/{11.2bpp.lz.454cfd8b => power_plant.2bpp.lz.454cfd8b} (100%) rename gfx/tilesets/{11.png => power_plant.png} (100%) rename gfx/tilesets/{27.2bpp.lz.27cdd9ad => radio_tower.2bpp.lz.27cdd9ad} (100%) rename gfx/tilesets/{27.png => radio_tower.png} (100%) rename gfx/tilesets/{36.2bpp.lz.8b42470b => ruins_of_alph.2bpp.lz.8b42470b} (100%) rename gfx/tilesets/{36.png => ruins_of_alph.png} (100%) rename gfx/tilesets/{23.2bpp.lz.bc56789c => sprout_tower.2bpp.lz.bc56789c} (100%) rename gfx/tilesets/{23.png => sprout_tower.png} (100%) rename gfx/tilesets/{17.2bpp.lz.1600ca86 => train_station.2bpp.lz.1600ca86} (100%) rename gfx/tilesets/{17.png => train_station.png} (100%) rename gfx/tilesets/{28.2bpp.lz.cace291c => underground.2bpp.lz.cace291c} (100%) rename gfx/tilesets/{28.png => underground.png} (100%) rename gfx/tilesets/{30.2bpp.lz.25b9c4b6 => whirl_islands.2bpp.lz.25b9c4b6} (100%) rename gfx/tilesets/{30.png => whirl_islands.png} (100%) delete mode 100644 tilesets/00_collision.bin delete mode 100644 tilesets/00_metatiles.bin delete mode 100644 tilesets/01_palette_map.asm rename tilesets/{32_collision.bin => aerodactyl_word_room_collision.bin} (100%) rename tilesets/{36_metatiles.bin => aerodactyl_word_room_metatiles.bin} (100%) rename tilesets/{26_palette_map.asm => aerodactyl_word_room_palette_map.asm} (100%) rename tilesets/{22_collision.bin => battle_tower_collision.bin} (100%) rename tilesets/{22_metatiles.bin => battle_tower_metatiles.bin} (100%) rename tilesets/{04_collision.bin => battle_tower_outside_collision.bin} (100%) rename tilesets/{04_metatiles.bin => battle_tower_outside_metatiles.bin} (100%) rename tilesets/{04_palette_map.asm => battle_tower_outside_palette_map.asm} (100%) rename tilesets/{22_palette_map.asm => battle_tower_palette_map.asm} (100%) rename tilesets/{33_collision.bin => beta_word_room_collision.bin} (100%) rename tilesets/{32_metatiles.bin => beta_word_room_metatiles.bin} (100%) rename tilesets/{32_palette_map.asm => beta_word_room_palette_map.asm} (100%) rename tilesets/{24_collision.bin => cave_collision.bin} (100%) rename tilesets/{24_metatiles.bin => cave_metatiles.bin} (100%) rename tilesets/{24_palette_map.asm => cave_palette_map.asm} (100%) rename tilesets/{13_collision.bin => celadon_mansion_collision.bin} (100%) rename tilesets/{13_metatiles.bin => celadon_mansion_metatiles.bin} (100%) rename tilesets/{13_palette_map.asm => celadon_mansion_palette_map.asm} (100%) rename tilesets/{14_collision.bin => game_corner_collision.bin} (100%) rename tilesets/{14_metatiles.bin => game_corner_metatiles.bin} (100%) rename tilesets/{14_palette_map.asm => game_corner_palette_map.asm} (100%) rename tilesets/{08_collision.bin => gate_collision.bin} (100%) rename tilesets/{08_metatiles.bin => gate_metatiles.bin} (100%) rename tilesets/{08_palette_map.asm => gate_palette_map.asm} (100%) rename tilesets/{15_collision.bin => gym_1_collision.bin} (100%) rename tilesets/{15_metatiles.bin => gym_1_metatiles.bin} (100%) rename tilesets/{15_palette_map.asm => gym_1_palette_map.asm} (100%) rename tilesets/{34_collision.bin => ho_oh_word_room_collision.bin} (100%) rename tilesets/{33_metatiles.bin => ho_oh_word_room_metatiles.bin} (100%) rename tilesets/{33_palette_map.asm => ho_oh_word_room_palette_map.asm} (100%) rename tilesets/{05_collision.bin => house_1_collision.bin} (100%) rename tilesets/{05_metatiles.bin => house_1_metatiles.bin} (100%) rename tilesets/{05_palette_map.asm => house_1_palette_map.asm} (100%) rename tilesets/{29_collision.bin => ice_path_collision.bin} (100%) rename tilesets/{29_metatiles.bin => ice_path_metatiles.bin} (100%) rename tilesets/{29_palette_map.asm => ice_path_palette_map.asm} (100%) rename tilesets/{31_collision.bin => ilex_forest_collision.bin} (100%) rename tilesets/{31_metatiles.bin => ilex_forest_metatiles.bin} (100%) rename tilesets/{31_palette_map.asm => ilex_forest_palette_map.asm} (100%) rename tilesets/{01_collision.bin => johto_1_collision.bin} (100%) rename tilesets/{01_metatiles.bin => johto_1_metatiles.bin} (100%) rename tilesets/{00_palette_map.asm => johto_1_palette_map.asm} (100%) mode change 100755 => 100644 rename tilesets/{02_collision.bin => johto_2_collision.bin} (100%) rename tilesets/{02_metatiles.bin => johto_2_metatiles.bin} (100%) rename tilesets/{02_palette_map.asm => johto_2_palette_map.asm} (100%) rename tilesets/{35_collision.bin => kabuto_word_room_collision.bin} (100%) rename tilesets/{34_metatiles.bin => kabuto_word_room_metatiles.bin} (100%) rename tilesets/{34_palette_map.asm => kabuto_word_room_palette_map.asm} (100%) rename tilesets/{03_collision.bin => kanto_collision.bin} (100%) rename tilesets/{03_metatiles.bin => kanto_metatiles.bin} (100%) rename tilesets/{03_palette_map.asm => kanto_palette_map.asm} (100%) rename tilesets/{16_collision.bin => kurts_house_collision.bin} (100%) rename tilesets/{16_metatiles.bin => kurts_house_metatiles.bin} (100%) rename tilesets/{16_palette_map.asm => kurts_house_palette_map.asm} (100%) rename tilesets/{10_collision.bin => lab_collision.bin} (100%) rename tilesets/{10_metatiles.bin => lab_metatiles.bin} (100%) rename tilesets/{10_palette_map.asm => lab_palette_map.asm} (100%) rename tilesets/{19_collision.bin => lighthouse_collision.bin} (100%) rename tilesets/{19_metatiles.bin => lighthouse_metatiles.bin} (100%) rename tilesets/{19_palette_map.asm => lighthouse_palette_map.asm} (100%) rename tilesets/{12_collision.bin => mart_collision.bin} (100%) rename tilesets/{12_metatiles.bin => mart_metatiles.bin} (100%) rename tilesets/{12_palette_map.asm => mart_palette_map.asm} (100%) rename tilesets/{18_collision.bin => olivine_gym_collision.bin} (100%) rename tilesets/{18_metatiles.bin => olivine_gym_metatiles.bin} (100%) rename tilesets/{18_palette_map.asm => olivine_gym_palette_map.asm} (100%) rename tilesets/{36_collision.bin => omanyte_word_room_collision.bin} (100%) rename tilesets/{35_metatiles.bin => omanyte_word_room_metatiles.bin} (100%) rename tilesets/{35_palette_map.asm => omanyte_word_room_palette_map.asm} (100%) rename tilesets/{25_collision.bin => park_collision.bin} (100%) rename tilesets/{25_metatiles.bin => park_metatiles.bin} (100%) rename tilesets/{25_palette_map.asm => park_palette_map.asm} (100%) rename tilesets/{20_collision.bin => players_house_2f_collision.bin} (100%) rename tilesets/{20_metatiles.bin => players_house_2f_metatiles.bin} (100%) rename tilesets/{20_palette_map.asm => players_house_2f_palette_map.asm} (100%) rename tilesets/{06_collision.bin => players_house_collision.bin} (100%) rename tilesets/{06_metatiles.bin => players_house_metatiles.bin} (100%) rename tilesets/{06_palette_map.asm => players_house_palette_map.asm} (100%) rename tilesets/{07_collision.bin => pokecenter_collision.bin} (100%) rename tilesets/{07_metatiles.bin => pokecenter_metatiles.bin} (100%) rename tilesets/{07_palette_map.asm => pokecenter_palette_map.asm} (100%) rename tilesets/{21_collision.bin => pokecom_center_collision.bin} (100%) rename tilesets/{21_metatiles.bin => pokecom_center_metatiles.bin} (100%) rename tilesets/{21_palette_map.asm => pokecom_center_palette_map.asm} (100%) rename tilesets/{09_collision.bin => port_collision.bin} (100%) rename tilesets/{09_metatiles.bin => port_metatiles.bin} (100%) rename tilesets/{09_palette_map.asm => port_palette_map.asm} (100%) rename tilesets/{11_collision.bin => power_plant_collision.bin} (100%) rename tilesets/{11_metatiles.bin => power_plant_metatiles.bin} (100%) rename tilesets/{11_palette_map.asm => power_plant_palette_map.asm} (100%) rename tilesets/{27_collision.bin => radio_tower_collision.bin} (100%) rename tilesets/{27_metatiles.bin => radio_tower_metatiles.bin} (100%) rename tilesets/{27_palette_map.asm => radio_tower_palette_map.asm} (100%) rename tilesets/{26_collision.bin => ruins_of_alph_collision.bin} (100%) rename tilesets/{26_metatiles.bin => ruins_of_alph_metatiles.bin} (100%) rename tilesets/{36_palette_map.asm => ruins_of_alph_palette_map.asm} (100%) rename tilesets/{23_collision.bin => sprout_tower_collision.bin} (100%) rename tilesets/{23_metatiles.bin => sprout_tower_metatiles.bin} (100%) rename tilesets/{23_palette_map.asm => sprout_tower_palette_map.asm} (100%) rename tilesets/{17_collision.bin => train_station_collision.bin} (100%) rename tilesets/{17_metatiles.bin => train_station_metatiles.bin} (100%) rename tilesets/{17_palette_map.asm => train_station_palette_map.asm} (100%) rename tilesets/{28_collision.bin => underground_collision.bin} (100%) rename tilesets/{28_metatiles.bin => underground_metatiles.bin} (100%) rename tilesets/{28_palette_map.asm => underground_palette_map.asm} (100%) rename tilesets/{unused_30_collision.bin => unused_whirl_islands_collision.bin} (100%) rename tilesets/{unused_30_metatiles.bin => unused_whirl_islands_metatiles.bin} (100%) rename tilesets/{30_collision.bin => whirl_islands_collision.bin} (100%) rename tilesets/{30_metatiles.bin => whirl_islands_metatiles.bin} (100%) rename tilesets/{30_palette_map.asm => whirl_islands_palette_map.asm} (100%) diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm index 702dc92bf..d06e22cc6 100644 --- a/constants/tilemap_constants.asm +++ b/constants/tilemap_constants.asm @@ -11,7 +11,7 @@ const_value SET 1 const TILESET_KANTO ; 03 const TILESET_BATTLE_TOWER_OUTSIDE ; 04 const TILESET_HOUSE_1 ; 05 - const TILESET_KRISS_HOUSE ; 06 + const TILESET_PLAYERS_HOUSE ; 06 const TILESET_POKECENTER ; 07 const TILESET_GATE ; 08 const TILESET_PORT ; 09 @@ -21,11 +21,11 @@ const_value SET 1 const TILESET_CELADON_MANSION ; 0d const TILESET_GAME_CORNER ; 0e const TILESET_GYM_1 ; 0f - const TILESET_KURT_HOUSE ; 10 + const TILESET_KURTS_HOUSE ; 10 const TILESET_TRAIN_STATION ; 11 const TILESET_OLIVINE_GYM ; 12 const TILESET_LIGHTHOUSE ; 13 - const TILESET_KRISS_HOUSE_2F ; 14 + const TILESET_PLAYERS_HOUSE_2F ; 14 const TILESET_POKECOM_CENTER ; 15 const TILESET_BATTLE_TOWER ; 16 const TILESET_SPROUT_TOWER ; 17 @@ -37,7 +37,7 @@ const_value SET 1 const TILESET_ICE_PATH ; 1d const TILESET_WHIRL_ISLANDS ; 1e const TILESET_ILEX_FOREST ; 1f - const TILESET_32 ; 20 + const TILESET_BETA_WORD_ROOM ; 20 const TILESET_HO_OH_WORD_ROOM ; 21 const TILESET_KABUTO_WORD_ROOM ; 22 const TILESET_OMANYTE_WORD_ROOM ; 23 diff --git a/data/sprite_engine.asm b/data/sprite_engine.asm index 31872d531..e3662fdaf 100755 --- a/data/sprite_engine.asm +++ b/data/sprite_engine.asm @@ -1640,7 +1640,7 @@ BrokenStdGFXPointers: ; Broken 2bpp pointers dbbw $80, $01, .deleted dbbw $80, $01, .deleted dbbw $80, $01, .deleted - dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within Tileset11GFX) + dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX) dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data) dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data) dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7) diff --git a/gfx/tilesets/01.2bpp.lz.0c7e555a b/gfx/tilesets/01.2bpp.lz.0c7e555a deleted file mode 100644 index 9821e1433a2ae8f69555999336c51936a0407568..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3080 zcmeHJjZ;%s7Qad4LzV)I(y~;8>oVGEfroeg!@s)bH6u4VB-p<~ywvlw2A+bTM|U7`kLLqd}G&YqhXD*Ow( z_xH}ZIrrXo@A=((?s=I6vZPeSSH;)GH^kSk&^}um%MvcokHdff7IHrNH}R)_6~Djm zQr?wI`LAriZWZCQr=BZ`(|(<$jcX_BHRmH&;(Kao6j_Pgc_b2bBaxt1qKF7WoCrdg zz_f(C`6kCrO`SOL{`+(psr15yuC5z5Iy>9i#`}YqumPBPfbq3KP;aPM*9RfP-!cLF zACF(CACC{c7aAX`S=MY`7>n=XtRys+)}k083yq~UNAgy-?^V|y6}PcYC})w3kCH$- zKx_oK=Z5^}MKyRuwf{b2+8&c1lP}Nj%U4{_9C_!s z;{=wVy>TPQUAn|!q37`=I1-0b#NqzZ{geDbuR0}V}Ed~u3ovy#%Y8@Cje3*s>A;rZzciL>Hu@F-K-eTaf92r;u0IviVia;}3 zJFKH3NI`@s@H#4XKBN+C|Aw`(wkjNHc2pFI6h6@xgCk{}y0oK9v+Zwfm6dm|ZvOu2 zD)@5pC{dHtcU@85FkZ>2ho*Ej<=*TEnmNWH3_FYK-!`pl(AW(wYyB?wS*aK+Uhsb; zK7e6J!*fFS1H~YI&^*&TGcA+FKK1gitphDhL6AdakbD-aOuV+?k3T<~vVy!t%E(Wq z!xJZ?4@Q3wecNpQY`S&qbL(YGPXM9$4#V;$wu#l#(}hTZIGg(LChY5WBB}1uQ#cHls6=EK$Q~vaevuj%824n6@jARG7nfMoCC$Un0&X*H15<^@;-aqQj z^v%z3n@gpiMDK`hi!F{A>QGe})@%4&4a?_ZI8fX3z2Nox{Ahsy#H4gbibwGBNL-P; zlHO{(7=<5Ss#jI7sF=!fRYi%Wge_y=of)||^YxCeDo44Rkz9Ln*}b}){G2oO z1y{NnDq!9Y9coQ)dPPsFrmQ;=Ch*GTvZRscd86@D<0nQVA%2la1VIQ3O9)ekg@xkV z0FBKP27s26t$Lm}qZf^hji`fphI)l(yVwr&xh)&#L7@3ZB9WjD#s54=mPgEE1J5FH z`snzVY~Dcu{GwkFL_c)GHedHV$&EI|&#s&N<=xe{V;+)6)rCQ1X^8^)$7W@zXsN#j zs{-pYjLBrRV)C$CttJ!0kmc#gb&AY}Jz{CYYcTKrVOp1?Rh(gT{IxB|j#-Wyc_Tkz z1e6I3K0?BTFd-rgP$Dq+Ff#)M`n{|Eb#1|cEx0C4LIF){NdN!}QQ^&eG(ivCS^A#U(Z?yeQ3-rb*??$uA#_C%Sg@6 zd~w~{r=<&g;_4EsSH8Vs@fQkU!M{j(V%qM1U0=+PfrR9QWPDJC?*8Js-P7*D2UW1W zDyd3d{cKHAP161(`h^V?P;(S?+hexJ)TND31iu&wgv)bB0%03P$q-3ZGRZY^-Rc_o zp@f6+hkkl6-ZkPKuVK0FEnEKi`|EnA{vCY-3ZvJd(BDhrWvM-hA5M76x5?r-IexB# z3U0Avy1qs4{PQ{BzzGfv1E>7s*;;2d4B}P`;>*VyL=M#GE-lX3SP%CXp+zFF||B=>mT;5{5Q5Ko5MW!g5imrd9LH84bq*tkbYBhuA`vbB(w=v z1fw7dCjEm}7p_Q;eH!!zX3t-TU!MZdvjDN!M&lE+C-{8;?rArS4p!$%@n3)(W@eHz z_kp_Gk$gGkj=_7z(AV-sU-Gw%M(py<*k)~?+g!dOU(dYD+GDv{ZrSJ9G=9J^ZZHj& zw+#H<;}{$39p}BgljjA~cK}9Qr)3V{c^g12(xmIMs0R6 z^aFjle-+?E-g2>P{vvqYcWkF@Jr=j6Xa2I!ZE;y$*2~tJQL}4C_k(F*$F0-1PyPG7 zlkStq>9FEBj6nx-pmz|!L*j5{HJ%8-$F-%qJP#80Xmu(mC!{A?!#S=}67&J<<{*%K3)oql7qcw(yxw-|R_BTi zJqxpn;%=e0%~nD9X4781*3NiGPT}SNFWoxryd4F~^ddI{ma3>U-+jJM2=!X`_x{-@ zcey;z>-+xv`u++q7P%h`247?>*vZf++U&NrHsFA<+ie2_H>0C58UVBeILFxgH9L0( zcdZy;))SW@J963nb_zk8wuFbtd}%J+hHE6?Qn=c z=z>8~b#~Q&nXze*#{CT5{)BATmkpS&R!xKW_t9??B0E2MToM27DkDTyTg>Q|I35Qk zXBB}t8_dq`sm@F*?5HTK-im-!KMn-gNcPMS0=m#w6?#H`vw{YWrvmRkpOFExGZ?(E zs*{bSv56R^T9J|aF*aZ>i{2dGA7$fV1eh+bi%->nxiJ|0N#ibdX$^vq6>NoLp}69W zXsoAllv&p!NE-(uPCz`yQ1AoMv1&3)wN1o~7O+|@j{50VLILE=l+NV8-Xko=_`Eg1$*#UfzWRlxEg9m8AQH&PO5tyZhyG=(A`5AhW)r zB;DN;jjGv~^%--(2pn+#^#JKddw2OO=jGT1Jrwq7U~_4DJ*DYuZc~rCS9I&`34jWo zz@g8mfAx}!tra>gD*&!YrS$mBf3;Atez{Lod3VRI-v9V2Uq11AE(6R-wR0fWlKxtW z_n&chU4$Gp%tbI(u${5(3s6FH_YqRbL5NpAyI_FQkCj&toW_(hIk2WeMp9A1OUGV# zPkGs%kwXtKmf1z=(Qq#m#)=AFt-AV0#rs;}`3?@c3328{VL5`I{bDx)-*Vc*0WK+B z-bVlk9^BZ-0W?r-rdE&H1%dOKlEFkAZEdK$vEx0(d)AQc&UVA^ZauGdVPE}z1Q<;5 z-u~;AwO7_ckgk^ADHhUv9t5?FDBd^EzF(L0TR2VadnQE33V#cxO~{LiH#+PF$OfOk zLLO<@9B4yDRmTQQB3SkhfMtOFFCH;_1OASpf}OFzT~s`^3BUl?@=F5<0L)lF48 z-Uy4aM7E8U5K^IKohr-A$$f@pg>=xoqM5fJc%8%*K0^cX&%^PdG%2YrX$tgy35F5q z>U2|}N4p}pJvuQ3;`V9hlz_$>hsrf@5pNHNZtzPmv+t0}iQqB^SwpsjtI6;7rp-Um zZ~}VqvT$I)#Kes?_J(uYbK9YpZ&aR%fcJ}F7ZG%7Bl!C|d<>sq?BO^KOsb5@w#ZHn zbR6(X9u7}~s%g+ON&}BhU~s+-ZILZg;7;SGc%jA`19S>_0M7#FzUn*H2v!m^Bfuj8 zIB1~sL__=7aKwf$&53GmWkW8dnDzK@B+S@HW`H>0ccW&p;m8<3n%OQ)0g5B~&9P`i z5V!fHkS?U7#{u^~BqO+Le)CU}QgNP7Z!uboR2=C5c=a$Y#u_vAMdpQ6pM>u%$CbL; zjwE|BcsvMbq|_?=1oRY2&M%TOPRgCrNg30_O#R2P1 z+6}+lqrCDK$Q$|AgOSho<{tq!2p~!6P0Gt}1Ef61$J>jg4+K4)Wl&t_u28%OrDydQ za|oF&d(`?$$*VavB3PN9GkYHH(!r7rNlg;n8c2~9?-d2q(jSvbQggmkUZQy6pd#5| z+7z$2!*p2txj#Q;zO0=$uIBt=(QD{8rQ^?fcuQHjEHOU2Q1aI8n0nZ+U#ibIGD44@ zJklZONbV&I2j|jG{A;j4Tr4LPa)#(VxYA^QfjCT%FD`)^3B9dwr9hMDe!5?eT~Dcl zgQ6rR6h;BTJy}v!&o208LHZl3?by|&Gg}u_C~k9+N0sH8(fCk7@v^TNEF&8{gggNx zD*hVae{pC>_1D3#TS0g1$*zdwiLN>y`u&Rc34pPCp8o=#Z2t%U6Yw87savr2p|2MJ O0000m77~RIOm0*hGke=EzzdllJjx4?aTA09 diff --git a/tilesets/00_metatiles.bin b/tilesets/00_metatiles.bin deleted file mode 100644 index 763df1997b23b3f63e271fb4d3d9a329835ef079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmaJ=X;0fg5CucxLLf9%1k|kw_&-sATwEak8jSSac~yjXDEwRP8x zMwQHGGMQ4PQX$!@)oO4TVU|hYZaMd6JE4^`+wkgWbaG?(RCy&JJZ197jcZ zs~rdHSh{UnQo}Z27`CmG?$LcfYWaz#82SbW4d)v00LHkWT#Xw+b z*)&&HH4Ua^;(1BaKIk7oZwd4d<$yPD58nO!_507~!!KXSfB)g*r@#M>PmaEQ|52*f z>-1iplp5Y947l>Wc+K)OUe7Czv*tK!<{J&K*%Cs4Uq`!IBH8d#X(5=GH4@2eE0t!R z*R=9N?B(e`(LEv_gZK^4YoeXt{5+C0i+z}jkaByzmq@lmDoruaw?Vf+-*emG8>s@( zJ8+t_{5kMBc5bq&U|vV}R-B%lU+m)?v#-_jcCz=+ Date: Mon, 11 Dec 2017 00:17:39 -0500 Subject: [PATCH 12/35] Rename overworld sprite files, consistent with their constants --- constants/sprite_constants.asm | 4 +- engine/battle_start.asm | 2 +- engine/color.asm | 2 +- engine/events_3.asm | 4 +- engine/healmachineanim.asm | 2 +- engine/overworld.asm | 2 +- event/field_moves.asm | 6 +- gfx/{ow_fx => overworld}/boulder_dust.png | Bin gfx/{ow_fx => overworld}/chris_fish.png | Bin gfx/{ow_fx => overworld}/cut_grass.png | Bin gfx/{ow_fx => overworld}/cut_tree.png | Bin gfx/{ow_fx => overworld}/fishing_rod.png | Bin gfx/{ow_fx => overworld}/grass_rustle.png | Bin gfx/{ow_fx => overworld}/headbutt_tree.png | Bin gfx/{ow_fx => overworld}/heal_machine.png | Bin gfx/{ow_fx => overworld}/kris_fish.png | Bin gfx/{ow_fx => overworld}/shadow.png | Bin gfx/overworld/sprites_1.asm | 44 ------- gfx/overworld/sprites_2.asm | 58 ---------- .../trainer_battle_pokeball_tiles.png | Bin gfx/pics.asm | 9 +- gfx/{overworld => }/sprite_headers.asm | 0 gfx/sprites.asm | 108 ++++++++++++++++++ .../070.png => sprites/big_lapras.png} | Bin .../079.png => sprites/big_onix.png} | Bin .../050.png => sprites/big_snorlax.png} | Bin gfx/{overworld/073.png => sprites/biker.png} | Bin gfx/{overworld/007.png => sprites/bill.png} | Bin gfx/{overworld/077.png => sprites/bird.png} | Bin .../064.png => sprites/black_belt.png} | Bin gfx/{overworld/012.png => sprites/blaine.png} | Bin gfx/{overworld/006.png => sprites/blue.png} | Bin .../089.png => sprites/boulder.png} | Bin gfx/{overworld/025.png => sprites/brock.png} | Bin gfx/{overworld/027.png => sprites/bruno.png} | Bin gfx/{overworld/041.png => sprites/buena.png} | Bin .../036.png => sprites/bug_catcher.png} | Bin gfx/{overworld/019.png => sprites/bugsy.png} | Bin gfx/{overworld/067.png => sprites/cal.png} | Bin .../069.png => sprites/captain.png} | Bin gfx/{overworld/000.png => sprites/chris.png} | Bin .../001.png => sprites/chris_bike.png} | Bin gfx/{overworld/021.png => sprites/chuck.png} | Bin gfx/{overworld/024.png => sprites/clair.png} | Bin gfx/{overworld/056.png => sprites/clerk.png} | Bin .../035.png => sprites/cooltrainer_f.png} | Bin .../034.png => sprites/cooltrainer_m.png} | Bin gfx/{overworld/014.png => sprites/daisy.png} | Bin gfx/{overworld/078.png => sprites/dragon.png} | Bin gfx/{overworld/008.png => sprites/elder.png} | Bin gfx/{overworld/015.png => sprites/elm.png} | Bin gfx/{overworld/099.png => sprites/entei.png} | Bin gfx/{overworld/031.png => sprites/erika.png} | Bin gfx/{overworld/076.png => sprites/fairy.png} | Bin .../017.png => sprites/falkner.png} | Bin .../091.png => sprites/famicom.png} | Bin gfx/{overworld/057.png => sprites/fisher.png} | Bin .../058.png => sprites/fishing_guru.png} | Bin .../092.png => sprites/fruit_tree.png} | Bin .../002.png => sprites/gameboy_kid.png} | Bin .../063.png => sprites/gentleman.png} | Bin .../093.png => sprites/gold_trophy.png} | Bin gfx/{overworld/046.png => sprites/gramps.png} | Bin gfx/{overworld/047.png => sprites/granny.png} | Bin .../071.png => sprites/gym_guy.png} | Bin gfx/{overworld/009.png => sprites/janine.png} | Bin .../022.png => sprites/jasmine.png} | Bin gfx/{overworld/026.png => sprites/karen.png} | Bin .../060.png => sprites/kimono_girl.png} | Bin gfx/{overworld/032.png => sprites/koga.png} | Bin gfx/{overworld/095.png => sprites/kris.png} | Bin .../096.png => sprites/kris_bike.png} | Bin gfx/{overworld/010.png => sprites/kurt.png} | Bin .../097.png => sprites/kurt_outside.png} | Bin gfx/{overworld/029.png => sprites/lance.png} | Bin gfx/{overworld/039.png => sprites/lass.png} | Bin .../055.png => sprites/link_receptionist.png} | Bin gfx/{overworld/028.png => sprites/misty.png} | Bin gfx/{overworld/011.png => sprites/mom.png} | Bin .../075.png => sprites/monster.png} | Bin gfx/{overworld/020.png => sprites/morty.png} | Bin gfx/{overworld/080.png => sprites/n64.png} | Bin gfx/{overworld/054.png => sprites/nurse.png} | Bin gfx/{overworld/004.png => sprites/oak.png} | Bin .../066.png => sprites/officer.png} | Bin .../old_link_receptionist.png} | Bin gfx/{overworld/085.png => sprites/paper.png} | Bin .../074.png => sprites/pharmacist.png} | Bin .../083.png => sprites/poke_ball.png} | Bin .../084.png => sprites/pokedex.png} | Bin .../045.png => sprites/pokefan_f.png} | Bin .../044.png => sprites/pokefan_m.png} | Bin gfx/{overworld/023.png => sprites/pryce.png} | Bin gfx/{overworld/100.png => sprites/raikou.png} | Bin .../065.png => sprites/receptionist.png} | Bin gfx/{overworld/005.png => sprites/red.png} | Bin .../013.png => sprites/reds_mom.png} | Bin gfx/{overworld/088.png => sprites/rock.png} | Bin gfx/{overworld/043.png => sprites/rocker.png} | Bin gfx/{overworld/052.png => sprites/rocket.png} | Bin .../053.png => sprites/rocket_girl.png} | Bin .../033.png => sprites/sabrina.png} | Bin gfx/{overworld/061.png => sprites/sage.png} | Bin gfx/{overworld/072.png => sprites/sailor.png} | Bin .../059.png => sprites/scientist.png} | Bin gfx/{overworld/003.png => sprites/silver.png} | Bin .../094.png => sprites/silver_trophy.png} | Bin .../068.png => sprites/slowpoke.png} | Bin gfx/{overworld/090.png => sprites/snes.png} | Bin .../standing_youngster.png} | Bin .../081.png => sprites/sudowoodo.png} | Bin .../098.png => sprites/suicune.png} | Bin .../042.png => sprites/super_nerd.png} | Bin gfx/{overworld/082.png => sprites/surf.png} | Bin .../051.png => sprites/surfing_pikachu.png} | Bin gfx/{overworld/030.png => sprites/surge.png} | Bin .../049.png => sprites/swimmer_girl.png} | Bin .../048.png => sprites/swimmer_guy.png} | Bin .../040.png => sprites/teacher.png} | Bin gfx/{overworld/037.png => sprites/twin.png} | Bin .../062.png => sprites/unused_guy.png} | Bin .../086.png => sprites/virtual_boy.png} | Bin .../018.png => sprites/whitney.png} | Bin gfx/{overworld/016.png => sprites/will.png} | Bin .../038.png => sprites/youngster.png} | Bin ...ette_pointers.asm => trainer_palettes.asm} | 0 gfx/{pics => }/trainer_pic_pointers.asm | 0 main.asm | 6 +- misc/gfx_41.asm | 8 +- pokecrystal.link | 4 +- 130 files changed, 132 insertions(+), 127 deletions(-) rename gfx/{ow_fx => overworld}/boulder_dust.png (100%) rename gfx/{ow_fx => overworld}/chris_fish.png (100%) rename gfx/{ow_fx => overworld}/cut_grass.png (100%) rename gfx/{ow_fx => overworld}/cut_tree.png (100%) rename gfx/{ow_fx => overworld}/fishing_rod.png (100%) rename gfx/{ow_fx => overworld}/grass_rustle.png (100%) rename gfx/{ow_fx => overworld}/headbutt_tree.png (100%) rename gfx/{ow_fx => overworld}/heal_machine.png (100%) rename gfx/{ow_fx => overworld}/kris_fish.png (100%) rename gfx/{ow_fx => overworld}/shadow.png (100%) delete mode 100644 gfx/overworld/sprites_1.asm delete mode 100644 gfx/overworld/sprites_2.asm rename gfx/{ow_fx => overworld}/trainer_battle_pokeball_tiles.png (100%) rename gfx/{overworld => }/sprite_headers.asm (100%) create mode 100644 gfx/sprites.asm rename gfx/{overworld/070.png => sprites/big_lapras.png} (100%) rename gfx/{overworld/079.png => sprites/big_onix.png} (100%) rename gfx/{overworld/050.png => sprites/big_snorlax.png} (100%) rename gfx/{overworld/073.png => sprites/biker.png} (100%) rename gfx/{overworld/007.png => sprites/bill.png} (100%) rename gfx/{overworld/077.png => sprites/bird.png} (100%) rename gfx/{overworld/064.png => sprites/black_belt.png} (100%) rename gfx/{overworld/012.png => sprites/blaine.png} (100%) rename gfx/{overworld/006.png => sprites/blue.png} (100%) rename gfx/{overworld/089.png => sprites/boulder.png} (100%) rename gfx/{overworld/025.png => sprites/brock.png} (100%) rename gfx/{overworld/027.png => sprites/bruno.png} (100%) rename gfx/{overworld/041.png => sprites/buena.png} (100%) rename gfx/{overworld/036.png => sprites/bug_catcher.png} (100%) rename gfx/{overworld/019.png => sprites/bugsy.png} (100%) rename gfx/{overworld/067.png => sprites/cal.png} (100%) rename gfx/{overworld/069.png => sprites/captain.png} (100%) rename gfx/{overworld/000.png => sprites/chris.png} (100%) rename gfx/{overworld/001.png => sprites/chris_bike.png} (100%) rename gfx/{overworld/021.png => sprites/chuck.png} (100%) rename gfx/{overworld/024.png => sprites/clair.png} (100%) rename gfx/{overworld/056.png => sprites/clerk.png} (100%) rename gfx/{overworld/035.png => sprites/cooltrainer_f.png} (100%) rename gfx/{overworld/034.png => sprites/cooltrainer_m.png} (100%) rename gfx/{overworld/014.png => sprites/daisy.png} (100%) rename gfx/{overworld/078.png => sprites/dragon.png} (100%) rename gfx/{overworld/008.png => sprites/elder.png} (100%) rename gfx/{overworld/015.png => sprites/elm.png} (100%) rename gfx/{overworld/099.png => sprites/entei.png} (100%) rename gfx/{overworld/031.png => sprites/erika.png} (100%) rename gfx/{overworld/076.png => sprites/fairy.png} (100%) rename gfx/{overworld/017.png => sprites/falkner.png} (100%) rename gfx/{overworld/091.png => sprites/famicom.png} (100%) rename gfx/{overworld/057.png => sprites/fisher.png} (100%) rename gfx/{overworld/058.png => sprites/fishing_guru.png} (100%) rename gfx/{overworld/092.png => sprites/fruit_tree.png} (100%) rename gfx/{overworld/002.png => sprites/gameboy_kid.png} (100%) rename gfx/{overworld/063.png => sprites/gentleman.png} (100%) rename gfx/{overworld/093.png => sprites/gold_trophy.png} (100%) rename gfx/{overworld/046.png => sprites/gramps.png} (100%) rename gfx/{overworld/047.png => sprites/granny.png} (100%) rename gfx/{overworld/071.png => sprites/gym_guy.png} (100%) rename gfx/{overworld/009.png => sprites/janine.png} (100%) rename gfx/{overworld/022.png => sprites/jasmine.png} (100%) rename gfx/{overworld/026.png => sprites/karen.png} (100%) rename gfx/{overworld/060.png => sprites/kimono_girl.png} (100%) rename gfx/{overworld/032.png => sprites/koga.png} (100%) rename gfx/{overworld/095.png => sprites/kris.png} (100%) rename gfx/{overworld/096.png => sprites/kris_bike.png} (100%) rename gfx/{overworld/010.png => sprites/kurt.png} (100%) rename gfx/{overworld/097.png => sprites/kurt_outside.png} (100%) rename gfx/{overworld/029.png => sprites/lance.png} (100%) rename gfx/{overworld/039.png => sprites/lass.png} (100%) rename gfx/{overworld/055.png => sprites/link_receptionist.png} (100%) rename gfx/{overworld/028.png => sprites/misty.png} (100%) rename gfx/{overworld/011.png => sprites/mom.png} (100%) rename gfx/{overworld/075.png => sprites/monster.png} (100%) rename gfx/{overworld/020.png => sprites/morty.png} (100%) rename gfx/{overworld/080.png => sprites/n64.png} (100%) rename gfx/{overworld/054.png => sprites/nurse.png} (100%) rename gfx/{overworld/004.png => sprites/oak.png} (100%) rename gfx/{overworld/066.png => sprites/officer.png} (100%) rename gfx/{overworld/087.png => sprites/old_link_receptionist.png} (100%) rename gfx/{overworld/085.png => sprites/paper.png} (100%) rename gfx/{overworld/074.png => sprites/pharmacist.png} (100%) rename gfx/{overworld/083.png => sprites/poke_ball.png} (100%) rename gfx/{overworld/084.png => sprites/pokedex.png} (100%) rename gfx/{overworld/045.png => sprites/pokefan_f.png} (100%) rename gfx/{overworld/044.png => sprites/pokefan_m.png} (100%) rename gfx/{overworld/023.png => sprites/pryce.png} (100%) rename gfx/{overworld/100.png => sprites/raikou.png} (100%) rename gfx/{overworld/065.png => sprites/receptionist.png} (100%) rename gfx/{overworld/005.png => sprites/red.png} (100%) rename gfx/{overworld/013.png => sprites/reds_mom.png} (100%) rename gfx/{overworld/088.png => sprites/rock.png} (100%) rename gfx/{overworld/043.png => sprites/rocker.png} (100%) rename gfx/{overworld/052.png => sprites/rocket.png} (100%) rename gfx/{overworld/053.png => sprites/rocket_girl.png} (100%) rename gfx/{overworld/033.png => sprites/sabrina.png} (100%) rename gfx/{overworld/061.png => sprites/sage.png} (100%) rename gfx/{overworld/072.png => sprites/sailor.png} (100%) rename gfx/{overworld/059.png => sprites/scientist.png} (100%) rename gfx/{overworld/003.png => sprites/silver.png} (100%) rename gfx/{overworld/094.png => sprites/silver_trophy.png} (100%) rename gfx/{overworld/068.png => sprites/slowpoke.png} (100%) rename gfx/{overworld/090.png => sprites/snes.png} (100%) rename gfx/{overworld/101.png => sprites/standing_youngster.png} (100%) rename gfx/{overworld/081.png => sprites/sudowoodo.png} (100%) rename gfx/{overworld/098.png => sprites/suicune.png} (100%) rename gfx/{overworld/042.png => sprites/super_nerd.png} (100%) rename gfx/{overworld/082.png => sprites/surf.png} (100%) rename gfx/{overworld/051.png => sprites/surfing_pikachu.png} (100%) rename gfx/{overworld/030.png => sprites/surge.png} (100%) rename gfx/{overworld/049.png => sprites/swimmer_girl.png} (100%) rename gfx/{overworld/048.png => sprites/swimmer_guy.png} (100%) rename gfx/{overworld/040.png => sprites/teacher.png} (100%) rename gfx/{overworld/037.png => sprites/twin.png} (100%) rename gfx/{overworld/062.png => sprites/unused_guy.png} (100%) rename gfx/{overworld/086.png => sprites/virtual_boy.png} (100%) rename gfx/{overworld/018.png => sprites/whitney.png} (100%) rename gfx/{overworld/016.png => sprites/will.png} (100%) rename gfx/{overworld/038.png => sprites/youngster.png} (100%) rename gfx/{trainers/palette_pointers.asm => trainer_palettes.asm} (100%) rename gfx/{pics => }/trainer_pic_pointers.asm (100%) diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 1a716f51b..787e130f4 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; SpriteHeaders indexes (see gfx/overworld/sprite_headers.asm) +; SpriteHeaders indexes (see gfx/sprite_headers.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 @@ -166,7 +166,7 @@ SPRITE_VARS EQU const_value const SPRITE_COPYCAT ; fb const SPRITE_JANINE_IMPERSONATOR ; fc -; sprite_header struct members (see gfx/overworld/sprite_headers.asm) +; sprite_header struct members (see gfx/sprite_headers.asm) const_def const SPRITEHEADER_ADDR_LO const SPRITEHEADER_ADDR_HI diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 962948386..b16bbbd67 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf ; 8c2f4 TrainerBattlePokeballTiles: ; 8c2f4 -INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp" +INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" FlashyTransitionToBattle: ; 8c314 diff --git a/engine/color.asm b/engine/color.asm index 6e99e9cb7..8690d7f1c 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1877,7 +1877,7 @@ Palettes_a8ca: INCLUDE "gfx/pics/palette_pointers.asm" -INCLUDE "gfx/trainers/palette_pointers.asm" +INCLUDE "gfx/trainer_palettes.asm" LoadMapPals: callba LoadSpecialMapPalette diff --git a/engine/events_3.asm b/engine/events_3.asm index cff4eefb9..b6aaea3b7 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3 ; b84f2 FishingGFX: ; b84f2 -INCBIN "gfx/ow_fx/chris_fish.2bpp" +INCBIN "gfx/overworld/chris_fish.2bpp" ; b8582 KrisFishingGFX: ; b8582 -INCBIN "gfx/ow_fx/kris_fish.2bpp" +INCBIN "gfx/overworld/kris_fish.2bpp" ; b8612 diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm index bea580dcd..4f543c0b3 100755 --- a/engine/healmachineanim.asm +++ b/engine/healmachineanim.asm @@ -137,7 +137,7 @@ HealMachineAnim: ; 12324 ; 123fc .HealMachineGFX: ; 123fc -INCBIN "gfx/ow_fx/heal_machine.2bpp" +INCBIN "gfx/overworld/heal_machine.2bpp" ; 1241c .HOF_OAM: ; 1241c diff --git a/engine/overworld.asm b/engine/overworld.asm index 1a49b1bfc..3ed029800 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -1477,5 +1477,5 @@ Group20Sprites: ; 1472b SpriteHeaders: ; 14736 -INCLUDE "gfx/overworld/sprite_headers.asm" +INCLUDE "gfx/sprite_headers.asm" ; 1499a diff --git a/event/field_moves.asm b/event/field_moves.asm index 2869f9be9..4c4b8cfc1 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a ; 8c893 HeadbuttTreeGFX: ; 8c893 -INCBIN "gfx/ow_fx/headbutt_tree.2bpp" +INCBIN "gfx/overworld/headbutt_tree.2bpp" ; 8c913 HideHeadbuttTree: ; 8c913 @@ -152,11 +152,11 @@ OWCutAnimation: ; 8c940 ; 8c98c CutTreeGFX: ; c898c -INCBIN "gfx/ow_fx/cut_tree.2bpp" +INCBIN "gfx/overworld/cut_tree.2bpp" ; c89cc CutGrassGFX: ; 8c9cc -INCBIN "gfx/ow_fx/cut_grass.2bpp" +INCBIN "gfx/overworld/cut_grass.2bpp" ; 8ca0c OWCutJumptable: ; 8ca0c diff --git a/gfx/ow_fx/boulder_dust.png b/gfx/overworld/boulder_dust.png similarity index 100% rename from gfx/ow_fx/boulder_dust.png rename to gfx/overworld/boulder_dust.png diff --git a/gfx/ow_fx/chris_fish.png b/gfx/overworld/chris_fish.png similarity index 100% rename from gfx/ow_fx/chris_fish.png rename to gfx/overworld/chris_fish.png diff --git a/gfx/ow_fx/cut_grass.png b/gfx/overworld/cut_grass.png similarity index 100% rename from gfx/ow_fx/cut_grass.png rename to gfx/overworld/cut_grass.png diff --git a/gfx/ow_fx/cut_tree.png b/gfx/overworld/cut_tree.png similarity index 100% rename from gfx/ow_fx/cut_tree.png rename to gfx/overworld/cut_tree.png diff --git a/gfx/ow_fx/fishing_rod.png b/gfx/overworld/fishing_rod.png similarity index 100% rename from gfx/ow_fx/fishing_rod.png rename to gfx/overworld/fishing_rod.png diff --git a/gfx/ow_fx/grass_rustle.png b/gfx/overworld/grass_rustle.png similarity index 100% rename from gfx/ow_fx/grass_rustle.png rename to gfx/overworld/grass_rustle.png diff --git a/gfx/ow_fx/headbutt_tree.png b/gfx/overworld/headbutt_tree.png similarity index 100% rename from gfx/ow_fx/headbutt_tree.png rename to gfx/overworld/headbutt_tree.png diff --git a/gfx/ow_fx/heal_machine.png b/gfx/overworld/heal_machine.png similarity index 100% rename from gfx/ow_fx/heal_machine.png rename to gfx/overworld/heal_machine.png diff --git a/gfx/ow_fx/kris_fish.png b/gfx/overworld/kris_fish.png similarity index 100% rename from gfx/ow_fx/kris_fish.png rename to gfx/overworld/kris_fish.png diff --git a/gfx/ow_fx/shadow.png b/gfx/overworld/shadow.png similarity index 100% rename from gfx/ow_fx/shadow.png rename to gfx/overworld/shadow.png diff --git a/gfx/overworld/sprites_1.asm b/gfx/overworld/sprites_1.asm deleted file mode 100644 index 640ac6ccc..000000000 --- a/gfx/overworld/sprites_1.asm +++ /dev/null @@ -1,44 +0,0 @@ -ChrisSpriteGFX: INCBIN "gfx/overworld/000.2bpp" ; c0000 -ChrisBikeSpriteGFX: INCBIN "gfx/overworld/001.2bpp" ; c0180 -GameboyKidSpriteGFX: INCBIN "gfx/overworld/002.2bpp" ; c0300 -SilverSpriteGFX: INCBIN "gfx/overworld/003.2bpp" ; c03c0 -OakSpriteGFX: INCBIN "gfx/overworld/004.2bpp" ; c0540 -RedSpriteGFX: INCBIN "gfx/overworld/005.2bpp" ; c06c0 -BlueSpriteGFX: INCBIN "gfx/overworld/006.2bpp" ; c0840 -BillSpriteGFX: INCBIN "gfx/overworld/007.2bpp" ; c09c0 -ElderSpriteGFX: INCBIN "gfx/overworld/008.2bpp" ; c0b40 -JanineSpriteGFX: INCBIN "gfx/overworld/009.2bpp" ; c0cc0 -KurtSpriteGFX: INCBIN "gfx/overworld/010.2bpp" ; c0e40 -MomSpriteGFX: INCBIN "gfx/overworld/011.2bpp" ; c0fc0 -BlaineSpriteGFX: INCBIN "gfx/overworld/012.2bpp" ; c1140 -RedsMomSpriteGFX: INCBIN "gfx/overworld/013.2bpp" ; c12c0 -DaisySpriteGFX: INCBIN "gfx/overworld/014.2bpp" ; c1440 -ElmSpriteGFX: INCBIN "gfx/overworld/015.2bpp" ; c15c0 -WillSpriteGFX: INCBIN "gfx/overworld/016.2bpp" ; c1740 -FalknerSpriteGFX: INCBIN "gfx/overworld/017.2bpp" ; c1800 -WhitneySpriteGFX: INCBIN "gfx/overworld/018.2bpp" ; c1980 -BugsySpriteGFX: INCBIN "gfx/overworld/019.2bpp" ; c1b00 -MortySpriteGFX: INCBIN "gfx/overworld/020.2bpp" ; c1c80 -ChuckSpriteGFX: INCBIN "gfx/overworld/021.2bpp" ; c1e00 -JasmineSpriteGFX: INCBIN "gfx/overworld/022.2bpp" ; c1f80 -PryceSpriteGFX: INCBIN "gfx/overworld/023.2bpp" ; c2100 -ClairSpriteGFX: INCBIN "gfx/overworld/024.2bpp" ; c2280 -BrockSpriteGFX: INCBIN "gfx/overworld/025.2bpp" ; c2400 -KarenSpriteGFX: INCBIN "gfx/overworld/026.2bpp" ; c2580 -BrunoSpriteGFX: INCBIN "gfx/overworld/027.2bpp" ; c2640 -MistySpriteGFX: INCBIN "gfx/overworld/028.2bpp" ; c27c0 -LanceSpriteGFX: INCBIN "gfx/overworld/029.2bpp" ; c2940 -SurgeSpriteGFX: INCBIN "gfx/overworld/030.2bpp" ; c2ac0 -ErikaSpriteGFX: INCBIN "gfx/overworld/031.2bpp" ; c2c40 -KogaSpriteGFX: INCBIN "gfx/overworld/032.2bpp" ; c2dc0 -SabrinaSpriteGFX: INCBIN "gfx/overworld/033.2bpp" ; c2f40 -CooltrainerMSpriteGFX: INCBIN "gfx/overworld/034.2bpp" ; c30c0 -CooltrainerFSpriteGFX: INCBIN "gfx/overworld/035.2bpp" ; c3240 -BugCatcherSpriteGFX: INCBIN "gfx/overworld/036.2bpp" ; c33c0 -TwinSpriteGFX: INCBIN "gfx/overworld/037.2bpp" ; c3540 -YoungsterSpriteGFX: INCBIN "gfx/overworld/038.2bpp" ; c36c0 -LassSpriteGFX: INCBIN "gfx/overworld/039.2bpp" ; c3840 -TeacherSpriteGFX: INCBIN "gfx/overworld/040.2bpp" ; c39c0 -BuenaSpriteGFX: INCBIN "gfx/overworld/041.2bpp" ; c3b40 -SuperNerdSpriteGFX: INCBIN "gfx/overworld/042.2bpp" ; c3cc0 -RockerSpriteGFX: INCBIN "gfx/overworld/043.2bpp" ; c3e40 diff --git a/gfx/overworld/sprites_2.asm b/gfx/overworld/sprites_2.asm deleted file mode 100644 index 20060d0c1..000000000 --- a/gfx/overworld/sprites_2.asm +++ /dev/null @@ -1,58 +0,0 @@ -PokefanMSpriteGFX: INCBIN "gfx/overworld/044.2bpp" ; c4000 -PokefanFSpriteGFX: INCBIN "gfx/overworld/045.2bpp" ; c4180 -GrampsSpriteGFX: INCBIN "gfx/overworld/046.2bpp" ; c4300 -GrannySpriteGFX: INCBIN "gfx/overworld/047.2bpp" ; c4480 -SwimmerGuySpriteGFX: INCBIN "gfx/overworld/048.2bpp" ; c4600 -SwimmerGirlSpriteGFX: INCBIN "gfx/overworld/049.2bpp" ; c4780 -BigSnorlaxSpriteGFX: INCBIN "gfx/overworld/050.2bpp" ; c4900 -SurfingPikachuSpriteGFX: INCBIN "gfx/overworld/051.2bpp" ; c4980 -RocketSpriteGFX: INCBIN "gfx/overworld/052.2bpp" ; c4b00 -RocketGirlSpriteGFX: INCBIN "gfx/overworld/053.2bpp" ; c4c80 -NurseSpriteGFX: INCBIN "gfx/overworld/054.2bpp" ; c4e00 -LinkReceptionistSpriteGFX: INCBIN "gfx/overworld/055.2bpp" ; c4ec0 -ClerkSpriteGFX: INCBIN "gfx/overworld/056.2bpp" ; c5040 -FisherSpriteGFX: INCBIN "gfx/overworld/057.2bpp" ; c51c0 -FishingGuruSpriteGFX: INCBIN "gfx/overworld/058.2bpp" ; c5340 -ScientistSpriteGFX: INCBIN "gfx/overworld/059.2bpp" ; c54c0 -KimonoGirlSpriteGFX: INCBIN "gfx/overworld/060.2bpp" ; c5640 -SageSpriteGFX: INCBIN "gfx/overworld/061.2bpp" ; c57c0 -UnusedGuySpriteGFX: INCBIN "gfx/overworld/062.2bpp" ; c5940 -GentlemanSpriteGFX: INCBIN "gfx/overworld/063.2bpp" ; c5ac0 -BlackBeltSpriteGFX: INCBIN "gfx/overworld/064.2bpp" ; c5c40 -ReceptionistSpriteGFX: INCBIN "gfx/overworld/065.2bpp" ; c5dc0 -OfficerSpriteGFX: INCBIN "gfx/overworld/066.2bpp" ; c5f40 -CalSpriteGFX: INCBIN "gfx/overworld/067.2bpp" ; c60c0 -SlowpokeSpriteGFX: INCBIN "gfx/overworld/068.2bpp" ; c6240 -CaptainSpriteGFX: INCBIN "gfx/overworld/069.2bpp" ; c6280 -BigLaprasSpriteGFX: INCBIN "gfx/overworld/070.2bpp" ; c6400 -GymGuySpriteGFX: INCBIN "gfx/overworld/071.2bpp" ; c6480 -SailorSpriteGFX: INCBIN "gfx/overworld/072.2bpp" ; c6600 -BikerSpriteGFX: INCBIN "gfx/overworld/073.2bpp" ; c6780 -PharmacistSpriteGFX: INCBIN "gfx/overworld/074.2bpp" ; c6900 -MonsterSpriteGFX: INCBIN "gfx/overworld/075.2bpp" ; c6a80 -FairySpriteGFX: INCBIN "gfx/overworld/076.2bpp" ; c6c00 -BirdSpriteGFX: INCBIN "gfx/overworld/077.2bpp" ; c6d80 -DragonSpriteGFX: INCBIN "gfx/overworld/078.2bpp" ; c6f00 -BigOnixSpriteGFX: INCBIN "gfx/overworld/079.2bpp" ; c7080 -N64SpriteGFX: INCBIN "gfx/overworld/080.2bpp" ; c7140 -SudowoodoSpriteGFX: INCBIN "gfx/overworld/081.2bpp" ; c7180 -SurfSpriteGFX: INCBIN "gfx/overworld/082.2bpp" ; c7200 -PokeBallSpriteGFX: INCBIN "gfx/overworld/083.2bpp" ; c7380 -PokedexSpriteGFX: INCBIN "gfx/overworld/084.2bpp" ; c7500 -PaperSpriteGFX: INCBIN "gfx/overworld/085.2bpp" ; c7680 -VirtualBoySpriteGFX: INCBIN "gfx/overworld/086.2bpp" ; c7800 -OldLinkReceptionistSpriteGFX: INCBIN "gfx/overworld/087.2bpp" ; c7840 -RockSpriteGFX: INCBIN "gfx/overworld/088.2bpp" ; c7880 -BoulderSpriteGFX: INCBIN "gfx/overworld/089.2bpp" ; c78c0 -SnesSpriteGFX: INCBIN "gfx/overworld/090.2bpp" ; c7900 -FamicomSpriteGFX: INCBIN "gfx/overworld/091.2bpp" ; c7940 -FruitTreeSpriteGFX: INCBIN "gfx/overworld/092.2bpp" ; c7980 -GoldTrophySpriteGFX: INCBIN "gfx/overworld/093.2bpp" ; c79c0 -SilverTrophySpriteGFX: INCBIN "gfx/overworld/094.2bpp" ; c7a00 -KrisSpriteGFX: INCBIN "gfx/overworld/095.2bpp" ; c7a40 -KrisBikeSpriteGFX: INCBIN "gfx/overworld/096.2bpp" ; c7bc0 -KurtOutsideSpriteGFX: INCBIN "gfx/overworld/097.2bpp" ; c7d40 -SuicuneSpriteGFX: INCBIN "gfx/overworld/098.2bpp" ; c7e00 -EnteiSpriteGFX: INCBIN "gfx/overworld/099.2bpp" ; c7e40 -RaikouSpriteGFX: INCBIN "gfx/overworld/100.2bpp" ; c7e80 -StandingYoungsterSpriteGFX: INCBIN "gfx/overworld/101.2bpp" ; c7ec0 diff --git a/gfx/ow_fx/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png similarity index 100% rename from gfx/ow_fx/trainer_battle_pokeball_tiles.png rename to gfx/overworld/trainer_battle_pokeball_tiles.png diff --git a/gfx/pics.asm b/gfx/pics.asm index c48106e3c..7e0aebb5c 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1,18 +1,21 @@ INCLUDE "includes.asm" -; Unown pic pointers are assumed to start at the same address in a different bank. - SECTION "Pic Pointers", ROMX + PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm" + SECTION "Unown Pic Pointers", ROMX + +; Unown pic pointers are assumed to start at the same address as PicPointers, +; but in a different bank. UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm" SECTION "Trainer Pic Pointers", ROMX -TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm" +TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm" SECTION "Pics 1", ROMX diff --git a/gfx/overworld/sprite_headers.asm b/gfx/sprite_headers.asm similarity index 100% rename from gfx/overworld/sprite_headers.asm rename to gfx/sprite_headers.asm diff --git a/gfx/sprites.asm b/gfx/sprites.asm new file mode 100644 index 000000000..f7740d6a6 --- /dev/null +++ b/gfx/sprites.asm @@ -0,0 +1,108 @@ +SECTION "Sprites 1", ROMX + +ChrisSpriteGFX: INCBIN "gfx/sprites/chris.2bpp" ; c0000 +ChrisBikeSpriteGFX: INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180 +GameboyKidSpriteGFX: INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300 +SilverSpriteGFX: INCBIN "gfx/sprites/silver.2bpp" ; c03c0 +OakSpriteGFX: INCBIN "gfx/sprites/oak.2bpp" ; c0540 +RedSpriteGFX: INCBIN "gfx/sprites/red.2bpp" ; c06c0 +BlueSpriteGFX: INCBIN "gfx/sprites/blue.2bpp" ; c0840 +BillSpriteGFX: INCBIN "gfx/sprites/bill.2bpp" ; c09c0 +ElderSpriteGFX: INCBIN "gfx/sprites/elder.2bpp" ; c0b40 +JanineSpriteGFX: INCBIN "gfx/sprites/janine.2bpp" ; c0cc0 +KurtSpriteGFX: INCBIN "gfx/sprites/kurt.2bpp" ; c0e40 +MomSpriteGFX: INCBIN "gfx/sprites/mom.2bpp" ; c0fc0 +BlaineSpriteGFX: INCBIN "gfx/sprites/blaine.2bpp" ; c1140 +RedsMomSpriteGFX: INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0 +DaisySpriteGFX: INCBIN "gfx/sprites/daisy.2bpp" ; c1440 +ElmSpriteGFX: INCBIN "gfx/sprites/elm.2bpp" ; c15c0 +WillSpriteGFX: INCBIN "gfx/sprites/will.2bpp" ; c1740 +FalknerSpriteGFX: INCBIN "gfx/sprites/falkner.2bpp" ; c1800 +WhitneySpriteGFX: INCBIN "gfx/sprites/whitney.2bpp" ; c1980 +BugsySpriteGFX: INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00 +MortySpriteGFX: INCBIN "gfx/sprites/morty.2bpp" ; c1c80 +ChuckSpriteGFX: INCBIN "gfx/sprites/chuck.2bpp" ; c1e00 +JasmineSpriteGFX: INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80 +PryceSpriteGFX: INCBIN "gfx/sprites/pryce.2bpp" ; c2100 +ClairSpriteGFX: INCBIN "gfx/sprites/clair.2bpp" ; c2280 +BrockSpriteGFX: INCBIN "gfx/sprites/brock.2bpp" ; c2400 +KarenSpriteGFX: INCBIN "gfx/sprites/karen.2bpp" ; c2580 +BrunoSpriteGFX: INCBIN "gfx/sprites/bruno.2bpp" ; c2640 +MistySpriteGFX: INCBIN "gfx/sprites/misty.2bpp" ; c27c0 +LanceSpriteGFX: INCBIN "gfx/sprites/lance.2bpp" ; c2940 +SurgeSpriteGFX: INCBIN "gfx/sprites/surge.2bpp" ; c2ac0 +ErikaSpriteGFX: INCBIN "gfx/sprites/erika.2bpp" ; c2c40 +KogaSpriteGFX: INCBIN "gfx/sprites/koga.2bpp" ; c2dc0 +SabrinaSpriteGFX: INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40 +CooltrainerMSpriteGFX: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0 +CooltrainerFSpriteGFX: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240 +BugCatcherSpriteGFX: INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0 +TwinSpriteGFX: INCBIN "gfx/sprites/twin.2bpp" ; c3540 +YoungsterSpriteGFX: INCBIN "gfx/sprites/youngster.2bpp" ; c36c0 +LassSpriteGFX: INCBIN "gfx/sprites/lass.2bpp" ; c3840 +TeacherSpriteGFX: INCBIN "gfx/sprites/teacher.2bpp" ; c39c0 +BuenaSpriteGFX: INCBIN "gfx/sprites/buena.2bpp" ; c3b40 +SuperNerdSpriteGFX: INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0 +RockerSpriteGFX: INCBIN "gfx/sprites/rocker.2bpp" ; c3e40 + + +SECTION "Sprites 2", ROMX + +PokefanMSpriteGFX: INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000 +PokefanFSpriteGFX: INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180 +GrampsSpriteGFX: INCBIN "gfx/sprites/gramps.2bpp" ; c4300 +GrannySpriteGFX: INCBIN "gfx/sprites/granny.2bpp" ; c4480 +SwimmerGuySpriteGFX: INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600 +SwimmerGirlSpriteGFX: INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780 +BigSnorlaxSpriteGFX: INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900 +SurfingPikachuSpriteGFX: INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980 +RocketSpriteGFX: INCBIN "gfx/sprites/rocket.2bpp" ; c4b00 +RocketGirlSpriteGFX: INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80 +NurseSpriteGFX: INCBIN "gfx/sprites/nurse.2bpp" ; c4e00 +LinkReceptionistSpriteGFX: INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0 +ClerkSpriteGFX: INCBIN "gfx/sprites/clerk.2bpp" ; c5040 +FisherSpriteGFX: INCBIN "gfx/sprites/fisher.2bpp" ; c51c0 +FishingGuruSpriteGFX: INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340 +ScientistSpriteGFX: INCBIN "gfx/sprites/scientist.2bpp" ; c54c0 +KimonoGirlSpriteGFX: INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640 +SageSpriteGFX: INCBIN "gfx/sprites/sage.2bpp" ; c57c0 +UnusedGuySpriteGFX: INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940 +GentlemanSpriteGFX: INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0 +BlackBeltSpriteGFX: INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40 +ReceptionistSpriteGFX: INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0 +OfficerSpriteGFX: INCBIN "gfx/sprites/officer.2bpp" ; c5f40 +CalSpriteGFX: INCBIN "gfx/sprites/cal.2bpp" ; c60c0 +SlowpokeSpriteGFX: INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240 +CaptainSpriteGFX: INCBIN "gfx/sprites/captain.2bpp" ; c6280 +BigLaprasSpriteGFX: INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400 +GymGuySpriteGFX: INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480 +SailorSpriteGFX: INCBIN "gfx/sprites/sailor.2bpp" ; c6600 +BikerSpriteGFX: INCBIN "gfx/sprites/biker.2bpp" ; c6780 +PharmacistSpriteGFX: INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900 +MonsterSpriteGFX: INCBIN "gfx/sprites/monster.2bpp" ; c6a80 +FairySpriteGFX: INCBIN "gfx/sprites/fairy.2bpp" ; c6c00 +BirdSpriteGFX: INCBIN "gfx/sprites/bird.2bpp" ; c6d80 +DragonSpriteGFX: INCBIN "gfx/sprites/dragon.2bpp" ; c6f00 +BigOnixSpriteGFX: INCBIN "gfx/sprites/big_onix.2bpp" ; c7080 +N64SpriteGFX: INCBIN "gfx/sprites/n64.2bpp" ; c7140 +SudowoodoSpriteGFX: INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180 +SurfSpriteGFX: INCBIN "gfx/sprites/surf.2bpp" ; c7200 +PokeBallSpriteGFX: INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380 +PokedexSpriteGFX: INCBIN "gfx/sprites/pokedex.2bpp" ; c7500 +PaperSpriteGFX: INCBIN "gfx/sprites/paper.2bpp" ; c7680 +VirtualBoySpriteGFX: INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800 +OldLinkReceptionistSpriteGFX: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840 +RockSpriteGFX: INCBIN "gfx/sprites/rock.2bpp" ; c7880 +BoulderSpriteGFX: INCBIN "gfx/sprites/boulder.2bpp" ; c78c0 +SnesSpriteGFX: INCBIN "gfx/sprites/snes.2bpp" ; c7900 +FamicomSpriteGFX: INCBIN "gfx/sprites/famicom.2bpp" ; c7940 +FruitTreeSpriteGFX: INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980 +GoldTrophySpriteGFX: INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0 +SilverTrophySpriteGFX: INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00 +KrisSpriteGFX: INCBIN "gfx/sprites/kris.2bpp" ; c7a40 +KrisBikeSpriteGFX: INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0 +KurtOutsideSpriteGFX: INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40 +SuicuneSpriteGFX: INCBIN "gfx/sprites/suicune.2bpp" ; c7e00 +EnteiSpriteGFX: INCBIN "gfx/sprites/entei.2bpp" ; c7e40 +RaikouSpriteGFX: INCBIN "gfx/sprites/raikou.2bpp" ; c7e80 +StandingYoungsterSpriteGFX: INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0 diff --git a/gfx/overworld/070.png b/gfx/sprites/big_lapras.png similarity index 100% rename from gfx/overworld/070.png rename to gfx/sprites/big_lapras.png diff --git a/gfx/overworld/079.png b/gfx/sprites/big_onix.png similarity index 100% rename from gfx/overworld/079.png rename to gfx/sprites/big_onix.png diff --git a/gfx/overworld/050.png b/gfx/sprites/big_snorlax.png similarity index 100% rename from gfx/overworld/050.png rename to gfx/sprites/big_snorlax.png diff --git a/gfx/overworld/073.png b/gfx/sprites/biker.png similarity index 100% rename from gfx/overworld/073.png rename to gfx/sprites/biker.png diff --git a/gfx/overworld/007.png b/gfx/sprites/bill.png similarity index 100% rename from gfx/overworld/007.png rename to gfx/sprites/bill.png diff --git a/gfx/overworld/077.png b/gfx/sprites/bird.png similarity index 100% rename from gfx/overworld/077.png rename to gfx/sprites/bird.png diff --git a/gfx/overworld/064.png b/gfx/sprites/black_belt.png similarity index 100% rename from gfx/overworld/064.png rename to gfx/sprites/black_belt.png diff --git a/gfx/overworld/012.png b/gfx/sprites/blaine.png similarity index 100% rename from gfx/overworld/012.png rename to gfx/sprites/blaine.png diff --git a/gfx/overworld/006.png b/gfx/sprites/blue.png similarity index 100% rename from gfx/overworld/006.png rename to gfx/sprites/blue.png diff --git a/gfx/overworld/089.png b/gfx/sprites/boulder.png similarity index 100% rename from gfx/overworld/089.png rename to gfx/sprites/boulder.png diff --git a/gfx/overworld/025.png b/gfx/sprites/brock.png similarity index 100% rename from gfx/overworld/025.png rename to gfx/sprites/brock.png diff --git a/gfx/overworld/027.png b/gfx/sprites/bruno.png similarity index 100% rename from gfx/overworld/027.png rename to gfx/sprites/bruno.png diff --git a/gfx/overworld/041.png b/gfx/sprites/buena.png similarity index 100% rename from gfx/overworld/041.png rename to gfx/sprites/buena.png diff --git a/gfx/overworld/036.png b/gfx/sprites/bug_catcher.png similarity index 100% rename from gfx/overworld/036.png rename to gfx/sprites/bug_catcher.png diff --git a/gfx/overworld/019.png b/gfx/sprites/bugsy.png similarity index 100% rename from gfx/overworld/019.png rename to gfx/sprites/bugsy.png diff --git a/gfx/overworld/067.png b/gfx/sprites/cal.png similarity index 100% rename from gfx/overworld/067.png rename to gfx/sprites/cal.png diff --git a/gfx/overworld/069.png b/gfx/sprites/captain.png similarity index 100% rename from gfx/overworld/069.png rename to gfx/sprites/captain.png diff --git a/gfx/overworld/000.png b/gfx/sprites/chris.png similarity index 100% rename from gfx/overworld/000.png rename to gfx/sprites/chris.png diff --git a/gfx/overworld/001.png b/gfx/sprites/chris_bike.png similarity index 100% rename from gfx/overworld/001.png rename to gfx/sprites/chris_bike.png diff --git a/gfx/overworld/021.png b/gfx/sprites/chuck.png similarity index 100% rename from gfx/overworld/021.png rename to gfx/sprites/chuck.png diff --git a/gfx/overworld/024.png b/gfx/sprites/clair.png similarity index 100% rename from gfx/overworld/024.png rename to gfx/sprites/clair.png diff --git a/gfx/overworld/056.png b/gfx/sprites/clerk.png similarity index 100% rename from gfx/overworld/056.png rename to gfx/sprites/clerk.png diff --git a/gfx/overworld/035.png b/gfx/sprites/cooltrainer_f.png similarity index 100% rename from gfx/overworld/035.png rename to gfx/sprites/cooltrainer_f.png diff --git a/gfx/overworld/034.png b/gfx/sprites/cooltrainer_m.png similarity index 100% rename from gfx/overworld/034.png rename to gfx/sprites/cooltrainer_m.png diff --git a/gfx/overworld/014.png b/gfx/sprites/daisy.png similarity index 100% rename from gfx/overworld/014.png rename to gfx/sprites/daisy.png diff --git a/gfx/overworld/078.png b/gfx/sprites/dragon.png similarity index 100% rename from gfx/overworld/078.png rename to gfx/sprites/dragon.png diff --git a/gfx/overworld/008.png b/gfx/sprites/elder.png similarity index 100% rename from gfx/overworld/008.png rename to gfx/sprites/elder.png diff --git a/gfx/overworld/015.png b/gfx/sprites/elm.png similarity index 100% rename from gfx/overworld/015.png rename to gfx/sprites/elm.png diff --git a/gfx/overworld/099.png b/gfx/sprites/entei.png similarity index 100% rename from gfx/overworld/099.png rename to gfx/sprites/entei.png diff --git a/gfx/overworld/031.png b/gfx/sprites/erika.png similarity index 100% rename from gfx/overworld/031.png rename to gfx/sprites/erika.png diff --git a/gfx/overworld/076.png b/gfx/sprites/fairy.png similarity index 100% rename from gfx/overworld/076.png rename to gfx/sprites/fairy.png diff --git a/gfx/overworld/017.png b/gfx/sprites/falkner.png similarity index 100% rename from gfx/overworld/017.png rename to gfx/sprites/falkner.png diff --git a/gfx/overworld/091.png b/gfx/sprites/famicom.png similarity index 100% rename from gfx/overworld/091.png rename to gfx/sprites/famicom.png diff --git a/gfx/overworld/057.png b/gfx/sprites/fisher.png similarity index 100% rename from gfx/overworld/057.png rename to gfx/sprites/fisher.png diff --git a/gfx/overworld/058.png b/gfx/sprites/fishing_guru.png similarity index 100% rename from gfx/overworld/058.png rename to gfx/sprites/fishing_guru.png diff --git a/gfx/overworld/092.png b/gfx/sprites/fruit_tree.png similarity index 100% rename from gfx/overworld/092.png rename to gfx/sprites/fruit_tree.png diff --git a/gfx/overworld/002.png b/gfx/sprites/gameboy_kid.png similarity index 100% rename from gfx/overworld/002.png rename to gfx/sprites/gameboy_kid.png diff --git a/gfx/overworld/063.png b/gfx/sprites/gentleman.png similarity index 100% rename from gfx/overworld/063.png rename to gfx/sprites/gentleman.png diff --git a/gfx/overworld/093.png b/gfx/sprites/gold_trophy.png similarity index 100% rename from gfx/overworld/093.png rename to gfx/sprites/gold_trophy.png diff --git a/gfx/overworld/046.png b/gfx/sprites/gramps.png similarity index 100% rename from gfx/overworld/046.png rename to gfx/sprites/gramps.png diff --git a/gfx/overworld/047.png b/gfx/sprites/granny.png similarity index 100% rename from gfx/overworld/047.png rename to gfx/sprites/granny.png diff --git a/gfx/overworld/071.png b/gfx/sprites/gym_guy.png similarity index 100% rename from gfx/overworld/071.png rename to gfx/sprites/gym_guy.png diff --git a/gfx/overworld/009.png b/gfx/sprites/janine.png similarity index 100% rename from gfx/overworld/009.png rename to gfx/sprites/janine.png diff --git a/gfx/overworld/022.png b/gfx/sprites/jasmine.png similarity index 100% rename from gfx/overworld/022.png rename to gfx/sprites/jasmine.png diff --git a/gfx/overworld/026.png b/gfx/sprites/karen.png similarity index 100% rename from gfx/overworld/026.png rename to gfx/sprites/karen.png diff --git a/gfx/overworld/060.png b/gfx/sprites/kimono_girl.png similarity index 100% rename from gfx/overworld/060.png rename to gfx/sprites/kimono_girl.png diff --git a/gfx/overworld/032.png b/gfx/sprites/koga.png similarity index 100% rename from gfx/overworld/032.png rename to gfx/sprites/koga.png diff --git a/gfx/overworld/095.png b/gfx/sprites/kris.png similarity index 100% rename from gfx/overworld/095.png rename to gfx/sprites/kris.png diff --git a/gfx/overworld/096.png b/gfx/sprites/kris_bike.png similarity index 100% rename from gfx/overworld/096.png rename to gfx/sprites/kris_bike.png diff --git a/gfx/overworld/010.png b/gfx/sprites/kurt.png similarity index 100% rename from gfx/overworld/010.png rename to gfx/sprites/kurt.png diff --git a/gfx/overworld/097.png b/gfx/sprites/kurt_outside.png similarity index 100% rename from gfx/overworld/097.png rename to gfx/sprites/kurt_outside.png diff --git a/gfx/overworld/029.png b/gfx/sprites/lance.png similarity index 100% rename from gfx/overworld/029.png rename to gfx/sprites/lance.png diff --git a/gfx/overworld/039.png b/gfx/sprites/lass.png similarity index 100% rename from gfx/overworld/039.png rename to gfx/sprites/lass.png diff --git a/gfx/overworld/055.png b/gfx/sprites/link_receptionist.png similarity index 100% rename from gfx/overworld/055.png rename to gfx/sprites/link_receptionist.png diff --git a/gfx/overworld/028.png b/gfx/sprites/misty.png similarity index 100% rename from gfx/overworld/028.png rename to gfx/sprites/misty.png diff --git a/gfx/overworld/011.png b/gfx/sprites/mom.png similarity index 100% rename from gfx/overworld/011.png rename to gfx/sprites/mom.png diff --git a/gfx/overworld/075.png b/gfx/sprites/monster.png similarity index 100% rename from gfx/overworld/075.png rename to gfx/sprites/monster.png diff --git a/gfx/overworld/020.png b/gfx/sprites/morty.png similarity index 100% rename from gfx/overworld/020.png rename to gfx/sprites/morty.png diff --git a/gfx/overworld/080.png b/gfx/sprites/n64.png similarity index 100% rename from gfx/overworld/080.png rename to gfx/sprites/n64.png diff --git a/gfx/overworld/054.png b/gfx/sprites/nurse.png similarity index 100% rename from gfx/overworld/054.png rename to gfx/sprites/nurse.png diff --git a/gfx/overworld/004.png b/gfx/sprites/oak.png similarity index 100% rename from gfx/overworld/004.png rename to gfx/sprites/oak.png diff --git a/gfx/overworld/066.png b/gfx/sprites/officer.png similarity index 100% rename from gfx/overworld/066.png rename to gfx/sprites/officer.png diff --git a/gfx/overworld/087.png b/gfx/sprites/old_link_receptionist.png similarity index 100% rename from gfx/overworld/087.png rename to gfx/sprites/old_link_receptionist.png diff --git a/gfx/overworld/085.png b/gfx/sprites/paper.png similarity index 100% rename from gfx/overworld/085.png rename to gfx/sprites/paper.png diff --git a/gfx/overworld/074.png b/gfx/sprites/pharmacist.png similarity index 100% rename from gfx/overworld/074.png rename to gfx/sprites/pharmacist.png diff --git a/gfx/overworld/083.png b/gfx/sprites/poke_ball.png similarity index 100% rename from gfx/overworld/083.png rename to gfx/sprites/poke_ball.png diff --git a/gfx/overworld/084.png b/gfx/sprites/pokedex.png similarity index 100% rename from gfx/overworld/084.png rename to gfx/sprites/pokedex.png diff --git a/gfx/overworld/045.png b/gfx/sprites/pokefan_f.png similarity index 100% rename from gfx/overworld/045.png rename to gfx/sprites/pokefan_f.png diff --git a/gfx/overworld/044.png b/gfx/sprites/pokefan_m.png similarity index 100% rename from gfx/overworld/044.png rename to gfx/sprites/pokefan_m.png diff --git a/gfx/overworld/023.png b/gfx/sprites/pryce.png similarity index 100% rename from gfx/overworld/023.png rename to gfx/sprites/pryce.png diff --git a/gfx/overworld/100.png b/gfx/sprites/raikou.png similarity index 100% rename from gfx/overworld/100.png rename to gfx/sprites/raikou.png diff --git a/gfx/overworld/065.png b/gfx/sprites/receptionist.png similarity index 100% rename from gfx/overworld/065.png rename to gfx/sprites/receptionist.png diff --git a/gfx/overworld/005.png b/gfx/sprites/red.png similarity index 100% rename from gfx/overworld/005.png rename to gfx/sprites/red.png diff --git a/gfx/overworld/013.png b/gfx/sprites/reds_mom.png similarity index 100% rename from gfx/overworld/013.png rename to gfx/sprites/reds_mom.png diff --git a/gfx/overworld/088.png b/gfx/sprites/rock.png similarity index 100% rename from gfx/overworld/088.png rename to gfx/sprites/rock.png diff --git a/gfx/overworld/043.png b/gfx/sprites/rocker.png similarity index 100% rename from gfx/overworld/043.png rename to gfx/sprites/rocker.png diff --git a/gfx/overworld/052.png b/gfx/sprites/rocket.png similarity index 100% rename from gfx/overworld/052.png rename to gfx/sprites/rocket.png diff --git a/gfx/overworld/053.png b/gfx/sprites/rocket_girl.png similarity index 100% rename from gfx/overworld/053.png rename to gfx/sprites/rocket_girl.png diff --git a/gfx/overworld/033.png b/gfx/sprites/sabrina.png similarity index 100% rename from gfx/overworld/033.png rename to gfx/sprites/sabrina.png diff --git a/gfx/overworld/061.png b/gfx/sprites/sage.png similarity index 100% rename from gfx/overworld/061.png rename to gfx/sprites/sage.png diff --git a/gfx/overworld/072.png b/gfx/sprites/sailor.png similarity index 100% rename from gfx/overworld/072.png rename to gfx/sprites/sailor.png diff --git a/gfx/overworld/059.png b/gfx/sprites/scientist.png similarity index 100% rename from gfx/overworld/059.png rename to gfx/sprites/scientist.png diff --git a/gfx/overworld/003.png b/gfx/sprites/silver.png similarity index 100% rename from gfx/overworld/003.png rename to gfx/sprites/silver.png diff --git a/gfx/overworld/094.png b/gfx/sprites/silver_trophy.png similarity index 100% rename from gfx/overworld/094.png rename to gfx/sprites/silver_trophy.png diff --git a/gfx/overworld/068.png b/gfx/sprites/slowpoke.png similarity index 100% rename from gfx/overworld/068.png rename to gfx/sprites/slowpoke.png diff --git a/gfx/overworld/090.png b/gfx/sprites/snes.png similarity index 100% rename from gfx/overworld/090.png rename to gfx/sprites/snes.png diff --git a/gfx/overworld/101.png b/gfx/sprites/standing_youngster.png similarity index 100% rename from gfx/overworld/101.png rename to gfx/sprites/standing_youngster.png diff --git a/gfx/overworld/081.png b/gfx/sprites/sudowoodo.png similarity index 100% rename from gfx/overworld/081.png rename to gfx/sprites/sudowoodo.png diff --git a/gfx/overworld/098.png b/gfx/sprites/suicune.png similarity index 100% rename from gfx/overworld/098.png rename to gfx/sprites/suicune.png diff --git a/gfx/overworld/042.png b/gfx/sprites/super_nerd.png similarity index 100% rename from gfx/overworld/042.png rename to gfx/sprites/super_nerd.png diff --git a/gfx/overworld/082.png b/gfx/sprites/surf.png similarity index 100% rename from gfx/overworld/082.png rename to gfx/sprites/surf.png diff --git a/gfx/overworld/051.png b/gfx/sprites/surfing_pikachu.png similarity index 100% rename from gfx/overworld/051.png rename to gfx/sprites/surfing_pikachu.png diff --git a/gfx/overworld/030.png b/gfx/sprites/surge.png similarity index 100% rename from gfx/overworld/030.png rename to gfx/sprites/surge.png diff --git a/gfx/overworld/049.png b/gfx/sprites/swimmer_girl.png similarity index 100% rename from gfx/overworld/049.png rename to gfx/sprites/swimmer_girl.png diff --git a/gfx/overworld/048.png b/gfx/sprites/swimmer_guy.png similarity index 100% rename from gfx/overworld/048.png rename to gfx/sprites/swimmer_guy.png diff --git a/gfx/overworld/040.png b/gfx/sprites/teacher.png similarity index 100% rename from gfx/overworld/040.png rename to gfx/sprites/teacher.png diff --git a/gfx/overworld/037.png b/gfx/sprites/twin.png similarity index 100% rename from gfx/overworld/037.png rename to gfx/sprites/twin.png diff --git a/gfx/overworld/062.png b/gfx/sprites/unused_guy.png similarity index 100% rename from gfx/overworld/062.png rename to gfx/sprites/unused_guy.png diff --git a/gfx/overworld/086.png b/gfx/sprites/virtual_boy.png similarity index 100% rename from gfx/overworld/086.png rename to gfx/sprites/virtual_boy.png diff --git a/gfx/overworld/018.png b/gfx/sprites/whitney.png similarity index 100% rename from gfx/overworld/018.png rename to gfx/sprites/whitney.png diff --git a/gfx/overworld/016.png b/gfx/sprites/will.png similarity index 100% rename from gfx/overworld/016.png rename to gfx/sprites/will.png diff --git a/gfx/overworld/038.png b/gfx/sprites/youngster.png similarity index 100% rename from gfx/overworld/038.png rename to gfx/sprites/youngster.png diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainer_palettes.asm similarity index 100% rename from gfx/trainers/palette_pointers.asm rename to gfx/trainer_palettes.asm diff --git a/gfx/pics/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm similarity index 100% rename from gfx/pics/trainer_pic_pointers.asm rename to gfx/trainer_pic_pointers.asm diff --git a/main.asm b/main.asm index 525fa26b9..a3161f7a6 100644 --- a/main.asm +++ b/main.asm @@ -5062,13 +5062,9 @@ StartBattleWithMapTrainerScript: ; 0xbe68a AlreadyBeatenTrainerScript: scripttalkafter -SECTION "bank30", ROMX -INCLUDE "gfx/overworld/sprites_1.asm" +INCLUDE "gfx/sprites.asm" -SECTION "bank31", ROMX - -INCLUDE "gfx/overworld/sprites_2.asm" SECTION "bank32", ROMX diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index 8f128a7bd..f627c85ff 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -632,7 +632,7 @@ HeartEmote: INCBIN "gfx/emotes/heart.2bpp" BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" FishEmote: INCBIN "gfx/emotes/fish.2bpp" -JumpShadowGFX: INCBIN "gfx/ow_fx/shadow.2bpp" -FishingRodGFX: INCBIN "gfx/ow_fx/fishing_rod.2bpp" -BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp" -GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp" +JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp" +FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp" +BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp" +GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp" diff --git a/pokecrystal.link b/pokecrystal.link index 9bd693e0f..555a61123 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -129,9 +129,9 @@ ROMX $2e ROMX $2f "bank2F" ROMX $30 - "bank30" + "Sprites 1" ROMX $31 - "bank31" + "Sprites 2" ROMX $32 "bank32" ROMX $33 From 41acb0667a321865277f50a45e662b1aae939a00 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 01:02:28 -0500 Subject: [PATCH 13/35] Document macros/map.asm Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events) Prefix FLOOR to the `elevfloor` constants --- battle/core.asm | 2 +- battle/effect_commands.asm | 6 +- constants/map_constants.asm | 32 ++--- constants/misc_constants.asm | 16 +-- constants/wram_constants.asm | 13 +- engine/color.asm | 12 +- engine/evolve.asm | 4 +- engine/fish.asm | 2 +- engine/phone.asm | 2 +- engine/rtc.asm | 10 +- engine/timeset.asm | 24 ++-- home/map_objects.asm | 4 +- macros/event.asm | 6 +- macros/map.asm | 205 ++++++++++++++++------------ main.asm | 10 +- maps/CeladonDeptStoreElevator.asm | 12 +- maps/CeladonGameCorner.asm | 4 +- maps/GoldenrodDeptStoreElevator.asm | 14 +- maps/GoldenrodGameCorner.asm | 4 +- maps/KrissHouse1F.asm | 6 +- maps/MountMoonGiftShop.asm | 8 +- predef/sgb.asm | 2 +- 22 files changed, 219 insertions(+), 179 deletions(-) diff --git a/battle/core.asm b/battle/core.asm index cd745a957..21409c2a4 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -6676,7 +6676,7 @@ CheckSleepingTreeMon: ; 3eb38 ; Get list for the time of day ld hl, .Morn ld a, [TimeOfDay] - cp DAY + cp DAY_F jr c, .Check ld hl, .Day jr z, .Check diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index b292474b8..fdb078645 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -9323,21 +9323,21 @@ BattleCommand_ClearHazards: ; 37b39 BattleCommand_HealMorn: ; 37b74 ; healmorn - ld b, MORN + ld b, MORN_F jr BattleCommand_TimeBasedHealContinue ; 37b78 BattleCommand_HealDay: ; 37b78 ; healday - ld b, DAY + ld b, DAY_F jr BattleCommand_TimeBasedHealContinue ; 37b7c BattleCommand_HealNite: ; 37b7c ; healnite - ld b, NITE + ld b, NITE_F ; fallthrough ; 37b7e diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 58dcf993f..8e04c5782 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -716,22 +716,22 @@ NUM_FRUIT_TREES EQU const_value +- 1 ; elevator floors ; used by `elevfloor` const_def - const _B4F - const _B3F - const _B2F - const _B1F - const _1F - const _2F - const _3F - const _4F - const _5F - const _6F - const _7F - const _8F - const _9F - const _10F - const _11F - const _ROOF + const FLOOR_B4F + const FLOOR_B3F + const FLOOR_B2F + const FLOOR_B1F + const FLOOR_1F + const FLOOR_2F + const FLOOR_3F + const FLOOR_4F + const FLOOR_5F + const FLOOR_6F + const FLOOR_7F + const FLOOR_8F + const FLOOR_9F + const FLOOR_10F + const FLOOR_11F + const FLOOR_ROOF ; command queue members CMDQUEUE_TYPE EQU 0 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6ae41e989..94244b481 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -50,14 +50,14 @@ NUM_HOF_TEAMS = 30 ; joypad const_def - const A_BUTTON_F - const B_BUTTON_F - const SELECT_F - const START_F - const D_RIGHT_F - const D_LEFT_F - const D_UP_F - const D_DOWN_F + const A_BUTTON_F ; 0 + const B_BUTTON_F ; 1 + const SELECT_F ; 2 + const START_F ; 3 + const D_RIGHT_F ; 4 + const D_LEFT_F ; 5 + const D_UP_F ; 6 + const D_DOWN_F ; 7 NO_INPUT EQU %00000000 A_BUTTON EQU 1 << A_BUTTON_F diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 424595ec4..ade157165 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -46,10 +46,15 @@ FACE_RIGHT EQU 1 ; TimeOfDay: ; d269 const_def - const MORN ; 0 - const DAY ; 1 - const NITE ; 2 - const DARKNESS ; 3 + const MORN_F ; 0 + const DAY_F ; 1 + const NITE_F ; 2 + const DARKNESS_F ; 3 + +MORN EQU 1 << MORN_F +DAY EQU 1 << DAY_F +NITE EQU 1 << NITE_F +DARKNESS EQU 1 << DARKNESS_F ; ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 diff --git a/engine/color.asm b/engine/color.asm index 8690d7f1c..29b6656d5 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1948,7 +1948,7 @@ LoadMapPals: call AddNTimes ld de, UnknOBPals ld bc, 8 palettes - ld a, $5 ; BANK(UnknOBPals) + ld a, BANK(UnknOBPals) call FarCopyWRAM ld a, [wPermission] @@ -1967,13 +1967,13 @@ LoadMapPals: add hl, de ld a, [TimeOfDayPal] and 3 - cp NITE + cp NITE_F jr c, .morn_day rept 4 inc hl endr .morn_day - ld de, UnknBGPals + 6 palettes + 2 + ld de, UnknBGPals palette PAL_BG_ROOF + 2 ld bc, 4 ld a, $5 call FarCopyWRAM @@ -1983,10 +1983,10 @@ endr dw .OutdoorColors ; unused dw .OutdoorColors ; TOWN dw .OutdoorColors ; ROUTE - dw .IndoorColors ; INDOOR + dw .IndoorColors ; INDOOR dw .DungeonColors ; CAVE - dw .Perm5Colors ; PERM_5 - dw .IndoorColors ; GATE + dw .Perm5Colors ; PERM_5 + dw .IndoorColors ; GATE dw .DungeonColors ; DUNGEON ; Valid indices: $00 - $29 diff --git a/engine/evolve.asm b/engine/evolve.asm index 3dc5d20b7..ada1e2f5f 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -133,13 +133,13 @@ EvolveAfterBattle_MasterLoop ; TR_NITE ld a, [TimeOfDay] - cp NITE + cp NITE_F jp nz, .dont_evolve_3 jr .proceed .happiness_daylight ld a, [TimeOfDay] - cp NITE + cp NITE_F jp z, .dont_evolve_3 jr .proceed diff --git a/engine/fish.asm b/engine/fish.asm index 44fe57b25..c571bba56 100644 --- a/engine/fish.asm +++ b/engine/fish.asm @@ -81,7 +81,7 @@ endr ld a, [TimeOfDay] and 3 - cp NITE + cp NITE_F jr c, .time_species inc hl inc hl diff --git a/engine/phone.asm b/engine/phone.asm index 6366ea579..55deab4d1 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -165,7 +165,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad) callba CheckTime pop af - and (1 << MORN) + (1 << DAY) + (1 << NITE) + and MORN + DAY + NITE and c pop de diff --git a/engine/rtc.asm b/engine/rtc.asm index 3018b5301..1b1b44fa6 100755 --- a/engine/rtc.asm +++ b/engine/rtc.asm @@ -51,11 +51,11 @@ GetTimeOfDay:: ; 14032 TimesOfDay: ; 14044 ; hours for the time of day ; 04-09 morn | 10-17 day | 18-03 nite - db 04, NITE - db 10, MORN - db 18, DAY - db 24, NITE - db -1, MORN + db 04, NITE_F + db 10, MORN_F + db 18, DAY_F + db 24, NITE_F + db -1, MORN_F ; 1404e Unknown_1404e: ; Unreferenced diff --git a/engine/timeset.asm b/engine/timeset.asm index ca5d9b85a..e8b0642e4 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -362,18 +362,18 @@ OakText_ResponseToSetTime: ; 0x908b8 ld c, l ld a, [wInitHourBuffer] cp 4 - jr c, .NITE + jr c, .nite cp 11 - jr c, .MORN + jr c, .morn cp 18 - jr c, .DAY -.NITE: + jr c, .day +.nite: ld hl, .sodark ret -.MORN: +.morn: ld hl, .overslept ret -.DAY: +.day: ld hl, .yikes ret ; 908ec (24:48ec) @@ -738,19 +738,19 @@ GetTimeOfDayString: ; 90b58 (24:4b58) cp 18 jr c, .day .nite - ld de, .NITE + ld de, .nite_string ret .morn - ld de, .MORN + ld de, .morn_string ret .day - ld de, .DAY + ld de, .day_string ret ; 90b71 (24:4b71) -.NITE: db "NITE@" -.MORN: db "MORN@" -.DAY: db "DAY@" +.nite_string: db "NITE@" +.morn_string: db "MORN@" +.day_string: db "DAY@" ; 90b7f AdjustHourForAMorPM: diff --git a/home/map_objects.asm b/home/map_objects.asm index dfcb411c5..67ca63c93 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -276,9 +276,7 @@ CheckObjectTime:: ; 18f5 ret .TimeOfDayValues_191e: - db 1 << MORN ; 1 - db 1 << DAY ; 2 - db 1 << NITE ; 4 + db MORN, DAY, NITE .check_hour ld hl, MAPOBJECT_HOUR diff --git a/macros/event.asm b/macros/event.asm index c575b7caf..a439b8fbf 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -287,9 +287,9 @@ checktime: macro db \1 ; time endm -checkmorn EQUS "checktime 1 << MORN" -checkday EQUS "checktime 1 << DAY" -checknite EQUS "checktime 1 << NITE" +checkmorn EQUS "checktime MORN" +checkday EQUS "checktime DAY" +checknite EQUS "checktime NITE" enum checkpoke_command checkpoke: macro diff --git a/macros/map.asm b/macros/map.asm index 2e8765770..40555d71c 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -1,77 +1,110 @@ -map: MACRO +map: macro +;\1: map id db GROUP_\1, MAP_\1 -ENDM +endm -roam_map: MACRO -; A map and an arbitrary number of some more maps. - - map \1 - db \2 - - rept \2 - map \3 - shift - endr - - db 0 -ENDM - -person_event: macro - db \1 ; sprite - db \2 + 4 ; y - db \3 + 4 ; x - db \4 ; movement function - dn \5, \6 ; radius: y, x - db \7 ; clock_hour - db \8 ; clock_daytime - shift - dn \8, \9 ; color_function - shift - db \9 ; sight_range - shift - dw \9 ; pointer - shift - dw \9 ; event flag - endm - -signpost: macro - db \1 ; y - db \2 ; x - db \3 ; function - dw \4 ; pointer - endm - -xy_trigger: macro - db \1 ; number - db \2 ; y - db \3 ; x - db \4 ; unknown1 - dw \5 ; script - db \6 ; unknown2 - db \7 ; unknown3 - endm +maptrigger: macro +;\1: script pointer + dw \1, 0 +endm warp_def: macro - db \1 ; y - db \2 ; x - db \3 ; warp_to - map \4 ; map - endm +;\1: y: top to bottom, starts at 0 +;\2: x: left to right, starts at 0 +;\3: warp destination: starts at 1 +;\4: map id: from constants/map_constants.asm + db \1, \2, \3 + map \4 +endm + +xy_trigger: macro +;\1: number: controlled by dotrigger/domaptrigger +;\2: y: top to bottom, starts at 0 +;\3: x: left to right, starts at 0 +;\4: unknown1: $0 +;\5: script pointer +;\6: unknown2: $0 +;\7: unknown3: $0 + db \1, \2, \3, \4 + dw \5 + db \6, \7 +endm + +signpost: macro +;\1: y: top to bottom, starts at 0 +;\2: x: left to right, starts at 0 +;\3: function: a SIGNPOST_* constant +;\4: script pointer + db \1, \2, \3 + dw \4 +endm + +person_event: macro +;\1: sprite: a SPRITE_* constant +;\2: y: top to bottom, starts at 0 +;\3: x: left to right, starts at 0 +;\4: movement function: a SPRITEMOVEDATA_* constant +;\5, \6: movement radius: y, x +;\7: clock hour: ??? +;\8: clock daytime: sum of MORN, DAY, and/or NITE, or 0 for always +;\9: color: a PAL_NPC_* constant, or 0 for sprite default +;\10: function: a PERSONTYPE_* constant +;\11: sight range: applies to PERSONTYPE_TRAINER +;\12: script pointer +;\13: event flag: an EVENT_* constant, or 0 for always + db \1, \2 + 4, \3 + 4, \4 + dn \5, \6 + db \7, \8 + shift + dn \8, \9 + shift + db \9 + shift + dw \9 + shift + dw \9 +endm -map_header: MACRO - ; label, tileset, permission, location, music, phone service flag, time of day, fishing group +newgroup: macro +const_value = const_value + 1 + enum_start 1 +endm + +mapgroup: macro +;\1: map id +;\2: height: in blocks +;\3: width: in blocks +GROUP_\1 EQU const_value + enum MAP_\1 +\1_HEIGHT EQU \2 +\1_WIDTH EQU \3 +endm + + +map_header: macro +;\1: map label +;\2: tileset: a TILESET_* constant +;\3: permission: TOWN, ROUTE, INDOOR, CAVE, PERM_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm +;\5: music: a MUSIC_* constant +;\6: phone service flag: 1 to prevent phone calls +;\7: time of day: a PALETTE_* constant +;\8: fishing group: a FISHGROUP_* constant \1_MapHeader: db BANK(\1_SecondMapHeader), \2, \3 dw \1_SecondMapHeader db \4, \5 dn \6, \7 db \8 -ENDM +endm -map_header_2: MACRO -; label, map, border block, connections +map_header_2: macro +;\1: map label +;\2: map id +;\3: border block +;\4: connections: sum of NORTH, SOUTH, WEST, and/or EAST, or 0 for none \1_SecondMapHeader:: db \3 db \2_HEIGHT, \2_WIDTH @@ -81,9 +114,9 @@ map_header_2: MACRO dw \1_MapScriptHeader dw \1_MapEventHeader db \4 -ENDM +endm -connection: MACRO +connection: macro if "\1" == "north" ;\2: map id ;\3: map label (eventually will be rolled into map id) @@ -151,27 +184,12 @@ if "\1" == "east" db 0 dw OverworldMap + \2_WIDTH + 7 endc +endm -ENDM -mapgroup: MACRO -GROUP_\1 EQU const_value - enum MAP_\1 -\1_HEIGHT EQU \2 -\1_WIDTH EQU \3 -ENDM - -newgroup: MACRO -const_value = const_value + 1 - enum_start 1 -ENDM - -elevfloor: MACRO - db \1, \2 - map \3 -ENDM - -itemball: MACRO +itemball: macro +;\1: item: from constants/item_constants.asm +;\2: quantity: default 1 if _NARG == 2 db \1, \2 else @@ -179,11 +197,30 @@ else endc endm -stonetable: MACRO +elevfloor: macro +;\1: floor: a FLOOR_* constant +;\2: warp destination: starts at 1 +;\3: map id + db \1, \2 + map \3 +ENDM + +stonetable: macro +;\1: warp id +;\2: person_event id +;\3: script pointer db \1, \2 dw \3 endm -maptrigger: MACRO - dw \1, 0 + +roam_map: macro +; A map and an arbitrary number of some more maps. + map \1 + db \2 +rept \2 + map \3 + shift +endr + db 0 endm diff --git a/main.asm b/main.asm index a3161f7a6..dd3a3f5d9 100644 --- a/main.asm +++ b/main.asm @@ -269,10 +269,10 @@ CheckTime:: ; c000 ret TimeOfDayTable: ; c012 - db MORN, 1 << MORN - db DAY, 1 << DAY - db NITE, 1 << NITE - db NITE, 1 << NITE + db MORN_F, MORN + db DAY_F, DAY + db NITE_F, NITE + db NITE_F, NITE db -1 INCLUDE "engine/specials.asm" @@ -1430,7 +1430,7 @@ PlayBattleMusic: ; 2ee6c ld de, MUSIC_JOHTO_WILD_BATTLE ld a, [TimeOfDay] - cp NITE + cp NITE_F jr nz, .done ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT jr .done diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 47c20b9b3..2f3be1a3d 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -20,12 +20,12 @@ UnknownScript_0x713bd: Elevator_0x713be: db 6 ; floors - elevfloor _1F, 4, CELADON_DEPT_STORE_1F - elevfloor _2F, 3, CELADON_DEPT_STORE_2F - elevfloor _3F, 3, CELADON_DEPT_STORE_3F - elevfloor _4F, 3, CELADON_DEPT_STORE_4F - elevfloor _5F, 3, CELADON_DEPT_STORE_5F - elevfloor _6F, 2, CELADON_DEPT_STORE_6F + elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F + elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F + elevfloor FLOOR_3F, 3, CELADON_DEPT_STORE_3F + elevfloor FLOOR_4F, 3, CELADON_DEPT_STORE_4F + elevfloor FLOOR_5F, 3, CELADON_DEPT_STORE_5F + elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F db $ff ; end diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 4bfe984f4..bd9b9b713 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -341,7 +341,7 @@ CeladonGameCorner_MapEventHeader: person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1 person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1 person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1 person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1 person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 2a3e2434e..3a12e7707 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -46,13 +46,13 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: Elevator_0x566e0: db 7 ; floors - elevfloor _B1F, 2, GOLDENROD_DEPT_STORE_B1F - elevfloor _1F, 4, GOLDENROD_DEPT_STORE_1F - elevfloor _2F, 3, GOLDENROD_DEPT_STORE_2F - elevfloor _3F, 3, GOLDENROD_DEPT_STORE_3F - elevfloor _4F, 3, GOLDENROD_DEPT_STORE_4F - elevfloor _5F, 3, GOLDENROD_DEPT_STORE_5F - elevfloor _6F, 2, GOLDENROD_DEPT_STORE_6F + elevfloor FLOOR_B1F, 2, GOLDENROD_DEPT_STORE_B1F + elevfloor FLOOR_1F, 4, GOLDENROD_DEPT_STORE_1F + elevfloor FLOOR_2F, 3, GOLDENROD_DEPT_STORE_2F + elevfloor FLOOR_3F, 3, GOLDENROD_DEPT_STORE_3F + elevfloor FLOOR_4F, 3, GOLDENROD_DEPT_STORE_4F + elevfloor FLOOR_5F, 3, GOLDENROD_DEPT_STORE_5F + elevfloor FLOOR_6F, 2, GOLDENROD_DEPT_STORE_6F db -1 ; end diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index f55a82539..500ce0017 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -493,8 +493,8 @@ GoldenrodGameCorner_MapEventHeader: person_event SPRITE_CLERK, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerCoinVendorScript, -1 person_event SPRITE_RECEPTIONIST, 2, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGmeCornerTMVendorScript, -1 person_event SPRITE_RECEPTIONIST, 2, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 - person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << NITE), PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 + person_event SPRITE_PHARMACIST, 7, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPharmacistScript, -1 person_event SPRITE_POKEFAN_M, 10, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM1Script, -1 person_event SPRITE_COOLTRAINER_M, 8, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerMScript, -1 person_event SPRITE_POKEFAN_F, 6, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanFScript, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index da8478d56..3a313ac7b 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -410,7 +410,7 @@ KrissHouse1F_MapEventHeader: .PersonEvents: db 5 person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, (1 << NITE), 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, PERSONTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 person_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index f36c0836f..aa0b97167 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -44,7 +44,7 @@ MountMoonGiftShop_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, (1 << MORN), 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, (1 << DAY), 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + person_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, PERSONTYPE_SCRIPT, 0, LassScript_0x771b0, -1 diff --git a/predef/sgb.asm b/predef/sgb.asm index 545a8d4e8..dc174e86f 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -556,7 +556,7 @@ endr .GetMapPalsIndex: ; 8a0c ld a, [TimeOfDayPal] - cp NITE + cp NITE_F jr c, .morn_day ld a, $19 ret From ec380e6df2d071dcd03f1d2d5bc06a3bb2865a67 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 01:11:05 -0500 Subject: [PATCH 14/35] =?UTF-8?q?tilemap=20=E2=86=92=20tileset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants.asm | 2 +- constants/{tilemap_constants.asm => tileset_constants.asm} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename constants/{tilemap_constants.asm => tileset_constants.asm} (100%) diff --git a/constants.asm b/constants.asm index 5c7288d87..dd8a6e11e 100644 --- a/constants.asm +++ b/constants.asm @@ -28,7 +28,7 @@ INCLUDE "constants/std_constants.asm" INCLUDE "constants/deco_constants.asm" INCLUDE "constants/radio_constants.asm" INCLUDE "constants/sprite_constants.asm" -INCLUDE "constants/tilemap_constants.asm" +INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/cgb_constants.asm" INCLUDE "constants/battle_tower_constants.asm" INCLUDE "constants/cry_constants.asm" diff --git a/constants/tilemap_constants.asm b/constants/tileset_constants.asm similarity index 100% rename from constants/tilemap_constants.asm rename to constants/tileset_constants.asm From c2ad79c4f21b5f4dd661d69a7a81b69506be8821 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 12:20:01 -0500 Subject: [PATCH 15/35] Add constants for time-of-day boundaries Split off more misc constants into proper files --- constants.asm | 2 + constants/gfx_constants.asm | 24 +++++++- constants/input_constants.asm | 26 ++++++++ constants/misc_constants.asm | 105 ++++++++------------------------- constants/serial_constants.asm | 12 ++++ engine/radio.asm | 2 +- engine/rtc.asm | 10 ++-- engine/timeset.asm | 35 +++++------ gfx/font.asm | 4 +- wram.asm | 2 + 10 files changed, 115 insertions(+), 107 deletions(-) create mode 100644 constants/input_constants.asm create mode 100644 constants/serial_constants.asm diff --git a/constants.asm b/constants.asm index dd8a6e11e..988c8b336 100644 --- a/constants.asm +++ b/constants.asm @@ -21,7 +21,9 @@ INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/animation_constants.asm" INCLUDE "constants/phone_constants.asm" INCLUDE "constants/gfx_constants.asm" +INCLUDE "constants/input_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" +INCLUDE "constants/serial_constants.asm" INCLUDE "constants/mobile_constants.asm" INCLUDE "constants/misc_constants.asm" INCLUDE "constants/std_constants.asm" diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 6b8cc33c9..445f0d815 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,3 +1,21 @@ -LEN_2BPP_TILE EQU 16 -LEN_1BPP_TILE EQU 8 -TILES_PER_FRAME EQU 6 +LEN_1BPP_TILE EQU 8 ; bytes +LEN_2BPP_TILE EQU 16 ; bytes + +TILE_WIDTH EQU 8 ; pixels + +NUM_PAL_COLORS EQU 4 + +SCREEN_WIDTH EQU 20 ; tiles +SCREEN_HEIGHT EQU 18 ; tiles +SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels +SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels + +BG_MAP_WIDTH EQU 32 ; tiles +BG_MAP_HEIGHT EQU 32 ; tiles +WMISC_WIDTH EQU 6 * 4 +WMISC_HEIGHT EQU 5 * 4 + +HP_BAR_LENGTH EQU 6 ; tiles +HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels +EXP_BAR_LENGTH EQU 8 ; tiles +EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels diff --git a/constants/input_constants.asm b/constants/input_constants.asm new file mode 100644 index 000000000..3042c3f89 --- /dev/null +++ b/constants/input_constants.asm @@ -0,0 +1,26 @@ +; joypad buttons + const_def + const A_BUTTON_F ; 0 + const B_BUTTON_F ; 1 + const SELECT_F ; 2 + const START_F ; 3 + const D_RIGHT_F ; 4 + const D_LEFT_F ; 5 + const D_UP_F ; 6 + const D_DOWN_F ; 7 + +NO_INPUT EQU %00000000 +A_BUTTON EQU 1 << A_BUTTON_F +B_BUTTON EQU 1 << B_BUTTON_F +SELECT EQU 1 << SELECT_F +START EQU 1 << START_F +D_RIGHT EQU 1 << D_RIGHT_F +D_LEFT EQU 1 << D_LEFT_F +D_UP EQU 1 << D_UP_F +D_DOWN EQU 1 << D_DOWN_F + +BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START +D_PAD EQU D_RIGHT | D_LEFT | D_UP | D_DOWN + +R_DPAD EQU %00100000 +R_BUTTONS EQU %00010000 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 94244b481..ff416e3cd 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -37,70 +37,11 @@ TRAINER_NAME EQU 7 ; broken ptr EQU 8 -; boxes -MONS_PER_BOX EQU 20 -NUM_BOXES EQU 14 - -; hall of fame -HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (PKMN_NAME_LENGTH +- 1) ; species, id, dvs, level, nick -HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator -NUM_HOF_TEAMS = 30 - - -; joypad - - const_def - const A_BUTTON_F ; 0 - const B_BUTTON_F ; 1 - const SELECT_F ; 2 - const START_F ; 3 - const D_RIGHT_F ; 4 - const D_LEFT_F ; 5 - const D_UP_F ; 6 - const D_DOWN_F ; 7 - -NO_INPUT EQU %00000000 -A_BUTTON EQU 1 << A_BUTTON_F -B_BUTTON EQU 1 << B_BUTTON_F -SELECT EQU 1 << SELECT_F -START EQU 1 << START_F -D_RIGHT EQU 1 << D_RIGHT_F -D_LEFT EQU 1 << D_LEFT_F -D_UP EQU 1 << D_UP_F -D_DOWN EQU 1 << D_DOWN_F - -BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START -D_PAD EQU D_RIGHT | D_LEFT | D_UP | D_DOWN - -R_DPAD EQU %00100000 -R_BUTTONS EQU %00010000 - - -; screen - -HP_BAR_LENGTH EQU 6 -HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * 8 -EXP_BAR_LENGTH EQU 8 -EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * 8 - -SCREEN_WIDTH EQU 20 -SCREEN_HEIGHT EQU 18 -SCREEN_WIDTH_PX EQU SCREEN_WIDTH * 8 -SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * 8 - -BG_MAP_WIDTH EQU 32 -BG_MAP_HEIGHT EQU 32 -WMISC_WIDTH EQU 6 * 4 -WMISC_HEIGHT EQU 5 * 4 - -TILE_WIDTH EQU 8 - - ; printing text - -PRINTNUM_MONEY_F EQU 5 -PRINTNUM_RIGHTALIGN_F EQU 6 -PRINTNUM_LEADINGZEROS_F EQU 7 +const_value set 5 + const PRINTNUM_MONEY_F ; 5 + const PRINTNUM_RIGHTALIGN_F ; 6 + const PRINTNUM_LEADINGZEROS_F ; 7 PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F @@ -119,6 +60,28 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F const STEP_WALK_IN_PLACE ; 7 +HMENURETURN_SCRIPT EQU %10000000 +HMENURETURN_ASM EQU %11111111 + + +; time of day boundaries +MORN_HOUR EQU 4 ; 4 AM +DAY_HOUR EQU 10 ; 10 AM +NITE_HOUR EQU 18 ; 6 PM +NOON_HOUR EQU 12 ; 12 PM +MAX_HOUR EQU 24 ; 12 AM + + +; boxes +MONS_PER_BOX EQU 20 +NUM_BOXES EQU 14 + +; hall of fame +HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (PKMN_NAME_LENGTH +- 1) ; species, id, dvs, level, nick +HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator +NUM_HOF_TEAMS = 30 + + ; ChangeHappiness arguments (see event/happiness_egg.asm) const_value = 1 const HAPPINESS_GAINLEVEL ; 01 @@ -140,19 +103,3 @@ const_value = 1 const HAPPINESS_REVIVALHERB ; 11 const HAPPINESS_MASSAGE ; 12 const HAPPINESS_GAINLEVELATHOME ; 13 - - - const_def - const LINK_NULL ; 0 - const LINK_TIMECAPSULE ; 1 - const LINK_TRADECENTER ; 2 - const LINK_COLOSSEUM ; 3 - const LINK_MOBILE ; 4 - -SERIAL_TIMECAPSULE EQU $60 -SERIAL_TRADECENTER EQU $70 -SERIAL_BATTLE EQU $80 - - -HMENURETURN_SCRIPT EQU %10000000 -HMENURETURN_ASM EQU %11111111 diff --git a/constants/serial_constants.asm b/constants/serial_constants.asm new file mode 100644 index 000000000..e7b4c4b2c --- /dev/null +++ b/constants/serial_constants.asm @@ -0,0 +1,12 @@ +; link types + const_def + const LINK_NULL ; 0 + const LINK_TIMECAPSULE ; 1 + const LINK_TRADECENTER ; 2 + const LINK_COLOSSEUM ; 3 + const LINK_MOBILE ; 4 + + +SERIAL_TIMECAPSULE EQU $60 +SERIAL_TRADECENTER EQU $70 +SERIAL_BATTLE EQU $80 diff --git a/engine/radio.asm b/engine/radio.asm index 8760956b2..feded7616 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -1837,7 +1837,7 @@ BuenasPassword21: BuenasPasswordCheckTime: call UpdateTime ld a, [hHours] - cp 18 ; 6 PM + cp NITE_HOUR ret BuenasPasswordChannelName: diff --git a/engine/rtc.asm b/engine/rtc.asm index 1b1b44fa6..f69dc1f6d 100755 --- a/engine/rtc.asm +++ b/engine/rtc.asm @@ -50,11 +50,11 @@ GetTimeOfDay:: ; 14032 TimesOfDay: ; 14044 ; hours for the time of day -; 04-09 morn | 10-17 day | 18-03 nite - db 04, NITE_F - db 10, MORN_F - db 18, DAY_F - db 24, NITE_F +; 0400-0959 morn | 1000-1759 day | 1800-0359 nite + db MORN_HOUR, NITE_F + db DAY_HOUR, MORN_F + db NITE_HOUR, DAY_F + db MAX_HOUR, NITE_F db -1, MORN_F ; 1404e diff --git a/engine/timeset.asm b/engine/timeset.asm index e8b0642e4..2a578f998 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -44,7 +44,7 @@ InitClock: ; 90672 (24:4672) ld bc, 50 xor a call ByteFill - ld a, $a + ld a, 10 ; default hour = 10 AM ld [wInitHourBuffer], a .loop @@ -98,7 +98,7 @@ InitClock: ; 90672 (24:4672) call SetMinutes jr nc, .SetMinutesLoop - ld a, [BattleMonNick + 5] + ld a, [wInitMinuteBuffer] ld [StringBuffer2 + 2], a call .ClearScreen ld hl, Text_WhoaMins @@ -237,7 +237,7 @@ SetMinutes: ; 90810 (24:4810) ret .d_down - ld hl, BattleMonNick + 5 + ld hl, wInitMinuteBuffer ld a, [hl] and a jr nz, .decrease @@ -248,7 +248,7 @@ SetMinutes: ; 90810 (24:4810) jr .finish_dpad .d_up - ld hl, BattleMonNick + 5 + ld hl, wInitMinuteBuffer ld a, [hl] cp 59 jr c, .increase @@ -271,7 +271,7 @@ SetMinutes: ; 90810 (24:4810) ret DisplayMinutesWithMinString: ; 90859 (24:4859) - ld de, BattleMonNick + 5 + ld de, wInitMinuteBuffer call PrintTwoDigitNumberRightAlign inc hl ld de, String_min @@ -355,17 +355,17 @@ OakText_ResponseToSetTime: ; 0x908b8 call PrintHour ld [hl], ":" inc hl - ld de, BattleMonNick + 5 + ld de, wInitMinuteBuffer lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ld b, h ld c, l ld a, [wInitHourBuffer] - cp 4 + cp MORN_HOUR jr c, .nite - cp 11 + cp DAY_HOUR + 1 jr c, .morn - cp 18 + cp NITE_HOUR jr c, .day .nite: ld hl, .sodark @@ -482,7 +482,7 @@ Special_SetDayOfWeek: ; 90913 ld a, [hl] and a jr nz, .decrease - ld a, 6 + 1 + ld a, SATURDAY + 1 .decrease dec a @@ -494,7 +494,7 @@ Special_SetDayOfWeek: ; 90913 ld a, [hl] cp 6 jr c, .increase - ld a, 0 - 1 + ld a, SUNDAY - 1 .increase inc a @@ -531,6 +531,7 @@ Special_SetDayOfWeek: ; 90913 ; 909f2 .WeekdayStrings: ; 909f2 +; entries correspond to CurDay constants (see constants/wram_constants.asm) dw .Sunday dw .Monday dw .Tuesday @@ -731,11 +732,11 @@ PrintHour: ; 90b3e (24:4b3e) GetTimeOfDayString: ; 90b58 (24:4b58) ld a, c - cp 4 + cp MORN_HOUR jr c, .nite - cp 10 + cp DAY_HOUR jr c, .morn - cp 18 + cp NITE_HOUR jr c, .day .nite ld de, .nite_string @@ -758,12 +759,12 @@ AdjustHourForAMorPM: ld a, c or a jr z, .midnight - cp 12 + cp NOON_HOUR ret c ret z - sub 12 + sub NOON_HOUR ret .midnight - ld a, 12 + ld a, NOON_HOUR ret diff --git a/gfx/font.asm b/gfx/font.asm index 8d7186e4c..99e8505b7 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -165,13 +165,13 @@ _LoadFontsBattleExtra:: ; fb4be LoadFrame: ; fb4cc ld a, [TextBoxFrame] and 7 - ld bc, TILES_PER_FRAME * LEN_1BPP_TILE + ld bc, LEN_1BPP_TILE * 6 ld hl, Frames call AddNTimes ld d, h ld e, l ld hl, VTiles2 tile "┌" ; $79 - lb bc, BANK(Frames), TILES_PER_FRAME + lb bc, BANK(Frames), 6 call Get1bpp_2 ld hl, VTiles2 tile " " ; $7f ld de, TextBoxSpaceGFX diff --git a/wram.asm b/wram.asm index 9b96f2bb6..e70457eba 100644 --- a/wram.asm +++ b/wram.asm @@ -355,6 +355,8 @@ NEXTU ; c608 ; timeset temp storage ds 20 wInitHourBuffer:: db ; c61c + ds 9 +wInitMinuteBuffer:: db ; c626 NEXTU ; c608 ; link engine data From 31cce83e9b3bab01d8a605b170549fbd25ca5fee Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 13:47:58 -0500 Subject: [PATCH 16/35] Move lots of data tables into individual data/ files (This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.) --- constants.asm | 1 + constants/deco_constants.asm | 2 +- constants/item_constants.asm | 1 + constants/landmark_constants.asm | 2 +- constants/map_constants.asm | 4 +- constants/misc_constants.asm | 8 +- constants/npctrade_constants.asm | 21 + constants/phone_constants.asm | 4 +- constants/pokemon_constants.asm | 2 +- constants/pokemon_data_constants.asm | 7 +- constants/sprite_constants.asm | 6 +- constants/wram_constants.asm | 39 +- data/battle_tower.asm | 209 -------- data/decoration_attributes.asm | 60 +++ data/default_options.asm | 16 + data/egg_move_pointers.asm | 1 - data/egg_moves.asm | 1 + data/emote_headers.asm | 20 + data/engine_flags.asm | 203 ++++++++ data/evos_attacks.asm | 1 + data/evos_attacks_pointers.asm | 5 +- {engine => data}/facings.asm | 0 data/fruit_tree_items.asm | 32 ++ data/happiness_changes.asm | 22 + data/hm_blocks.asm | 53 ++ data/landmarks.asm | 207 ++++++++ {engine => data}/map_triggers.asm | 4 - data/mom_phone_items.asm | 27 + data/mon_menu_icons.asm | 252 +++++++++ data/mystery_gift/decos.asm | 37 ++ data/mystery_gift/items.asm | 37 ++ data/npc_trades.asm | 20 + data/odd_eggs.asm | 98 +--- data/outdoor_sprites.asm | 694 ++++++++++++++++++++++++ data/phone_contacts.asm | 49 ++ data/phone_special.asm | 16 + data/spawn_points.asm | 39 ++ data/sprite_anim_seqs.asm | 92 ++++ data/sprite_mons.asm | 37 ++ data/time_capsule/mon_order.asm | 253 +++++++++ data/time_capsule/special_stats.asm | 152 ++++++ data/tmhm_moves.asm | 67 +++ data/wild/bug_contest_mons.asm | 12 + data/wild/probabilities.asm | 15 + data/wild/roammon_maps.asm | 31 ++ data/wild/treemon_maps.asm | 50 ++ data/wild/treemons.asm | 128 +++++ engine/battle_tower.asm | 210 ++++++++ engine/decorations.asm | 62 +-- engine/delete_save_change_clock.asm | 4 +- engine/engine_flags.asm | 203 +------- engine/events_2.asm | 13 +- engine/events_3.asm | 173 +----- engine/fruit_trees.asm | 31 +- engine/intro_menu.asm | 8 +- engine/landmarks.asm | 207 +------- engine/map_objects.asm | 2 +- engine/mon_icons.asm | 25 +- engine/mysterygift2.asm | 82 +-- engine/npctrade.asm | 46 +- engine/odd_eggs.asm | 96 ++++ engine/options_menu.asm | 128 ++--- engine/overworld.asm | 752 +-------------------------- engine/phone.asm | 80 +-- engine/save.asm | 9 +- engine/spawn_points.asm | 40 +- engine/sprites.asm | 93 +--- engine/time_capsule/conversion.asm | 407 +-------------- engine/tmhm.asm | 65 +-- engine/wildmons.asm | 42 +- event/happiness_egg.asm | 30 +- event/mom_phone.asm | 32 +- event/overworld.asm | 46 +- gfx/icon_pointers.asm | 41 ++ gfx/icons.asm | 39 ++ macros/map.asm | 12 - main.asm | 8 +- maps/BlackthornEmysHouse.asm | 2 +- maps/GoldenrodDeptStore5F.asm | 2 +- maps/OlivineTimsHouse.asm | 2 +- maps/PewterPokecenter1F.asm | 2 +- maps/PowerPlant.asm | 2 +- maps/Route14.asm | 2 +- maps/VioletOnixTradeHouse.asm | 2 +- menu/mon_icons.asm | 349 ------------- wram.asm | 6 +- 86 files changed, 3238 insertions(+), 3154 deletions(-) create mode 100644 constants/npctrade_constants.asm create mode 100644 data/decoration_attributes.asm create mode 100644 data/default_options.asm create mode 100644 data/emote_headers.asm create mode 100644 data/engine_flags.asm rename {engine => data}/facings.asm (100%) create mode 100644 data/fruit_tree_items.asm create mode 100644 data/happiness_changes.asm create mode 100644 data/hm_blocks.asm create mode 100644 data/landmarks.asm rename {engine => data}/map_triggers.asm (99%) create mode 100644 data/mom_phone_items.asm create mode 100644 data/mon_menu_icons.asm create mode 100644 data/mystery_gift/decos.asm create mode 100644 data/mystery_gift/items.asm create mode 100644 data/npc_trades.asm create mode 100644 data/outdoor_sprites.asm create mode 100644 data/phone_contacts.asm create mode 100644 data/phone_special.asm create mode 100644 data/spawn_points.asm create mode 100644 data/sprite_anim_seqs.asm create mode 100644 data/sprite_mons.asm create mode 100644 data/time_capsule/mon_order.asm create mode 100644 data/time_capsule/special_stats.asm create mode 100644 data/tmhm_moves.asm create mode 100644 data/wild/bug_contest_mons.asm create mode 100644 data/wild/probabilities.asm create mode 100644 data/wild/roammon_maps.asm create mode 100644 data/wild/treemon_maps.asm create mode 100644 data/wild/treemons.asm create mode 100644 engine/battle_tower.asm create mode 100644 engine/odd_eggs.asm create mode 100644 gfx/icon_pointers.asm create mode 100644 gfx/icons.asm delete mode 100644 menu/mon_icons.asm diff --git a/constants.asm b/constants.asm index 988c8b336..0d5e3cc87 100644 --- a/constants.asm +++ b/constants.asm @@ -29,6 +29,7 @@ INCLUDE "constants/misc_constants.asm" INCLUDE "constants/std_constants.asm" INCLUDE "constants/deco_constants.asm" INCLUDE "constants/radio_constants.asm" +INCLUDE "constants/npctrade_constants.asm" INCLUDE "constants/sprite_constants.asm" INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/cgb_constants.asm" diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 540920e5c..433b11e25 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -59,7 +59,7 @@ deco: MACRO enum DECOFLAG_\1 endm -; decorations +; decorations (see data/decoration_attribute.asm) const_value = 1 __enum__ = 0 const BEDS diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 443176f1f..996023e73 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -197,6 +197,7 @@ const MIRAGE_MAIL ; $BD const ITEM_BE ; $BE +; see data/tmhm_moves.asm for moves add_tm DYNAMICPUNCH ; $BF add_tm HEADBUTT ; $C0 add_tm CURSE ; $C1 diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index f9c840595..e53d44d04 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -1,4 +1,4 @@ -; Landmarks indexes (see engine/landmarks.asm) +; Landmarks indexes (see data/landmarks.asm) const_def ; Johto landmarks diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 8e04c5782..a9b923deb 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -603,7 +603,7 @@ SLIDING EQU 3 EMOTE_OBJECT EQU 7 -; SpawnPoints indexes (see engine/spawn_points.asm) +; SpawnPoints indexes (see data/spawn_points.asm) const_value = -1 const SPAWN_N_A const SPAWN_HOME @@ -679,7 +679,7 @@ NUM_SPAWNS EQU const_value const EMOTE_GRASS_RUSTLE ; 11 EMOTE_MEM EQU -1 -; FruitTreeItems indexes (see engine/fruit_trees.asm) +; FruitTreeItems indexes (see data/fruit_tree_items.asm) const_value SET 1 const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_30_1 ; 02 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index ff416e3cd..7510fdf50 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -25,6 +25,7 @@ PKMN_NAME_LENGTH EQU 11 MOVE_NAME_LENGTH EQU 13 ITEM_NAME_LENGTH EQU 13 TRAINER_CLASS_NAME_LENGTH EQU 13 +NAME_LENGTH_JAPANESE EQU 6 ; GetName types (see home.asm) PKMN_NAME EQU 1 @@ -82,7 +83,12 @@ HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminato NUM_HOF_TEAMS = 30 -; ChangeHappiness arguments (see event/happiness_egg.asm) +; significant money values +START_MONEY EQU 3000 +MOM_MONEY EQU 2300 + + +; ChangeHappiness arguments (see data/happiness_changes.asm) const_value = 1 const HAPPINESS_GAINLEVEL ; 01 const HAPPINESS_USEDITEM ; 02 diff --git a/constants/npctrade_constants.asm b/constants/npctrade_constants.asm new file mode 100644 index 000000000..2da4abd64 --- /dev/null +++ b/constants/npctrade_constants.asm @@ -0,0 +1,21 @@ +; npctrade struct members (see data/npc_trades.asm) +TRADE_DIALOG EQU 0 +TRADE_GIVEMON EQU 1 +TRADE_GETMON EQU 2 +TRADE_NICK EQU 3 +TRADE_DVS EQU 14 +TRADE_ITEM EQU 16 +TRADE_OT_ID EQU 17 +TRADE_OT_NAME EQU 19 +TRADE_GENDER EQU 30 +TRADE_PADDING EQU 31 + +; NPCTrades indexes (see data/npc_trades.asm) + const_def + const NPCTRADE_MIKE ; 0 + const NPCTRADE_KYLE ; 1 + const NPCTRADE_TIM ; 2 + const NPCTRADE_EMY ; 3 + const NPCTRADE_CHRIS ; 4 + const NPCTRADE_KIM ; 5 + const NPCTRADE_FOREST ; 6 diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm index fe602a413..b2312ab4b 100644 --- a/constants/phone_constants.asm +++ b/constants/phone_constants.asm @@ -1,4 +1,4 @@ -; PhoneContacts indexes (see engine/phone.asm) +; PhoneContacts indexes (see data/phone_contacts.asm) const_def const PHONE_00 const PHONE_MOM @@ -39,7 +39,7 @@ const PHONE_PICNICKER_ERIN const PHONE_BUENA -; SpecialPhoneCallList indexes (see engine/phone.asm) +; SpecialPhoneCallList indexes (see data/phone_special.asm) const_def const SPECIALCALL_NONE const SPECIALCALL_POKERUS diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index fb713507f..743325ea3 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -14,7 +14,7 @@ ; - PicPointers (see gfx/pics/pic_pointers.asm) ; - AlphabeticalPokedexOrder (see data/pokedex/order_alpha.asm) ; - NewPokedexOrder (see data/pokedex/order_new.asm) -; - MonMenuIcons (see menu/mon_icons.asm) +; - MonMenuIcons (see data/mon_menu_icons.asm) ; - Pokered_MonIndices (see engine/time_capsule/conversion.asm) ; - SortedPokemon (see misc/fixed_words.asm) const_value set 1 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index c7cf9dccb..08d5bdbd8 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -27,8 +27,9 @@ const_value SET 1 const NO_EGGS ; f -; IconPointers indexes (see menu/mon_icons.asm) -const_value SET 1 +; IconPointers indexes (see gfx/icon_pointers.asm) + const_def + const ICON_NULL const ICON_POLIWAG const ICON_JIGGLYPUFF const ICON_DIGLETT @@ -94,6 +95,8 @@ const_value SET 1 BASE_HAPPINESS EQU 70 FRIEND_BALL_HAPPINESS EQU 200 HAPPINESS_TO_EVOLVE EQU 220 +HAPPINESS_THRESHOLD_1 EQU 100 +HAPPINESS_THRESHOLD_2 EQU 200 NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 787e130f4..d2416c0fe 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -105,7 +105,7 @@ const SPRITE_RAIKOU ; 65 const SPRITE_STANDING_YOUNGSTER ; 66 -; SpriteMons indexes (see engine/overworld.asm) +; SpriteMons indexes (see data/sprite_mons.asm) const_value SET $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 @@ -326,7 +326,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const PERSON_ACTION_GRASS_SHAKE const PERSON_ACTION_SKYFALL -; Facings indexes (see engine/facings.asm) +; Facings indexes (see data/facings.asm) const_def const FACING_STEP_DOWN_0 const FACING_STEP_DOWN_1 @@ -487,7 +487,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITE_ANIM_SEQ_INTRO_UNOWN_F const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY -; SpriteAnimSeqData indexes (see engine/sprites.asm) +; SpriteAnimSeqData indexes (see data/sprite_anim_seqs.asm) const_def const SPRITE_ANIM_INDEX_PARTY_MON const SPRITE_ANIM_INDEX_01 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index ade157165..a1047fc53 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -7,27 +7,38 @@ const WILDMON ; 4 ; Options: (bits) ; cfcc -const_value SET 5 - const STEREO ; 5 - const BATTLE_SHIFT ; 6 - const BATTLE_SCENE ; 7 +const_value SET 4 + const NO_TEXT_SCROLL ; 4 + const STEREO ; 5 + const BATTLE_SHIFT ; 6 + const BATTLE_SCENE ; 7 -; Options: (bits 0-2 values) ; cfcc -FAST_TEXT EQU 0 -MED_TEXT EQU 1 -SLOW_TEXT EQU 2 -NO_TEXT_SCROLL EQU 4 +; Options: (bits 0-2) +TEXT_DELAY_FAST EQU 1 +TEXT_DELAY_MED EQU 3 +TEXT_DELAY_SLOW EQU 5 + +; TextBoxFrame: ; cfce + const_def + const FRAME_1 ; 0 + const FRAME_2 ; 1 + const FRAME_3 ; 2 + const FRAME_4 ; 3 + const FRAME_5 ; 4 + const FRAME_6 ; 5 + const FRAME_7 ; 6 + const FRAME_8 ; 7 ; Options2: const_def const MENU_ACCOUNT ; 0 ; GBPrinter: -PRINT_LIGHTEST EQU $00 -PRINT_LIGHTER EQU $20 -PRINT_NORMAL EQU $40 -PRINT_DARKER EQU $60 -PRINT_DARKEST EQU $7f +GBPRINTER_LIGHTEST EQU $00 +GBPRINTER_LIGHTER EQU $20 +GBPRINTER_NORMAL EQU $40 +GBPRINTER_DARKER EQU $60 +GBPRINTER_DARKEST EQU $7f ; WalkingDirection: ; d043 const_value SET -1 diff --git a/data/battle_tower.asm b/data/battle_tower.asm index 8997a53b8..2c78ffb82 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -1,212 +1,3 @@ -Function_LoadOpponentTrainerAndPokemons: ; 1f8000 - ld a, [rSVBK] - push af - ld a, BANK(BT_OTTrainer) - ld [rSVBK], a - - ; Fill BT_OTTrainer with zeros - xor a - ld hl, BT_OTTrainer - ld bc, BT_OTTrainerEnd - BT_OTTrainer - call ByteFill - - ; Write $ff into the Item-Slots - ld a, $ff - ld [BT_OTPkmn1Item], a - ld [BT_OTPkmn2Item], a - ld [BT_OTPkmn3Item], a - - ; Set BT_OTTrainer as start address to write the following data to - ld de, BT_OTTrainer - - ld a, [hRandomAdd] - ld b, a -.resample ; loop to find a random trainer - call Random - ld a, [hRandomAdd] - add b - ld b, a ; b contains the nr of the trainer -IF DEF(CRYSTAL11) - and (1 << 7) - 1 - cp 70 -ELSE - and (1 << 5) - 1 - cp 21 -ENDC - jr nc, .resample - ld b, a - - ld a, BANK(sBTTrainers) - call GetSRAMBank - - ld c, BATTLETOWER_NROFTRAINERS - ld hl, sBTTrainers -.next_trainer - ld a, [hli] - cp b - jr z, .resample - dec c - jr nz, .next_trainer ; c <= 7 initialise all 7 trainers? - - ld hl, sBTTrainers - ld a, [sNrOfBeatenBattleTowerTrainers] - ld c, a - ld a, b - ld b, 0 - add hl, bc - ld [hl], a - - call CloseSRAM - - push af -; Copy name (10 bytes) and class (1 byte) of trainer - ld hl, BattleTowerTrainers - ld bc, NAME_LENGTH - call AddNTimes - ld bc, NAME_LENGTH - call CopyBytes - - call Function_LoadRandomBattleTowerPkmn - pop af - - ld hl, BattleTowerTrainerData - ld bc, BATTLETOWER_TRAINERDATALENGTH - call AddNTimes - ld bc, BATTLETOWER_TRAINERDATALENGTH -.copy_bt_trainer_data_loop - ld a, BANK(BattleTowerTrainerData) - call GetFarByte - ld [de], a - inc hl - inc de - dec bc - ld a, b - or c - jr nz, .copy_bt_trainer_data_loop - - pop af - ld [rSVBK], a - - ret - - -Function_LoadRandomBattleTowerPkmn: ; 1f8081 - ld c, BATTLETOWER_NROFPKMNS -.loop - push bc - ld a, BANK(sBTPkmnPrevTrainer1) - call GetSRAMBank - -.FindARandomBattleTowerPkmn: - ; From Which LevelGroup are the Pkmn loaded - ; a = 1..10 - ld a, [wBTChoiceOfLvlGroup] ; [$d800] - dec a - ld hl, BattleTowerMons - ld bc, BattleTowerMons2 - BattleTowerMons1 - call AddNTimes - - ld a, [hRandomAdd] - ld b, a -.resample - call Random - ld a, [hRandomAdd] - add b - ld b, a - and $1f - cp BATTLETOWER_NRMONSPERLEVELBRACKET - jr nc, .resample - ; in register 'a' is the chosen Pkmn of the LevelGroup - - ; Check if Pkmn was already loaded before - ; Check current and the 2 previous teams - ; includes check if item is double at the current team - ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH - call AddNTimes - ld a, [hli] - ld b, a - ld a, [hld] - ld c, a - ld a, [BT_OTPkmn1] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [BT_OTPkmn1Item] - cp c - jr z, .FindARandomBattleTowerPkmn - ld a, [BT_OTPkmn2] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [BT_OTPkmn2Item] - cp c - jr z, .FindARandomBattleTowerPkmn - ld a, [BT_OTPkmn3] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [BT_OTPkmn3Item] - cp c - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevTrainer1] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevTrainer2] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevTrainer3] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevPrevTrainer1] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevPrevTrainer2] - cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevPrevTrainer3] - cp b - jr z, .FindARandomBattleTowerPkmn - - ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH - call CopyBytes - - ld a, [wNamedObjectIndexBuffer] - push af - push de - ld hl, - (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) - add hl, de - ld a, [hl] - ld [wNamedObjectIndexBuffer], a - ld bc, PARTYMON_STRUCT_LENGTH - add hl, bc - push hl - call GetPokemonName - ld h, d - ld l, e - pop de - ld bc, PKMN_NAME_LENGTH - call CopyBytes - - pop de - pop af - ld [wNamedObjectIndexBuffer], a - pop bc - dec c - jp nz, .loop - - ld a, [sBTPkmnPrevTrainer1] - ld [sBTPkmnPrevPrevTrainer1], a - ld a, [sBTPkmnPrevTrainer2] - ld [sBTPkmnPrevPrevTrainer2], a - ld a, [sBTPkmnPrevTrainer3] - ld [sBTPkmnPrevPrevTrainer3], a - ld a, [BT_OTPkmn1] - ld [sBTPkmnPrevTrainer1], a - ld a, [BT_OTPkmn2] - ld [sBTPkmnPrevTrainer2], a - ld a, [BT_OTPkmn3] - ld [sBTPkmnPrevTrainer3], a - call CloseSRAM - ret -; 1f814e - BattleTowerTrainers: ; 1f814e ; The trainer class is not used in Crystal 1.0 due to a bug. ; Instead, the sixth character in the trainer's name is used. diff --git a/data/decoration_attributes.asm b/data/decoration_attributes.asm new file mode 100644 index 000000000..07d4abb37 --- /dev/null +++ b/data/decoration_attributes.asm @@ -0,0 +1,60 @@ +decoration: MACRO + ; type, name, command, event flag, tile/sprite + db \1, \2, \3 + dw \4 + db \5 +ENDM + + decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b + decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c + decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d + decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08 + decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b + decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e + decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20 + decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21 + decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f + decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23 + decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24 + decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM + decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES + decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64 + decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX + decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX + decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU + decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU + decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY + decoration DECO_DOLL, JIGGLYPUFF, SET_UP_DOLL, EVENT_DECO_JIGGLYPUFF_DOLL, SPRITE_JIGGLYPUFF + decoration DECO_DOLL, BULBASAUR, SET_UP_DOLL, EVENT_DECO_BULBASAUR_DOLL, SPRITE_BULBASAUR + decoration DECO_DOLL, CHARMANDER, SET_UP_DOLL, EVENT_DECO_CHARMANDER_DOLL, SPRITE_CHARMANDER + decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE + decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG + decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT + decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE + decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP + decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH + decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR + decoration DECO_DOLL, SHELLDER, SET_UP_DOLL, EVENT_DECO_SHELLDER_DOLL, SPRITE_SHELLDER + decoration DECO_DOLL, GRIMER, SET_UP_DOLL, EVENT_DECO_GRIMER_DOLL, SPRITE_GRIMER + decoration DECO_DOLL, VOLTORB, SET_UP_DOLL, EVENT_DECO_VOLTORB_DOLL, SPRITE_VOLTORB + decoration DECO_DOLL, WEEDLE, SET_UP_DOLL, EVENT_DECO_WEEDLE_DOLL, SPRITE_WEEDLE + decoration DECO_DOLL, UNOWN, SET_UP_DOLL, EVENT_DECO_UNOWN_DOLL, SPRITE_UNOWN + decoration DECO_DOLL, GEODUDE, SET_UP_DOLL, EVENT_DECO_GEODUDE_DOLL, SPRITE_GEODUDE + decoration DECO_DOLL, MACHOP, SET_UP_DOLL, EVENT_DECO_MACHOP_DOLL, SPRITE_MACHOP + decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL + decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY + decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY diff --git a/data/default_options.asm b/data/default_options.asm new file mode 100644 index 000000000..7ecbe3163 --- /dev/null +++ b/data/default_options.asm @@ -0,0 +1,16 @@ +; Options: med text speed + db TEXT_DELAY_MED +; wSaveFileExists: no + db $00 +; TextBoxFrame: frame 1 + db FRAME_1 +; TextBoxFlags: ?? + db $01 +; GBPrinter: normal brightness + db GBPRINTER_NORMAL +; Options2: menu account on + db $01 +; $cfd2: ?? + db $00 +; $cfd3: ?? + db $00 diff --git a/data/egg_move_pointers.asm b/data/egg_move_pointers.asm index 11665f23e..27558ddef 100644 --- a/data/egg_move_pointers.asm +++ b/data/egg_move_pointers.asm @@ -1,4 +1,3 @@ -EggMovePointers:: ; 0x23b11 dw BulbasaurEggMoves dw NoEggMoves dw NoEggMoves diff --git a/data/egg_moves.asm b/data/egg_moves.asm index 2fcf47232..d27c2f52b 100644 --- a/data/egg_moves.asm +++ b/data/egg_moves.asm @@ -10,6 +10,7 @@ SECTION "Egg Moves", ROMX ; and can only breed with Ditto. +EggMovePointers:: ; 0x23b11 INCLUDE "data/egg_move_pointers.asm" diff --git a/data/emote_headers.asm b/data/emote_headers.asm new file mode 100644 index 000000000..8605471f9 --- /dev/null +++ b/data/emote_headers.asm @@ -0,0 +1,20 @@ +emote_header: MACRO +; graphics pointer, length, starting tile + dw \1 + db \2 tiles, BANK(\1) + dw VTiles1 tile \3 +ENDM + +; entries correspond to EMOTE_* constants + emote_header ShockEmote, 4, $78 + emote_header QuestionEmote, 4, $78 + emote_header HappyEmote, 4, $78 + emote_header SadEmote, 4, $78 + emote_header HeartEmote, 4, $78 + emote_header BoltEmote, 4, $78 + emote_header SleepEmote, 4, $78 + emote_header FishEmote, 4, $78 + emote_header JumpShadowGFX, 1, $7c + emote_header FishingRodGFX, 2, $7c + emote_header BoulderDustGFX, 2, $7e + emote_header GrassRustleGFX, 1, $7e diff --git a/data/engine_flags.asm b/data/engine_flags.asm new file mode 100644 index 000000000..facc30bac --- /dev/null +++ b/data/engine_flags.asm @@ -0,0 +1,203 @@ +engine_flag: MACRO + dwb \1, 1 << \2 +ENDM + + ; location, bit + ; (all locations are in WRAM bank 1) + + ; pokegear + engine_flag wPokegearFlags, 1 ; radio card ; $0 + engine_flag wPokegearFlags, 0 ; map card + engine_flag wPokegearFlags, 2 ; phone card + engine_flag wPokegearFlags, 3 ; expn card + engine_flag wPokegearFlags, 7 ; on/off + + ; wDayCareMan, 7 ; day-care 1 on + engine_flag wDayCareMan, 6 ; egg is ready + ; wDayCareMan, 5 ; monster 1 and 2 are compatible + engine_flag wDayCareMan, 0 ; monster 1 in day-care + + ; wDayCareLady, 7 = day-care 2 on + engine_flag wDayCareLady, 0 ; monster 2 in day-care + + engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 + engine_flag wMomSavingMoney, 7 ; dst + + engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer + + engine_flag StatusFlags, 0 ; pokedex + engine_flag StatusFlags, 1 ; unown dex + engine_flag StatusFlags, 3 ; pokerus + engine_flag StatusFlags, 4 ; rocket signal on ch20 + engine_flag StatusFlags, 6 ; credits skip + engine_flag StatusFlags, 7 ; bug contest on ; $10 + engine_flag StatusFlags2, 2 ; bug contest timer + engine_flag StatusFlags2, 1 ; safari zone? + engine_flag StatusFlags2, 0 ; rockets in radio tower + engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd) + engine_flag StatusFlags2, 5 ; give pokerus + engine_flag StatusFlags2, 6 ; berry -> berry juice when trading? + engine_flag StatusFlags2, 7 ; rockets in mahogany + + engine_flag BikeFlags, 0 ; strength active ; $18 + engine_flag BikeFlags, 1 ; always on bike (cant surf) + engine_flag BikeFlags, 2 ; downhill (cycling road) + + engine_flag JohtoBadges, 0 ; zephyrbadge + engine_flag JohtoBadges, 1 ; hivebadge + engine_flag JohtoBadges, 2 ; plainbadge + engine_flag JohtoBadges, 3 ; fogbadge + engine_flag JohtoBadges, 4 ; mineralbadge + engine_flag JohtoBadges, 5 ; stormbadge ; $20 + engine_flag JohtoBadges, 6 ; glacierbadge + engine_flag JohtoBadges, 7 ; risingbadge + + engine_flag KantoBadges, 0 ; boulderbadge + engine_flag KantoBadges, 1 ; cascadebadge + engine_flag KantoBadges, 2 ; thunderbadge + engine_flag KantoBadges, 3 ; rainbowbadge + engine_flag KantoBadges, 4 ; soulbadge + engine_flag KantoBadges, 5 ; marshbadge ; $28 + engine_flag KantoBadges, 6 ; volcanobadge + engine_flag KantoBadges, 7 ; earthbadge + + ; unown sets + engine_flag UnlockedUnowns, 0 ; 1 + engine_flag UnlockedUnowns, 1 ; 2 + engine_flag UnlockedUnowns, 2 ; 3 + engine_flag UnlockedUnowns, 3 ; 4 + engine_flag UnlockedUnowns, 4 ; 5 + engine_flag UnlockedUnowns, 5 ; 6 ; $30 + engine_flag UnlockedUnowns, 6 ; 7 + engine_flag UnlockedUnowns, 7 ; 8 + + ; fly + engine_flag VisitedSpawns, 0 ; your house + engine_flag VisitedSpawns, 1 ; viridian pokecenter + engine_flag VisitedSpawns, 2 ; pallet + engine_flag VisitedSpawns, 3 ; viridian + engine_flag VisitedSpawns, 4 ; pewter + engine_flag VisitedSpawns, 5 ; cerulean ; $38 + engine_flag VisitedSpawns, 6 ; rock tunnel + engine_flag VisitedSpawns, 7 ; vermilion + engine_flag VisitedSpawns + 1, 0 ; lavender + engine_flag VisitedSpawns + 1, 1 ; saffron + engine_flag VisitedSpawns + 1, 2 ; celadon + engine_flag VisitedSpawns + 1, 3 ; fuchsia + engine_flag VisitedSpawns + 1, 4 ; cinnabar + engine_flag VisitedSpawns + 1, 5 ; indigo plateau ; $40 + engine_flag VisitedSpawns + 1, 6 ; new bark + engine_flag VisitedSpawns + 1, 7 ; cherrygrove + engine_flag VisitedSpawns + 2, 0 ; violet + ; union cave + engine_flag VisitedSpawns + 2, 2 ; azalea + engine_flag VisitedSpawns + 2, 3 ; cianwood + engine_flag VisitedSpawns + 2, 4 ; goldenrod + engine_flag VisitedSpawns + 2, 5 ; olivine + engine_flag VisitedSpawns + 2, 6 ; ecruteak ; $48 + engine_flag VisitedSpawns + 2, 7 ; mahogany + engine_flag VisitedSpawns + 3, 0 ; lake of rage + engine_flag VisitedSpawns + 3, 1 ; blackthorn + engine_flag VisitedSpawns + 3, 2 ; silver cave + ; fast ship + engine_flag VisitedSpawns + 3, 4 ; unused + + engine_flag wLuckyNumberShowFlag, 0 ; lucky number show + engine_flag StatusFlags2, 3 ; ???? + + engine_flag DailyFlags, 0 ; kurt making balls ; $50 + engine_flag DailyFlags, 1 ; ???? + engine_flag DailyFlags, 2 ; special wilddata? + engine_flag DailyFlags, 3 ; time capsule (24h wait) + engine_flag DailyFlags, 4 ; all fruit trees + engine_flag DailyFlags, 5 ; shuckle given + engine_flag DailyFlags, 6 ; goldenrod underground merchant closed + engine_flag DailyFlags, 7 ; fought in trainer hall today + + engine_flag WeeklyFlags, 0 ; mt moon square clefairy ; $58 + engine_flag WeeklyFlags, 1 ; union cave lapras + engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used + engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07 + engine_flag WeeklyFlags, 4 ; tea in blues house + engine_flag WeeklyFlags, 5 ; indigo plateau rival fight + engine_flag WeeklyFlags, 6 ; move tutor + engine_flag WeeklyFlags, 7 ; buenas password + + engine_flag SwarmFlags, 0 ; buenas password 2 + engine_flag SwarmFlags, 1 ; goldenrod dept store sale is on + + engine_flag GameTimerPause, 7 ; $62 + + engine_flag PlayerGender, 0 ; player is female + + engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it + + ; rematches + engine_flag wDailyRematchFlags, 0 ; jack + engine_flag wDailyRematchFlags, 1 ; huey + engine_flag wDailyRematchFlags, 2 ; gaven + engine_flag wDailyRematchFlags, 3 ; beth ; $68 + engine_flag wDailyRematchFlags, 4 ; jose + engine_flag wDailyRematchFlags, 5 ; reena + engine_flag wDailyRematchFlags, 6 ; joey + engine_flag wDailyRematchFlags, 7 ; wade + engine_flag wDailyRematchFlags + 1, 0 ; ralph + engine_flag wDailyRematchFlags + 1, 1 ; liz + engine_flag wDailyRematchFlags + 1, 2 ; anthony + engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 + engine_flag wDailyRematchFlags + 1, 4 ; gina + engine_flag wDailyRematchFlags + 1, 5 ; arnie + engine_flag wDailyRematchFlags + 1, 6 ; alan + engine_flag wDailyRematchFlags + 1, 7 ; dana + engine_flag wDailyRematchFlags + 2, 0 ; chad + engine_flag wDailyRematchFlags + 2, 1 ; tully + engine_flag wDailyRematchFlags + 2, 2 ; brent + engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 + engine_flag wDailyRematchFlags + 2, 4 ; vance + engine_flag wDailyRematchFlags + 2, 5 ; wilton + engine_flag wDailyRematchFlags + 2, 6 ; parry + engine_flag wDailyRematchFlags + 2, 7 ; erin + + engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget + engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece + engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) + engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 + engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone + engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone + engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget + engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone + + engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow + engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) + + engine_flag wDailyPhoneTimeOfDayFlags, 0 + engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 + engine_flag wDailyPhoneTimeOfDayFlags, 2 + engine_flag wDailyPhoneTimeOfDayFlags, 3 + engine_flag wDailyPhoneTimeOfDayFlags, 4 + engine_flag wDailyPhoneTimeOfDayFlags, 5 + engine_flag wDailyPhoneTimeOfDayFlags, 6 + engine_flag wDailyPhoneTimeOfDayFlags, 7 + + engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 + engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 + + engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 3 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 4 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 5 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 6 + engine_flag wDailyPhoneTimeOfDayFlags + 2, 7 + + engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male + + engine_flag SwarmFlags, 2 ; dunsparce swarm ; $a0 + engine_flag SwarmFlags, 3 ; yanma swarm diff --git a/data/evos_attacks.asm b/data/evos_attacks.asm index 749731812..c8e5da236 100644 --- a/data/evos_attacks.asm +++ b/data/evos_attacks.asm @@ -4,6 +4,7 @@ INCLUDE "includes.asm" SECTION "Evolutions and Attacks", ROMX +EvosAttacksPointers:: ; 0x425b1 INCLUDE "data/evos_attacks_pointers.asm" diff --git a/data/evos_attacks_pointers.asm b/data/evos_attacks_pointers.asm index 4ce10b105..863e17824 100644 --- a/data/evos_attacks_pointers.asm +++ b/data/evos_attacks_pointers.asm @@ -1,8 +1,5 @@ -; Pointer table for evolutions and attacks. +; Evolutions and attacks are grouped together since they're both checked at level-up. -; These are grouped together since they're both checked at level-up. - -EvosAttacksPointers:: ; 0x425b1 dw BulbasaurEvosAttacks dw IvysaurEvosAttacks dw VenusaurEvosAttacks diff --git a/engine/facings.asm b/data/facings.asm similarity index 100% rename from engine/facings.asm rename to data/facings.asm diff --git a/data/fruit_tree_items.asm b/data/fruit_tree_items.asm new file mode 100644 index 000000000..91fcb3a58 --- /dev/null +++ b/data/fruit_tree_items.asm @@ -0,0 +1,32 @@ +; entries correspond to FRUITTREE_* constants + + db BERRY ; ROUTE_29 + db BERRY ; ROUTE_30_1 + db BERRY ; ROUTE_38 + db BERRY ; ROUTE_46_1 + db PSNCUREBERRY ; ROUTE_30_2 + db PSNCUREBERRY ; ROUTE_33 + db BITTER_BERRY ; ROUTE_31 + db BITTER_BERRY ; ROUTE_43 + db PRZCUREBERRY ; VIOLET_CITY + db PRZCUREBERRY ; ROUTE_46_2 + db MYSTERYBERRY ; ROUTE_35 + db MYSTERYBERRY ; ROUTE_45 + db ICE_BERRY ; ROUTE_36 + db ICE_BERRY ; ROUTE_26 + db MINT_BERRY ; ROUTE_39 + db BURNT_BERRY ; ROUTE_44 + db RED_APRICORN ; ROUTE_37_1 + db BLU_APRICORN ; ROUTE_37_2 + db BLK_APRICORN ; ROUTE_37_3 + db WHT_APRICORN ; AZALEA_TOWN + db PNK_APRICORN ; ROUTE_42_1 + db GRN_APRICORN ; ROUTE_42_2 + db YLW_APRICORN ; ROUTE_42_3 + db BERRY ; ROUTE_11 + db PSNCUREBERRY ; ROUTE_2 + db BITTER_BERRY ; ROUTE_1 + db PRZCUREBERRY ; ROUTE_8 + db ICE_BERRY ; PEWTER_CITY_1 + db MINT_BERRY ; PEWTER_CITY_2 + db BURNT_BERRY ; FUCHSIA_CITY diff --git a/data/happiness_changes.asm b/data/happiness_changes.asm new file mode 100644 index 000000000..ba854bfc6 --- /dev/null +++ b/data/happiness_changes.asm @@ -0,0 +1,22 @@ +; entries correspond to HAPPINESS_* constants + +; change if happiness < 100, change if happiness < 200, change otherwise + db +5, +3, +2 ; Gained a level + db +5, +3, +2 ; Vitamin + db +1, +1, +0 ; X Item + db +3, +2, +1 ; Battled a Gym Leader + db +1, +1, +0 ; Learned a move + db -1, -1, -1 ; Lost to an enemy + db -5, -5, -10 ; Fainted due to poison + db -5, -5, -10 ; Lost to a much stronger enemy + db +1, +1, +1 ; Haircut (Y1) + db +3, +3, +1 ; Haircut (Y2) + db +5, +5, +2 ; Haircut (Y3) + db +1, +1, +1 ; Haircut (O1) + db +3, +3, +1 ; Haircut (O2) + db +10, +10, +4 ; Haircut (O3) + db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter) + db -10, -10, -15 ; Used Energy Root (bitter) + db -15, -15, -20 ; Used Revival Herb (bitter) + db +3, +3, +1 ; Grooming + db +10, +6, +4 ; Gained a level in the place where it was caught diff --git a/data/hm_blocks.asm b/data/hm_blocks.asm new file mode 100644 index 000000000..5e9bbc1f4 --- /dev/null +++ b/data/hm_blocks.asm @@ -0,0 +1,53 @@ +CutTreeBlockPointers: ; c862 +; tileset, block list pointer + dbw TILESET_JOHTO_1, .johto1 + dbw TILESET_JOHTO_2, .johto2 + dbw TILESET_KANTO, .kanto + dbw TILESET_PARK, .park + dbw TILESET_ILEX_FOREST, .ilex + db -1 + +.johto1 ; Johto OW +; facing block, replacement block, animation + db $03, $02, $01 ; grass + db $5b, $3c, $00 ; tree + db $5f, $3d, $00 ; tree + db $63, $3f, $00 ; tree + db $67, $3e, $00 ; tree + db -1 + +.johto2 ; Goldenrod area +; facing block, replacement block, animation + db $03, $02, $01 ; grass + db -1 + +.kanto ; Kanto OW +; facing block, replacement block, animation + db $0b, $0a, $01 ; grass + db $32, $6d, $00 ; tree + db $33, $6c, $00 ; tree + db $34, $6f, $00 ; tree + db $35, $4c, $00 ; tree + db $60, $6e, $00 ; tree + db -1 + +.park ; National Park +; facing block, replacement block, animation + db $13, $03, $01 ; grass + db $03, $04, $01 ; grass + db -1 + +.ilex ; Ilex Forest +; facing block, replacement block, animation + db $0f, $17, $00 + db -1 + + +WhirlpoolBlockPointers: ; c8a4 + dbw TILESET_JOHTO_1, .johto + db -1 + +.johto ; c8a8 +; facing block, replacement block, animation + db $07, $36, $00 + db -1 diff --git a/data/landmarks.asm b/data/landmarks.asm new file mode 100644 index 000000000..1de292ef8 --- /dev/null +++ b/data/landmarks.asm @@ -0,0 +1,207 @@ +landmark: MACRO +; x, y, name + db \1, \2 + dw \3 +ENDM + +; entries correspond to constants/landmark_constants.asm + landmark 0, 0, SpecialMapName + landmark 148, 116, NewBarkTownName + landmark 136, 116, Route29Name + landmark 108, 116, CherrygroveCityName + landmark 108, 96, Route30Name + landmark 104, 76, Route31Name + landmark 92, 76, VioletCityName + landmark 93, 74, SproutTowerName + landmark 92, 108, Route32Name + landmark 84, 92, RuinsOfAlphName + landmark 92, 140, UnionCaveName + landmark 90, 140, Route33Name + landmark 76, 140, AzaleaTownName + landmark 78, 138, SlowpokeWellName + landmark 60, 136, IlexForestName + landmark 60, 128, Route34Name + landmark 60, 108, GoldenrodCityName + landmark 58, 108, RadioTowerName + landmark 60, 92, Route35Name + landmark 60, 76, NationalParkName + landmark 72, 76, Route36Name + landmark 76, 68, Route37Name + landmark 76, 60, EcruteakCityName + landmark 78, 58, TinTowerName + landmark 74, 58, BurnedTowerName + landmark 60, 60, Route38Name + landmark 44, 64, Route39Name + landmark 44, 76, OlivineCityName + landmark 46, 78, LighthouseName + landmark 36, 72, BattleTowerName + landmark 36, 80, Route40Name + landmark 36, 108, WhirlIslandsName + landmark 36, 116, Route41Name + landmark 28, 116, CianwoodCityName + landmark 100, 60, Route42Name + landmark 92, 60, MtMortarName + landmark 116, 60, MahoganyTownName + landmark 116, 52, Route43Name + landmark 116, 44, LakeOfRageName + landmark 128, 60, Route44Name + landmark 138, 54, IcePathName + landmark 140, 60, BlackthornCityName + landmark 140, 52, DragonsDenName + landmark 140, 80, Route45Name + landmark 120, 88, DarkCaveName + landmark 132, 104, Route46Name + landmark 156, 84, SilverCaveName + landmark 60, 124, PalletTownName + landmark 60, 108, Route1Name + landmark 60, 92, ViridianCityName + landmark 60, 80, Route2Name + landmark 60, 68, PewterCityName + landmark 72, 68, Route3Name + landmark 84, 68, MtMoonName + landmark 96, 68, Route4Name + landmark 108, 68, CeruleanCityName + landmark 108, 60, Route24Name + landmark 116, 52, Route25Name + landmark 108, 76, Route5Name + landmark 116, 92, UndergroundName + landmark 108, 92, Route6Name + landmark 108, 100, VermilionCityName + landmark 96, 76, DiglettsCaveName + landmark 96, 84, Route7Name + landmark 124, 84, Route8Name + landmark 124, 68, Route9Name + landmark 140, 68, RockTunnelName + landmark 140, 72, Route10Name + landmark 140, 76, PowerPlantName + landmark 140, 84, LavenderTownName + landmark 148, 84, LavRadioTowerName + landmark 84, 84, CeladonCityName + landmark 108, 84, SaffronCityName + landmark 124, 100, Route11Name + landmark 140, 96, Route12Name + landmark 132, 116, Route13Name + landmark 124, 128, Route14Name + landmark 112, 132, Route15Name + landmark 76, 84, Route16Name + landmark 76, 108, Route17Name + landmark 88, 132, Route18Name + landmark 100, 132, FuchsiaCityName + landmark 100, 144, Route19Name + landmark 84, 148, Route20Name + landmark 76, 148, SeafoamIslandsName + landmark 60, 148, CinnabarIslandName + landmark 60, 136, Route21Name + landmark 44, 84, Route22Name + landmark 36, 68, VictoryRoadName + landmark 36, 60, Route23Name + landmark 36, 52, IndigoPlateauName + landmark 36, 108, Route26Name + landmark 28, 116, Route27Name + landmark 20, 116, TohjoFallsName + landmark 28, 84, Route28Name + landmark 148, 132, FastShipName + + +NewBarkTownName: db "NEW BARK¯TOWN@" +CherrygroveCityName: db "CHERRYGROVE¯CITY@" +VioletCityName: db "VIOLET CITY@" +AzaleaTownName: db "AZALEA TOWN@" +GoldenrodCityName: db "GOLDENROD¯CITY@" +EcruteakCityName: db "ECRUTEAK¯CITY@" +OlivineCityName: db "OLIVINE¯CITY@" +CianwoodCityName: db "CIANWOOD¯CITY@" +MahoganyTownName: db "MAHOGANY¯TOWN@" +BlackthornCityName: db "BLACKTHORN¯CITY@" +LakeOfRageName: db "LAKE OF¯RAGE@" +SilverCaveName: db "SILVER CAVE@" +SproutTowerName: db "SPROUT¯TOWER@" +RuinsOfAlphName: db "RUINS¯OF ALPH@" +UnionCaveName: db "UNION CAVE@" +SlowpokeWellName: db "SLOWPOKE¯WELL@" +RadioTowerName: db "RADIO TOWER@" +PowerPlantName: db "POWER PLANT@" +NationalParkName: db "NATIONAL¯PARK@" +TinTowerName: db "TIN TOWER@" +LighthouseName: db "LIGHTHOUSE@" +WhirlIslandsName: db "WHIRL¯ISLANDS@" +MtMortarName: db "MT.MORTAR@" +DragonsDenName: db "DRAGON'S¯DEN@" +IcePathName: db "ICE PATH@" +NotApplicableName: db "N/A@" +PalletTownName: db "PALLET TOWN@" +ViridianCityName: db "VIRIDIAN¯CITY@" +PewterCityName: db "PEWTER CITY@" +CeruleanCityName: db "CERULEAN¯CITY@" +LavenderTownName: db "LAVENDER¯TOWN@" +VermilionCityName: db "VERMILION¯CITY@" +CeladonCityName: db "CELADON¯CITY@" +SaffronCityName: db "SAFFRON¯CITY@" +FuchsiaCityName: db "FUCHSIA¯CITY@" +CinnabarIslandName: db "CINNABAR¯ISLAND@" +IndigoPlateauName: db "INDIGO¯PLATEAU@" +VictoryRoadName: db "VICTORY¯ROAD@" +MtMoonName: db "MT.MOON@" +RockTunnelName: db "ROCK TUNNEL@" +LavRadioTowerName: db "LAV¯RADIO TOWER@" +SilphCoName: db "SILPH CO.@" +SafariZoneName: db "SAFARI ZONE@" +SeafoamIslandsName: db "SEAFOAM¯ISLANDS@" +PokemonMansionName: db "#MON¯MANSION@" +CeruleanCaveName: db "CERULEAN¯CAVE@" +Route1Name: db "ROUTE 1@" +Route2Name: db "ROUTE 2@" +Route3Name: db "ROUTE 3@" +Route4Name: db "ROUTE 4@" +Route5Name: db "ROUTE 5@" +Route6Name: db "ROUTE 6@" +Route7Name: db "ROUTE 7@" +Route8Name: db "ROUTE 8@" +Route9Name: db "ROUTE 9@" +Route10Name: db "ROUTE 10@" +Route11Name: db "ROUTE 11@" +Route12Name: db "ROUTE 12@" +Route13Name: db "ROUTE 13@" +Route14Name: db "ROUTE 14@" +Route15Name: db "ROUTE 15@" +Route16Name: db "ROUTE 16@" +Route17Name: db "ROUTE 17@" +Route18Name: db "ROUTE 18@" +Route19Name: db "ROUTE 19@" +Route20Name: db "ROUTE 20@" +Route21Name: db "ROUTE 21@" +Route22Name: db "ROUTE 22@" +Route23Name: db "ROUTE 23@" +Route24Name: db "ROUTE 24@" +Route25Name: db "ROUTE 25@" +Route26Name: db "ROUTE 26@" +Route27Name: db "ROUTE 27@" +Route28Name: db "ROUTE 28@" +Route29Name: db "ROUTE 29@" +Route30Name: db "ROUTE 30@" +Route31Name: db "ROUTE 31@" +Route32Name: db "ROUTE 32@" +Route33Name: db "ROUTE 33@" +Route34Name: db "ROUTE 34@" +Route35Name: db "ROUTE 35@" +Route36Name: db "ROUTE 36@" +Route37Name: db "ROUTE 37@" +Route38Name: db "ROUTE 38@" +Route39Name: db "ROUTE 39@" +Route40Name: db "ROUTE 40@" +Route41Name: db "ROUTE 41@" +Route42Name: db "ROUTE 42@" +Route43Name: db "ROUTE 43@" +Route44Name: db "ROUTE 44@" +Route45Name: db "ROUTE 45@" +Route46Name: db "ROUTE 46@" +DarkCaveName: db "DARK CAVE@" +IlexForestName: db "ILEX¯FOREST@" +BurnedTowerName: db "BURNED¯TOWER@" +FastShipName: db "FAST SHIP@" +ViridianForestName: db "VIRIDIAN¯FOREST@" +DiglettsCaveName: db "DIGLETT'S¯CAVE@" +TohjoFallsName: db "TOHJO FALLS@" +UndergroundName: db "UNDERGROUND@" +BattleTowerName: db "BATTLE¯TOWER@" +SpecialMapName: db "SPECIAL@" diff --git a/engine/map_triggers.asm b/data/map_triggers.asm similarity index 99% rename from engine/map_triggers.asm rename to data/map_triggers.asm index 2b190fa3e..567165392 100644 --- a/engine/map_triggers.asm +++ b/data/map_triggers.asm @@ -1,6 +1,3 @@ -MapTriggers:: ; 4d01e -; Map triggers - trigger_def: MACRO ; db group, map ; dw address @@ -88,4 +85,3 @@ ENDM trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger db -1 -; 4d15b diff --git a/data/mom_phone_items.asm b/data/mom_phone_items.asm new file mode 100644 index 000000000..533241ca1 --- /dev/null +++ b/data/mom_phone_items.asm @@ -0,0 +1,27 @@ +momitem: macro +; money to trigger, cost, kind, item + dt \1 + dt \2 + db \3, \4 +ENDM + +MomItems_1: ; fd136 + momitem 0, 600, MOM_ITEM, SUPER_POTION + momitem 0, 90, MOM_ITEM, ANTIDOTE + momitem 0, 180, MOM_ITEM, POKE_BALL + momitem 0, 450, MOM_ITEM, ESCAPE_ROPE + momitem 0, 500, MOM_ITEM, GREAT_BALL +MomItems_1End: ; fd15e + +MomItems_2: ; fd15e + momitem 900, 600, MOM_ITEM, SUPER_POTION + momitem 4000, 270, MOM_ITEM, REPEL + momitem 7000, 600, MOM_ITEM, SUPER_POTION + momitem 10000, 1800, MOM_DOLL, DECO_CHARMANDER_DOLL + momitem 15000, 3000, MOM_ITEM, MOON_STONE + momitem 19000, 600, MOM_ITEM, SUPER_POTION + momitem 30000, 4800, MOM_DOLL, DECO_CLEFAIRY_DOLL + momitem 40000, 900, MOM_ITEM, HYPER_POTION + momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL + momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL +MomItems_2End: ; fd1ae diff --git a/data/mon_menu_icons.asm b/data/mon_menu_icons.asm new file mode 100644 index 000000000..f5c4386ad --- /dev/null +++ b/data/mon_menu_icons.asm @@ -0,0 +1,252 @@ +; party menu icons + db ICON_BULBASAUR ; BULBASAUR + db ICON_BULBASAUR ; IVYSAUR + db ICON_BULBASAUR ; VENUSAUR + db ICON_CHARMANDER ; CHARMANDER + db ICON_CHARMANDER ; CHARMELEON + db ICON_BIGMON ; CHARIZARD + db ICON_SQUIRTLE ; SQUIRTLE + db ICON_SQUIRTLE ; WARTORTLE + db ICON_SQUIRTLE ; BLASTOISE + db ICON_CATERPILLAR ; CATERPIE + db ICON_CATERPILLAR ; METAPOD + db ICON_MOTH ; BUTTERFREE + db ICON_CATERPILLAR ; WEEDLE + db ICON_CATERPILLAR ; KAKUNA + db ICON_BUG ; BEEDRILL + db ICON_BIRD ; PIDGEY + db ICON_BIRD ; PIDGEOTTO + db ICON_BIRD ; PIDGEOT + db ICON_FOX ; RATTATA + db ICON_FOX ; RATICATE + db ICON_BIRD ; SPEAROW + db ICON_BIRD ; FEAROW + db ICON_SERPENT ; EKANS + db ICON_SERPENT ; ARBOK + db ICON_PIKACHU ; PIKACHU + db ICON_PIKACHU ; RAICHU + db ICON_MONSTER ; SANDSHREW + db ICON_MONSTER ; SANDSLASH + db ICON_FOX ; NIDORAN_F + db ICON_FOX ; NIDORINA + db ICON_MONSTER ; NIDOQUEEN + db ICON_FOX ; NIDORAN_M + db ICON_FOX ; NIDORINO + db ICON_MONSTER ; NIDOKING + db ICON_CLEFAIRY ; CLEFAIRY + db ICON_CLEFAIRY ; CLEFABLE + db ICON_FOX ; VULPIX + db ICON_FOX ; NINETALES + db ICON_JIGGLYPUFF ; JIGGLYPUFF + db ICON_JIGGLYPUFF ; WIGGLYTUFF + db ICON_BAT ; ZUBAT + db ICON_BAT ; GOLBAT + db ICON_ODDISH ; ODDISH + db ICON_ODDISH ; GLOOM + db ICON_ODDISH ; VILEPLUME + db ICON_BUG ; PARAS + db ICON_BUG ; PARASECT + db ICON_CATERPILLAR ; VENONAT + db ICON_MOTH ; VENOMOTH + db ICON_DIGLETT ; DIGLETT + db ICON_DIGLETT ; DUGTRIO + db ICON_FOX ; MEOWTH + db ICON_FOX ; PERSIAN + db ICON_MONSTER ; PSYDUCK + db ICON_MONSTER ; GOLDUCK + db ICON_FIGHTER ; MANKEY + db ICON_FIGHTER ; PRIMEAPE + db ICON_FOX ; GROWLITHE + db ICON_FOX ; ARCANINE + db ICON_POLIWAG ; POLIWAG + db ICON_POLIWAG ; POLIWHIRL + db ICON_POLIWAG ; POLIWRATH + db ICON_HUMANSHAPE ; ABRA + db ICON_HUMANSHAPE ; KADABRA + db ICON_HUMANSHAPE ; ALAKAZAM + db ICON_FIGHTER ; MACHOP + db ICON_FIGHTER ; MACHOKE + db ICON_FIGHTER ; MACHAMP + db ICON_ODDISH ; BELLSPROUT + db ICON_ODDISH ; WEEPINBELL + db ICON_ODDISH ; VICTREEBEL + db ICON_JELLYFISH ; TENTACOOL + db ICON_JELLYFISH ; TENTACRUEL + db ICON_GEODUDE ; GEODUDE + db ICON_GEODUDE ; GRAVELER + db ICON_GEODUDE ; GOLEM + db ICON_EQUINE ; PONYTA + db ICON_EQUINE ; RAPIDASH + db ICON_SLOWPOKE ; SLOWPOKE + db ICON_SLOWPOKE ; SLOWBRO + db ICON_VOLTORB ; MAGNEMITE + db ICON_VOLTORB ; MAGNETON + db ICON_BIRD ; FARFETCH_D + db ICON_BIRD ; DODUO + db ICON_BIRD ; DODRIO + db ICON_LAPRAS ; SEEL + db ICON_LAPRAS ; DEWGONG + db ICON_BLOB ; GRIMER + db ICON_BLOB ; MUK + db ICON_SHELL ; SHELLDER + db ICON_SHELL ; CLOYSTER + db ICON_GHOST ; GASTLY + db ICON_GHOST ; HAUNTER + db ICON_GHOST ; GENGAR + db ICON_SERPENT ; ONIX + db ICON_HUMANSHAPE ; DROWZEE + db ICON_HUMANSHAPE ; HYPNO + db ICON_SHELL ; KRABBY + db ICON_SHELL ; KINGLER + db ICON_VOLTORB ; VOLTORB + db ICON_VOLTORB ; ELECTRODE + db ICON_ODDISH ; EXEGGCUTE + db ICON_ODDISH ; EXEGGUTOR + db ICON_MONSTER ; CUBONE + db ICON_MONSTER ; MAROWAK + db ICON_FIGHTER ; HITMONLEE + db ICON_FIGHTER ; HITMONCHAN + db ICON_MONSTER ; LICKITUNG + db ICON_BLOB ; KOFFING + db ICON_BLOB ; WEEZING + db ICON_EQUINE ; RHYHORN + db ICON_MONSTER ; RHYDON + db ICON_CLEFAIRY ; CHANSEY + db ICON_ODDISH ; TANGELA + db ICON_MONSTER ; KANGASKHAN + db ICON_FISH ; HORSEA + db ICON_FISH ; SEADRA + db ICON_FISH ; GOLDEEN + db ICON_FISH ; SEAKING + db ICON_STARYU ; STARYU + db ICON_STARYU ; STARMIE + db ICON_HUMANSHAPE ; MR__MIME + db ICON_BUG ; SCYTHER + db ICON_HUMANSHAPE ; JYNX + db ICON_HUMANSHAPE ; ELECTABUZZ + db ICON_HUMANSHAPE ; MAGMAR + db ICON_BUG ; PINSIR + db ICON_EQUINE ; TAUROS + db ICON_FISH ; MAGIKARP + db ICON_GYARADOS ; GYARADOS + db ICON_LAPRAS ; LAPRAS + db ICON_BLOB ; DITTO + db ICON_FOX ; EEVEE + db ICON_FOX ; VAPOREON + db ICON_FOX ; JOLTEON + db ICON_FOX ; FLAREON + db ICON_VOLTORB ; PORYGON + db ICON_SHELL ; OMANYTE + db ICON_SHELL ; OMASTAR + db ICON_SHELL ; KABUTO + db ICON_SHELL ; KABUTOPS + db ICON_BIRD ; AERODACTYL + db ICON_SNORLAX ; SNORLAX + db ICON_BIRD ; ARTICUNO + db ICON_BIRD ; ZAPDOS + db ICON_BIRD ; MOLTRES + db ICON_SERPENT ; DRATINI + db ICON_SERPENT ; DRAGONAIR + db ICON_BIGMON ; DRAGONITE + db ICON_HUMANSHAPE ; MEWTWO + db ICON_HUMANSHAPE ; MEW + db ICON_ODDISH ; CHIKORITA + db ICON_ODDISH ; BAYLEEF + db ICON_ODDISH ; MEGANIUM + db ICON_FOX ; CYNDAQUIL + db ICON_FOX ; QUILAVA + db ICON_FOX ; TYPHLOSION + db ICON_MONSTER ; TOTODILE + db ICON_MONSTER ; CROCONAW + db ICON_MONSTER ; FERALIGATR + db ICON_FOX ; SENTRET + db ICON_FOX ; FURRET + db ICON_BIRD ; HOOTHOOT + db ICON_BIRD ; NOCTOWL + db ICON_BUG ; LEDYBA + db ICON_BUG ; LEDIAN + db ICON_BUG ; SPINARAK + db ICON_BUG ; ARIADOS + db ICON_BAT ; CROBAT + db ICON_FISH ; CHINCHOU + db ICON_FISH ; LANTURN + db ICON_PIKACHU ; PICHU + db ICON_CLEFAIRY ; CLEFFA + db ICON_JIGGLYPUFF ; IGGLYBUFF + db ICON_CLEFAIRY ; TOGEPI + db ICON_BIRD ; TOGETIC + db ICON_BIRD ; NATU + db ICON_BIRD ; XATU + db ICON_FOX ; MAREEP + db ICON_MONSTER ; FLAAFFY + db ICON_MONSTER ; AMPHAROS + db ICON_ODDISH ; BELLOSSOM + db ICON_JIGGLYPUFF ; MARILL + db ICON_JIGGLYPUFF ; AZUMARILL + db ICON_SUDOWOODO ; SUDOWOODO + db ICON_POLIWAG ; POLITOED + db ICON_ODDISH ; HOPPIP + db ICON_ODDISH ; SKIPLOOM + db ICON_ODDISH ; JUMPLUFF + db ICON_MONSTER ; AIPOM + db ICON_ODDISH ; SUNKERN + db ICON_ODDISH ; SUNFLORA + db ICON_BUG ; YANMA + db ICON_MONSTER ; WOOPER + db ICON_MONSTER ; QUAGSIRE + db ICON_FOX ; ESPEON + db ICON_FOX ; UMBREON + db ICON_BIRD ; MURKROW + db ICON_SLOWPOKE ; SLOWKING + db ICON_GHOST ; MISDREAVUS + db ICON_UNOWN ; UNOWN + db ICON_GHOST ; WOBBUFFET + db ICON_EQUINE ; GIRAFARIG + db ICON_BUG ; PINECO + db ICON_BUG ; FORRETRESS + db ICON_SERPENT ; DUNSPARCE + db ICON_BUG ; GLIGAR + db ICON_SERPENT ; STEELIX + db ICON_MONSTER ; SNUBBULL + db ICON_MONSTER ; GRANBULL + db ICON_FISH ; QWILFISH + db ICON_BUG ; SCIZOR + db ICON_BUG ; SHUCKLE + db ICON_BUG ; HERACROSS + db ICON_FOX ; SNEASEL + db ICON_MONSTER ; TEDDIURSA + db ICON_MONSTER ; URSARING + db ICON_BLOB ; SLUGMA + db ICON_BLOB ; MAGCARGO + db ICON_EQUINE ; SWINUB + db ICON_EQUINE ; PILOSWINE + db ICON_SHELL ; CORSOLA + db ICON_FISH ; REMORAID + db ICON_FISH ; OCTILLERY + db ICON_MONSTER ; DELIBIRD + db ICON_FISH ; MANTINE + db ICON_BIRD ; SKARMORY + db ICON_FOX ; HOUNDOUR + db ICON_FOX ; HOUNDOOM + db ICON_BIGMON ; KINGDRA + db ICON_EQUINE ; PHANPY + db ICON_EQUINE ; DONPHAN + db ICON_VOLTORB ; PORYGON2 + db ICON_EQUINE ; STANTLER + db ICON_MONSTER ; SMEARGLE + db ICON_FIGHTER ; TYROGUE + db ICON_FIGHTER ; HITMONTOP + db ICON_HUMANSHAPE ; SMOOCHUM + db ICON_HUMANSHAPE ; ELEKID + db ICON_HUMANSHAPE ; MAGBY + db ICON_EQUINE ; MILTANK + db ICON_CLEFAIRY ; BLISSEY + db ICON_FOX ; RAIKOU + db ICON_FOX ; ENTEI + db ICON_FOX ; SUICUNE + db ICON_MONSTER ; LARVITAR + db ICON_MONSTER ; PUPITAR + db ICON_MONSTER ; TYRANITAR + db ICON_LUGIA ; LUGIA + db ICON_HO_OH ; HO_OH + db ICON_HUMANSHAPE ; CELEBI diff --git a/data/mystery_gift/decos.asm b/data/mystery_gift/decos.asm new file mode 100644 index 000000000..18cc0ac30 --- /dev/null +++ b/data/mystery_gift/decos.asm @@ -0,0 +1,37 @@ + db DECOFLAG_PIKACHU_DOLL + db DECOFLAG_BULBASAUR_DOLL + db DECOFLAG_CHARMANDER_DOLL + db DECOFLAG_SQUIRTLE_DOLL + db DECOFLAG_POLIWAG_DOLL + db DECOFLAG_DIGLETT_DOLL + db DECOFLAG_STARMIE_DOLL + db DECOFLAG_MAGIKARP_DOLL + db DECOFLAG_ODDISH_DOLL + db DECOFLAG_GENGAR_DOLL + db DECOFLAG_CLEFAIRY_POSTER + db DECOFLAG_JIGGLYPUFF_POSTER + db DECOFLAG_SNES + db DECOFLAG_SHELLDER_DOLL + db DECOFLAG_VOLTORB_DOLL + db DECOFLAG_WEEDLE_DOLL + db DECOFLAG_MAGNAPLANT + db DECOFLAG_TROPICPLANT + db DECOFLAG_FAMICOM + db DECOFLAG_N64 + db DECOFLAG_SURF_PIKACHU_DOLL + db DECOFLAG_JIGGLYPUFF_DOLL + db DECOFLAG_PINK_BED + db DECOFLAG_POLKADOT_BED + db DECOFLAG_RED_CARPET + db DECOFLAG_BLUE_CARPET + db DECOFLAG_YELLOW_CARPET + db DECOFLAG_GREEN_CARPET + db DECOFLAG_JUMBOPLANT + db DECOFLAG_VIRTUAL_BOY + db DECOFLAG_MACHOP_DOLL + db DECOFLAG_PIKACHU_POSTER + db DECOFLAG_TENTACOOL_DOLL + db DECOFLAG_BIG_ONIX_DOLL + db DECOFLAG_PIKACHU_BED + db DECOFLAG_GRIMER_DOLL + db DECOFLAG_UNOWN_DOLL diff --git a/data/mystery_gift/items.asm b/data/mystery_gift/items.asm new file mode 100644 index 000000000..1970d6826 --- /dev/null +++ b/data/mystery_gift/items.asm @@ -0,0 +1,37 @@ + db BERRY + db PRZCUREBERRY + db MINT_BERRY + db ICE_BERRY + db BURNT_BERRY + db PSNCUREBERRY + db GUARD_SPEC + db X_DEFEND + db X_ATTACK + db BITTER_BERRY + db DIRE_HIT + db X_SPECIAL + db X_ACCURACY + db EON_MAIL + db MORPH_MAIL + db MUSIC_MAIL + db MIRACLEBERRY + db GOLD_BERRY + db REVIVE + db GREAT_BALL + db SUPER_REPEL + db MAX_REPEL + db ELIXER + db ETHER + db WATER_STONE + db FIRE_STONE + db LEAF_STONE + db THUNDERSTONE + db MAX_ETHER + db MAX_ELIXER + db MAX_REVIVE + db SCOPE_LENS + db HP_UP + db PP_UP + db RARE_CANDY + db BLUESKY_MAIL + db MIRAGE_MAIL diff --git a/data/npc_trades.asm b/data/npc_trades.asm new file mode 100644 index 000000000..1957d5c3f --- /dev/null +++ b/data/npc_trades.asm @@ -0,0 +1,20 @@ +npctrade: MACRO +; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested + db \1, \2, \3, \4, \5, \6, \7 + shift + dw \7 + db \8, \9, 0 +ENDM + +TRADE_EITHER_GENDER EQU 0 +TRADE_MALE_ONLY EQU 1 +TRADE_FEMALE_ONLY EQU 2 + +; entries correspond to NPCTRADE_* constants + npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER + npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER + npctrade 1, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER + npctrade 3, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY + npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER + npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER + npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm index 2a1e7d997..f3a3036f9 100644 --- a/data/odd_eggs.asm +++ b/data/odd_eggs.asm @@ -1,100 +1,4 @@ -GiveOddEgg: ; 1fb4b6 - - ; Figure out which egg to give. - - ; Compare a random word to - ; probabilities out of 0xffff. - call Random - ld hl, .Probabilities - ld c, 0 - ld b, c -.loop - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - - ; Break on $ffff. - ld a, d - cp $ffff / $100 - jr nz, .not_done - ld a, e - cp $ffff % $100 - jr z, .done -.not_done - - ; Break when [hRandom] <= de. - ld a, [hRandom + 1] - cp d - jr c, .done - jr z, .ok - jr .next -.ok - ld a, [hRandom + 0] - cp e - jr c, .done - jr z, .done -.next - inc bc - jr .loop -.done - - ld hl, OddEggs - ld a, OddEgg2 - OddEgg1 - call AddNTimes - - ld de, OddEggSpecies - ld bc, PARTYMON_STRUCT_LENGTH + 2 * PKMN_NAME_LENGTH - call CopyBytes - - ld a, EGG_TICKET - ld [CurItem], a - ld a, 1 - ld [wItemQuantityChangeBuffer], a - ld a, -1 - ld [CurItemQuantity], a - ld hl, NumItems - call TossItem - - ; load species in wcd2a - ld a, EGG - ld [wMobileMonSpeciesBuffer], a - - ; load pointer to (wMobileMonSpeciesBuffer - 1) in wMobileMonSpeciesPointerBuffer - ld a, (wMobileMonSpeciesBuffer - 1) % $100 - ld [wMobileMonSpeciesPointerBuffer], a - ld a, (wMobileMonSpeciesBuffer - 1) / $100 - ld [wMobileMonSpeciesPointerBuffer + 1], a - ; load pointer to OddEggSpecies in wMobileMonStructurePointerBuffer - ld a, OddEggSpecies % $100 - ld [wMobileMonStructurePointerBuffer], a - ld a, OddEggSpecies / $100 - ld [wMobileMonStructurePointerBuffer + 1], a - - ; load Odd Egg Name in wTempOddEggNickname - ld hl, .Odd - ld de, wTempOddEggNickname - ld bc, PKMN_NAME_LENGTH - call CopyBytes - - ; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer - ld a, wTempOddEggNickname % $100 - ld [wMobileMonOTNamePointerBuffer], a - ld a, wTempOddEggNickname / $100 - ld [wMobileMonOTNamePointerBuffer + 1], a - ; load pointer to wOddEggName in wMobileMonNicknamePointerBuffer - ld a, wOddEggName % $100 - ld [wMobileMonNicknamePointerBuffer], a - ld a, wOddEggName / $100 - ld [wMobileMonNicknamePointerBuffer + 1], a - callba AddMobileMonToParty - ret -; 1fb546 - -.Odd: - db "ODD@@@@@@@@@" - -.Probabilities: +OddEggProbabilities: prob: MACRO prob_total = prob_total + (\1) diff --git a/data/outdoor_sprites.asm b/data/outdoor_sprites.asm new file mode 100644 index 000000000..ef88fbb8a --- /dev/null +++ b/data/outdoor_sprites.asm @@ -0,0 +1,694 @@ +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_DAY_CARE_MON_1 + db SPRITE_COOLTRAINER_F + db SPRITE_ROCKET + db SPRITE_LASS + db SPRITE_DAY_CARE_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 diff --git a/data/phone_contacts.asm b/data/phone_contacts.asm new file mode 100644 index 000000000..c5614a64c --- /dev/null +++ b/data/phone_contacts.asm @@ -0,0 +1,49 @@ +phone: macro +; trainer class, trainer id, map, ?, script 1, ?, script 2 + db \1, \2 + map \3 + db \4 + dba \5 + db \6 + dba \7 +endm + +; entries correspond to PHONE_* constants + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, 7, MomPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BILL, N_A, 7, BillPhoneScript1, 0, BillPhoneScript2 + phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, 7, ElmPhoneScript1, 0, ElmPhoneScript2 + phone SCHOOLBOY, JACK1, NATIONAL_PARK, 7, JackPhoneScript1, 7, JackPhoneScript2 + phone POKEFANF, BEVERLY1, NATIONAL_PARK, 7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2 + phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, 7, HueyPhoneScript1, 7, HueyPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone COOLTRAINERM, GAVEN3, ROUTE_26, 7, GavenPhoneScript1, 7, GavenPhoneScript2 + phone COOLTRAINERF, BETH1, ROUTE_26, 7, BethPhoneScript1, 7, BethPhoneScript2 + phone BIRD_KEEPER, JOSE2, ROUTE_27, 7, JosePhoneScript1, 7, JosePhoneScript2 + phone COOLTRAINERF, REENA1, ROUTE_27, 7, ReenaPhoneScript1, 7, ReenaPhoneScript2 + phone YOUNGSTER, JOEY1, ROUTE_30, 7, JoeyPhoneScript1, 7, JoeyPhoneScript2 + phone BUG_CATCHER, WADE1, ROUTE_31, 7, WadePhoneScript1, 7, WadePhoneScript2 + phone FISHER, RALPH1, ROUTE_32, 7, RalphPhoneScript1, 7, RalphPhoneScript2 + phone PICNICKER, LIZ1, ROUTE_32, 7, LizPhoneScript1, 7, LizPhoneScript2 + phone HIKER, ANTHONY2, ROUTE_33, 7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2 + phone CAMPER, TODD1, ROUTE_34, 7, ToddPhoneScript1, 7, ToddPhoneScript2 + phone PICNICKER, GINA1, ROUTE_34, 7, GinaPhoneScript1, 7, GinaPhoneScript2 + phone JUGGLER, IRWIN1, ROUTE_35, 7, IrwinPhoneScript1, 7, IrwinPhoneScript2 + phone BUG_CATCHER, ARNIE1, ROUTE_35, 7, ArniePhoneScript1, 7, ArniePhoneScript2 + phone SCHOOLBOY, ALAN1, ROUTE_36, 7, AlanPhoneScript1, 7, AlanPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone LASS, DANA1, ROUTE_38, 7, DanaPhoneScript1, 7, DanaPhoneScript2 + phone SCHOOLBOY, CHAD1, ROUTE_38, 7, ChadPhoneScript1, 7, ChadPhoneScript2 + phone POKEFANM, DEREK1, ROUTE_39, 7, DerekPhoneScript1, 7, DerekPhoneScript2 + phone FISHER, TULLY1, ROUTE_42, 7, TullyPhoneScript1, 7, TullyPhoneScript2 + phone POKEMANIAC, BRENT1, ROUTE_43, 7, BrentPhoneScript1, 7, BrentPhoneScript2 + phone PICNICKER, TIFFANY3, ROUTE_43, 7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2 + phone BIRD_KEEPER, VANCE1, ROUTE_44, 7, VancePhoneScript1, 7, VancePhoneScript2 + phone FISHER, WILTON1, ROUTE_44, 7, WiltonPhoneScript1, 7, WiltonPhoneScript2 + phone BLACKBELT_T, KENJI3, ROUTE_45, 7, KenjiPhoneScript1, 7, KenjiPhoneScript2 + phone HIKER, PARRY1, ROUTE_45, 7, ParryPhoneScript1, 7, ParryPhoneScript2 + phone PICNICKER, ERIN1, ROUTE_46, 7, ErinPhoneScript1, 7, ErinPhoneScript2 + phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1, 7, BuenaPhoneScript2 diff --git a/data/phone_special.asm b/data/phone_special.asm new file mode 100644 index 000000000..5446e95c9 --- /dev/null +++ b/data/phone_special.asm @@ -0,0 +1,16 @@ +specialcall: macro +; condition, contact, script + dw \1 + db \2 + dba \3 +endm + +; entries correspond to SPECIALCALL_* constants + specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONE_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONE_OAK, BikeShopPhoneScript + specialcall SpecialCallWhereverYouAre, PHONE_MOM, MomPhoneLectureScript + specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 diff --git a/data/spawn_points.asm b/data/spawn_points.asm new file mode 100644 index 000000000..39b71c620 --- /dev/null +++ b/data/spawn_points.asm @@ -0,0 +1,39 @@ +spawn: MACRO +; map, y, x + map \1 + db \2, \3 +ENDM + +; entries correspond to SPAWN_* constants + + spawn KRISS_HOUSE_2F, 3, 3 + spawn VIRIDIAN_POKECENTER_1F, 5, 3 + + spawn PALLET_TOWN, 5, 6 + spawn VIRIDIAN_CITY, 23, 26 + spawn PEWTER_CITY, 13, 26 + spawn CERULEAN_CITY, 19, 22 + spawn ROUTE_10_NORTH, 11, 2 + spawn VERMILION_CITY, 9, 6 + spawn LAVENDER_TOWN, 5, 6 + spawn SAFFRON_CITY, 9, 30 + spawn CELADON_CITY, 29, 10 + spawn FUCHSIA_CITY, 19, 28 + spawn CINNABAR_ISLAND, 11, 12 + spawn ROUTE_23, 9, 6 + + spawn NEW_BARK_TOWN, 13, 6 + spawn CHERRYGROVE_CITY, 29, 4 + spawn VIOLET_CITY, 31, 26 + spawn ROUTE_32, 11, 74 + spawn AZALEA_TOWN, 15, 10 + spawn CIANWOOD_CITY, 23, 44 + spawn GOLDENROD_CITY, 15, 28 + spawn OLIVINE_CITY, 13, 22 + spawn ECRUTEAK_CITY, 23, 28 + spawn MAHOGANY_TOWN, 15, 14 + spawn LAKE_OF_RAGE, 21, 29 + spawn BLACKTHORN_CITY, 21, 30 + spawn SILVER_CAVE_OUTSIDE, 23, 20 + spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2 + spawn N_A, -1, -1 diff --git a/data/sprite_anim_seqs.asm b/data/sprite_anim_seqs.asm new file mode 100644 index 000000000..8c70f96b3 --- /dev/null +++ b/data/sprite_anim_seqs.asm @@ -0,0 +1,92 @@ +; entries correspond to SPRITE_ANIM_INDEX_* constants + ; frameset sequence, tile +; SPRITE_ANIM_INDEX_PARTY_MON + db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 +; SPRITE_ANIM_INDEX_01 + db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00 +; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR + db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 +; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO + db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 +; SPRITE_ANIM_INDEX_GS_INTRO_STAR + db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR, SPRITE_ANIM_SEQ_GS_INTRO_STAR, $06 +; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE + db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE, SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE, $06 +; SPRITE_ANIM_INDEX_SLOTS_GOLEM + db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOTS_GOLEM, $07 +; SPRITE_ANIM_INDEX_SLOTS_CHANSEY + db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 +; SPRITE_ANIM_INDEX_SLOTS_EGG + db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 +; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR + db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_MAIL_CURSOR, $05 +; SPRITE_ANIM_INDEX_RED_WALK + db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_0B + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08 +; SPRITE_ANIM_INDEX_DUMMY_GAME + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08 +; SPRITE_ANIM_INDEX_0D + db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08 +; SPRITE_ANIM_INDEX_TRADE_POKE_BALL + db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, $00 +; SPRITE_ANIM_INDEX_TRADE_POOF + db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE + db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE, $00 +; SPRITE_ANIM_INDEX_TRADEMON_ICON + db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 +; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE + db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 +; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT + db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 +; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB + db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB, $00 +; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_LEAF + db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_CUT_LEAVES, $00 +; SPRITE_ANIM_INDEX_CUT_TREE + db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_FLY_LEAF + db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 +; SPRITE_ANIM_INDEX_EGG_CRACK + db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_1A + db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 +; SPRITE_ANIM_INDEX_HEADBUTT + db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_EGG_HATCH + db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 +; SPRITE_ANIM_INDEX_1D + db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 +; SPRITE_ANIM_INDEX_BLUE_WALK + db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_20 + db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_21 + db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_22 + db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_23 + db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00 +; SPRITE_ANIM_INDEX_24 + db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00 +; SPRITE_ANIM_INDEX_25 + db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00 +; SPRITE_ANIM_INDEX_INTRO_SUICUNE + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00 +; SPRITE_ANIM_INDEX_INTRO_PICHU + db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 +; SPRITE_ANIM_INDEX_INTRO_WOOPER + db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 +; SPRITE_ANIM_INDEX_INTRO_UNOWN + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00 +; SPRITE_ANIM_INDEX_INTRO_UNOWN_F + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 +; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 +; SPRITE_ANIM_INDEX_CELEBI + db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; 2c diff --git a/data/sprite_mons.asm b/data/sprite_mons.asm new file mode 100644 index 000000000..62f7fc15d --- /dev/null +++ b/data/sprite_mons.asm @@ -0,0 +1,37 @@ +; entries correspond to SPRITE_* constants past SPRITE_POKEMON + + 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 diff --git a/data/time_capsule/mon_order.asm b/data/time_capsule/mon_order.asm new file mode 100644 index 000000000..2769794e6 --- /dev/null +++ b/data/time_capsule/mon_order.asm @@ -0,0 +1,253 @@ + db RHYDON + db KANGASKHAN + db NIDORAN_M + db CLEFAIRY + db SPEAROW + db VOLTORB + db NIDOKING + db SLOWBRO + db IVYSAUR + db EXEGGUTOR + db LICKITUNG + db EXEGGCUTE + db GRIMER + db GENGAR + db NIDORAN_F + db NIDOQUEEN + db CUBONE + db RHYHORN + db LAPRAS + db ARCANINE + db MEW + db GYARADOS + db SHELLDER + db TENTACOOL + db GASTLY + db SCYTHER + db STARYU + db BLASTOISE + db PINSIR + db TANGELA + db SCIZOR ; MISSINGNO. + db SHUCKLE ; MISSINGNO. + db GROWLITHE + db ONIX + db FEAROW + db PIDGEY + db SLOWPOKE + db KADABRA + db GRAVELER + db CHANSEY + db MACHOKE + db MR__MIME + db HITMONLEE + db HITMONCHAN + db ARBOK + db PARASECT + db PSYDUCK + db DROWZEE + db GOLEM + db HERACROSS ; MISSINGNO. + db MAGMAR + db HO_OH ; MISSINGNO. + db ELECTABUZZ + db MAGNETON + db KOFFING + db SNEASEL ; MISSINGNO. + db MANKEY + db SEEL + db DIGLETT + db TAUROS + db TEDDIURSA ; MISSINGNO. + db URSARING ; MISSINGNO. + db SLUGMA ; MISSINGNO. + db FARFETCH_D + db VENONAT + db DRAGONITE + db MAGCARGO ; MISSINGNO. + db SWINUB ; MISSINGNO. + db PILOSWINE ; MISSINGNO. + db DODUO + db POLIWAG + db JYNX + db MOLTRES + db ARTICUNO + db ZAPDOS + db DITTO + db MEOWTH + db KRABBY + db CORSOLA ; MISSINGNO. + db REMORAID ; MISSINGNO. + db OCTILLERY ; MISSINGNO. + db VULPIX + db NINETALES + db PIKACHU + db RAICHU + db DELIBIRD ; MISSINGNO. + db MANTINE ; MISSINGNO. + db DRATINI + db DRAGONAIR + db KABUTO + db KABUTOPS + db HORSEA + db SEADRA + db SKARMORY ; MISSINGNO. + db HOUNDOUR ; MISSINGNO. + db SANDSHREW + db SANDSLASH + db OMANYTE + db OMASTAR + db JIGGLYPUFF + db WIGGLYTUFF + db EEVEE + db FLAREON + db JOLTEON + db VAPOREON + db MACHOP + db ZUBAT + db EKANS + db PARAS + db POLIWHIRL + db POLIWRATH + db WEEDLE + db KAKUNA + db BEEDRILL + db HOUNDOOM ; MISSINGNO. + db DODRIO + db PRIMEAPE + db DUGTRIO + db VENOMOTH + db DEWGONG + db KINGDRA ; MISSINGNO. + db PHANPY ; MISSINGNO. + db CATERPIE + db METAPOD + db BUTTERFREE + db MACHAMP + db DONPHAN ; MISSINGNO. + db GOLDUCK + db HYPNO + db GOLBAT + db MEWTWO + db SNORLAX + db MAGIKARP + db PORYGON2 ; MISSINGNO. + db STANTLER ; MISSINGNO. + db MUK + db SMEARGLE ; MISSINGNO. + db KINGLER + db CLOYSTER + db TYROGUE ; MISSINGNO. + db ELECTRODE + db CLEFABLE + db WEEZING + db PERSIAN + db MAROWAK + db HITMONTOP ; MISSINGNO. + db HAUNTER + db ABRA + db ALAKAZAM + db PIDGEOTTO + db PIDGEOT + db STARMIE + db BULBASAUR + db VENUSAUR + db TENTACRUEL + db SMOOCHUM ; MISSINGNO. + db GOLDEEN + db SEAKING + db ELEKID ; MISSINGNO. + db MAGBY ; MISSINGNO. + db MILTANK ; MISSINGNO. + db BLISSEY ; MISSINGNO. + db PONYTA + db RAPIDASH + db RATTATA + db RATICATE + db NIDORINO + db NIDORINA + db GEODUDE + db PORYGON + db AERODACTYL + db RAIKOU ; MISSINGNO. + db MAGNEMITE + db ENTEI ; MISSINGNO. + db SUICUNE ; MISSINGNO. + db CHARMANDER + db SQUIRTLE + db CHARMELEON + db WARTORTLE + db CHARIZARD + db LARVITAR ; MISSINGNO. + db PUPITAR ; MISSINGNO. KABUTOPS FOSSIL + db TYRANITAR ; MISSINGNO. AERODACTYL FOSSIL + db LUGIA ; MISSINGNO. GHOST + db ODDISH + db GLOOM + db VILEPLUME + db BELLSPROUT + db WEEPINBELL + db VICTREEBEL + + db CHIKORITA + db BAYLEEF + db MEGANIUM + db CYNDAQUIL + db QUILAVA + db TYPHLOSION + db TOTODILE + db CROCONAW + db FERALIGATR + db SENTRET + db FURRET + db HOOTHOOT + db NOCTOWL + db LEDYBA + db LEDIAN + db SPINARAK + db ARIADOS + db CROBAT + db CHINCHOU + db LANTURN + db PICHU + db CLEFFA + db IGGLYBUFF + db TOGEPI + db TOGETIC + db NATU + db XATU + db MAREEP + db FLAAFFY + db AMPHAROS + db BELLOSSOM + db MARILL + db AZUMARILL + db SUDOWOODO + db POLITOED + db HOPPIP + db SKIPLOOM + db JUMPLUFF + db AIPOM + db SUNKERN + db SUNFLORA + db YANMA + db WOOPER + db QUAGSIRE + db ESPEON + db UMBREON + db MURKROW + db SLOWKING + db MISDREAVUS + db UNOWN + db WOBBUFFET + db GIRAFARIG + db PINECO + db FORRETRESS + db DUNSPARCE + db GLIGAR + db STEELIX + db SNUBBULL + db GRANBULL + db QWILFISH + db WOBBUFFET + db WOBBUFFET diff --git a/data/time_capsule/special_stats.asm b/data/time_capsule/special_stats.asm new file mode 100644 index 000000000..7da90e1c9 --- /dev/null +++ b/data/time_capsule/special_stats.asm @@ -0,0 +1,152 @@ +; The original base Special stat for each Pokémon from Red/Blue + db 65 ; BULBASAUR + db 80 ; IVYSAUR + db 100 ; VENUSAUR + db 50 ; CHARMANDER + db 65 ; CHARMELEON + db 85 ; CHARIZARD + db 50 ; SQUIRTLE + db 65 ; WARTORTLE + db 85 ; BLASTOISE + db 20 ; CATERPIE + db 25 ; METAPOD + db 80 ; BUTTERFREE + db 20 ; WEEDLE + db 25 ; KAKUNA + db 45 ; BEEDRILL + db 35 ; PIDGEY + db 50 ; PIDGEOTTO + db 70 ; PIDGEOT + db 25 ; RATTATA + db 50 ; RATICATE + db 31 ; SPEAROW + db 61 ; FEAROW + db 40 ; EKANS + db 65 ; ARBOK + db 50 ; PIKACHU + db 90 ; RAICHU + db 30 ; SANDSHREW + db 55 ; SANDSLASH + db 40 ; NIDORAN_F + db 55 ; NIDORINA + db 75 ; NIDOQUEEN + db 40 ; NIDORAN_M + db 55 ; NIDORINO + db 75 ; NIDOKING + db 60 ; CLEFAIRY + db 85 ; CLEFABLE + db 65 ; VULPIX + db 100 ; NINETALES + db 25 ; JIGGLYPUFF + db 50 ; WIGGLYTUFF + db 40 ; ZUBAT + db 75 ; GOLBAT + db 75 ; ODDISH + db 85 ; GLOOM + db 100 ; VILEPLUME + db 55 ; PARAS + db 80 ; PARASECT + db 40 ; VENONAT + db 90 ; VENOMOTH + db 45 ; DIGLETT + db 70 ; DUGTRIO + db 40 ; MEOWTH + db 65 ; PERSIAN + db 50 ; PSYDUCK + db 80 ; GOLDUCK + db 35 ; MANKEY + db 60 ; PRIMEAPE + db 50 ; GROWLITHE + db 80 ; ARCANINE + db 40 ; POLIWAG + db 50 ; POLIWHIRL + db 70 ; POLIWRATH + db 105 ; ABRA + db 120 ; KADABRA + db 135 ; ALAKAZAM + db 35 ; MACHOP + db 50 ; MACHOKE + db 65 ; MACHAMP + db 70 ; BELLSPROUT + db 85 ; WEEPINBELL + db 100 ; VICTREEBEL + db 100 ; TENTACOOL + db 120 ; TENTACRUEL + db 30 ; GEODUDE + db 45 ; GRAVELER + db 55 ; GOLEM + db 65 ; PONYTA + db 80 ; RAPIDASH + db 40 ; SLOWPOKE + db 80 ; SLOWBRO + db 95 ; MAGNEMITE + db 120 ; MAGNETON + db 58 ; FARFETCH_D + db 35 ; DODUO + db 60 ; DODRIO + db 70 ; SEEL + db 95 ; DEWGONG + db 40 ; GRIMER + db 65 ; MUK + db 45 ; SHELLDER + db 85 ; CLOYSTER + db 100 ; GASTLY + db 115 ; HAUNTER + db 130 ; GENGAR + db 30 ; ONIX + db 90 ; DROWZEE + db 115 ; HYPNO + db 25 ; KRABBY + db 50 ; KINGLER + db 55 ; VOLTORB + db 80 ; ELECTRODE + db 60 ; EXEGGCUTE + db 125 ; EXEGGUTOR + db 40 ; CUBONE + db 50 ; MAROWAK + db 35 ; HITMONLEE + db 35 ; HITMONCHAN + db 60 ; LICKITUNG + db 60 ; KOFFING + db 85 ; WEEZING + db 30 ; RHYHORN + db 45 ; RHYDON + db 105 ; CHANSEY + db 100 ; TANGELA + db 40 ; KANGASKHAN + db 70 ; HORSEA + db 95 ; SEADRA + db 50 ; GOLDEEN + db 80 ; SEAKING + db 70 ; STARYU + db 100 ; STARMIE + db 100 ; MR__MIME + db 55 ; SCYTHER + db 95 ; JYNX + db 85 ; ELECTABUZZ + db 85 ; MAGMAR + db 55 ; PINSIR + db 70 ; TAUROS + db 20 ; MAGIKARP + db 100 ; GYARADOS + db 95 ; LAPRAS + db 48 ; DITTO + db 65 ; EEVEE + db 110 ; VAPOREON + db 110 ; JOLTEON + db 110 ; FLAREON + db 75 ; PORYGON + db 90 ; OMANYTE + db 115 ; OMASTAR + db 45 ; KABUTO + db 70 ; KABUTOPS + db 60 ; AERODACTYL + db 65 ; SNORLAX + db 125 ; ARTICUNO + db 125 ; ZAPDOS + db 125 ; MOLTRES + db 50 ; DRATINI + db 70 ; DRAGONAIR + db 100 ; DRAGONITE + db 154 ; MEWTWO + db 100 ; MEW diff --git a/data/tmhm_moves.asm b/data/tmhm_moves.asm new file mode 100644 index 000000000..be9d4916b --- /dev/null +++ b/data/tmhm_moves.asm @@ -0,0 +1,67 @@ +; TMs + db DYNAMICPUNCH + db HEADBUTT + db CURSE + db ROLLOUT + db ROAR + db TOXIC + db ZAP_CANNON + db ROCK_SMASH + db PSYCH_UP + db HIDDEN_POWER + db SUNNY_DAY + db SWEET_SCENT + db SNORE + db BLIZZARD + db HYPER_BEAM + db ICY_WIND + db PROTECT + db RAIN_DANCE + db GIGA_DRAIN + db ENDURE + db FRUSTRATION + db SOLARBEAM + db IRON_TAIL + db DRAGONBREATH + db THUNDER + db EARTHQUAKE + db RETURN + db DIG + db PSYCHIC_M + db SHADOW_BALL + db MUD_SLAP + db DOUBLE_TEAM + db ICE_PUNCH + db SWAGGER + db SLEEP_TALK + db SLUDGE_BOMB + db SANDSTORM + db FIRE_BLAST + db SWIFT + db DEFENSE_CURL + db THUNDERPUNCH + db DREAM_EATER + db DETECT + db REST + db ATTRACT + db THIEF + db STEEL_WING + db FIRE_PUNCH + db FURY_CUTTER + db NIGHTMARE + +; HMs + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db WHIRLPOOL + db WATERFALL + +; Move tutor + db FLAMETHROWER + db THUNDERBOLT + db ICE_BEAM + + db 0 ; end diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm new file mode 100644 index 000000000..1b74fb3ee --- /dev/null +++ b/data/wild/bug_contest_mons.asm @@ -0,0 +1,12 @@ + ; %, species, min, max + db 20, CATERPIE, 7, 18 + db 20, WEEDLE, 7, 18 + db 10, METAPOD, 9, 18 + db 10, KAKUNA, 9, 18 + db 5, BUTTERFREE, 12, 15 + db 5, BEEDRILL, 12, 15 + db 10, VENONAT, 10, 16 + db 10, PARAS, 10, 17 + db 5, SCYTHER, 13, 14 + db 5, PINSIR, 13, 14 + db -1, VENOMOTH, 30, 40 diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm new file mode 100644 index 000000000..a18e9d336 --- /dev/null +++ b/data/wild/probabilities.asm @@ -0,0 +1,15 @@ +GrassMonProbTable: ; 2a1cb + db 30, $0 ; 30% chance + db 60, $2 ; 30% chance + db 80, $4 ; 20% chance + db 90, $6 ; 10% chance + db 95, $8 ; 5% chance + db 99, $a ; 4% chance + db 100, $c ; 1% chance +; 2a1d9 + +WaterMonProbTable: ; 2a1d9 + db 60, $0 ; 60% chance + db 90, $2 ; 30% chance + db 100, $4 ; 10% chance +; 2a1df diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm new file mode 100644 index 000000000..403ebef25 --- /dev/null +++ b/data/wild/roammon_maps.asm @@ -0,0 +1,31 @@ +; Maps that roaming monsters can be on, and possible maps they can jump to. +; Notably missing are Route 40 and Route 41, which are water routes. + +roam_map: macro +; map, # of other maps, other maps + map \1 + db \2 +rept \2 + map \3 + shift +endr + db 0 +endm + + roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 + roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31 + roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36 + roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33 + roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34 + roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35 + roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36 + roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 + roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42 + roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42 + roam_map ROUTE_39, 1, ROUTE_38 + roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 + roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44 + roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45 + roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46 + roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29 + db -1 ; end diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm new file mode 100644 index 000000000..47491c2c9 --- /dev/null +++ b/data/wild/treemon_maps.asm @@ -0,0 +1,50 @@ +treemon_map: macro + map \1 + db \2 ; treemon set +endm + +TreeMonMaps: ; b825e + treemon_map ROUTE_26, 4 + treemon_map ROUTE_27, 4 + treemon_map ROUTE_28, 0 + treemon_map ROUTE_29, 3 + treemon_map ROUTE_30, 3 + treemon_map ROUTE_31, 3 + treemon_map ROUTE_32, 4 + treemon_map ROUTE_33, 2 + treemon_map ROUTE_34, 3 + treemon_map ROUTE_35, 3 + treemon_map ROUTE_36, 3 + treemon_map ROUTE_37, 3 + treemon_map ROUTE_38, 3 + treemon_map ROUTE_39, 3 + treemon_map ROUTE_40, 0 + treemon_map ROUTE_41, 0 + treemon_map ROUTE_42, 2 + treemon_map ROUTE_43, 5 + treemon_map ROUTE_44, 1 + treemon_map ROUTE_45, 1 + treemon_map ROUTE_46, 1 + treemon_map NEW_BARK_TOWN, 0 + treemon_map CHERRYGROVE_CITY, 0 + treemon_map VIOLET_CITY, 0 + treemon_map AZALEA_TOWN, 2 + treemon_map CIANWOOD_CITY, 0 + treemon_map GOLDENROD_CITY, 0 + treemon_map OLIVINE_CITY, 0 + treemon_map ECRUTEAK_CITY, 0 + treemon_map MAHOGANY_TOWN, 0 + treemon_map LAKE_OF_RAGE, 5 + treemon_map BLACKTHORN_CITY, 0 + treemon_map SILVER_CAVE_OUTSIDE, 0 + treemon_map ILEX_FOREST, 6 + db -1 +; b82c5 + +RockMonMaps: ; b82c5 + treemon_map CIANWOOD_CITY, 7 + treemon_map ROUTE_40, 7 + treemon_map DARK_CAVE_VIOLET_ENTRANCE, 7 + treemon_map SLOWPOKE_WELL_B1F, 7 + db -1 +; b82d2 diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm new file mode 100644 index 000000000..0cb8fa83d --- /dev/null +++ b/data/wild/treemons.asm @@ -0,0 +1,128 @@ +TreeMons: ; b82e8 + dw TreeMons1 + dw TreeMons1 + dw TreeMons2 + dw TreeMons3 + dw TreeMons4 + dw TreeMons5 + dw TreeMons6 + dw RockMons + dw TreeMons1 + +; Two tables each (common, rare). +; Structure: +; db %, species, level + +TreeMons1: ; b82fa +; common + db 50, SPEAROW, 10 + db 15, SPEAROW, 10 + db 15, SPEAROW, 10 + db 10, AIPOM, 10 + db 5, AIPOM, 10 + db 5, AIPOM, 10 + db -1 +; rare + db 50, SPEAROW, 10 + db 15, HERACROSS, 10 + db 15, HERACROSS, 10 + db 10, AIPOM, 10 + db 5, AIPOM, 10 + db 5, AIPOM, 10 + db -1 + +TreeMons2: ; b8320 +; common + db 50, SPEAROW, 10 + db 15, EKANS, 10 + db 15, SPEAROW, 10 + db 10, AIPOM, 10 + db 5, AIPOM, 10 + db 5, AIPOM, 10 + db -1 +; rare + db 50, SPEAROW, 10 + db 15, HERACROSS, 10 + db 15, HERACROSS, 10 + db 10, AIPOM, 10 + db 5, AIPOM, 10 + db 5, AIPOM, 10 + db -1 + +TreeMons3: ; b8346 +; common + db 50, HOOTHOOT, 10 + db 15, SPINARAK, 10 + db 15, LEDYBA, 10 + db 10, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db -1 +; rare + db 50, HOOTHOOT, 10 + db 15, PINECO, 10 + db 15, PINECO, 10 + db 10, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db -1 + +TreeMons4: ; b836c +; common + db 50, HOOTHOOT, 10 + db 15, EKANS, 10 + db 15, HOOTHOOT, 10 + db 10, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db -1 +; rare + db 50, HOOTHOOT, 10 + db 15, PINECO, 10 + db 15, PINECO, 10 + db 10, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db -1 + +TreeMons5: ; b8392 +; common + db 50, HOOTHOOT, 10 + db 15, VENONAT, 10 + db 15, HOOTHOOT, 10 + db 10, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db -1 +; rare + db 50, HOOTHOOT, 10 + db 15, PINECO, 10 + db 15, PINECO, 10 + db 10, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db 5, EXEGGCUTE, 10 + db -1 + +TreeMons6: ; b83b8 +; common + db 50, HOOTHOOT, 10 + db 15, PINECO, 10 + db 15, PINECO, 10 + db 10, NOCTOWL, 10 + db 5, BUTTERFREE, 10 + db 5, BEEDRILL, 10 + db -1 +; rare + db 50, HOOTHOOT, 10 + db 15, CATERPIE, 10 + db 15, WEEDLE, 10 + db 10, HOOTHOOT, 10 + db 5, METAPOD, 10 + db 5, KAKUNA, 10 + db -1 + +RockMons: ; b83de + db 90, KRABBY, 15 + db 10, SHUCKLE, 15 + db -1 +; b83e5 diff --git a/engine/battle_tower.asm b/engine/battle_tower.asm new file mode 100644 index 000000000..b880a099b --- /dev/null +++ b/engine/battle_tower.asm @@ -0,0 +1,210 @@ +Function_LoadOpponentTrainerAndPokemons: ; 1f8000 + ld a, [rSVBK] + push af + ld a, BANK(BT_OTTrainer) + ld [rSVBK], a + + ; Fill BT_OTTrainer with zeros + xor a + ld hl, BT_OTTrainer + ld bc, BT_OTTrainerEnd - BT_OTTrainer + call ByteFill + + ; Write $ff into the Item-Slots + ld a, $ff + ld [BT_OTPkmn1Item], a + ld [BT_OTPkmn2Item], a + ld [BT_OTPkmn3Item], a + + ; Set BT_OTTrainer as start address to write the following data to + ld de, BT_OTTrainer + + ld a, [hRandomAdd] + ld b, a +.resample ; loop to find a random trainer + call Random + ld a, [hRandomAdd] + add b + ld b, a ; b contains the nr of the trainer +IF DEF(CRYSTAL11) + and (1 << 7) - 1 + cp 70 +ELSE + and (1 << 5) - 1 + cp 21 +ENDC + jr nc, .resample + ld b, a + + ld a, BANK(sBTTrainers) + call GetSRAMBank + + ld c, BATTLETOWER_NROFTRAINERS + ld hl, sBTTrainers +.next_trainer + ld a, [hli] + cp b + jr z, .resample + dec c + jr nz, .next_trainer ; c <= 7 initialise all 7 trainers? + + ld hl, sBTTrainers + ld a, [sNrOfBeatenBattleTowerTrainers] + ld c, a + ld a, b + ld b, 0 + add hl, bc + ld [hl], a + + call CloseSRAM + + push af +; Copy name (10 bytes) and class (1 byte) of trainer + ld hl, BattleTowerTrainers + ld bc, NAME_LENGTH + call AddNTimes + ld bc, NAME_LENGTH + call CopyBytes + + call Function_LoadRandomBattleTowerPkmn + pop af + + ld hl, BattleTowerTrainerData + ld bc, BATTLETOWER_TRAINERDATALENGTH + call AddNTimes + ld bc, BATTLETOWER_TRAINERDATALENGTH +.copy_bt_trainer_data_loop + ld a, BANK(BattleTowerTrainerData) + call GetFarByte + ld [de], a + inc hl + inc de + dec bc + ld a, b + or c + jr nz, .copy_bt_trainer_data_loop + + pop af + ld [rSVBK], a + + ret + + +Function_LoadRandomBattleTowerPkmn: ; 1f8081 + ld c, BATTLETOWER_NROFPKMNS +.loop + push bc + ld a, BANK(sBTPkmnPrevTrainer1) + call GetSRAMBank + +.FindARandomBattleTowerPkmn: + ; From Which LevelGroup are the Pkmn loaded + ; a = 1..10 + ld a, [wBTChoiceOfLvlGroup] ; [$d800] + dec a + ld hl, BattleTowerMons + ld bc, BattleTowerMons2 - BattleTowerMons1 + call AddNTimes + + ld a, [hRandomAdd] + ld b, a +.resample + call Random + ld a, [hRandomAdd] + add b + ld b, a + and $1f + cp BATTLETOWER_NRMONSPERLEVELBRACKET + jr nc, .resample + ; in register 'a' is the chosen Pkmn of the LevelGroup + + ; Check if Pkmn was already loaded before + ; Check current and the 2 previous teams + ; includes check if item is double at the current team + ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH + call AddNTimes + ld a, [hli] + ld b, a + ld a, [hld] + ld c, a + ld a, [BT_OTPkmn1] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [BT_OTPkmn1Item] + cp c + jr z, .FindARandomBattleTowerPkmn + ld a, [BT_OTPkmn2] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [BT_OTPkmn2Item] + cp c + jr z, .FindARandomBattleTowerPkmn + ld a, [BT_OTPkmn3] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [BT_OTPkmn3Item] + cp c + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevTrainer1] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevTrainer2] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevTrainer3] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevPrevTrainer1] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevPrevTrainer2] + cp b + jr z, .FindARandomBattleTowerPkmn + ld a, [sBTPkmnPrevPrevTrainer3] + cp b + jr z, .FindARandomBattleTowerPkmn + + ld bc, PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH + call CopyBytes + + ld a, [wNamedObjectIndexBuffer] + push af + push de + ld hl, - (PARTYMON_STRUCT_LENGTH + PKMN_NAME_LENGTH) + add hl, de + ld a, [hl] + ld [wNamedObjectIndexBuffer], a + ld bc, PARTYMON_STRUCT_LENGTH + add hl, bc + push hl + call GetPokemonName + ld h, d + ld l, e + pop de + ld bc, PKMN_NAME_LENGTH + call CopyBytes + + pop de + pop af + ld [wNamedObjectIndexBuffer], a + pop bc + dec c + jp nz, .loop + + ld a, [sBTPkmnPrevTrainer1] + ld [sBTPkmnPrevPrevTrainer1], a + ld a, [sBTPkmnPrevTrainer2] + ld [sBTPkmnPrevPrevTrainer2], a + ld a, [sBTPkmnPrevTrainer3] + ld [sBTPkmnPrevPrevTrainer3], a + ld a, [BT_OTPkmn1] + ld [sBTPkmnPrevTrainer1], a + ld a, [BT_OTPkmn2] + ld [sBTPkmnPrevTrainer2], a + ld a, [BT_OTPkmn3] + ld [sBTPkmnPrevTrainer3], a + call CloseSRAM + ret +; 1f814e + +INCLUDE "data/battle_tower.asm" diff --git a/engine/decorations.asm b/engine/decorations.asm index ad82a2080..4d8410bb6 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -541,70 +541,10 @@ GetDecorationSprite: ; 26a44 ret ; 26a4f -decoration: MACRO - ; type, name, command, event flag, tile/sprite - db \1, \2, \3 - dw \4 - db \5 -ENDM - DecorationAttributes: ; 26a4f - decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b - decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c - decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d - decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08 - decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b - decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e - decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20 - decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21 - decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f - decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23 - decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24 - decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM - decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES - decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64 - decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX - decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX - decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU - decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU - decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY - decoration DECO_DOLL, JIGGLYPUFF, SET_UP_DOLL, EVENT_DECO_JIGGLYPUFF_DOLL, SPRITE_JIGGLYPUFF - decoration DECO_DOLL, BULBASAUR, SET_UP_DOLL, EVENT_DECO_BULBASAUR_DOLL, SPRITE_BULBASAUR - decoration DECO_DOLL, CHARMANDER, SET_UP_DOLL, EVENT_DECO_CHARMANDER_DOLL, SPRITE_CHARMANDER - decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE - decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG - decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT - decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE - decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP - decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH - decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR - decoration DECO_DOLL, SHELLDER, SET_UP_DOLL, EVENT_DECO_SHELLDER_DOLL, SPRITE_SHELLDER - decoration DECO_DOLL, GRIMER, SET_UP_DOLL, EVENT_DECO_GRIMER_DOLL, SPRITE_GRIMER - decoration DECO_DOLL, VOLTORB, SET_UP_DOLL, EVENT_DECO_VOLTORB_DOLL, SPRITE_VOLTORB - decoration DECO_DOLL, WEEDLE, SET_UP_DOLL, EVENT_DECO_WEEDLE_DOLL, SPRITE_WEEDLE - decoration DECO_DOLL, UNOWN, SET_UP_DOLL, EVENT_DECO_UNOWN_DOLL, SPRITE_UNOWN - decoration DECO_DOLL, GEODUDE, SET_UP_DOLL, EVENT_DECO_GEODUDE_DOLL, SPRITE_GEODUDE - decoration DECO_DOLL, MACHOP, SET_UP_DOLL, EVENT_DECO_MACHOP_DOLL, SPRITE_MACHOP - decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL - decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY - decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY +INCLUDE "data/decoration_attributes.asm" ; 26b8d - DecorationNames: ; 26b8d db "CANCEL@" db "PUT IT AWAY@" diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm index 7a806ad01..782b95425 100755 --- a/engine/delete_save_change_clock.asm +++ b/engine/delete_save_change_clock.asm @@ -127,7 +127,7 @@ ClockResetPassword: ; 4d41e ld e, a ld d, $0 add hl, de - ld [hl], $61 + ld [hl], "▲" ret .dpadinput ; 4d490 @@ -227,7 +227,7 @@ ClockResetPassword: ; 4d41e ld c, $2 call .ComponentFromNumber ld hl, sPlayerData + (PlayerName - wPlayerData) - ld c, $5 ; PLAYER_NAME_LENGTH_J + ld c, NAME_LENGTH_JAPANESE - 1 call .ComponentFromString ld hl, sPlayerData + (Money - wPlayerData) ld c, $3 diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 943735ca6..3ff7f42dd 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -84,205 +84,4 @@ EngineFlagAction:: ; 80430 EngineFlags: ; 80462 -; All locations are in WRAM bank 1. -engine_flag: MACRO - dwb \1, 1 << \2 -ENDM - ; location, bit - - ; pokegear - engine_flag wPokegearFlags, 1 ; radio card ; $0 - engine_flag wPokegearFlags, 0 ; map card - engine_flag wPokegearFlags, 2 ; phone card - engine_flag wPokegearFlags, 3 ; expn card - engine_flag wPokegearFlags, 7 ; on/off - - ; wDayCareMan, 7 ; day-care 1 on - engine_flag wDayCareMan, 6 ; egg is ready - ; wDayCareMan, 5 ; monster 1 and 2 are compatible - engine_flag wDayCareMan, 0 ; monster 1 in day-care - - ; wDayCareLady, 7 = day-care 2 on - engine_flag wDayCareLady, 0 ; monster 2 in day-care - - engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 - engine_flag wMomSavingMoney, 7 ; dst - - engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer - - engine_flag StatusFlags, 0 ; pokedex - engine_flag StatusFlags, 1 ; unown dex - engine_flag StatusFlags, 3 ; pokerus - engine_flag StatusFlags, 4 ; rocket signal on ch20 - engine_flag StatusFlags, 6 ; credits skip - engine_flag StatusFlags, 7 ; bug contest on ; $10 - engine_flag StatusFlags2, 2 ; bug contest timer - engine_flag StatusFlags2, 1 ; safari zone? - engine_flag StatusFlags2, 0 ; rockets in radio tower - engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd) - engine_flag StatusFlags2, 5 ; give pokerus - engine_flag StatusFlags2, 6 ; berry -> berry juice when trading? - engine_flag StatusFlags2, 7 ; rockets in mahogany - - engine_flag BikeFlags, 0 ; strength active ; $18 - engine_flag BikeFlags, 1 ; always on bike (cant surf) - engine_flag BikeFlags, 2 ; downhill (cycling road) - - engine_flag JohtoBadges, 0 ; zephyrbadge - engine_flag JohtoBadges, 1 ; hivebadge - engine_flag JohtoBadges, 2 ; plainbadge - engine_flag JohtoBadges, 3 ; fogbadge - engine_flag JohtoBadges, 4 ; mineralbadge - engine_flag JohtoBadges, 5 ; stormbadge ; $20 - engine_flag JohtoBadges, 6 ; glacierbadge - engine_flag JohtoBadges, 7 ; risingbadge - - engine_flag KantoBadges, 0 ; boulderbadge - engine_flag KantoBadges, 1 ; cascadebadge - engine_flag KantoBadges, 2 ; thunderbadge - engine_flag KantoBadges, 3 ; rainbowbadge - engine_flag KantoBadges, 4 ; soulbadge - engine_flag KantoBadges, 5 ; marshbadge ; $28 - engine_flag KantoBadges, 6 ; volcanobadge - engine_flag KantoBadges, 7 ; earthbadge - - ; unown sets - engine_flag UnlockedUnowns, 0 ; 1 - engine_flag UnlockedUnowns, 1 ; 2 - engine_flag UnlockedUnowns, 2 ; 3 - engine_flag UnlockedUnowns, 3 ; 4 - engine_flag UnlockedUnowns, 4 ; 5 - engine_flag UnlockedUnowns, 5 ; 6 ; $30 - engine_flag UnlockedUnowns, 6 ; 7 - engine_flag UnlockedUnowns, 7 ; 8 - - ; fly - engine_flag VisitedSpawns, 0 ; your house - engine_flag VisitedSpawns, 1 ; viridian pokecenter - engine_flag VisitedSpawns, 2 ; pallet - engine_flag VisitedSpawns, 3 ; viridian - engine_flag VisitedSpawns, 4 ; pewter - engine_flag VisitedSpawns, 5 ; cerulean ; $38 - engine_flag VisitedSpawns, 6 ; rock tunnel - engine_flag VisitedSpawns, 7 ; vermilion - engine_flag VisitedSpawns + 1, 0 ; lavender - engine_flag VisitedSpawns + 1, 1 ; saffron - engine_flag VisitedSpawns + 1, 2 ; celadon - engine_flag VisitedSpawns + 1, 3 ; fuchsia - engine_flag VisitedSpawns + 1, 4 ; cinnabar - engine_flag VisitedSpawns + 1, 5 ; indigo plateau ; $40 - engine_flag VisitedSpawns + 1, 6 ; new bark - engine_flag VisitedSpawns + 1, 7 ; cherrygrove - engine_flag VisitedSpawns + 2, 0 ; violet - ; union cave - engine_flag VisitedSpawns + 2, 2 ; azalea - engine_flag VisitedSpawns + 2, 3 ; cianwood - engine_flag VisitedSpawns + 2, 4 ; goldenrod - engine_flag VisitedSpawns + 2, 5 ; olivine - engine_flag VisitedSpawns + 2, 6 ; ecruteak ; $48 - engine_flag VisitedSpawns + 2, 7 ; mahogany - engine_flag VisitedSpawns + 3, 0 ; lake of rage - engine_flag VisitedSpawns + 3, 1 ; blackthorn - engine_flag VisitedSpawns + 3, 2 ; silver cave - ; fast ship - engine_flag VisitedSpawns + 3, 4 ; unused - - engine_flag wLuckyNumberShowFlag, 0 ; lucky number show - engine_flag StatusFlags2, 3 ; ???? - - engine_flag DailyFlags, 0 ; kurt making balls ; $50 - engine_flag DailyFlags, 1 ; ???? - engine_flag DailyFlags, 2 ; special wilddata? - engine_flag DailyFlags, 3 ; time capsule (24h wait) - engine_flag DailyFlags, 4 ; all fruit trees - engine_flag DailyFlags, 5 ; shuckle given - engine_flag DailyFlags, 6 ; goldenrod underground merchant closed - engine_flag DailyFlags, 7 ; fought in trainer hall today - - engine_flag WeeklyFlags, 0 ; mt moon square clefairy ; $58 - engine_flag WeeklyFlags, 1 ; union cave lapras - engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07 - engine_flag WeeklyFlags, 4 ; tea in blues house - engine_flag WeeklyFlags, 5 ; indigo plateau rival fight - engine_flag WeeklyFlags, 6 ; move tutor - engine_flag WeeklyFlags, 7 ; buenas password - - engine_flag SwarmFlags, 0 ; buenas password 2 - engine_flag SwarmFlags, 1 ; goldenrod dept store sale is on - - engine_flag GameTimerPause, 7 ; $62 - - engine_flag PlayerGender, 0 ; player is female - - engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it - - ; rematches - engine_flag wDailyRematchFlags, 0 ; jack - engine_flag wDailyRematchFlags, 1 ; huey - engine_flag wDailyRematchFlags, 2 ; gaven - engine_flag wDailyRematchFlags, 3 ; beth ; $68 - engine_flag wDailyRematchFlags, 4 ; jose - engine_flag wDailyRematchFlags, 5 ; reena - engine_flag wDailyRematchFlags, 6 ; joey - engine_flag wDailyRematchFlags, 7 ; wade - engine_flag wDailyRematchFlags + 1, 0 ; ralph - engine_flag wDailyRematchFlags + 1, 1 ; liz - engine_flag wDailyRematchFlags + 1, 2 ; anthony - engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 - engine_flag wDailyRematchFlags + 1, 4 ; gina - engine_flag wDailyRematchFlags + 1, 5 ; arnie - engine_flag wDailyRematchFlags + 1, 6 ; alan - engine_flag wDailyRematchFlags + 1, 7 ; dana - engine_flag wDailyRematchFlags + 2, 0 ; chad - engine_flag wDailyRematchFlags + 2, 1 ; tully - engine_flag wDailyRematchFlags + 2, 2 ; brent - engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 - engine_flag wDailyRematchFlags + 2, 4 ; vance - engine_flag wDailyRematchFlags + 2, 5 ; wilton - engine_flag wDailyRematchFlags + 2, 6 ; parry - engine_flag wDailyRematchFlags + 2, 7 ; erin - - engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget - engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece - engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 - engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone - engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone - engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget - engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone - - engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow - engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) - - engine_flag wDailyPhoneTimeOfDayFlags, 0 - engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 - engine_flag wDailyPhoneTimeOfDayFlags, 2 - engine_flag wDailyPhoneTimeOfDayFlags, 3 - engine_flag wDailyPhoneTimeOfDayFlags, 4 - engine_flag wDailyPhoneTimeOfDayFlags, 5 - engine_flag wDailyPhoneTimeOfDayFlags, 6 - engine_flag wDailyPhoneTimeOfDayFlags, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 7 - - engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male - - engine_flag SwarmFlags, 2 ; dunsparce swarm ; $a0 - engine_flag SwarmFlags, 3 ; yanma swarm +INCLUDE "data/engine_flags.asm" diff --git a/engine/events_2.asm b/engine/events_2.asm index 285b3e05b..5a89f5e68 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -254,18 +254,7 @@ TryWildEncounter_BugContest: ; 97d64 ; 97d87 ContestMons: ; 97d87 - ; %, species, min, max - db 20, CATERPIE, 7, 18 - db 20, WEEDLE, 7, 18 - db 10, METAPOD, 9, 18 - db 10, KAKUNA, 9, 18 - db 5, BUTTERFREE, 12, 15 - db 5, BEEDRILL, 12, 15 - db 10, VENONAT, 10, 16 - db 10, PARAS, 10, 17 - db 5, SCYTHER, 13, 14 - db 5, PINSIR, 13, 14 - db -1, VENOMOTH, 30, 40 +INCLUDE "data/wild/bug_contest_mons.asm" ; 97db3 DoBikeStep:: ; 97db3 diff --git a/engine/events_3.asm b/engine/events_3.asm index b6aaea3b7..f53297d61 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -455,55 +455,7 @@ GetTreeMonSet: ; b823f ret ; b825e -TreeMonMaps: ; b825e -treemon_map: macro - map \1 - db \2 ; treemon set -endm - treemon_map ROUTE_26, 4 - treemon_map ROUTE_27, 4 - treemon_map ROUTE_28, 0 - treemon_map ROUTE_29, 3 - treemon_map ROUTE_30, 3 - treemon_map ROUTE_31, 3 - treemon_map ROUTE_32, 4 - treemon_map ROUTE_33, 2 - treemon_map ROUTE_34, 3 - treemon_map ROUTE_35, 3 - treemon_map ROUTE_36, 3 - treemon_map ROUTE_37, 3 - treemon_map ROUTE_38, 3 - treemon_map ROUTE_39, 3 - treemon_map ROUTE_40, 0 - treemon_map ROUTE_41, 0 - treemon_map ROUTE_42, 2 - treemon_map ROUTE_43, 5 - treemon_map ROUTE_44, 1 - treemon_map ROUTE_45, 1 - treemon_map ROUTE_46, 1 - treemon_map NEW_BARK_TOWN, 0 - treemon_map CHERRYGROVE_CITY, 0 - treemon_map VIOLET_CITY, 0 - treemon_map AZALEA_TOWN, 2 - treemon_map CIANWOOD_CITY, 0 - treemon_map GOLDENROD_CITY, 0 - treemon_map OLIVINE_CITY, 0 - treemon_map ECRUTEAK_CITY, 0 - treemon_map MAHOGANY_TOWN, 0 - treemon_map LAKE_OF_RAGE, 5 - treemon_map BLACKTHORN_CITY, 0 - treemon_map SILVER_CAVE_OUTSIDE, 0 - treemon_map ILEX_FOREST, 6 - db -1 -; b82c5 - -RockMonMaps: ; b82c5 - treemon_map CIANWOOD_CITY, 7 - treemon_map ROUTE_40, 7 - treemon_map DARK_CAVE_VIOLET_ENTRANCE, 7 - treemon_map SLOWPOKE_WELL_B1F, 7 - db -1 -; b82d2 +INCLUDE "data/wild/treemon_maps.asm" GetTreeMons: ; b82d2 ; Return the address of TreeMon table a in hl. @@ -533,128 +485,7 @@ GetTreeMons: ; b82d2 ret ; b82e8 -TreeMons: ; b82e8 - dw TreeMons1 - dw TreeMons1 - dw TreeMons2 - dw TreeMons3 - dw TreeMons4 - dw TreeMons5 - dw TreeMons6 - dw RockMons - dw TreeMons1 - -; Two tables each (normal, rare). -; Structure: -; db %, species, level - -TreeMons1: ; b82fa - db 50, SPEAROW, 10 - db 15, SPEAROW, 10 - db 15, SPEAROW, 10 - db 10, AIPOM, 10 - db 5, AIPOM, 10 - db 5, AIPOM, 10 - db -1 - - db 50, SPEAROW, 10 - db 15, HERACROSS, 10 - db 15, HERACROSS, 10 - db 10, AIPOM, 10 - db 5, AIPOM, 10 - db 5, AIPOM, 10 - db -1 - -TreeMons2: ; b8320 - db 50, SPEAROW, 10 - db 15, EKANS, 10 - db 15, SPEAROW, 10 - db 10, AIPOM, 10 - db 5, AIPOM, 10 - db 5, AIPOM, 10 - db -1 - - db 50, SPEAROW, 10 - db 15, HERACROSS, 10 - db 15, HERACROSS, 10 - db 10, AIPOM, 10 - db 5, AIPOM, 10 - db 5, AIPOM, 10 - db -1 - -TreeMons3: ; b8346 - db 50, HOOTHOOT, 10 - db 15, SPINARAK, 10 - db 15, LEDYBA, 10 - db 10, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db -1 - - db 50, HOOTHOOT, 10 - db 15, PINECO, 10 - db 15, PINECO, 10 - db 10, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db -1 - -TreeMons4: ; b836c - db 50, HOOTHOOT, 10 - db 15, EKANS, 10 - db 15, HOOTHOOT, 10 - db 10, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db -1 - - db 50, HOOTHOOT, 10 - db 15, PINECO, 10 - db 15, PINECO, 10 - db 10, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db -1 - -TreeMons5: ; b8392 - db 50, HOOTHOOT, 10 - db 15, VENONAT, 10 - db 15, HOOTHOOT, 10 - db 10, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db -1 - - db 50, HOOTHOOT, 10 - db 15, PINECO, 10 - db 15, PINECO, 10 - db 10, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db 5, EXEGGCUTE, 10 - db -1 - -TreeMons6: ; b83b8 - db 50, HOOTHOOT, 10 - db 15, PINECO, 10 - db 15, PINECO, 10 - db 10, NOCTOWL, 10 - db 5, BUTTERFREE, 10 - db 5, BEEDRILL, 10 - db -1 - - db 50, HOOTHOOT, 10 - db 15, CATERPIE, 10 - db 15, WEEDLE, 10 - db 10, HOOTHOOT, 10 - db 5, METAPOD, 10 - db 5, KAKUNA, 10 - db -1 - -RockMons: ; b83de - db 90, KRABBY, 15 - db 10, SHUCKLE, 15 - db -1 -; b83e5 +INCLUDE "data/wild/treemons.asm" GetTreeMon: ; b83e5 push hl diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 6a40fb05c..134adda60 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -103,36 +103,7 @@ GetFruitTreeItem: ; 4408a ; 44097 FruitTreeItems: ; 44097 - db BERRY - db BERRY - db BERRY - db BERRY - db PSNCUREBERRY - db PSNCUREBERRY - db BITTER_BERRY - db BITTER_BERRY - db PRZCUREBERRY - db PRZCUREBERRY - db MYSTERYBERRY - db MYSTERYBERRY - db ICE_BERRY - db ICE_BERRY - db MINT_BERRY - db BURNT_BERRY - db RED_APRICORN - db BLU_APRICORN - db BLK_APRICORN - db WHT_APRICORN - db PNK_APRICORN - db GRN_APRICORN - db YLW_APRICORN - db BERRY - db PSNCUREBERRY - db BITTER_BERRY - db PRZCUREBERRY - db ICE_BERRY - db MINT_BERRY - db BURNT_BERRY +INCLUDE "data/fruit_tree_items.asm" ; 440b5 FruitBearingTreeText: ; 440b5 diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 6dcda93f3..e0ecd41fe 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -199,8 +199,6 @@ _ResetWRAM: ; 5bae ld [Coins], a ld [Coins + 1], a -START_MONEY EQU 3000 - IF START_MONEY / $10000 ld a, START_MONEY / $10000 ENDC @@ -214,11 +212,11 @@ ENDC ld [wWhichMomItem], a ld hl, MomItemTriggerBalance - ld [hl], 2300 / $10000 + ld [hl], MOM_MONEY / $10000 inc hl - ld [hl], 2300 / $100 % $100 + ld [hl], MOM_MONEY / $100 % $100 inc hl - ld [hl], 2300 % $100 + ld [hl], MOM_MONEY % $100 call InitializeNPCNames diff --git a/engine/landmarks.asm b/engine/landmarks.asm index 465a70f3c..401073d83 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -48,212 +48,7 @@ GetLandmarkName:: ; 0x1ca8a5 Landmarks: ; 0x1ca8c3 - -landmark: MACRO - db \1, \2 - dw \3 -ENDM - - landmark 0, 0, SpecialMapName - landmark 148, 116, NewBarkTownName - landmark 136, 116, Route29Name - landmark 108, 116, CherrygroveCityName - landmark 108, 96, Route30Name - landmark 104, 76, Route31Name - landmark 92, 76, VioletCityName - landmark 93, 74, SproutTowerName - landmark 92, 108, Route32Name - landmark 84, 92, RuinsOfAlphName - landmark 92, 140, UnionCaveName - landmark 90, 140, Route33Name - landmark 76, 140, AzaleaTownName - landmark 78, 138, SlowpokeWellName - landmark 60, 136, IlexForestName - landmark 60, 128, Route34Name - landmark 60, 108, GoldenrodCityName - landmark 58, 108, RadioTowerName - landmark 60, 92, Route35Name - landmark 60, 76, NationalParkName - landmark 72, 76, Route36Name - landmark 76, 68, Route37Name - landmark 76, 60, EcruteakCityName - landmark 78, 58, TinTowerName - landmark 74, 58, BurnedTowerName - landmark 60, 60, Route38Name - landmark 44, 64, Route39Name - landmark 44, 76, OlivineCityName - landmark 46, 78, LighthouseName - landmark 36, 72, BattleTowerName - landmark 36, 80, Route40Name - landmark 36, 108, WhirlIslandsName - landmark 36, 116, Route41Name - landmark 28, 116, CianwoodCityName - landmark 100, 60, Route42Name - landmark 92, 60, MtMortarName - landmark 116, 60, MahoganyTownName - landmark 116, 52, Route43Name - landmark 116, 44, LakeOfRageName - landmark 128, 60, Route44Name - landmark 138, 54, IcePathName - landmark 140, 60, BlackthornCityName - landmark 140, 52, DragonsDenName - landmark 140, 80, Route45Name - landmark 120, 88, DarkCaveName - landmark 132, 104, Route46Name - landmark 156, 84, SilverCaveName - landmark 60, 124, PalletTownName - landmark 60, 108, Route1Name - landmark 60, 92, ViridianCityName - landmark 60, 80, Route2Name - landmark 60, 68, PewterCityName - landmark 72, 68, Route3Name - landmark 84, 68, MtMoonName - landmark 96, 68, Route4Name - landmark 108, 68, CeruleanCityName - landmark 108, 60, Route24Name - landmark 116, 52, Route25Name - landmark 108, 76, Route5Name - landmark 116, 92, UndergroundName - landmark 108, 92, Route6Name - landmark 108, 100, VermilionCityName - landmark 96, 76, DiglettsCaveName - landmark 96, 84, Route7Name - landmark 124, 84, Route8Name - landmark 124, 68, Route9Name - landmark 140, 68, RockTunnelName - landmark 140, 72, Route10Name - landmark 140, 76, PowerPlantName - landmark 140, 84, LavenderTownName - landmark 148, 84, LavRadioTowerName - landmark 84, 84, CeladonCityName - landmark 108, 84, SaffronCityName - landmark 124, 100, Route11Name - landmark 140, 96, Route12Name - landmark 132, 116, Route13Name - landmark 124, 128, Route14Name - landmark 112, 132, Route15Name - landmark 76, 84, Route16Name - landmark 76, 108, Route17Name - landmark 88, 132, Route18Name - landmark 100, 132, FuchsiaCityName - landmark 100, 144, Route19Name - landmark 84, 148, Route20Name - landmark 76, 148, SeafoamIslandsName - landmark 60, 148, CinnabarIslandName - landmark 60, 136, Route21Name - landmark 44, 84, Route22Name - landmark 36, 68, VictoryRoadName - landmark 36, 60, Route23Name - landmark 36, 52, IndigoPlateauName - landmark 36, 108, Route26Name - landmark 28, 116, Route27Name - landmark 20, 116, TohjoFallsName - landmark 28, 84, Route28Name - landmark 148, 132, FastShipName - - -NewBarkTownName: db "NEW BARK¯TOWN@" -CherrygroveCityName: db "CHERRYGROVE¯CITY@" -VioletCityName: db "VIOLET CITY@" -AzaleaTownName: db "AZALEA TOWN@" -GoldenrodCityName: db "GOLDENROD¯CITY@" -EcruteakCityName: db "ECRUTEAK¯CITY@" -OlivineCityName: db "OLIVINE¯CITY@" -CianwoodCityName: db "CIANWOOD¯CITY@" -MahoganyTownName: db "MAHOGANY¯TOWN@" -BlackthornCityName: db "BLACKTHORN¯CITY@" -LakeOfRageName: db "LAKE OF¯RAGE@" -SilverCaveName: db "SILVER CAVE@" -SproutTowerName: db "SPROUT¯TOWER@" -RuinsOfAlphName: db "RUINS¯OF ALPH@" -UnionCaveName: db "UNION CAVE@" -SlowpokeWellName: db "SLOWPOKE¯WELL@" -RadioTowerName: db "RADIO TOWER@" -PowerPlantName: db "POWER PLANT@" -NationalParkName: db "NATIONAL¯PARK@" -TinTowerName: db "TIN TOWER@" -LighthouseName: db "LIGHTHOUSE@" -WhirlIslandsName: db "WHIRL¯ISLANDS@" -MtMortarName: db "MT.MORTAR@" -DragonsDenName: db "DRAGON'S¯DEN@" -IcePathName: db "ICE PATH@" -NotApplicableName: db "N/A@" -PalletTownName: db "PALLET TOWN@" -ViridianCityName: db "VIRIDIAN¯CITY@" -PewterCityName: db "PEWTER CITY@" -CeruleanCityName: db "CERULEAN¯CITY@" -LavenderTownName: db "LAVENDER¯TOWN@" -VermilionCityName: db "VERMILION¯CITY@" -CeladonCityName: db "CELADON¯CITY@" -SaffronCityName: db "SAFFRON¯CITY@" -FuchsiaCityName: db "FUCHSIA¯CITY@" -CinnabarIslandName: db "CINNABAR¯ISLAND@" -IndigoPlateauName: db "INDIGO¯PLATEAU@" -VictoryRoadName: db "VICTORY¯ROAD@" -MtMoonName: db "MT.MOON@" -RockTunnelName: db "ROCK TUNNEL@" -LavRadioTowerName: db "LAV¯RADIO TOWER@" -SilphCoName: db "SILPH CO.@" -SafariZoneName: db "SAFARI ZONE@" -SeafoamIslandsName: db "SEAFOAM¯ISLANDS@" -PokemonMansionName: db "#MON¯MANSION@" -CeruleanCaveName: db "CERULEAN¯CAVE@" -Route1Name: db "ROUTE 1@" -Route2Name: db "ROUTE 2@" -Route3Name: db "ROUTE 3@" -Route4Name: db "ROUTE 4@" -Route5Name: db "ROUTE 5@" -Route6Name: db "ROUTE 6@" -Route7Name: db "ROUTE 7@" -Route8Name: db "ROUTE 8@" -Route9Name: db "ROUTE 9@" -Route10Name: db "ROUTE 10@" -Route11Name: db "ROUTE 11@" -Route12Name: db "ROUTE 12@" -Route13Name: db "ROUTE 13@" -Route14Name: db "ROUTE 14@" -Route15Name: db "ROUTE 15@" -Route16Name: db "ROUTE 16@" -Route17Name: db "ROUTE 17@" -Route18Name: db "ROUTE 18@" -Route19Name: db "ROUTE 19@" -Route20Name: db "ROUTE 20@" -Route21Name: db "ROUTE 21@" -Route22Name: db "ROUTE 22@" -Route23Name: db "ROUTE 23@" -Route24Name: db "ROUTE 24@" -Route25Name: db "ROUTE 25@" -Route26Name: db "ROUTE 26@" -Route27Name: db "ROUTE 27@" -Route28Name: db "ROUTE 28@" -Route29Name: db "ROUTE 29@" -Route30Name: db "ROUTE 30@" -Route31Name: db "ROUTE 31@" -Route32Name: db "ROUTE 32@" -Route33Name: db "ROUTE 33@" -Route34Name: db "ROUTE 34@" -Route35Name: db "ROUTE 35@" -Route36Name: db "ROUTE 36@" -Route37Name: db "ROUTE 37@" -Route38Name: db "ROUTE 38@" -Route39Name: db "ROUTE 39@" -Route40Name: db "ROUTE 40@" -Route41Name: db "ROUTE 41@" -Route42Name: db "ROUTE 42@" -Route43Name: db "ROUTE 43@" -Route44Name: db "ROUTE 44@" -Route45Name: db "ROUTE 45@" -Route46Name: db "ROUTE 46@" -DarkCaveName: db "DARK CAVE@" -IlexForestName: db "ILEX¯FOREST@" -BurnedTowerName: db "BURNED¯TOWER@" -FastShipName: db "FAST SHIP@" -ViridianForestName: db "VIRIDIAN¯FOREST@" -DiglettsCaveName: db "DIGLETT'S¯CAVE@" -TohjoFallsName: db "TOHJO FALLS@" -UndergroundName: db "UNDERGROUND@" -BattleTowerName: db "BATTLE¯TOWER@" -SpecialMapName: db "SPECIAL@" +INCLUDE "data/landmarks.asm" RegionCheck: ; 0x1caea1 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 83147c168..4ca7482fe 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1,5 +1,5 @@ -INCLUDE "engine/facings.asm" +INCLUDE "data/facings.asm" SpriteMovementData:: ; 4273 INCLUDE "data/map_objects.asm" diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 9c6fb1870..af1972dae 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -450,4 +450,27 @@ HoldSwitchmonIcon: ; 8ea8c jr nz, .loop ret -INCLUDE "menu/mon_icons.asm" +ReadMonMenuIcon: ; 8eab3 + cp EGG + jr z, .egg + dec a + ld hl, MonMenuIcons + ld e, a + ld d, 0 + add hl, de + ld a, [hl] + ret +.egg + ld a, ICON_EGG + ret +; 8eac4 + +MonMenuIcons: ; 8eac4 +INCLUDE "data/mon_menu_icons.asm" + + +INCLUDE "gfx/icon_pointers.asm" + +Icons: +INCLUDE "gfx/icons.asm" + diff --git a/engine/mysterygift2.asm b/engine/mysterygift2.asm index 0b8948c5b..e2ed30f3d 100755 --- a/engine/mysterygift2.asm +++ b/engine/mysterygift2.asm @@ -123,7 +123,7 @@ PrepMysteryGiftDataToSend: ; 2c642 (b:4642) MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708) ld a, c - cp $25 ; 37 + cp MysteryGiftItemsEnd - MysteryGiftItems jr nc, MysteryGiftFallbackItem ld hl, MysteryGiftItems ld b, 0 @@ -133,7 +133,7 @@ MysteryGiftGetItemHeldEffect: ; 2c708 (b:4708) MysteryGiftGetDecoration: ; 2c715 (b:4715) ld a, c - cp $25 ; 37 + cp MysteryGiftDecosEnd - MysteryGiftDecos jr nc, MysteryGiftFallbackItem ld hl, MysteryGiftDecos ld b, 0 @@ -147,81 +147,11 @@ MysteryGiftFallbackItem: ; 2c722 (b:4722) ; 2c725 (b:4725) MysteryGiftItems: ; 2c725 - db BERRY - db PRZCUREBERRY - db MINT_BERRY - db ICE_BERRY - db BURNT_BERRY - db PSNCUREBERRY - db GUARD_SPEC - db X_DEFEND - db X_ATTACK - db BITTER_BERRY - db DIRE_HIT - db X_SPECIAL - db X_ACCURACY - db EON_MAIL - db MORPH_MAIL - db MUSIC_MAIL - db MIRACLEBERRY - db GOLD_BERRY - db REVIVE - db GREAT_BALL - db SUPER_REPEL - db MAX_REPEL - db ELIXER - db ETHER - db WATER_STONE - db FIRE_STONE - db LEAF_STONE - db THUNDERSTONE - db MAX_ETHER - db MAX_ELIXER - db MAX_REVIVE - db SCOPE_LENS - db HP_UP - db PP_UP - db RARE_CANDY - db BLUESKY_MAIL - db MIRAGE_MAIL +INCLUDE "data/mystery_gift/items.asm" +MysteryGiftItemsEnd ; 2c74a MysteryGiftDecos: ; 2c74a - db DECOFLAG_PIKACHU_DOLL - db DECOFLAG_BULBASAUR_DOLL - db DECOFLAG_CHARMANDER_DOLL - db DECOFLAG_SQUIRTLE_DOLL - db DECOFLAG_POLIWAG_DOLL - db DECOFLAG_DIGLETT_DOLL - db DECOFLAG_STARMIE_DOLL - db DECOFLAG_MAGIKARP_DOLL - db DECOFLAG_ODDISH_DOLL - db DECOFLAG_GENGAR_DOLL - db DECOFLAG_CLEFAIRY_POSTER - db DECOFLAG_JIGGLYPUFF_POSTER - db DECOFLAG_SNES - db DECOFLAG_SHELLDER_DOLL - db DECOFLAG_VOLTORB_DOLL - db DECOFLAG_WEEDLE_DOLL - db DECOFLAG_MAGNAPLANT - db DECOFLAG_TROPICPLANT - db DECOFLAG_FAMICOM - db DECOFLAG_N64 - db DECOFLAG_SURF_PIKACHU_DOLL - db DECOFLAG_JIGGLYPUFF_DOLL - db DECOFLAG_PINK_BED - db DECOFLAG_POLKADOT_BED - db DECOFLAG_RED_CARPET - db DECOFLAG_BLUE_CARPET - db DECOFLAG_YELLOW_CARPET - db DECOFLAG_GREEN_CARPET - db DECOFLAG_JUMBOPLANT - db DECOFLAG_VIRTUAL_BOY - db DECOFLAG_MACHOP_DOLL - db DECOFLAG_PIKACHU_POSTER - db DECOFLAG_TENTACOOL_DOLL - db DECOFLAG_BIG_ONIX_DOLL - db DECOFLAG_PIKACHU_BED - db DECOFLAG_GRIMER_DOLL - db DECOFLAG_UNOWN_DOLL +INCLUDE "data/mystery_gift/decos.asm" +MysteryGiftDecosEnd ; 2c76f diff --git a/engine/npctrade.asm b/engine/npctrade.asm index fa1be880e..1ec828b54 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -1,26 +1,10 @@ - -; Trade struct -TRADE_DIALOG EQU 0 -TRADE_GIVEMON EQU 1 -TRADE_GETMON EQU 2 -TRADE_NICK EQU 3 -TRADE_DVS EQU 14 -TRADE_ITEM EQU 16 -TRADE_OT_ID EQU 17 -TRADE_OT_NAME EQU 19 -TRADE_GENDER EQU 30 -TRADE_PADDING EQU 31 - ; Trade dialogs -TRADE_INTRO EQU 0 -TRADE_CANCEL EQU 1 -TRADE_WRONG EQU 2 -TRADE_COMPLETE EQU 3 -TRADE_AFTER EQU 4 - -TRADE_EITHER_GENDER EQU 0 -TRADE_MALE_ONLY EQU 1 -TRADE_FEMALE_ONLY EQU 2 + const_def + const TRADE_INTRO + const TRADE_CANCEL + const TRADE_WRONG + const TRADE_COMPLETE + const TRADE_AFTER NPCTrade:: ; fcba8 ld a, e @@ -428,23 +412,7 @@ GetTradeMonNames: ; fce1b NPCTrades: ; fce58 -npctrade: MACRO - db \1, \2, \3, \4 ; dialog set, requested mon, offered mon, nickname - db \5, \6 ; dvs - shift - db \6 ; item - dw \7 ; OT ID - db \8, \9, 0 ; OT name, gender requested -ENDM - - - npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER - npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER - npctrade 1, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER - npctrade 3, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY - npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER - npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER - npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER +INCLUDE "data/npc_trades.asm" ; fcf38 diff --git a/engine/odd_eggs.asm b/engine/odd_eggs.asm new file mode 100644 index 000000000..93d753dfb --- /dev/null +++ b/engine/odd_eggs.asm @@ -0,0 +1,96 @@ +GiveOddEgg: ; 1fb4b6 + ; Figure out which egg to give. + + ; Compare a random word to + ; probabilities out of 0xffff. + call Random + ld hl, OddEggProbabilities + ld c, 0 + ld b, c +.loop + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + + ; Break on $ffff. + ld a, d + cp $ffff / $100 + jr nz, .not_done + ld a, e + cp $ffff % $100 + jr z, .done +.not_done + + ; Break when [hRandom] <= de. + ld a, [hRandom + 1] + cp d + jr c, .done + jr z, .ok + jr .next +.ok + ld a, [hRandom + 0] + cp e + jr c, .done + jr z, .done +.next + inc bc + jr .loop +.done + + ld hl, OddEggs + ld a, OddEgg2 - OddEgg1 + call AddNTimes + + ld de, OddEggSpecies + ld bc, PARTYMON_STRUCT_LENGTH + 2 * PKMN_NAME_LENGTH + call CopyBytes + + ld a, EGG_TICKET + ld [CurItem], a + ld a, 1 + ld [wItemQuantityChangeBuffer], a + ld a, -1 + ld [CurItemQuantity], a + ld hl, NumItems + call TossItem + + ; load species in wcd2a + ld a, EGG + ld [wMobileMonSpeciesBuffer], a + + ; load pointer to (wMobileMonSpeciesBuffer - 1) in wMobileMonSpeciesPointerBuffer + ld a, (wMobileMonSpeciesBuffer - 1) % $100 + ld [wMobileMonSpeciesPointerBuffer], a + ld a, (wMobileMonSpeciesBuffer - 1) / $100 + ld [wMobileMonSpeciesPointerBuffer + 1], a + ; load pointer to OddEggSpecies in wMobileMonStructurePointerBuffer + ld a, OddEggSpecies % $100 + ld [wMobileMonStructurePointerBuffer], a + ld a, OddEggSpecies / $100 + ld [wMobileMonStructurePointerBuffer + 1], a + + ; load Odd Egg Name in wTempOddEggNickname + ld hl, .Odd + ld de, wTempOddEggNickname + ld bc, PKMN_NAME_LENGTH + call CopyBytes + + ; load pointer to wTempOddEggNickname in wMobileMonOTNamePointerBuffer + ld a, wTempOddEggNickname % $100 + ld [wMobileMonOTNamePointerBuffer], a + ld a, wTempOddEggNickname / $100 + ld [wMobileMonOTNamePointerBuffer + 1], a + ; load pointer to wOddEggName in wMobileMonNicknamePointerBuffer + ld a, wOddEggName % $100 + ld [wMobileMonNicknamePointerBuffer], a + ld a, wOddEggName / $100 + ld [wMobileMonNicknamePointerBuffer + 1], a + callba AddMobileMonToParty + ret +; 1fb546 + +.Odd: + db "ODD@@@@@@@@@" + +INCLUDE "data/odd_eggs.asm" diff --git a/engine/options_menu.asm b/engine/options_menu.asm index ec41288ff..6e306a646 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -105,6 +105,11 @@ GetOptionPointer: ; e42d6 ; e42f5 + const_def + const TEXT_SPEED_FAST ; 0 + const TEXT_SPEED_MED ; 1 + const TEXT_SPEED_SLOW ; 2 + Options_TextSpeed: ; e42f5 call GetTextSpeed ld a, [hJoyPressed] @@ -113,9 +118,9 @@ Options_TextSpeed: ; e42f5 bit D_RIGHT_F, a jr z, .NonePressed ld a, c ; right pressed - cp SLOW_TEXT + cp TEXT_SPEED_SLOW jr c, .Increase - ld c, FAST_TEXT +- 1 + ld c, TEXT_SPEED_FAST +- 1 .Increase: inc c @@ -126,7 +131,7 @@ Options_TextSpeed: ; e42f5 ld a, c and a jr nz, .Decrease - ld c, SLOW_TEXT + 1 + ld c, TEXT_SPEED_SLOW + 1 .Decrease: dec c @@ -154,38 +159,39 @@ Options_TextSpeed: ; e42f5 ; e4331 .Strings: +; entries correspond to TEXT_SPEED_* constants dw .Fast dw .Mid dw .Slow -.Fast: - db "FAST@" -.Mid: - db "MID @" -.Slow: - db "SLOW@" +.Fast: db "FAST@" +.Mid: db "MID @" +.Slow: db "SLOW@" ; e4346 GetTextSpeed: ; e4346 - ld a, [Options] ; This converts the number of frames, to 0, 1, 2 representing speed - and 7 - cp 5 ; 5 frames of delay is slow +; converts TEXT_DELAY_* value in a to TEXT_SPEED_* value in c, +; with previous/next TEXT_DELAY_* values in d/e + ld a, [Options] + and $7 + cp TEXT_DELAY_SLOW jr z, .slow - cp 1 ; 1 frame of delay is fast + cp TEXT_DELAY_FAST jr z, .fast - ld c, MED_TEXT ; set it to mid if not one of the above - lb de, 1, 5 + ; none of the above + ld c, TEXT_SPEED_MED + lb de, TEXT_DELAY_FAST, TEXT_DELAY_SLOW ret .slow - ld c, SLOW_TEXT - lb de, 3, 1 + ld c, TEXT_SPEED_SLOW + lb de, TEXT_DELAY_MED, TEXT_DELAY_FAST ret .fast - ld c, FAST_TEXT - lb de, 5, 3 + ld c, TEXT_SPEED_FAST + lb de, TEXT_DELAY_SLOW, TEXT_DELAY_MED ret ; e4365 @@ -227,10 +233,8 @@ Options_BattleScene: ; e4365 ret ; e4398 -.On: - db "ON @" -.Off: - db "OFF@" +.On: db "ON @" +.Off: db "OFF@" ; e43a0 @@ -270,10 +274,8 @@ Options_BattleStyle: ; e43a0 ret ; e43d1 -.Shift: - db "SHIFT@" -.Set: - db "SET @" +.Shift: db "SHIFT@" +.Set: db "SET @" ; e43dd @@ -320,13 +322,18 @@ Options_Sound: ; e43dd ret ; e4416 -.Mono: - db "MONO @" -.Stereo: - db "STEREO@" +.Mono: db "MONO @" +.Stereo: db "STEREO@" ; e4424 + const_def + const PRINT_LIGHTEST ; 0 + const PRINT_LIGHTER ; 1 + const PRINT_NORMAL ; 2 + const PRINT_DARKER ; 3 + const PRINT_DARKEST ; 4 + Options_Print: ; e4424 call GetPrinterSetting ld a, [hJoyPressed] @@ -335,9 +342,9 @@ Options_Print: ; e4424 bit D_RIGHT_F, a jr z, .NonePressed ld a, c - cp 4 + cp PRINT_DARKEST jr c, .Increase - ld c, -1 + ld c, PRINT_LIGHTEST - 1 .Increase: inc c @@ -348,7 +355,7 @@ Options_Print: ; e4424 ld a, c and a jr nz, .Decrease - ld c, 5 + ld c, PRINT_DARKEST + 1 .Decrease: dec c @@ -373,57 +380,56 @@ Options_Print: ; e4424 ; e445a .Strings: +; entries correspond to PRINT_* constants dw .Lightest dw .Lighter dw .Normal dw .Darker dw .Darkest -.Lightest: - db "LIGHTEST@" -.Lighter: - db "LIGHTER @" -.Normal: - db "NORMAL @" -.Darker: - db "DARKER @" -.Darkest: - db "DARKEST @" +.Lightest: db "LIGHTEST@" +.Lighter: db "LIGHTER @" +.Normal: db "NORMAL @" +.Darker: db "DARKER @" +.Darkest: db "DARKEST @" ; e4491 GetPrinterSetting: ; e4491 - ld a, [GBPrinter] ; converts from the stored printer setting to 0,1,2,3,4 +; converts GBPRINTER_* value in a to PRINT_* value in c, +; with previous/next GBPRINTER_* values in d/e + ld a, [GBPrinter] and a jr z, .IsLightest - cp PRINT_LIGHTER + cp GBPRINTER_LIGHTER jr z, .IsLight - cp PRINT_DARKER + cp GBPRINTER_DARKER jr z, .IsDark - cp PRINT_DARKEST + cp GBPRINTER_DARKEST jr z, .IsDarkest - ld c, 2 ; normal if none of the above - lb de, PRINT_LIGHTER, PRINT_DARKER ; the 2 values next to this setting + ; none of the above + ld c, PRINT_NORMAL + lb de, GBPRINTER_LIGHTER, GBPRINTER_DARKER ret .IsLightest: - ld c, 0 - lb de, PRINT_DARKEST, PRINT_LIGHTER ; the 2 values next to this setting + ld c, PRINT_LIGHTEST + lb de, GBPRINTER_DARKEST, GBPRINTER_LIGHTER ret .IsLight: - ld c, 1 - lb de, PRINT_LIGHTEST, PRINT_NORMAL ; the 2 values next to this setting + ld c, PRINT_LIGHTER + lb de, GBPRINTER_LIGHTEST, GBPRINTER_NORMAL ret .IsDark: - ld c, 3 - lb de, PRINT_NORMAL, PRINT_DARKEST ; the 2 values next to this setting + ld c, PRINT_DARKER + lb de, GBPRINTER_NORMAL, GBPRINTER_DARKEST ret .IsDarkest: - ld c, 4 - lb de, PRINT_DARKER, PRINT_LIGHTEST ; the 2 values next to this setting + ld c, PRINT_DARKEST + lb de, GBPRINTER_DARKER, GBPRINTER_LIGHTEST ret ; e44c1 @@ -463,10 +469,8 @@ Options_MenuAccount: ; e44c1 ret ; e44f2 -.Off: - db "OFF@" -.On: - db "ON @" +.Off: db "OFF@" +.On: db "ON @" ; e44fa diff --git a/engine/overworld.asm b/engine/overworld.asm index 3ed029800..5681dd6b8 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -716,764 +716,18 @@ LoadEmote:: ; 1442f ret ; 1444d -emote_header: MACRO - dw \1 - db \2 tiles, BANK(\1) - dw VTiles1 tile \3 -ENDM EmotesPointers: ; 144d -; entries correspond to EMOTE_* constants -; graphics address, length, starting tile - emote_header ShockEmote, 4, $78 - emote_header QuestionEmote, 4, $78 - emote_header HappyEmote, 4, $78 - emote_header SadEmote, 4, $78 - emote_header HeartEmote, 4, $78 - emote_header BoltEmote, 4, $78 - emote_header SleepEmote, 4, $78 - emote_header FishEmote, 4, $78 - emote_header JumpShadowGFX, 1, $7c - emote_header FishingRodGFX, 2, $7c - emote_header BoulderDustGFX, 2, $7e - emote_header GrassRustleGFX, 1, $7e +INCLUDE "data/emote_headers.asm" ; 14495 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 +INCLUDE "data/sprite_mons.asm" ; 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_DAY_CARE_MON_1 - db SPRITE_COOLTRAINER_F - db SPRITE_ROCKET - db SPRITE_LASS - db SPRITE_DAY_CARE_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 +INCLUDE "data/outdoor_sprites.asm" SpriteHeaders: ; 14736 diff --git a/engine/phone.asm b/engine/phone.asm index 55deab4d1..ce9cfa081 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -761,87 +761,11 @@ GetCallerLocation: ; 90439 ; 9045f PhoneContacts: ; 9045f -phone: MACRO - db \1, \2 ; trainer - map \3 ; map - db \4 - dba \5 ; script 1 - db \6 - dba \7 ; script 2 -ENDM -; entries correspond to PHONE_* constants - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_MOM, KRISS_HOUSE_1F, 7, MomPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BILL, N_A, 7, BillPhoneScript1, 0, BillPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, 7, ElmPhoneScript1, 0, ElmPhoneScript2 - phone SCHOOLBOY, JACK1, NATIONAL_PARK, 7, JackPhoneScript1, 7, JackPhoneScript2 - phone POKEFANF, BEVERLY1, NATIONAL_PARK, 7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2 - phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, 7, HueyPhoneScript1, 7, HueyPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone COOLTRAINERM, GAVEN3, ROUTE_26, 7, GavenPhoneScript1, 7, GavenPhoneScript2 - phone COOLTRAINERF, BETH1, ROUTE_26, 7, BethPhoneScript1, 7, BethPhoneScript2 - phone BIRD_KEEPER, JOSE2, ROUTE_27, 7, JosePhoneScript1, 7, JosePhoneScript2 - phone COOLTRAINERF, REENA1, ROUTE_27, 7, ReenaPhoneScript1, 7, ReenaPhoneScript2 - phone YOUNGSTER, JOEY1, ROUTE_30, 7, JoeyPhoneScript1, 7, JoeyPhoneScript2 - phone BUG_CATCHER, WADE1, ROUTE_31, 7, WadePhoneScript1, 7, WadePhoneScript2 - phone FISHER, RALPH1, ROUTE_32, 7, RalphPhoneScript1, 7, RalphPhoneScript2 - phone PICNICKER, LIZ1, ROUTE_32, 7, LizPhoneScript1, 7, LizPhoneScript2 - phone HIKER, ANTHONY2, ROUTE_33, 7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2 - phone CAMPER, TODD1, ROUTE_34, 7, ToddPhoneScript1, 7, ToddPhoneScript2 - phone PICNICKER, GINA1, ROUTE_34, 7, GinaPhoneScript1, 7, GinaPhoneScript2 - phone JUGGLER, IRWIN1, ROUTE_35, 7, IrwinPhoneScript1, 7, IrwinPhoneScript2 - phone BUG_CATCHER, ARNIE1, ROUTE_35, 7, ArniePhoneScript1, 7, ArniePhoneScript2 - phone SCHOOLBOY, ALAN1, ROUTE_36, 7, AlanPhoneScript1, 7, AlanPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone LASS, DANA1, ROUTE_38, 7, DanaPhoneScript1, 7, DanaPhoneScript2 - phone SCHOOLBOY, CHAD1, ROUTE_38, 7, ChadPhoneScript1, 7, ChadPhoneScript2 - phone POKEFANM, DEREK1, ROUTE_39, 7, DerekPhoneScript1, 7, DerekPhoneScript2 - phone FISHER, TULLY1, ROUTE_42, 7, TullyPhoneScript1, 7, TullyPhoneScript2 - phone POKEMANIAC, BRENT1, ROUTE_43, 7, BrentPhoneScript1, 7, BrentPhoneScript2 - phone PICNICKER, TIFFANY3, ROUTE_43, 7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2 - phone BIRD_KEEPER, VANCE1, ROUTE_44, 7, VancePhoneScript1, 7, VancePhoneScript2 - phone FISHER, WILTON1, ROUTE_44, 7, WiltonPhoneScript1, 7, WiltonPhoneScript2 - phone BLACKBELT_T, KENJI3, ROUTE_45, 7, KenjiPhoneScript1, 7, KenjiPhoneScript2 - phone HIKER, PARRY1, ROUTE_45, 7, ParryPhoneScript1, 7, ParryPhoneScript2 - phone PICNICKER, ERIN1, ROUTE_46, 7, ErinPhoneScript1, 7, ErinPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1, 7, BuenaPhoneScript2 +INCLUDE "data/phone_contacts.asm" ; 90627 SpecialPhoneCallList: ; 90627 - dw SpecialCallOnlyWhenOutside - db PHONE_ELM - dba ElmPhoneScript2 - - dw SpecialCallOnlyWhenOutside - db PHONE_ELM - dba ElmPhoneScript2 - - dw SpecialCallOnlyWhenOutside - db PHONE_ELM - dba ElmPhoneScript2 - - dw SpecialCallOnlyWhenOutside - db PHONE_ELM - dba ElmPhoneScript2 - - dw SpecialCallWhereverYouAre - db PHONE_ELM - dba ElmPhoneScript2 - - dw SpecialCallWhereverYouAre - db PHONE_OAK ; ???????? - dba BikeShopPhoneScript ; bike shop - - dw SpecialCallWhereverYouAre - db PHONE_MOM - dba MomPhoneLectureScript - - dw SpecialCallOnlyWhenOutside - db PHONE_ELM - dba ElmPhoneScript2 +INCLUDE "data/phone_special.asm" ; 90657 UnknownScript_0x90657: ; 0x90657 diff --git a/engine/save.asm b/engine/save.asm index de2d3bc65..97267347c 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -727,14 +727,7 @@ TryLoadSaveData: ; 14f1c ; 14f7c DefaultOptions: ; 14f7c - db $03 ; mid text speed - db $00 ; wSaveFileExists - db $00 ; frame 0 - db $01 ; TextBoxFlags - db $40 ; gb printer: normal brightness - db $01 ; menu account on - db $00 ; ?? - db $00 ; ?? +INCLUDE "data/default_options.asm" ; 14f84 CheckPrimarySaveFile: ; 14f84 diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index 8dda255a1..3ed0a98ce 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -1,44 +1,6 @@ SpawnPoints: ; 0x152ab - -spawn: MACRO -; map, y, x - map \1 - db \2, \3 -ENDM - - spawn KRISS_HOUSE_2F, 3, 3 - spawn VIRIDIAN_POKECENTER_1F, 5, 3 - - spawn PALLET_TOWN, 5, 6 - spawn VIRIDIAN_CITY, 23, 26 - spawn PEWTER_CITY, 13, 26 - spawn CERULEAN_CITY, 19, 22 - spawn ROUTE_10_NORTH, 11, 2 - spawn VERMILION_CITY, 9, 6 - spawn LAVENDER_TOWN, 5, 6 - spawn SAFFRON_CITY, 9, 30 - spawn CELADON_CITY, 29, 10 - spawn FUCHSIA_CITY, 19, 28 - spawn CINNABAR_ISLAND, 11, 12 - spawn ROUTE_23, 9, 6 - - spawn NEW_BARK_TOWN, 13, 6 - spawn CHERRYGROVE_CITY, 29, 4 - spawn VIOLET_CITY, 31, 26 - spawn ROUTE_32, 11, 74 - spawn AZALEA_TOWN, 15, 10 - spawn CIANWOOD_CITY, 23, 44 - spawn GOLDENROD_CITY, 15, 28 - spawn OLIVINE_CITY, 13, 22 - spawn ECRUTEAK_CITY, 23, 28 - spawn MAHOGANY_TOWN, 15, 14 - spawn LAKE_OF_RAGE, 21, 29 - spawn BLACKTHORN_CITY, 21, 30 - spawn SILVER_CAVE_OUTSIDE, 23, 20 - spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2 - spawn N_A, -1, -1 - +INCLUDE "data/spawn_points.asm" LoadSpawnPoint: ; 1531f diff --git a/engine/sprites.asm b/engine/sprites.asm index ad36dfbc9..4b20a2371 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -551,98 +551,7 @@ BrokenGetStdGraphics: ; 8d1ac ; 8d1c4 SpriteAnimSeqData: ; 8d1c4 -; entries correspond to SPRITE_ANIM_INDEX_* constants - ; frameset sequence, tile -; SPRITE_ANIM_INDEX_PARTY_MON - db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 -; SPRITE_ANIM_INDEX_01 - db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00 -; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR - db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05 -; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO - db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO, SPRITE_ANIM_SEQ_GAMEFREAK_LOGO, $00 -; SPRITE_ANIM_INDEX_GS_INTRO_STAR - db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR, SPRITE_ANIM_SEQ_GS_INTRO_STAR, $06 -; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE - db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE, SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE, $06 -; SPRITE_ANIM_INDEX_SLOTS_GOLEM - db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM, SPRITE_ANIM_SEQ_SLOTS_GOLEM, $07 -; SPRITE_ANIM_INDEX_SLOTS_CHANSEY - db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY, SPRITE_ANIM_SEQ_SLOTS_CHANSEY, $07 -; SPRITE_ANIM_INDEX_SLOTS_EGG - db SPRITE_ANIM_FRAMESET_SLOTS_EGG, SPRITE_ANIM_SEQ_SLOTS_EGG, $07 -; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR - db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_MAIL_CURSOR, $05 -; SPRITE_ANIM_INDEX_RED_WALK - db SPRITE_ANIM_FRAMESET_RED_WALK, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_0B - db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08 -; SPRITE_ANIM_INDEX_DUMMY_GAME - db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08 -; SPRITE_ANIM_INDEX_0D - db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08 -; SPRITE_ANIM_INDEX_TRADE_POKE_BALL - db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, $00 -; SPRITE_ANIM_INDEX_TRADE_POOF - db SPRITE_ANIM_FRAMESET_TRADE_POOF, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE - db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE, SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE, $00 -; SPRITE_ANIM_INDEX_TRADEMON_ICON - db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 -; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE - db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 -; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT - db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 -; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB - db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB, SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB, $00 -; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED - db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_LEAF - db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_CUT_LEAVES, $00 -; SPRITE_ANIM_INDEX_CUT_TREE - db SPRITE_ANIM_FRAMESET_CUT_TREE, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_FLY_LEAF - db SPRITE_ANIM_FRAMESET_LEAF, SPRITE_ANIM_SEQ_FLY_LEAF, $00 -; SPRITE_ANIM_INDEX_EGG_CRACK - db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_1A - db SPRITE_ANIM_FRAMESET_24, SPRITE_ANIM_SEQ_19, $00 -; SPRITE_ANIM_INDEX_HEADBUTT - db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_EGG_HATCH - db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 -; SPRITE_ANIM_INDEX_1D - db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 -; SPRITE_ANIM_INDEX_BLUE_WALK - db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE - db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_20 - db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_21 - db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_22 - db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_23 - db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00 -; SPRITE_ANIM_INDEX_24 - db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00 -; SPRITE_ANIM_INDEX_25 - db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00 -; SPRITE_ANIM_INDEX_INTRO_SUICUNE - db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00 -; SPRITE_ANIM_INDEX_INTRO_PICHU - db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 -; SPRITE_ANIM_INDEX_INTRO_WOOPER - db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 -; SPRITE_ANIM_INDEX_INTRO_UNOWN - db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00 -; SPRITE_ANIM_INDEX_INTRO_UNOWN_F - db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 -; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY - db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 -; SPRITE_ANIM_INDEX_CELEBI - db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; 2c +INCLUDE "data/sprite_anim_seqs.asm" ; 8d24b INCLUDE "engine/sprite_anims.asm" ; DoAnimFrame diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm index 561721074..6f17398fd 100755 --- a/engine/time_capsule/conversion.asm +++ b/engine/time_capsule/conversion.asm @@ -145,159 +145,7 @@ PlaceTradePartnerNamesAndParty: ; fb60d ; fb656 KantoMonSpecials: ; fb656 -; The original special base stat for -; each Kanto monster from Red/Blue. - db 65 ; BULBASAUR - db 80 ; IVYSAUR - db 100 ; VENUSAUR - db 50 ; CHARMANDER - db 65 ; CHARMELEON - db 85 ; CHARIZARD - db 50 ; SQUIRTLE - db 65 ; WARTORTLE - db 85 ; BLASTOISE - db 20 ; CATERPIE - db 25 ; METAPOD - db 80 ; BUTTERFREE - db 20 ; WEEDLE - db 25 ; KAKUNA - db 45 ; BEEDRILL - db 35 ; PIDGEY - db 50 ; PIDGEOTTO - db 70 ; PIDGEOT - db 25 ; RATTATA - db 50 ; RATICATE - db 31 ; SPEAROW - db 61 ; FEAROW - db 40 ; EKANS - db 65 ; ARBOK - db 50 ; PIKACHU - db 90 ; RAICHU - db 30 ; SANDSHREW - db 55 ; SANDSLASH - db 40 ; NIDORAN_F - db 55 ; NIDORINA - db 75 ; NIDOQUEEN - db 40 ; NIDORAN_M - db 55 ; NIDORINO - db 75 ; NIDOKING - db 60 ; CLEFAIRY - db 85 ; CLEFABLE - db 65 ; VULPIX - db 100 ; NINETALES - db 25 ; JIGGLYPUFF - db 50 ; WIGGLYTUFF - db 40 ; ZUBAT - db 75 ; GOLBAT - db 75 ; ODDISH - db 85 ; GLOOM - db 100 ; VILEPLUME - db 55 ; PARAS - db 80 ; PARASECT - db 40 ; VENONAT - db 90 ; VENOMOTH - db 45 ; DIGLETT - db 70 ; DUGTRIO - db 40 ; MEOWTH - db 65 ; PERSIAN - db 50 ; PSYDUCK - db 80 ; GOLDUCK - db 35 ; MANKEY - db 60 ; PRIMEAPE - db 50 ; GROWLITHE - db 80 ; ARCANINE - db 40 ; POLIWAG - db 50 ; POLIWHIRL - db 70 ; POLIWRATH - db 105 ; ABRA - db 120 ; KADABRA - db 135 ; ALAKAZAM - db 35 ; MACHOP - db 50 ; MACHOKE - db 65 ; MACHAMP - db 70 ; BELLSPROUT - db 85 ; WEEPINBELL - db 100 ; VICTREEBEL - db 100 ; TENTACOOL - db 120 ; TENTACRUEL - db 30 ; GEODUDE - db 45 ; GRAVELER - db 55 ; GOLEM - db 65 ; PONYTA - db 80 ; RAPIDASH - db 40 ; SLOWPOKE - db 80 ; SLOWBRO - db 95 ; MAGNEMITE - db 120 ; MAGNETON - db 58 ; FARFETCH_D - db 35 ; DODUO - db 60 ; DODRIO - db 70 ; SEEL - db 95 ; DEWGONG - db 40 ; GRIMER - db 65 ; MUK - db 45 ; SHELLDER - db 85 ; CLOYSTER - db 100 ; GASTLY - db 115 ; HAUNTER - db 130 ; GENGAR - db 30 ; ONIX - db 90 ; DROWZEE - db 115 ; HYPNO - db 25 ; KRABBY - db 50 ; KINGLER - db 55 ; VOLTORB - db 80 ; ELECTRODE - db 60 ; EXEGGCUTE - db 125 ; EXEGGUTOR - db 40 ; CUBONE - db 50 ; MAROWAK - db 35 ; HITMONLEE - db 35 ; HITMONCHAN - db 60 ; LICKITUNG - db 60 ; KOFFING - db 85 ; WEEZING - db 30 ; RHYHORN - db 45 ; RHYDON - db 105 ; CHANSEY - db 100 ; TANGELA - db 40 ; KANGASKHAN - db 70 ; HORSEA - db 95 ; SEADRA - db 50 ; GOLDEEN - db 80 ; SEAKING - db 70 ; STARYU - db 100 ; STARMIE - db 100 ; MR__MIME - db 55 ; SCYTHER - db 95 ; JYNX - db 85 ; ELECTABUZZ - db 85 ; MAGMAR - db 55 ; PINSIR - db 70 ; TAUROS - db 20 ; MAGIKARP - db 100 ; GYARADOS - db 95 ; LAPRAS - db 48 ; DITTO - db 65 ; EEVEE - db 110 ; VAPOREON - db 110 ; JOLTEON - db 110 ; FLAREON - db 75 ; PORYGON - db 90 ; OMANYTE - db 115 ; OMASTAR - db 45 ; KABUTO - db 70 ; KABUTOPS - db 60 ; AERODACTYL - db 65 ; SNORLAX - db 125 ; ARTICUNO - db 125 ; ZAPDOS - db 125 ; MOLTRES - db 50 ; DRATINI - db 70 ; DRAGONAIR - db 100 ; DRAGONITE - db 154 ; MEWTWO - db 100 ; MEW +INCLUDE "data/time_capsule/special_stats.asm" ; fb6ed @@ -427,256 +275,5 @@ ConvertMon_1to2: ; fb908 ; fb91c Pokered_MonIndices: ; fb91c - db RHYDON - db KANGASKHAN - db NIDORAN_M - db CLEFAIRY - db SPEAROW - db VOLTORB - db NIDOKING - db SLOWBRO - db IVYSAUR - db EXEGGUTOR - db LICKITUNG - db EXEGGCUTE - db GRIMER - db GENGAR - db NIDORAN_F - db NIDOQUEEN - db CUBONE - db RHYHORN - db LAPRAS - db ARCANINE - db MEW - db GYARADOS - db SHELLDER - db TENTACOOL - db GASTLY - db SCYTHER - db STARYU - db BLASTOISE - db PINSIR - db TANGELA - db SCIZOR - db SHUCKLE - db GROWLITHE - db ONIX - db FEAROW - db PIDGEY - db SLOWPOKE - db KADABRA - db GRAVELER - db CHANSEY - db MACHOKE - db MR__MIME - db HITMONLEE - db HITMONCHAN - db ARBOK - db PARASECT - db PSYDUCK - db DROWZEE - db GOLEM - db HERACROSS - db MAGMAR - db HO_OH - db ELECTABUZZ - db MAGNETON - db KOFFING - db SNEASEL - db MANKEY - db SEEL - db DIGLETT - db TAUROS - db TEDDIURSA - db URSARING - db SLUGMA - db FARFETCH_D - db VENONAT - db DRAGONITE - db MAGCARGO - db SWINUB - db PILOSWINE - db DODUO - db POLIWAG - db JYNX - db MOLTRES - db ARTICUNO - db ZAPDOS - db DITTO - db MEOWTH - db KRABBY - db CORSOLA - db REMORAID - db OCTILLERY - db VULPIX - db NINETALES - db PIKACHU - db RAICHU - db DELIBIRD - db MANTINE - db DRATINI - db DRAGONAIR - db KABUTO - db KABUTOPS - db HORSEA - db SEADRA - db SKARMORY - db HOUNDOUR - db SANDSHREW - db SANDSLASH - db OMANYTE - db OMASTAR - db JIGGLYPUFF - db WIGGLYTUFF - db EEVEE - db FLAREON - db JOLTEON - db VAPOREON - db MACHOP - db ZUBAT - db EKANS - db PARAS - db POLIWHIRL - db POLIWRATH - db WEEDLE - db KAKUNA - db BEEDRILL - db HOUNDOOM - db DODRIO - db PRIMEAPE - db DUGTRIO - db VENOMOTH - db DEWGONG - db KINGDRA - db PHANPY - db CATERPIE - db METAPOD - db BUTTERFREE - db MACHAMP - db DONPHAN - db GOLDUCK - db HYPNO - db GOLBAT - db MEWTWO - db SNORLAX - db MAGIKARP - db PORYGON2 - db STANTLER - db MUK - db SMEARGLE - db KINGLER - db CLOYSTER - db TYROGUE - db ELECTRODE - db CLEFABLE - db WEEZING - db PERSIAN - db MAROWAK - db HITMONTOP - db HAUNTER - db ABRA - db ALAKAZAM - db PIDGEOTTO - db PIDGEOT - db STARMIE - db BULBASAUR - db VENUSAUR - db TENTACRUEL - db SMOOCHUM - db GOLDEEN - db SEAKING - db ELEKID - db MAGBY - db MILTANK - db BLISSEY - db PONYTA - db RAPIDASH - db RATTATA - db RATICATE - db NIDORINO - db NIDORINA - db GEODUDE - db PORYGON - db AERODACTYL - db RAIKOU - db MAGNEMITE - db ENTEI - db SUICUNE - db CHARMANDER - db SQUIRTLE - db CHARMELEON - db WARTORTLE - db CHARIZARD - db LARVITAR - db PUPITAR - db TYRANITAR - db LUGIA - db ODDISH - db GLOOM - db VILEPLUME - db BELLSPROUT - db WEEPINBELL - db VICTREEBEL - db CHIKORITA - db BAYLEEF - db MEGANIUM - db CYNDAQUIL - db QUILAVA - db TYPHLOSION - db TOTODILE - db CROCONAW - db FERALIGATR - db SENTRET - db FURRET - db HOOTHOOT - db NOCTOWL - db LEDYBA - db LEDIAN - db SPINARAK - db ARIADOS - db CROBAT - db CHINCHOU - db LANTURN - db PICHU - db CLEFFA - db IGGLYBUFF - db TOGEPI - db TOGETIC - db NATU - db XATU - db MAREEP - db FLAAFFY - db AMPHAROS - db BELLOSSOM - db MARILL - db AZUMARILL - db SUDOWOODO - db POLITOED - db HOPPIP - db SKIPLOOM - db JUMPLUFF - db AIPOM - db SUNKERN - db SUNFLORA - db YANMA - db WOOPER - db QUAGSIRE - db ESPEON - db UMBREON - db MURKROW - db SLOWKING - db MISDREAVUS - db UNOWN - db WOBBUFFET - db GIRAFARIG - db PINECO - db FORRETRESS - db DUNSPARCE - db GLIGAR - db STEELIX - db SNUBBULL - db GRANBULL - db QWILFISH - db WOBBUFFET - db WOBBUFFET +INCLUDE "data/time_capsule/mon_order.asm" ; fba18 diff --git a/engine/tmhm.asm b/engine/tmhm.asm index dc5d698e1..40922c9ad 100755 --- a/engine/tmhm.asm +++ b/engine/tmhm.asm @@ -46,68 +46,5 @@ GetTMHMMove: ; 1166a ; 1167a TMHMMoves: ; 1167a - db DYNAMICPUNCH - db HEADBUTT - db CURSE - db ROLLOUT - db ROAR - db TOXIC - db ZAP_CANNON - db ROCK_SMASH - db PSYCH_UP - db HIDDEN_POWER - db SUNNY_DAY - db SWEET_SCENT - db SNORE - db BLIZZARD - db HYPER_BEAM - db ICY_WIND - db PROTECT - db RAIN_DANCE - db GIGA_DRAIN - db ENDURE - db FRUSTRATION - db SOLARBEAM - db IRON_TAIL - db DRAGONBREATH - db THUNDER - db EARTHQUAKE - db RETURN - db DIG - db PSYCHIC_M - db SHADOW_BALL - db MUD_SLAP - db DOUBLE_TEAM - db ICE_PUNCH - db SWAGGER - db SLEEP_TALK - db SLUDGE_BOMB - db SANDSTORM - db FIRE_BLAST - db SWIFT - db DEFENSE_CURL - db THUNDERPUNCH - db DREAM_EATER - db DETECT - db REST - db ATTRACT - db THIEF - db STEEL_WING - db FIRE_PUNCH - db FURY_CUTTER - db NIGHTMARE - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db WHIRLPOOL - db WATERFALL - -; Move tutor - db FLAMETHROWER - db THUNDERBOLT - db ICE_BEAM - - db 0 ; end +INCLUDE "data/tmhm_moves.asm" ; 116b7 diff --git a/engine/wildmons.asm b/engine/wildmons.asm index bb668f2be..8fab382b7 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -271,14 +271,14 @@ ChooseWildEncounter: ; 2a14f inc hl inc hl call CheckOnWater - ld de, .WaterMonTable + ld de, WaterMonProbTable jr z, .watermon inc hl inc hl ld a, [TimeOfDay] ld bc, $e call AddNTimes - ld de, .GrassMonTable + ld de, GrassMonProbTable .watermon ; hl contains the pointer to the wild mon data, let's save that to the stack @@ -357,21 +357,7 @@ ChooseWildEncounter: ; 2a14f ret ; 2a1cb -.GrassMonTable: ; 2a1cb - db 30, $0 ; 30% chance - db 60, $2 ; 30% chance - db 80, $4 ; 20% chance - db 90, $6 ; 10% chance - db 95, $8 ; 5% chance - db 99, $a ; 4% chance - db 100, $c ; 1% chance -; 2a1d9 - -.WaterMonTable: ; 2a1d9 - db 60, $0 ; 60% chance - db 90, $2 ; 30% chance - db 100, $4 ; 10% chance -; 2a1df +INCLUDE "data/wild/probabilities.asm" CheckRepelEffect:: ; 2a1df ; If there is no active Repel, there's no need to be here. @@ -799,27 +785,7 @@ _BackUpMapIndices: ; 2a3f6 ; 2a40f RoamMaps: ; 2a40f -; Maps that roaming monsters can be on, -; and possible maps they can jump to. -; Notably missing are Route 40 and -; Route 41, which are water routes. - roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 - roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31 - roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36 - roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33 - roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34 - roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35 - roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36 - roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 - roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42 - roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42 - roam_map ROUTE_39, 1, ROUTE_38 - roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 - roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44 - roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45 - roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46 - roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29 - db -1 +INCLUDE "data/wild/roammon_maps.asm" ; 2a4a0 ValidateTempWildMonSpecies: ; 2a4a0 diff --git a/event/happiness_egg.asm b/event/happiness_egg.asm index 7588108bf..7c6d6f46b 100755 --- a/event/happiness_egg.asm +++ b/event/happiness_egg.asm @@ -55,11 +55,11 @@ ChangeHappiness: ; 71c2 push de ld a, [de] - cp 100 + cp HAPPINESS_THRESHOLD_1 ld e, 0 jr c, .ok inc e - cp 200 + cp HAPPINESS_THRESHOLD_2 jr c, .ok inc e @@ -73,7 +73,7 @@ ChangeHappiness: ; 71c2 ld d, 0 add hl, de ld a, [hl] - cp 100 + cp $64 ; $80? pop de ld a, [de] @@ -103,25 +103,7 @@ ChangeHappiness: ; 71c2 ret .Actions: - db +5, +3, +2 ; Gained a level - db +5, +3, +2 ; Vitamin - db +1, +1, +0 ; X Item - db +3, +2, +1 ; Battled a Gym Leader - db +1, +1, +0 ; Learned a move - db -1, -1, -1 ; Lost to an enemy - db -5, -5, -10 ; Fainted due to poison - db -5, -5, -10 ; Lost to a much stronger enemy - db +1, +1, +1 ; Haircut (Y1) - db +3, +3, +1 ; Haircut (Y2) - db +5, +5, +2 ; Haircut (Y3) - db +1, +1, +1 ; Haircut (O1) - db +3, +3, +1 ; Haircut (O2) - db +10, +10, +4 ; Haircut (O3) - db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter) - db -10, -10, -15 ; Used Energy Root (bitter) - db -15, -15, -20 ; Used Revival Herb (bitter) - db +3, +3, +1 ; Grooming - db +10, +6, +4 ; Gained a level in the place where it was caught +INCLUDE "data/happiness_changes.asm" StepHappiness:: ; 725a ; Raise the party's happiness by 1 point every other step cycle. @@ -165,7 +147,7 @@ DayCareStep:: ; 7282 jr z, .day_care_lady ld a, [wBreedMon1Level] ; level - cp 100 + cp MAX_LEVEL jr nc, .day_care_lady ld hl, wBreedMon1Exp + 2 ; exp inc [hl] @@ -187,7 +169,7 @@ DayCareStep:: ; 7282 jr z, .check_egg ld a, [wBreedMon2Level] ; level - cp 100 + cp MAX_LEVEL jr nc, .check_egg ld hl, wBreedMon2Exp + 2 ; exp inc [hl] diff --git a/event/mom_phone.asm b/event/mom_phone.asm index 818010091..0d7a2366f 100755 --- a/event/mom_phone.asm +++ b/event/mom_phone.asm @@ -80,11 +80,11 @@ CheckBalance_MomItem2: ; fd044 .check_have_2300 ld hl, hMoneyTemp - ld [hl], (2300 / $10000) ; $00 + ld [hl], MOM_MONEY / $10000 inc hl - ld [hl], ((2300 % $10000) / $100) ; $08 + ld [hl], MOM_MONEY / $100 % $100 inc hl - ld [hl], (2300 % $100) ; $fc + ld [hl], MOM_MONEY % $100 .loop ld de, MomItemTriggerBalance ld bc, wMomsMoney @@ -212,31 +212,7 @@ endr ret ; fd136 -momitem: macro -; money to trigger, cost, kind, item - dt \1 - dt \2 - db \3, \4 -ENDM - -MomItems_1: ; fd136 - momitem 0, 600, MOM_ITEM, SUPER_POTION - momitem 0, 90, MOM_ITEM, ANTIDOTE - momitem 0, 180, MOM_ITEM, POKE_BALL - momitem 0, 450, MOM_ITEM, ESCAPE_ROPE - momitem 0, 500, MOM_ITEM, GREAT_BALL -MomItems_2: ; fd15e - momitem 900, 600, MOM_ITEM, SUPER_POTION - momitem 4000, 270, MOM_ITEM, REPEL - momitem 7000, 600, MOM_ITEM, SUPER_POTION - momitem 10000, 1800, MOM_DOLL, DECO_CHARMANDER_DOLL - momitem 15000, 3000, MOM_ITEM, MOON_STONE - momitem 19000, 600, MOM_ITEM, SUPER_POTION - momitem 30000, 4800, MOM_DOLL, DECO_CLEFAIRY_DOLL - momitem 40000, 900, MOM_ITEM, HYPER_POTION - momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL - momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL -; fd1ae +INCLUDE "data/mom_phone_items.asm" db 0, 0, 0 ; XXX diff --git a/event/overworld.asm b/event/overworld.asm index 4d67bf61e..221f02a4f 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -277,53 +277,9 @@ CheckOverworldTileArrays: ; c840 xor a ret -CutTreeBlockPointers: ; c862 -; Which tileset are we in? - dbw TILESET_JOHTO_1, .johto1 - dbw TILESET_JOHTO_2, .johto2 - dbw TILESET_KANTO, .kanto - dbw TILESET_PARK, .park - dbw TILESET_ILEX_FOREST, .ilex - db -1 -.johto1 ; Johto OW -; Which meta tile are we facing, which should we replace it with, and which animation? - db $03, $02, $01 ; grass - db $5b, $3c, $00 ; tree - db $5f, $3d, $00 ; tree - db $63, $3f, $00 ; tree - db $67, $3e, $00 ; tree - db -1 +INCLUDE "data/hm_blocks.asm" -.johto2 ; Goldenrod area - db $03, $02, $01 ; grass - db -1 - -.kanto ; Kanto OW - db $0b, $0a, $01 ; grass - db $32, $6d, $00 ; tree - db $33, $6c, $00 ; tree - db $34, $6f, $00 ; tree - db $35, $4c, $00 ; tree - db $60, $6e, $00 ; tree - db -1 - -.park ; National Park - db $13, $03, $01 ; grass - db $03, $04, $01 ; grass - db -1 - -.ilex ; Ilex Forest - db $0f, $17, $00 - db -1 - -WhirlpoolBlockPointers: ; c8a4 - dbw TILESET_JOHTO_1, .johto - db -1 - -.johto ; c8a8 - db $07, $36, $00 - db -1 OWFlash: ; c8ac call .CheckUseFlash diff --git a/gfx/icon_pointers.asm b/gfx/icon_pointers.asm new file mode 100644 index 000000000..bfe07abb6 --- /dev/null +++ b/gfx/icon_pointers.asm @@ -0,0 +1,41 @@ +IconPointers: +; entries correspond to ICON_* constants + dw NullIcon + dw PoliwagIcon + dw JigglypuffIcon + dw DiglettIcon + dw PikachuIcon + dw StaryuIcon + dw FishIcon + dw BirdIcon + dw MonsterIcon + dw ClefairyIcon + dw OddishIcon + dw BugIcon + dw GhostIcon + dw LaprasIcon + dw HumanshapeIcon + dw FoxIcon + dw EquineIcon + dw ShellIcon + dw BlobIcon + dw SerpentIcon + dw VoltorbIcon + dw SquirtleIcon + dw BulbasaurIcon + dw CharmanderIcon + dw CaterpillarIcon + dw UnownIcon + dw GeodudeIcon + dw FighterIcon + dw EggIcon + dw JellyfishIcon + dw MothIcon + dw BatIcon + dw SnorlaxIcon + dw HoOhIcon + dw LugiaIcon + dw GyaradosIcon + dw SlowpokeIcon + dw SudowoodoIcon + dw BigmonIcon diff --git a/gfx/icons.asm b/gfx/icons.asm new file mode 100644 index 000000000..8d44c1fef --- /dev/null +++ b/gfx/icons.asm @@ -0,0 +1,39 @@ +NullIcon: +PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d +JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d +DiglettIcon: INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d +PikachuIcon: INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d +StaryuIcon: INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d +FishIcon: INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d +BirdIcon: INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d +MonsterIcon: INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d +ClefairyIcon: INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d +OddishIcon: INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d +BugIcon: INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d +GhostIcon: INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d +LaprasIcon: INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d +HumanshapeIcon: INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d +FoxIcon: INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d +EquineIcon: INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d +ShellIcon: INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d +BlobIcon: INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d +SerpentIcon: INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d +VoltorbIcon: INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d +SquirtleIcon: INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d +BulbasaurIcon: INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d +CharmanderIcon: INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d +CaterpillarIcon: INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d +UnownIcon: INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d +GeodudeIcon: INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d +FighterIcon: INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d +EggIcon: INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d +JellyfishIcon: INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d +MothIcon: INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d +BatIcon: INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d +SnorlaxIcon: INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d +HoOhIcon: INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d +LugiaIcon: INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d +GyaradosIcon: INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d +SlowpokeIcon: INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d +SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d +BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d diff --git a/macros/map.asm b/macros/map.asm index 40555d71c..eb78be725 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -212,15 +212,3 @@ stonetable: macro db \1, \2 dw \3 endm - - -roam_map: macro -; A map and an arbitrary number of some more maps. - map \1 - db \2 -rept \2 - map \3 - shift -endr - db 0 -endm diff --git a/main.asm b/main.asm index dd3a3f5d9..0c699954c 100644 --- a/main.asm +++ b/main.asm @@ -2350,7 +2350,9 @@ CheckSave:: ; 4cffe ld c, $0 ret -INCLUDE "engine/map_triggers.asm" +MapTriggers:: ; 4d01e +INCLUDE "data/map_triggers.asm" +; 4d15b _LoadMapPart:: ; 4d15b ld hl, wMisc @@ -6063,8 +6065,8 @@ INCBIN "unknown/1f5db4.bin" SECTION "bank7E", ROMX -INCLUDE "data/battle_tower.asm" -INCLUDE "data/odd_eggs.asm" +INCLUDE "engine/battle_tower.asm" +INCLUDE "engine/odd_eggs.asm" SECTION "bank7F", ROMX diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 9869fe720..bb69914d4 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -11,7 +11,7 @@ BlackthornEmysHouse_MapScriptHeader: Emy: faceplayer opentext - trade $3 + trade NPCTRADE_EMY waitbutton closetext end diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 247322ea6..0c33b44a3 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -126,7 +126,7 @@ LassScript_0x56130: Mike: faceplayer opentext - trade $0 + trade NPCTRADE_MIKE waitbutton closetext end diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 0d9a2862c..bde18bee1 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -11,7 +11,7 @@ OlivineTimsHouse_MapScriptHeader: Tim: faceplayer opentext - trade $2 + trade NPCTRADE_TIM waitbutton closetext end diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index b0ef93e16..e9ddbbd32 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -32,7 +32,7 @@ BugCatcherScript_0x1a2ef7: Chris: faceplayer opentext - trade $4 + trade NPCTRADE_CHRIS waitbutton closetext end diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 193bc7434..f96f0aef5 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -191,7 +191,7 @@ UnknownScript_0x188ec5: Forest: faceplayer opentext - trade $6 + trade NPCTRADE_FOREST waitbutton closetext end diff --git a/maps/Route14.asm b/maps/Route14.asm index 0b4372bd6..841ee2c97 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -14,7 +14,7 @@ Route14_MapScriptHeader: Kim: faceplayer opentext - trade $5 + trade NPCTRADE_KIM waitbutton closetext end diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 8e6e44426..feb5b10af 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -15,7 +15,7 @@ PokefanMScript_0x6998d: Kyle: faceplayer opentext - trade $1 + trade NPCTRADE_KYLE waitbutton closetext end diff --git a/menu/mon_icons.asm b/menu/mon_icons.asm deleted file mode 100644 index aeb758282..000000000 --- a/menu/mon_icons.asm +++ /dev/null @@ -1,349 +0,0 @@ -ReadMonMenuIcon: ; 8eab3 - cp EGG - jr z, .egg - dec a - ld hl, MonMenuIcons - ld e, a - ld d, 0 - add hl, de - ld a, [hl] - ret -.egg - ld a, ICON_EGG - ret -; 8eac4 - -MonMenuIcons: ; 8eac4 - db ICON_BULBASAUR ; BULBASAUR - db ICON_BULBASAUR ; IVYSAUR - db ICON_BULBASAUR ; VENUSAUR - db ICON_CHARMANDER ; CHARMANDER - db ICON_CHARMANDER ; CHARMELEON - db ICON_BIGMON ; CHARIZARD - db ICON_SQUIRTLE ; SQUIRTLE - db ICON_SQUIRTLE ; WARTORTLE - db ICON_SQUIRTLE ; BLASTOISE - db ICON_CATERPILLAR ; CATERPIE - db ICON_CATERPILLAR ; METAPOD - db ICON_MOTH ; BUTTERFREE - db ICON_CATERPILLAR ; WEEDLE - db ICON_CATERPILLAR ; KAKUNA - db ICON_BUG ; BEEDRILL - db ICON_BIRD ; PIDGEY - db ICON_BIRD ; PIDGEOTTO - db ICON_BIRD ; PIDGEOT - db ICON_FOX ; RATTATA - db ICON_FOX ; RATICATE - db ICON_BIRD ; SPEAROW - db ICON_BIRD ; FEAROW - db ICON_SERPENT ; EKANS - db ICON_SERPENT ; ARBOK - db ICON_PIKACHU ; PIKACHU - db ICON_PIKACHU ; RAICHU - db ICON_MONSTER ; SANDSHREW - db ICON_MONSTER ; SANDSLASH - db ICON_FOX ; NIDORAN_F - db ICON_FOX ; NIDORINA - db ICON_MONSTER ; NIDOQUEEN - db ICON_FOX ; NIDORAN_M - db ICON_FOX ; NIDORINO - db ICON_MONSTER ; NIDOKING - db ICON_CLEFAIRY ; CLEFAIRY - db ICON_CLEFAIRY ; CLEFABLE - db ICON_FOX ; VULPIX - db ICON_FOX ; NINETALES - db ICON_JIGGLYPUFF ; JIGGLYPUFF - db ICON_JIGGLYPUFF ; WIGGLYTUFF - db ICON_BAT ; ZUBAT - db ICON_BAT ; GOLBAT - db ICON_ODDISH ; ODDISH - db ICON_ODDISH ; GLOOM - db ICON_ODDISH ; VILEPLUME - db ICON_BUG ; PARAS - db ICON_BUG ; PARASECT - db ICON_CATERPILLAR ; VENONAT - db ICON_MOTH ; VENOMOTH - db ICON_DIGLETT ; DIGLETT - db ICON_DIGLETT ; DUGTRIO - db ICON_FOX ; MEOWTH - db ICON_FOX ; PERSIAN - db ICON_MONSTER ; PSYDUCK - db ICON_MONSTER ; GOLDUCK - db ICON_FIGHTER ; MANKEY - db ICON_FIGHTER ; PRIMEAPE - db ICON_FOX ; GROWLITHE - db ICON_FOX ; ARCANINE - db ICON_POLIWAG ; POLIWAG - db ICON_POLIWAG ; POLIWHIRL - db ICON_POLIWAG ; POLIWRATH - db ICON_HUMANSHAPE ; ABRA - db ICON_HUMANSHAPE ; KADABRA - db ICON_HUMANSHAPE ; ALAKAZAM - db ICON_FIGHTER ; MACHOP - db ICON_FIGHTER ; MACHOKE - db ICON_FIGHTER ; MACHAMP - db ICON_ODDISH ; BELLSPROUT - db ICON_ODDISH ; WEEPINBELL - db ICON_ODDISH ; VICTREEBEL - db ICON_JELLYFISH ; TENTACOOL - db ICON_JELLYFISH ; TENTACRUEL - db ICON_GEODUDE ; GEODUDE - db ICON_GEODUDE ; GRAVELER - db ICON_GEODUDE ; GOLEM - db ICON_EQUINE ; PONYTA - db ICON_EQUINE ; RAPIDASH - db ICON_SLOWPOKE ; SLOWPOKE - db ICON_SLOWPOKE ; SLOWBRO - db ICON_VOLTORB ; MAGNEMITE - db ICON_VOLTORB ; MAGNETON - db ICON_BIRD ; FARFETCH_D - db ICON_BIRD ; DODUO - db ICON_BIRD ; DODRIO - db ICON_LAPRAS ; SEEL - db ICON_LAPRAS ; DEWGONG - db ICON_BLOB ; GRIMER - db ICON_BLOB ; MUK - db ICON_SHELL ; SHELLDER - db ICON_SHELL ; CLOYSTER - db ICON_GHOST ; GASTLY - db ICON_GHOST ; HAUNTER - db ICON_GHOST ; GENGAR - db ICON_SERPENT ; ONIX - db ICON_HUMANSHAPE ; DROWZEE - db ICON_HUMANSHAPE ; HYPNO - db ICON_SHELL ; KRABBY - db ICON_SHELL ; KINGLER - db ICON_VOLTORB ; VOLTORB - db ICON_VOLTORB ; ELECTRODE - db ICON_ODDISH ; EXEGGCUTE - db ICON_ODDISH ; EXEGGUTOR - db ICON_MONSTER ; CUBONE - db ICON_MONSTER ; MAROWAK - db ICON_FIGHTER ; HITMONLEE - db ICON_FIGHTER ; HITMONCHAN - db ICON_MONSTER ; LICKITUNG - db ICON_BLOB ; KOFFING - db ICON_BLOB ; WEEZING - db ICON_EQUINE ; RHYHORN - db ICON_MONSTER ; RHYDON - db ICON_CLEFAIRY ; CHANSEY - db ICON_ODDISH ; TANGELA - db ICON_MONSTER ; KANGASKHAN - db ICON_FISH ; HORSEA - db ICON_FISH ; SEADRA - db ICON_FISH ; GOLDEEN - db ICON_FISH ; SEAKING - db ICON_STARYU ; STARYU - db ICON_STARYU ; STARMIE - db ICON_HUMANSHAPE ; MR__MIME - db ICON_BUG ; SCYTHER - db ICON_HUMANSHAPE ; JYNX - db ICON_HUMANSHAPE ; ELECTABUZZ - db ICON_HUMANSHAPE ; MAGMAR - db ICON_BUG ; PINSIR - db ICON_EQUINE ; TAUROS - db ICON_FISH ; MAGIKARP - db ICON_GYARADOS ; GYARADOS - db ICON_LAPRAS ; LAPRAS - db ICON_BLOB ; DITTO - db ICON_FOX ; EEVEE - db ICON_FOX ; VAPOREON - db ICON_FOX ; JOLTEON - db ICON_FOX ; FLAREON - db ICON_VOLTORB ; PORYGON - db ICON_SHELL ; OMANYTE - db ICON_SHELL ; OMASTAR - db ICON_SHELL ; KABUTO - db ICON_SHELL ; KABUTOPS - db ICON_BIRD ; AERODACTYL - db ICON_SNORLAX ; SNORLAX - db ICON_BIRD ; ARTICUNO - db ICON_BIRD ; ZAPDOS - db ICON_BIRD ; MOLTRES - db ICON_SERPENT ; DRATINI - db ICON_SERPENT ; DRAGONAIR - db ICON_BIGMON ; DRAGONITE - db ICON_HUMANSHAPE ; MEWTWO - db ICON_HUMANSHAPE ; MEW - db ICON_ODDISH ; CHIKORITA - db ICON_ODDISH ; BAYLEEF - db ICON_ODDISH ; MEGANIUM - db ICON_FOX ; CYNDAQUIL - db ICON_FOX ; QUILAVA - db ICON_FOX ; TYPHLOSION - db ICON_MONSTER ; TOTODILE - db ICON_MONSTER ; CROCONAW - db ICON_MONSTER ; FERALIGATR - db ICON_FOX ; SENTRET - db ICON_FOX ; FURRET - db ICON_BIRD ; HOOTHOOT - db ICON_BIRD ; NOCTOWL - db ICON_BUG ; LEDYBA - db ICON_BUG ; LEDIAN - db ICON_BUG ; SPINARAK - db ICON_BUG ; ARIADOS - db ICON_BAT ; CROBAT - db ICON_FISH ; CHINCHOU - db ICON_FISH ; LANTURN - db ICON_PIKACHU ; PICHU - db ICON_CLEFAIRY ; CLEFFA - db ICON_JIGGLYPUFF ; IGGLYBUFF - db ICON_CLEFAIRY ; TOGEPI - db ICON_BIRD ; TOGETIC - db ICON_BIRD ; NATU - db ICON_BIRD ; XATU - db ICON_FOX ; MAREEP - db ICON_MONSTER ; FLAAFFY - db ICON_MONSTER ; AMPHAROS - db ICON_ODDISH ; BELLOSSOM - db ICON_JIGGLYPUFF ; MARILL - db ICON_JIGGLYPUFF ; AZUMARILL - db ICON_SUDOWOODO ; SUDOWOODO - db ICON_POLIWAG ; POLITOED - db ICON_ODDISH ; HOPPIP - db ICON_ODDISH ; SKIPLOOM - db ICON_ODDISH ; JUMPLUFF - db ICON_MONSTER ; AIPOM - db ICON_ODDISH ; SUNKERN - db ICON_ODDISH ; SUNFLORA - db ICON_BUG ; YANMA - db ICON_MONSTER ; WOOPER - db ICON_MONSTER ; QUAGSIRE - db ICON_FOX ; ESPEON - db ICON_FOX ; UMBREON - db ICON_BIRD ; MURKROW - db ICON_SLOWPOKE ; SLOWKING - db ICON_GHOST ; MISDREAVUS - db ICON_UNOWN ; UNOWN - db ICON_GHOST ; WOBBUFFET - db ICON_EQUINE ; GIRAFARIG - db ICON_BUG ; PINECO - db ICON_BUG ; FORRETRESS - db ICON_SERPENT ; DUNSPARCE - db ICON_BUG ; GLIGAR - db ICON_SERPENT ; STEELIX - db ICON_MONSTER ; SNUBBULL - db ICON_MONSTER ; GRANBULL - db ICON_FISH ; QWILFISH - db ICON_BUG ; SCIZOR - db ICON_BUG ; SHUCKLE - db ICON_BUG ; HERACROSS - db ICON_FOX ; SNEASEL - db ICON_MONSTER ; TEDDIURSA - db ICON_MONSTER ; URSARING - db ICON_BLOB ; SLUGMA - db ICON_BLOB ; MAGCARGO - db ICON_EQUINE ; SWINUB - db ICON_EQUINE ; PILOSWINE - db ICON_SHELL ; CORSOLA - db ICON_FISH ; REMORAID - db ICON_FISH ; OCTILLERY - db ICON_MONSTER ; DELIBIRD - db ICON_FISH ; MANTINE - db ICON_BIRD ; SKARMORY - db ICON_FOX ; HOUNDOUR - db ICON_FOX ; HOUNDOOM - db ICON_BIGMON ; KINGDRA - db ICON_EQUINE ; PHANPY - db ICON_EQUINE ; DONPHAN - db ICON_VOLTORB ; PORYGON2 - db ICON_EQUINE ; STANTLER - db ICON_MONSTER ; SMEARGLE - db ICON_FIGHTER ; TYROGUE - db ICON_FIGHTER ; HITMONTOP - db ICON_HUMANSHAPE ; SMOOCHUM - db ICON_HUMANSHAPE ; ELEKID - db ICON_HUMANSHAPE ; MAGBY - db ICON_EQUINE ; MILTANK - db ICON_CLEFAIRY ; BLISSEY - db ICON_FOX ; RAIKOU - db ICON_FOX ; ENTEI - db ICON_FOX ; SUICUNE - db ICON_MONSTER ; LARVITAR - db ICON_MONSTER ; PUPITAR - db ICON_MONSTER ; TYRANITAR - db ICON_LUGIA ; LUGIA - db ICON_HO_OH ; HO_OH - db ICON_HUMANSHAPE ; CELEBI - -IconPointers: - dw NullIcon - dw PoliwagIcon - dw JigglypuffIcon - dw DiglettIcon - dw PikachuIcon - dw StaryuIcon - dw FishIcon - dw BirdIcon - dw MonsterIcon - dw ClefairyIcon - dw OddishIcon - dw BugIcon - dw GhostIcon - dw LaprasIcon - dw HumanshapeIcon - dw FoxIcon - dw EquineIcon - dw ShellIcon - dw BlobIcon - dw SerpentIcon - dw VoltorbIcon - dw SquirtleIcon - dw BulbasaurIcon - dw CharmanderIcon - dw CaterpillarIcon - dw UnownIcon - dw GeodudeIcon - dw FighterIcon - dw EggIcon - dw JellyfishIcon - dw MothIcon - dw BatIcon - dw SnorlaxIcon - dw HoOhIcon - dw LugiaIcon - dw GyaradosIcon - dw SlowpokeIcon - dw SudowoodoIcon - dw BigmonIcon - -Icons: -NullIcon: -PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d -JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d -DiglettIcon: INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d -PikachuIcon: INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d -StaryuIcon: INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d -FishIcon: INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d -BirdIcon: INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d -MonsterIcon: INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d -ClefairyIcon: INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d -OddishIcon: INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d -BugIcon: INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d -GhostIcon: INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d -LaprasIcon: INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d -HumanshapeIcon: INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d -FoxIcon: INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d -EquineIcon: INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d -ShellIcon: INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d -BlobIcon: INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d -SerpentIcon: INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d -VoltorbIcon: INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d -SquirtleIcon: INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d -BulbasaurIcon: INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d -CharmanderIcon: INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d -CaterpillarIcon: INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d -UnownIcon: INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d -GeodudeIcon: INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d -FighterIcon: INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d -EggIcon: INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d -JellyfishIcon: INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d -MothIcon: INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d -BatIcon: INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d -SnorlaxIcon: INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d -HoOhIcon: INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d -LugiaIcon: INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d -GyaradosIcon: INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d -SlowpokeIcon: INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d -SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d -BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d diff --git a/wram.asm b/wram.asm index e70457eba..e7ed6741c 100644 --- a/wram.asm +++ b/wram.asm @@ -1613,9 +1613,9 @@ wTrainerHUDTiles:: db NEXTU ; d002 ; mobile participant nicknames ds 4 -wMobileParticipant1Nickname:: ds 6 -wMobileParticipant2Nickname:: ds 6 -wMobileParticipant3Nickname:: ds 6 +wMobileParticipant1Nickname:: ds NAME_LENGTH_JAPANESE +wMobileParticipant2Nickname:: ds NAME_LENGTH_JAPANESE +wMobileParticipant3Nickname:: ds NAME_LENGTH_JAPANESE NEXTU ; d002 ; earthquake data buffer From 5be98bae3c3c27b4b57bb8fda9368cf6c7f0d473 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 15:20:32 -0500 Subject: [PATCH 17/35] Move more data tables into data/ files. --- audio.asm | 4 +- audio/drumkits.asm | 301 ++++++++++++++++++++ audio/engine.asm | 362 ++----------------------- audio/trainer_encounters.asm | 96 ------- constants/audio_constants.asm | 1 + constants/map_constants.asm | 4 +- constants/trainer_constants.asm | 2 +- constants/wram_constants.asm | 5 + data/audio/notes.asm | 25 ++ data/audio/wave_samples.asm | 12 + data/bug_contest_winners.asm | 74 +++++ data/hm_moves.asm | 9 + data/mail_input_chars.asm | 19 ++ data/mapgroup_roofs.asm | 28 ++ data/name_input_chars.asm | 31 +++ data/outdoor_sprites.asm | 4 +- data/time_capsule/catch_rate_items.asm | 17 ++ engine/link.asm | 17 +- engine/namingscreen.asm | 49 +--- engine/npc_movement.asm | 4 +- event/bug_contest_judging.asm | 74 +---- home.asm | 9 +- home/map.asm | 16 +- main.asm | 41 +-- tilesets/roofs.asm | 28 +- trainers/encounter_music.asm | 73 +++++ trainers/gendered_trainers.asm | 40 +++ 27 files changed, 685 insertions(+), 660 deletions(-) create mode 100644 audio/drumkits.asm delete mode 100644 audio/trainer_encounters.asm create mode 100644 data/audio/notes.asm create mode 100644 data/audio/wave_samples.asm create mode 100644 data/bug_contest_winners.asm create mode 100644 data/hm_moves.asm create mode 100644 data/mail_input_chars.asm create mode 100644 data/mapgroup_roofs.asm create mode 100644 data/name_input_chars.asm create mode 100644 data/time_capsule/catch_rate_items.asm create mode 100644 trainers/encounter_music.asm create mode 100644 trainers/gendered_trainers.asm diff --git a/audio.asm b/audio.asm index 203684d69..d21bdbe41 100644 --- a/audio.asm +++ b/audio.asm @@ -5,8 +5,8 @@ SECTION "Audio", ROMX INCLUDE "audio/engine.asm" -; What music plays when a trainer notices you -INCLUDE "audio/trainer_encounters.asm" +TrainerEncounterMusic:: +INCLUDE "trainers/encounter_music.asm" Music: INCLUDE "audio/music_pointers.asm" diff --git a/audio/drumkits.asm b/audio/drumkits.asm new file mode 100644 index 000000000..4e311a2e5 --- /dev/null +++ b/audio/drumkits.asm @@ -0,0 +1,301 @@ +Drumkits: ; e8e52 + dw Drumkit0 + dw Drumkit1 + dw Drumkit2 + dw Drumkit3 + dw Drumkit4 + dw Drumkit5 +; e8e5e + +Drumkit0: ; e8e5e + dw Drum00 ; rest + dw Snare1 ; c + dw Snare2 ; c# + dw Snare3 ; d + dw Snare4 ; d# + dw Drum05 ; e + dw Triangle1 ; f + dw Triangle2 ; f# + dw HiHat1 ; g + dw Snare5 ; g# + dw Snare6 ; a + dw Snare7 ; a# + dw HiHat2 ; b +Drumkit1: ; e8e78 + dw Drum00 + dw HiHat1 + dw Snare5 + dw Snare6 + dw Snare7 + dw HiHat2 + dw HiHat3 + dw Snare8 + dw Triangle3 + dw Triangle4 + dw Snare9 + dw Snare10 + dw Snare11 +Drumkit2: ; e8e92 + dw Drum00 + dw Snare1 + dw Snare9 + dw Snare10 + dw Snare11 + dw Drum05 + dw Triangle1 + dw Triangle2 + dw HiHat1 + dw Snare5 + dw Snare6 + dw Snare7 + dw HiHat2 +Drumkit3: ; e8eac + dw Drum21 + dw Snare12 + dw Snare13 + dw Snare14 + dw Kick1 + dw Triangle5 + dw Drum20 + dw Drum27 + dw Drum28 + dw Drum29 + dw Drum21 + dw Kick2 + dw Crash2 +Drumkit4: ; e8ec6 + dw Drum21 + dw Drum20 + dw Snare13 + dw Snare14 + dw Kick1 + dw Drum33 + dw Triangle5 + dw Drum35 + dw Drum31 + dw Drum32 + dw Drum36 + dw Kick2 + dw Crash1 +Drumkit5: ; e8ee0 + dw Drum00 + dw Snare9 + dw Snare10 + dw Snare11 + dw Drum27 + dw Drum28 + dw Drum29 + dw Drum05 + dw Triangle1 + dw Crash1 + dw Snare14 + dw Snare13 + dw Kick2 +; e8efa + +Drum00: ; e8efa +; unused + noise C#, 1, $11, $00 + endchannel +; e8efe + +Snare1: ; e8efe + noise C#, 1, $c1, $33 + endchannel +; e8f02 + +Snare2: ; e8f02 + noise C#, 1, $b1, $33 + endchannel +; e8f06 + +Snare3: ; e8f06 + noise C#, 1, $a1, $33 + endchannel +; e8f0a + +Snare4: ; e8f0a + noise C#, 1, $81, $33 + endchannel +; e8f0e + +Drum05: ; e8f0e + noise C#, 8, $84, $37 + noise C#, 7, $84, $36 + noise C#, 6, $83, $35 + noise C#, 5, $83, $34 + noise C#, 4, $82, $33 + noise C#, 3, $81, $32 + endchannel +; e8f21 + +Triangle1: ; e8f21 + noise C#, 1, $51, $2a + endchannel +; e8f25 + +Triangle2: ; e8f25 + noise C#, 2, $41, $2b + noise C#, 1, $61, $2a + endchannel +; e8f2c + +HiHat1: ; e8f2c + noise C#, 1, $81, $10 + endchannel +; e8f30 + +Snare5: ; e8f30 + noise C#, 1, $82, $23 + endchannel +; e8f34 + +Snare6: ; e8f34 + noise C#, 1, $82, $25 + endchannel +; e8f38 + +Snare7: ; e8f38 + noise C#, 1, $82, $26 + endchannel +; e8f3c + +HiHat2: ; e8f3c + noise C#, 1, $a1, $10 + endchannel +; e8f40 + +HiHat3: ; e8f40 + noise C#, 1, $a2, $11 + endchannel +; e8f44 + +Snare8: ; e8f44 + noise C#, 1, $a2, $50 + endchannel +; e8f48 + +Triangle3: ; e8f48 + noise C#, 1, $a1, $18 + noise C#, 1, $31, $33 + endchannel +; e8f4f + +Triangle4: ; e8f4f + noise C#, 3, $91, $28 + noise C#, 1, $71, $18 + endchannel +; e8f56 + +Snare9: ; e8f56 + noise C#, 1, $91, $22 + endchannel +; e8f5a + +Snare10: ; e8f5a + noise C#, 1, $71, $22 + endchannel +; e8f5e + +Snare11: ; e8f5e + noise C#, 1, $61, $22 + endchannel +; e8f62 + +Drum20: ; e8f62 + noise C#, 1, $11, $11 + endchannel +; e8f66 + +Drum21: ; e8f66 + endchannel +; e8f67 + +Snare12: ; e8f67 + noise C#, 1, $91, $33 + endchannel +; e8f6b + +Snare13: ; e8f6b + noise C#, 1, $51, $32 + endchannel +; e8f6f + +Snare14: ; e8f6f + noise C#, 1, $81, $31 + endchannel +; e8f73 + +Kick1: ; e8f73 + noise C#, 1, $88, $6b + noise C#, 1, $71, $00 + endchannel +; e8f7a + +Triangle5: ; e8f7a + noise D_, 1, $91, $18 + endchannel +; e8f7e + +Drum27: ; e8f7e + noise C#, 8, $92, $10 + endchannel +; e8f82 + +Drum28: ; e8f82 + noise D_, 4, $91, $00 + noise D_, 4, $11, $00 + endchannel +; e8f89 + +Drum29: ; e8f89 + noise D_, 4, $91, $11 + noise D_, 4, $11, $00 + endchannel +; e8f90 + +Crash1: ; e8f90 + noise D_, 4, $88, $15 + noise C#, 1, $65, $12 + endchannel +; e8f97 + +Drum31: ; e8f97 + noise D_, 4, $51, $21 + noise D_, 4, $11, $11 + endchannel +; e8f9e + +Drum32: ; e8f9e + noise D_, 4, $51, $50 + noise D_, 4, $11, $11 + endchannel +; e8fa5 + +Drum33: ; e8fa5 + noise C#, 1, $a1, $31 + endchannel +; e8fa9 + +Crash2: ; e8fa9 + noise C#, 1, $84, $12 + endchannel +; e8fad + +Drum35: ; e8fad + noise D_, 4, $81, $00 + noise D_, 4, $11, $00 + endchannel +; e8fb4 + +Drum36: ; e8fb4 + noise D_, 4, $81, $21 + noise D_, 4, $11, $11 + endchannel +; e8fbb + +Kick2: ; e8fbb + noise C#, 1, $a8, $6b + noise C#, 1, $71, $00 + endchannel +; e8fc2 diff --git a/audio/engine.asm b/audio/engine.asm index b6e9b1aeb..7a4854b39 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -2883,349 +2883,14 @@ LoadMusicByte:: ; e8d76 ; e8d80 FrequencyTable: ; e8d80 - dw 0 ; __ - dw $f82c ; C_ - dw $f89d ; C# - dw $f907 ; D_ - dw $f96b ; D# - dw $f9ca ; E_ - dw $fa23 ; F_ - dw $fa77 ; F# - dw $fac7 ; G_ - dw $fb12 ; G# - dw $fb58 ; A_ - dw $fb9b ; A# - dw $fbda ; B_ - dw $fc16 ; C_ - dw $fc4e ; C# - dw $fc83 ; D_ - dw $fcb5 ; D# - dw $fce5 ; E_ - dw $fd11 ; F_ - dw $fd3b ; F# - dw $fd63 ; G_ - dw $fd89 ; G# - dw $fdac ; A_ - dw $fdcd ; A# - dw $fded ; B_ +INCLUDE "data/audio/notes.asm" ; e8db2 WaveSamples: ; e8db2 - ; these are streams of 32 4-bit values used as wavepatterns - ; nothing interesting here! - dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 - dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 - dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 - dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 - dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 - dn 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 15, 15, 14, 14, 12, 12, 10, 10, 8, 8, 10, 10, 12, 12, 14, 14 - dn 0, 2, 4, 6, 8, 10, 12, 14, 12, 11, 10, 9, 8, 7, 6, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 1, 1 - dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14 - dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5 - dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1 +INCLUDE "data/audio/wave_samples.asm" ; e8e52 -Drumkits: ; e8e52 - dw Drumkit0 - dw Drumkit1 - dw Drumkit2 - dw Drumkit3 - dw Drumkit4 - dw Drumkit5 -; e8e5e - -Drumkit0: ; e8e5e - dw Drum00 ; rest - dw Snare1 ; c - dw Snare2 ; c# - dw Snare3 ; d - dw Snare4 ; d# - dw Drum05 ; e - dw Triangle1 ; f - dw Triangle2 ; f# - dw HiHat1 ; g - dw Snare5 ; g# - dw Snare6 ; a - dw Snare7 ; a# - dw HiHat2 ; b -Drumkit1: ; e8e78 - dw Drum00 - dw HiHat1 - dw Snare5 - dw Snare6 - dw Snare7 - dw HiHat2 - dw HiHat3 - dw Snare8 - dw Triangle3 - dw Triangle4 - dw Snare9 - dw Snare10 - dw Snare11 -Drumkit2: ; e8e92 - dw Drum00 - dw Snare1 - dw Snare9 - dw Snare10 - dw Snare11 - dw Drum05 - dw Triangle1 - dw Triangle2 - dw HiHat1 - dw Snare5 - dw Snare6 - dw Snare7 - dw HiHat2 -Drumkit3: ; e8eac - dw Drum21 - dw Snare12 - dw Snare13 - dw Snare14 - dw Kick1 - dw Triangle5 - dw Drum20 - dw Drum27 - dw Drum28 - dw Drum29 - dw Drum21 - dw Kick2 - dw Crash2 -Drumkit4: ; e8ec6 - dw Drum21 - dw Drum20 - dw Snare13 - dw Snare14 - dw Kick1 - dw Drum33 - dw Triangle5 - dw Drum35 - dw Drum31 - dw Drum32 - dw Drum36 - dw Kick2 - dw Crash1 -Drumkit5: ; e8ee0 - dw Drum00 - dw Snare9 - dw Snare10 - dw Snare11 - dw Drum27 - dw Drum28 - dw Drum29 - dw Drum05 - dw Triangle1 - dw Crash1 - dw Snare14 - dw Snare13 - dw Kick2 -; e8efa - -Drum00: ; e8efa -; unused - noise C#, 1, $11, $00 - endchannel -; e8efe - -Snare1: ; e8efe - noise C#, 1, $c1, $33 - endchannel -; e8f02 - -Snare2: ; e8f02 - noise C#, 1, $b1, $33 - endchannel -; e8f06 - -Snare3: ; e8f06 - noise C#, 1, $a1, $33 - endchannel -; e8f0a - -Snare4: ; e8f0a - noise C#, 1, $81, $33 - endchannel -; e8f0e - -Drum05: ; e8f0e - noise C#, 8, $84, $37 - noise C#, 7, $84, $36 - noise C#, 6, $83, $35 - noise C#, 5, $83, $34 - noise C#, 4, $82, $33 - noise C#, 3, $81, $32 - endchannel -; e8f21 - -Triangle1: ; e8f21 - noise C#, 1, $51, $2a - endchannel -; e8f25 - -Triangle2: ; e8f25 - noise C#, 2, $41, $2b - noise C#, 1, $61, $2a - endchannel -; e8f2c - -HiHat1: ; e8f2c - noise C#, 1, $81, $10 - endchannel -; e8f30 - -Snare5: ; e8f30 - noise C#, 1, $82, $23 - endchannel -; e8f34 - -Snare6: ; e8f34 - noise C#, 1, $82, $25 - endchannel -; e8f38 - -Snare7: ; e8f38 - noise C#, 1, $82, $26 - endchannel -; e8f3c - -HiHat2: ; e8f3c - noise C#, 1, $a1, $10 - endchannel -; e8f40 - -HiHat3: ; e8f40 - noise C#, 1, $a2, $11 - endchannel -; e8f44 - -Snare8: ; e8f44 - noise C#, 1, $a2, $50 - endchannel -; e8f48 - -Triangle3: ; e8f48 - noise C#, 1, $a1, $18 - noise C#, 1, $31, $33 - endchannel -; e8f4f - -Triangle4: ; e8f4f - noise C#, 3, $91, $28 - noise C#, 1, $71, $18 - endchannel -; e8f56 - -Snare9: ; e8f56 - noise C#, 1, $91, $22 - endchannel -; e8f5a - -Snare10: ; e8f5a - noise C#, 1, $71, $22 - endchannel -; e8f5e - -Snare11: ; e8f5e - noise C#, 1, $61, $22 - endchannel -; e8f62 - -Drum20: ; e8f62 - noise C#, 1, $11, $11 - endchannel -; e8f66 - -Drum21: ; e8f66 - endchannel -; e8f67 - -Snare12: ; e8f67 - noise C#, 1, $91, $33 - endchannel -; e8f6b - -Snare13: ; e8f6b - noise C#, 1, $51, $32 - endchannel -; e8f6f - -Snare14: ; e8f6f - noise C#, 1, $81, $31 - endchannel -; e8f73 - -Kick1: ; e8f73 - noise C#, 1, $88, $6b - noise C#, 1, $71, $00 - endchannel -; e8f7a - -Triangle5: ; e8f7a - noise D_, 1, $91, $18 - endchannel -; e8f7e - -Drum27: ; e8f7e - noise C#, 8, $92, $10 - endchannel -; e8f82 - -Drum28: ; e8f82 - noise D_, 4, $91, $00 - noise D_, 4, $11, $00 - endchannel -; e8f89 - -Drum29: ; e8f89 - noise D_, 4, $91, $11 - noise D_, 4, $11, $00 - endchannel -; e8f90 - -Crash1: ; e8f90 - noise D_, 4, $88, $15 - noise C#, 1, $65, $12 - endchannel -; e8f97 - -Drum31: ; e8f97 - noise D_, 4, $51, $21 - noise D_, 4, $11, $11 - endchannel -; e8f9e - -Drum32: ; e8f9e - noise D_, 4, $51, $50 - noise D_, 4, $11, $11 - endchannel -; e8fa5 - -Drum33: ; e8fa5 - noise C#, 1, $a1, $31 - endchannel -; e8fa9 - -Crash2: ; e8fa9 - noise C#, 1, $84, $12 - endchannel -; e8fad - -Drum35: ; e8fad - noise D_, 4, $81, $00 - noise D_, 4, $11, $00 - endchannel -; e8fb4 - -Drum36: ; e8fb4 - noise D_, 4, $81, $21 - noise D_, 4, $11, $11 - endchannel -; e8fbb - -Kick2: ; e8fbb - noise C#, 1, $a8, $6b - noise C#, 1, $71, $00 - endchannel -; e8fc2 +INCLUDE "audio/drumkits.asm" GetLRTracks: ; e8fc2 ; gets the default sound l/r channels @@ -3306,3 +2971,24 @@ ClearChannel: ; e8ffe ret ; e900a + +PlayTrainerEncounterMusic:: ; e900a +; input: e = trainer type + ; turn fade off + xor a + ld [MusicFade], a + ; play nothing for one frame + push de + ld de, 0 ; id: Music_Nothing + call PlayMusic + call DelayFrame + ; play new song + call MaxVolume + pop de + ld d, $00 + ld hl, TrainerEncounterMusic + add hl, de + ld e, [hl] + call PlayMusic + ret +; e9027 diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm deleted file mode 100644 index e909c96e6..000000000 --- a/audio/trainer_encounters.asm +++ /dev/null @@ -1,96 +0,0 @@ -; Currently, must be in the same bank as the sound engine. - -PlayTrainerEncounterMusic:: ; e900a -; input: e = trainer type - ; turn fade off - xor a - ld [MusicFade], a - ; play nothing for one frame - push de - ld de, 0 ; id: Music_Nothing - call PlayMusic - call DelayFrame - ; play new song - call MaxVolume - pop de - ld d, $00 - ld hl, TrainerEncounterMusic - add hl, de - ld e, [hl] - call PlayMusic - ret -; e9027 - -TrainerEncounterMusic: ; e9027 - db MUSIC_HIKER_ENCOUNTER - db MUSIC_YOUNGSTER_ENCOUNTER ; falkner - db MUSIC_LASS_ENCOUNTER ; whitney - db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy - db MUSIC_OFFICER_ENCOUNTER ; morty - db MUSIC_OFFICER_ENCOUNTER ; pryce - db MUSIC_LASS_ENCOUNTER ; jasmine - db MUSIC_OFFICER_ENCOUNTER ; chuck - db MUSIC_BEAUTY_ENCOUNTER ; clair - db MUSIC_RIVAL_ENCOUNTER ; rival1 - db MUSIC_HIKER_ENCOUNTER ; pokemon_prof - db MUSIC_HIKER_ENCOUNTER ; will - db MUSIC_HIKER_ENCOUNTER ; cal - db MUSIC_OFFICER_ENCOUNTER ; bruno - db MUSIC_HIKER_ENCOUNTER ; karen - db MUSIC_HIKER_ENCOUNTER ; koga - db MUSIC_OFFICER_ENCOUNTER ; champion - db MUSIC_YOUNGSTER_ENCOUNTER ; brock - db MUSIC_LASS_ENCOUNTER ; misty - db MUSIC_OFFICER_ENCOUNTER ; lt_surge - db MUSIC_ROCKET_ENCOUNTER ; scientist - db MUSIC_OFFICER_ENCOUNTER ; erika - db MUSIC_YOUNGSTER_ENCOUNTER ; youngster - db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy - db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper - db MUSIC_LASS_ENCOUNTER ; lass - db MUSIC_LASS_ENCOUNTER ; janine - db MUSIC_HIKER_ENCOUNTER ; cooltrainerm - db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf - db MUSIC_BEAUTY_ENCOUNTER ; beauty - db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac - db MUSIC_ROCKET_ENCOUNTER ; gruntm - db MUSIC_HIKER_ENCOUNTER ; gentleman - db MUSIC_BEAUTY_ENCOUNTER ; skier - db MUSIC_BEAUTY_ENCOUNTER ; teacher - db MUSIC_BEAUTY_ENCOUNTER ; sabrina - db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher - db MUSIC_HIKER_ENCOUNTER ; fisher - db MUSIC_HIKER_ENCOUNTER ; swimmerm - db MUSIC_BEAUTY_ENCOUNTER ; swimmerf - db MUSIC_HIKER_ENCOUNTER ; sailor - db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd - db MUSIC_RIVAL_ENCOUNTER ; rival2 - db MUSIC_HIKER_ENCOUNTER ; guitarist - db MUSIC_HIKER_ENCOUNTER ; hiker - db MUSIC_HIKER_ENCOUNTER ; biker - db MUSIC_OFFICER_ENCOUNTER ; blaine - db MUSIC_POKEMANIAC_ENCOUNTER ; burglar - db MUSIC_HIKER_ENCOUNTER ; firebreather - db MUSIC_POKEMANIAC_ENCOUNTER ; juggler - db MUSIC_HIKER_ENCOUNTER ; blackbelt_t - db MUSIC_ROCKET_ENCOUNTER ; executivem - db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t - db MUSIC_LASS_ENCOUNTER ; picnicker - db MUSIC_YOUNGSTER_ENCOUNTER ; camper - db MUSIC_ROCKET_ENCOUNTER ; executivef - db MUSIC_SAGE_ENCOUNTER ; sage - db MUSIC_SAGE_ENCOUNTER ; medium - db MUSIC_HIKER_ENCOUNTER ; boarder - db MUSIC_HIKER_ENCOUNTER ; pokefanm - db MUSIC_KIMONO_ENCOUNTER ; kimono_girl - db MUSIC_LASS_ENCOUNTER ; twins - db MUSIC_BEAUTY_ENCOUNTER ; pokefanf - db MUSIC_HIKER_ENCOUNTER ; red - db MUSIC_RIVAL_ENCOUNTER ; blue - db MUSIC_HIKER_ENCOUNTER ; officer - db MUSIC_ROCKET_ENCOUNTER ; gruntf - db MUSIC_HIKER_ENCOUNTER ; mysticalman - db MUSIC_HIKER_ENCOUNTER - db MUSIC_HIKER_ENCOUNTER - db MUSIC_HIKER_ENCOUNTER -; e906e diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index a0c2f05ae..dd39df20f 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -1,4 +1,5 @@ ; pitch +; FrequencyTable indexes (see data/audio/notes.asm) const_def const __ ; 0 const C_ ; 1 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index a9b923deb..7caa3529a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -7,8 +7,8 @@ MAP_NONE EQU 0 ; map group ids ; `newgroup` indexes are for: ; - MapGroupPointers (see maps/map_headers.asm) -; - OutdoorSprites (see engine/overworld.asm) -; - MapGroupRoofs (see tilesets/roofs.asm) +; - OutdoorSprites (see data/outdoor_sprites.asm) +; - MapGroupRoofs (see data/mapgroup_roofs.asm) ; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) const_def diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 42b499abb..49a0df454 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -2,8 +2,8 @@ ; `trainerclass` indexes are for: ; - TrainerClassAttributes (see trainers/attributes.asm) ; - TrainerClassDVs (see trainers/dvs.asm) +; - TrainerEncounterMusic (see trainers/encounter_music.asm) ; - TrainerGroups (see trainers/trainer_pointers.asm) -; - TrainerEncounterMusic (see audio/trainer_encounters.asm) ; - BTTrainerClassGenders (see misc/battle_tower_47.asm) ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see trainers/trainers.asm) enum_start diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index a1047fc53..23692fdef 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -48,6 +48,11 @@ const_value SET -1 const LEFT ; 2 const RIGHT ; 3 +DOWN_MASK EQU 1 << DOWN +UP_MASK EQU 1 << UP +LEFT_MASK EQU 1 << LEFT +RIGHT_MASK EQU 1 << RIGHT + ; FacingDirection: ; d044 FACE_CURRENT EQU 0 FACE_DOWN EQU 8 diff --git a/data/audio/notes.asm b/data/audio/notes.asm new file mode 100644 index 000000000..bc5e682c9 --- /dev/null +++ b/data/audio/notes.asm @@ -0,0 +1,25 @@ + dw 0 ; __ + dw $f82c ; C_ + dw $f89d ; C# + dw $f907 ; D_ + dw $f96b ; D# + dw $f9ca ; E_ + dw $fa23 ; F_ + dw $fa77 ; F# + dw $fac7 ; G_ + dw $fb12 ; G# + dw $fb58 ; A_ + dw $fb9b ; A# + dw $fbda ; B_ + dw $fc16 ; C_ + dw $fc4e ; C# + dw $fc83 ; D_ + dw $fcb5 ; D# + dw $fce5 ; E_ + dw $fd11 ; F_ + dw $fd3b ; F# + dw $fd63 ; G_ + dw $fd89 ; G# + dw $fdac ; A_ + dw $fdcd ; A# + dw $fded ; B_ diff --git a/data/audio/wave_samples.asm b/data/audio/wave_samples.asm new file mode 100644 index 000000000..abf0925ce --- /dev/null +++ b/data/audio/wave_samples.asm @@ -0,0 +1,12 @@ + ; these are streams of 32 4-bit values used as wavepatterns + ; nothing interesting here! + dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 + dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 + dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 + dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 + dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 + dn 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 15, 15, 14, 14, 12, 12, 10, 10, 8, 8, 10, 10, 12, 12, 14, 14 + dn 0, 2, 4, 6, 8, 10, 12, 14, 12, 11, 10, 9, 8, 7, 6, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 1, 1 + dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14 + dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5 + dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1 diff --git a/data/bug_contest_winners.asm b/data/bug_contest_winners.asm new file mode 100644 index 000000000..8529ed0f0 --- /dev/null +++ b/data/bug_contest_winners.asm @@ -0,0 +1,74 @@ +BugContestantPointers: ; 13783 + dw BugContestant_BugCatcherDon ; This reverts back to the player + dw BugContestant_BugCatcherDon + dw BugContestant_BugCatcherEd + dw BugContestant_CooltrainerMNick + dw BugContestant_PokefanMWilliam + dw BugContestant_BugCatcherBenny + dw BugContestant_CamperBarry + dw BugContestant_PicnickerCindy + dw BugContestant_BugCatcherJosh + dw BugContestant_YoungsterSamuel + dw BugContestant_SchoolboyKipp +; 13799 + +BugContestant_BugCatcherDon: + db BUG_CATCHER, DON + dbw KAKUNA, 300 + dbw METAPOD, 285 + dbw CATERPIE, 226 + +BugContestant_BugCatcherEd: + db BUG_CATCHER, ED + dbw BUTTERFREE, 286 + dbw BUTTERFREE, 251 + dbw CATERPIE, 237 + +BugContestant_CooltrainerMNick: + db COOLTRAINERM, NICK + dbw SCYTHER, 357 + dbw BUTTERFREE, 349 + dbw PINSIR, 368 + +BugContestant_PokefanMWilliam: + db POKEFANM, WILLIAM + dbw PINSIR, 332 + dbw BUTTERFREE, 324 + dbw VENONAT, 321 + +BugContestant_BugCatcherBenny: + db BUG_CATCHER, BUG_CATCHER_BENNY + dbw BUTTERFREE, 318 + dbw WEEDLE, 295 + dbw CATERPIE, 285 + +BugContestant_CamperBarry: + db CAMPER, BARRY + dbw PINSIR, 366 + dbw VENONAT, 329 + dbw KAKUNA, 314 + +BugContestant_PicnickerCindy: + db PICNICKER, CINDY + dbw BUTTERFREE, 341 + dbw METAPOD, 301 + dbw CATERPIE, 264 + +BugContestant_BugCatcherJosh: + db BUG_CATCHER, JOSH + dbw SCYTHER, 326 + dbw BUTTERFREE, 292 + dbw METAPOD, 282 + +BugContestant_YoungsterSamuel: + db YOUNGSTER, SAMUEL + dbw WEEDLE, 270 + dbw PINSIR, 282 + dbw CATERPIE, 251 + +BugContestant_SchoolboyKipp: + db SCHOOLBOY, KIPP + dbw VENONAT, 267 + dbw PARAS, 254 + dbw KAKUNA, 259 +; 13807 diff --git a/data/hm_moves.asm b/data/hm_moves.asm new file mode 100644 index 000000000..49d40d1d7 --- /dev/null +++ b/data/hm_moves.asm @@ -0,0 +1,9 @@ +; HM moves can't be forgotten + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db WATERFALL + db WHIRLPOOL + db -1 ; end diff --git a/data/mail_input_chars.asm b/data/mail_input_chars.asm new file mode 100644 index 000000000..4466464b2 --- /dev/null +++ b/data/mail_input_chars.asm @@ -0,0 +1,19 @@ +; see engine/naming_screen.asm + +MailEntry_Uppercase: ; 122dd + db "A B C D E F G H I J" + db "K L M N O P Q R S T" + db "U V W X Y Z , ? !" + db "1 2 3 4 5 6 7 8 9 0" + db " é ♂ ♀ ¥ … ×" + db "lower DEL END " + +; 1224f + +MailEntry_Lowercase: ; 1224f + db "a b c d e f g h i j" + db "k l m n o p q r s t" + db "u v w x y z . - /" + db "'d 'l 'm 'r 's 't 'v & ( )" + db "<``> <''> [ ] ' : ; " + db "UPPER DEL END " diff --git a/data/mapgroup_roofs.asm b/data/mapgroup_roofs.asm new file mode 100644 index 000000000..076a0e8e1 --- /dev/null +++ b/data/mapgroup_roofs.asm @@ -0,0 +1,28 @@ +; valid roofs: 0, 1, 2, 3, 4; -1 for none + db -1 ; group 0 (unused) + db 3 ; group 1 (Olivine) + db 2 ; group 2 (Mahogany) + db -1 ; group 3 + db 1 ; group 4 (Ecruteak) + db 2 ; group 5 (Blackthorn) + db -1 ; group 6 + db -1 ; group 7 + db 2 ; group 8 (Azalea) + db 2 ; group 9 (Lake of Rage) + db 1 ; group 10 (Violet) + db 4 ; group 11 (Goldenrod) + db -1 ; group 12 + db -1 ; group 13 + db -1 ; group 14 + db -1 ; group 15 + db -1 ; group 16 + db -1 ; group 17 + db -1 ; group 18 + db 0 ; group 19 (Silver Cave) + db -1 ; group 20 + db -1 ; group 21 + db 3 ; group 22 (Cianwood) + db -1 ; group 23 + db 0 ; group 24 (New Bark) + db -1 ; group 25 + db 0 ; group 26 (Cherrygrove) diff --git a/data/name_input_chars.asm b/data/name_input_chars.asm new file mode 100644 index 000000000..d89289142 --- /dev/null +++ b/data/name_input_chars.asm @@ -0,0 +1,31 @@ +; see engine/naming_screen.asm + +NameInputLower: + db "a b c d e f g h i" + db "j k l m n o p q r" + db "s t u v w x y z " + db "× ( ) : ; [ ] " + db "UPPER DEL END " + +BoxNameInputLower: + db "a b c d e f g h i" + db "j k l m n o p q r" + db "s t u v w x y z " + db "é 'd 'l 'm 'r 's 't 'v 0" + db "1 2 3 4 5 6 7 8 9" + db "UPPER DEL END " + +NameInputUpper: + db "A B C D E F G H I" + db "J K L M N O P Q R" + db "S T U V W X Y Z " + db "- ? ! / . , " + db "lower DEL END " + +BoxNameInputUpper: + db "A B C D E F G H I" + db "J K L M N O P Q R" + db "S T U V W X Y Z " + db "× ( ) : ; [ ] " + db "- ? ! ♂ ♀ / . , &" + db "lower DEL END " diff --git a/data/outdoor_sprites.asm b/data/outdoor_sprites.asm index ef88fbb8a..b99efcfe7 100644 --- a/data/outdoor_sprites.asm +++ b/data/outdoor_sprites.asm @@ -1,5 +1,7 @@ -OutdoorSprites: ; 144b8 ; Valid sprite IDs for each map group. +; Maps with permission ROUTE or TOWN can only use these sprites. + +OutdoorSprites: ; 144b8 dw Group1Sprites dw Group2Sprites dw Group3Sprites diff --git a/data/time_capsule/catch_rate_items.asm b/data/time_capsule/catch_rate_items.asm new file mode 100644 index 000000000..1db3818f8 --- /dev/null +++ b/data/time_capsule/catch_rate_items.asm @@ -0,0 +1,17 @@ +; Pokémon traded from RBY do not have held items, so GSC usually interprets the +; catch rate as an item. However, if the catch rate appears in this table, the +; item associated with the table entry is used instead. + + db ITEM_19, LEFTOVERS + db ITEM_2D, BITTER_BERRY + db ITEM_32, GOLD_BERRY + db ITEM_5A, BERRY + db ITEM_64, BERRY + db ITEM_78, BERRY + db ITEM_87, BERRY + db ITEM_BE, BERRY + db ITEM_C3, BERRY + db ITEM_DC, BERRY + db ITEM_FA, BERRY + db -1, BERRY + db 0 ; end diff --git a/engine/link.asm b/engine/link.asm index ab3d38968..1aac20489 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1130,22 +1130,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771 ret .TimeCapsuleAlt: ; 28785 -; Pokémon traded from RBY do not have held items, so GSC usually interprets the -; catch rate as an item. However, if the catch rate appears in this table, the -; item associated with the table entry is used instead. - db ITEM_19, LEFTOVERS - db ITEM_2D, BITTER_BERRY - db ITEM_32, GOLD_BERRY - db ITEM_5A, BERRY - db ITEM_64, BERRY - db ITEM_78, BERRY - db ITEM_87, BERRY - db ITEM_BE, BERRY - db ITEM_C3, BERRY - db ITEM_DC, BERRY - db ITEM_FA, BERRY - db -1, BERRY - db 0 +INCLUDE "data/time_capsule/catch_rate_items.asm" ; 2879e Link_CopyOTData: ; 2879e diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index d4f11cb8c..0bc613709 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -953,36 +953,7 @@ NamingScreenGFX_Cursor: ; 11cc7 INCBIN "gfx/namingscreen/cursor.2bpp" ; 11ce7 -NameInputLower: - db "a b c d e f g h i" - db "j k l m n o p q r" - db "s t u v w x y z " - db "× ( ) : ; [ ] " - db "UPPER DEL END " - -BoxNameInputLower: - db "a b c d e f g h i" - db "j k l m n o p q r" - db "s t u v w x y z " - db "é 'd 'l 'm 'r 's 't 'v 0" - db "1 2 3 4 5 6 7 8 9" - db "UPPER DEL END " - -NameInputUpper: - db "A B C D E F G H I" - db "J K L M N O P Q R" - db "S T U V W X Y Z " - db "- ? ! / . , " - db "lower DEL END " - -BoxNameInputUpper: - db "A B C D E F G H I" - db "J K L M N O P Q R" - db "S T U V W X Y Z " - db "× ( ) : ; [ ] " - db "- ? ! ♂ ♀ / . , &" - db "lower DEL END " - +INCLUDE "data/name_input_chars.asm" ; 11e5d NamingScreenGFX_End: ; unused @@ -1499,22 +1470,6 @@ MailComposition_TryAddLastCharacter: ; 121ac (4:61ac) ; 121dd -MailEntry_Uppercase: ; 122dd - db "A B C D E F G H I J" - db "K L M N O P Q R S T" - db "U V W X Y Z , ? !" - db "1 2 3 4 5 6 7 8 9 0" - db " é ♂ ♀ ¥ … ×" - db "lower DEL END " - -; 1224f - -MailEntry_Lowercase: ; 1224f - db "a b c d e f g h i j" - db "k l m n o p q r s t" - db "u v w x y z . - /" - db "'d 'l 'm 'r 's 't 'v & ( )" - db "<``> <''> [ ] ' : ; " - db "UPPER DEL END " +INCLUDE "data/mail_input_chars.asm" ; 122c1 diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index bc36e3ee9..9a18cdcb1 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -118,7 +118,7 @@ Function6f3e: ; 6f3e ; 6f5b .data_6f5b - db 1 << DOWN, 1 << UP, 1 << RIGHT, 1 << LEFT + db DOWN_MASK, UP_MASK, RIGHT_MASK, LEFT_MASK ; 6f5f Function6f5f: ; 6f5f @@ -143,7 +143,7 @@ Function6f5f: ; 6f5f ; 6f7b .data_6f7b - db 1 << UP, 1 << DOWN, 1 << LEFT, 1 << RIGHT + db UP_MASK, DOWN_MASK, LEFT_MASK, RIGHT_MASK ; 6f7f Function6f7f: ; 6f7f diff --git a/event/bug_contest_judging.asm b/event/bug_contest_judging.asm index 0d400bb39..a7a9eb022 100755 --- a/event/bug_contest_judging.asm +++ b/event/bug_contest_judging.asm @@ -134,81 +134,11 @@ LoadContestantName: ; 13730 jp CopyBytes ; 13783 -BugContestantPointers: ; 13783 - dw BugContestant_BugCatcherDon ; This reverts back to the player - dw BugContestant_BugCatcherDon - dw BugContestant_BugCatcherEd - dw BugContestant_CooltrainerMNick - dw BugContestant_PokefanMWilliam - dw BugContestant_BugCatcherBenny - dw BugContestant_CamperBarry - dw BugContestant_PicnickerCindy - dw BugContestant_BugCatcherJosh - dw BugContestant_YoungsterSamuel - dw BugContestant_SchoolboyKipp -; 13799 -BugContestant_BugCatcherDon: - db BUG_CATCHER, DON - dbw KAKUNA, 300 - dbw METAPOD, 285 - dbw CATERPIE, 226 - -BugContestant_BugCatcherEd: - db BUG_CATCHER, ED - dbw BUTTERFREE, 286 - dbw BUTTERFREE, 251 - dbw CATERPIE, 237 - -BugContestant_CooltrainerMNick: - db COOLTRAINERM, NICK - dbw SCYTHER, 357 - dbw BUTTERFREE, 349 - dbw PINSIR, 368 - -BugContestant_PokefanMWilliam: - db POKEFANM, WILLIAM - dbw PINSIR, 332 - dbw BUTTERFREE, 324 - dbw VENONAT, 321 - -BugContestant_BugCatcherBenny: - db BUG_CATCHER, BUG_CATCHER_BENNY - dbw BUTTERFREE, 318 - dbw WEEDLE, 295 - dbw CATERPIE, 285 - -BugContestant_CamperBarry: - db CAMPER, BARRY - dbw PINSIR, 366 - dbw VENONAT, 329 - dbw KAKUNA, 314 - -BugContestant_PicnickerCindy: - db PICNICKER, CINDY - dbw BUTTERFREE, 341 - dbw METAPOD, 301 - dbw CATERPIE, 264 - -BugContestant_BugCatcherJosh: - db BUG_CATCHER, JOSH - dbw SCYTHER, 326 - dbw BUTTERFREE, 292 - dbw METAPOD, 282 - -BugContestant_YoungsterSamuel: - db YOUNGSTER, SAMUEL - dbw WEEDLE, 270 - dbw PINSIR, 282 - dbw CATERPIE, 251 - -BugContestant_SchoolboyKipp: - db SCHOOLBOY, KIPP - dbw VENONAT, 267 - dbw PARAS, 254 - dbw KAKUNA, 259 +INCLUDE "data/bug_contest_winners.asm" ; 13807 + BugContest_GetPlayersResult: ; 13807 ld hl, wBugContestThirdPlacePersonID ld de, -4 diff --git a/home.asm b/home.asm index 4686ed4b1..7e2cc786f 100644 --- a/home.asm +++ b/home.asm @@ -1041,14 +1041,7 @@ IsHMMove:: ; 34e7 jp IsInArray .HMMoves: - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db WATERFALL - db WHIRLPOOL - db -1 +INCLUDE "data/hm_moves.asm" ; 34f8 GetMoveName:: ; 34f8 diff --git a/home/map.asm b/home/map.asm index 6d9337fe9..fb6b2d738 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1593,14 +1593,14 @@ GetMovementPermissions:: ; 2914 ; 2945 .MovementPermissionsData: ; 2945 - db 1 << DOWN - db 1 << UP - db 1 << LEFT - db 1 << RIGHT - db (1 << DOWN) | (1 << RIGHT) - db (1 << UP) | (1 << RIGHT) - db (1 << DOWN) | (1 << LEFT) - db (1 << UP) | (1 << LEFT) + db DOWN_MASK + db UP_MASK + db LEFT_MASK + db RIGHT_MASK + db DOWN_MASK | RIGHT_MASK + db UP_MASK | RIGHT_MASK + db DOWN_MASK | LEFT_MASK + db UP_MASK | LEFT_MASK ; 294d .UpDown: diff --git a/main.asm b/main.asm index 0c699954c..829118d99 100644 --- a/main.asm +++ b/main.asm @@ -3398,46 +3398,7 @@ GetMobileOTTrainerClass: ; mobile function ld a, [hl] ret -MaleTrainers: ; 4e95d - db BURGLAR - db YOUNGSTER - db SCHOOLBOY - db BIRD_KEEPER - db POKEMANIAC - db GENTLEMAN - db BUG_CATCHER - db FISHER - db SWIMMERM - db SAILOR - db SUPER_NERD - db GUITARIST - db HIKER - db FIREBREATHER - db BLACKBELT_T - db PSYCHIC_T - db CAMPER - db COOLTRAINERM - db BOARDER - db JUGGLER - db POKEFANM - db OFFICER - db SAGE - db BIKER - db SCIENTIST -MaleTrainersEnd: - -FemaleTrainers: ; 4e976 - db MEDIUM - db LASS - db BEAUTY - db SKIER - db TEACHER - db SWIMMERF - db PICNICKER - db KIMONO_GIRL - db POKEFANF - db COOLTRAINERF -FemaleTrainersEnd: +INCLUDE "trainers/gendered_trainers.asm" INCLUDE "battle/sliding_intro.asm" diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index d17d4464e..e829065ba 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -18,33 +18,7 @@ LoadMapGroupRoof:: ; 1c000 ; 1c021 MapGroupRoofs: ; 1c021i - db -1 ; group 0 (unused) - db 3 ; group 1 (Olivine) - db 2 ; group 2 (Mahogany) - db -1 ; group 3 - db 1 ; group 4 (Ecruteak) - db 2 ; group 5 (Blackthorn) - db -1 ; group 6 - db -1 ; group 7 - db 2 ; group 8 (Azalea) - db 2 ; group 9 (Lake of Rage) - db 1 ; group 10 (Violet) - db 4 ; group 11 (Goldenrod) - db -1 ; group 12 - db -1 ; group 13 - db -1 ; group 14 - db -1 ; group 15 - db -1 ; group 16 - db -1 ; group 17 - db -1 ; group 18 - db 0 ; group 19 (Silver Cave) - db -1 ; group 20 - db -1 ; group 21 - db 3 ; group 22 (Cianwood) - db -1 ; group 23 - db 0 ; group 24 (New Bark) - db -1 ; group 25 - db 0 ; group 26 (Cherrygrove) +INCLUDE "data/mapgroup_roofs.asm" ; 1c03c Roofs: ; 1c03c diff --git a/trainers/encounter_music.asm b/trainers/encounter_music.asm new file mode 100644 index 000000000..9d41294be --- /dev/null +++ b/trainers/encounter_music.asm @@ -0,0 +1,73 @@ +; What music plays when a trainer notices you + + db MUSIC_HIKER_ENCOUNTER ; none + db MUSIC_YOUNGSTER_ENCOUNTER ; falkner + db MUSIC_LASS_ENCOUNTER ; whitney + db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy + db MUSIC_OFFICER_ENCOUNTER ; morty + db MUSIC_OFFICER_ENCOUNTER ; pryce + db MUSIC_LASS_ENCOUNTER ; jasmine + db MUSIC_OFFICER_ENCOUNTER ; chuck + db MUSIC_BEAUTY_ENCOUNTER ; clair + db MUSIC_RIVAL_ENCOUNTER ; rival1 + db MUSIC_HIKER_ENCOUNTER ; pokemon_prof + db MUSIC_HIKER_ENCOUNTER ; will + db MUSIC_HIKER_ENCOUNTER ; cal + db MUSIC_OFFICER_ENCOUNTER ; bruno + db MUSIC_HIKER_ENCOUNTER ; karen + db MUSIC_HIKER_ENCOUNTER ; koga + db MUSIC_OFFICER_ENCOUNTER ; champion + db MUSIC_YOUNGSTER_ENCOUNTER ; brock + db MUSIC_LASS_ENCOUNTER ; misty + db MUSIC_OFFICER_ENCOUNTER ; lt_surge + db MUSIC_ROCKET_ENCOUNTER ; scientist + db MUSIC_OFFICER_ENCOUNTER ; erika + db MUSIC_YOUNGSTER_ENCOUNTER ; youngster + db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy + db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper + db MUSIC_LASS_ENCOUNTER ; lass + db MUSIC_LASS_ENCOUNTER ; janine + db MUSIC_HIKER_ENCOUNTER ; cooltrainerm + db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf + db MUSIC_BEAUTY_ENCOUNTER ; beauty + db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac + db MUSIC_ROCKET_ENCOUNTER ; gruntm + db MUSIC_HIKER_ENCOUNTER ; gentleman + db MUSIC_BEAUTY_ENCOUNTER ; skier + db MUSIC_BEAUTY_ENCOUNTER ; teacher + db MUSIC_BEAUTY_ENCOUNTER ; sabrina + db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher + db MUSIC_HIKER_ENCOUNTER ; fisher + db MUSIC_HIKER_ENCOUNTER ; swimmerm + db MUSIC_BEAUTY_ENCOUNTER ; swimmerf + db MUSIC_HIKER_ENCOUNTER ; sailor + db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd + db MUSIC_RIVAL_ENCOUNTER ; rival2 + db MUSIC_HIKER_ENCOUNTER ; guitarist + db MUSIC_HIKER_ENCOUNTER ; hiker + db MUSIC_HIKER_ENCOUNTER ; biker + db MUSIC_OFFICER_ENCOUNTER ; blaine + db MUSIC_POKEMANIAC_ENCOUNTER ; burglar + db MUSIC_HIKER_ENCOUNTER ; firebreather + db MUSIC_POKEMANIAC_ENCOUNTER ; juggler + db MUSIC_HIKER_ENCOUNTER ; blackbelt_t + db MUSIC_ROCKET_ENCOUNTER ; executivem + db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t + db MUSIC_LASS_ENCOUNTER ; picnicker + db MUSIC_YOUNGSTER_ENCOUNTER ; camper + db MUSIC_ROCKET_ENCOUNTER ; executivef + db MUSIC_SAGE_ENCOUNTER ; sage + db MUSIC_SAGE_ENCOUNTER ; medium + db MUSIC_HIKER_ENCOUNTER ; boarder + db MUSIC_HIKER_ENCOUNTER ; pokefanm + db MUSIC_KIMONO_ENCOUNTER ; kimono_girl + db MUSIC_LASS_ENCOUNTER ; twins + db MUSIC_BEAUTY_ENCOUNTER ; pokefanf + db MUSIC_HIKER_ENCOUNTER ; red + db MUSIC_RIVAL_ENCOUNTER ; blue + db MUSIC_HIKER_ENCOUNTER ; officer + db MUSIC_ROCKET_ENCOUNTER ; gruntf + db MUSIC_HIKER_ENCOUNTER ; mysticalman + db MUSIC_HIKER_ENCOUNTER + db MUSIC_HIKER_ENCOUNTER + db MUSIC_HIKER_ENCOUNTER diff --git a/trainers/gendered_trainers.asm b/trainers/gendered_trainers.asm new file mode 100644 index 000000000..98cfec2ac --- /dev/null +++ b/trainers/gendered_trainers.asm @@ -0,0 +1,40 @@ +MaleTrainers: ; 4e95d + db BURGLAR + db YOUNGSTER + db SCHOOLBOY + db BIRD_KEEPER + db POKEMANIAC + db GENTLEMAN + db BUG_CATCHER + db FISHER + db SWIMMERM + db SAILOR + db SUPER_NERD + db GUITARIST + db HIKER + db FIREBREATHER + db BLACKBELT_T + db PSYCHIC_T + db CAMPER + db COOLTRAINERM + db BOARDER + db JUGGLER + db POKEFANM + db OFFICER + db SAGE + db BIKER + db SCIENTIST +MaleTrainersEnd + +FemaleTrainers: ; 4e976 + db MEDIUM + db LASS + db BEAUTY + db SKIER + db TEACHER + db SWIMMERF + db PICNICKER + db KIMONO_GIRL + db POKEFANF + db COOLTRAINERF +FemaleTrainersEnd From 4af1d7eca874ff44604df528979ba87bc818d7a2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 16:50:26 -0500 Subject: [PATCH 18/35] Name map groups --- maps/map_headers.asm | 104 +++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 30010042e..378356624 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,34 +1,34 @@ MapGroupPointers:: ; pointers to the first map header of each map group - dw MapGroup1 - dw MapGroup2 - dw MapGroup3 - dw MapGroup4 - dw MapGroup5 - dw MapGroup6 - dw MapGroup7 - dw MapGroup8 - dw MapGroup9 - dw MapGroup10 - dw MapGroup11 - dw MapGroup12 - dw MapGroup13 - dw MapGroup14 - dw MapGroup15 - dw MapGroup16 - dw MapGroup17 - dw MapGroup18 - dw MapGroup19 - dw MapGroup20 - dw MapGroup21 - dw MapGroup22 - dw MapGroup23 - dw MapGroup24 - dw MapGroup25 - dw MapGroup26 + dw MapGroup_Olivine ; 1 + dw MapGroup_Mahogany ; 2 + dw MapGroup_Dungeons ; 3 + dw MapGroup_Ecruteak ; 4 + dw MapGroup_Blackthorn ; 5 + dw MapGroup_Cinnabar ; 6 + dw MapGroup_Cerulean ; 7 + dw MapGroup_Azalea ; 8 + dw MapGroup_LakeOfRage ; 9 + dw MapGroup_Violet ; 10 + dw MapGroup_Goldenrod ; 11 + dw MapGroup_Vermilion ; 12 + dw MapGroup_Pallet ; 13 + dw MapGroup_Pewter ; 14 + dw MapGroup_FastShip ; 15 + dw MapGroup_Indigo ; 16 + dw MapGroup_Fuchsia ; 17 + dw MapGroup_Lavender ; 18 + dw MapGroup_Silver ; 19 + dw MapGroup_CableClub ; 20 + dw MapGroup_Celadon ; 21 + dw MapGroup_Cianwood ; 22 + dw MapGroup_Viridian ; 23 + dw MapGroup_NewBark ; 24 + dw MapGroup_Saffron ; 25 + dw MapGroup_Cherrygrove ; 26 -MapGroup1: +MapGroup_Olivine: map_header OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -45,7 +45,7 @@ MapGroup1: map_header OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup2: +MapGroup_Mahogany: map_header MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -55,7 +55,7 @@ MapGroup2: map_header MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup3: +MapGroup_Dungeons: map_header SproutTower1F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SproutTower2F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SproutTower3F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -149,7 +149,7 @@ MapGroup3: map_header VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, 1, PALETTE_NITE, FISHGROUP_SHORE -MapGroup4: +MapGroup_Ecruteak: map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -161,7 +161,7 @@ MapGroup4: map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND -MapGroup5: +MapGroup_Blackthorn: map_header BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -174,7 +174,7 @@ MapGroup5: map_header BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_POND -MapGroup6: +MapGroup_Cinnabar: map_header CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -185,7 +185,7 @@ MapGroup6: map_header CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN -MapGroup7: +MapGroup_Cerulean: map_header CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -205,7 +205,7 @@ MapGroup7: map_header CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_NONE -MapGroup8: +MapGroup_Azalea: map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -215,7 +215,7 @@ MapGroup8: map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup9: +MapGroup_LakeOfRage: map_header LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -224,7 +224,7 @@ MapGroup9: map_header LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, 0, PALETTE_AUTO, FISHGROUP_GYARADOS -MapGroup10: +MapGroup_Violet: map_header Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_QWILFISH map_header Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_POND map_header Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -244,7 +244,7 @@ MapGroup10: map_header Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup11: +MapGroup_Goldenrod: map_header Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -271,7 +271,7 @@ MapGroup11: map_header DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup12: +MapGroup_Vermilion: map_header Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_POND map_header Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN @@ -287,7 +287,7 @@ MapGroup12: map_header Route6UndergroundEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup13: +MapGroup_Pallet: map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -296,7 +296,7 @@ MapGroup13: map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup14: +MapGroup_Pewter: map_header Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -307,7 +307,7 @@ MapGroup14: map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup15: +MapGroup_FastShip: map_header OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -322,7 +322,7 @@ MapGroup15: map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup16: +MapGroup_Indigo: map_header Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE map_header WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -333,7 +333,7 @@ MapGroup16: map_header HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, 1, PALETTE_DAY, FISHGROUP_SHORE -MapGroup17: +MapGroup_Fuchsia: map_header Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map_header Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -349,7 +349,7 @@ MapGroup17: map_header Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup18: +MapGroup_Lavender: map_header Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, 0, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM map_header Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_LAKE @@ -366,14 +366,14 @@ MapGroup18: map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup19: +MapGroup_Silver : map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup20: +MapGroup_CableClub: map_header Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -382,7 +382,7 @@ MapGroup20: map_header MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE -MapGroup21: +MapGroup_Celadon: map_header Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_NONE @@ -411,7 +411,7 @@ MapGroup21: map_header Route1718Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup22: +MapGroup_Cianwood: map_header Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -430,7 +430,7 @@ MapGroup22: map_header BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, 0, PALETTE_AUTO, FISHGROUP_SHORE -MapGroup23: +MapGroup_Viridian: map_header Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_POND map_header ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_POND @@ -446,7 +446,7 @@ MapGroup23: map_header VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup24: +MapGroup_NewBark: map_header Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -462,7 +462,7 @@ MapGroup24: map_header Route2946Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup25: +MapGroup_Saffron: map_header Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -480,7 +480,7 @@ MapGroup25: map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup26: +MapGroup_Cherrygrove: map_header Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND map_header Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_POND map_header CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, 0, PALETTE_AUTO, FISHGROUP_SHORE From 690442e31dd868383ce3a798748733f720247f81 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 16:51:12 -0500 Subject: [PATCH 19/35] Map dimensions are separate from other constants, same as pokemon_constants vs pokemon_data_constants --- constants.asm | 1 + constants/map_constants.asm | 476 -------------------------- constants/map_dimension_constants.asm | 473 +++++++++++++++++++++++++ constants/pokemon_constants.asm | 69 ---- constants/pokemon_data_constants.asm | 74 ++++ 5 files changed, 548 insertions(+), 545 deletions(-) create mode 100644 constants/map_dimension_constants.asm diff --git a/constants.asm b/constants.asm index 0d5e3cc87..ffdf247e5 100644 --- a/constants.asm +++ b/constants.asm @@ -8,6 +8,7 @@ INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/map_dimension_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_setup_constants.asm" INCLUDE "constants/landmark_constants.asm" diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7caa3529a..be73faf9e 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,484 +1,8 @@ GROUP_N_A EQU -1 MAP_N_A EQU -1 - GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map group ids -; `newgroup` indexes are for: -; - MapGroupPointers (see maps/map_headers.asm) -; - OutdoorSprites (see data/outdoor_sprites.asm) -; - MapGroupRoofs (see data/mapgroup_roofs.asm) -; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) - const_def - - newgroup ; 1 - - mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1 - mapgroup OLIVINE_GYM, 8, 5 ; 2 - mapgroup OLIVINE_TIMS_HOUSE, 4, 4 ; 3 - mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4 - mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 - mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 - mapgroup OLIVINE_CAFE, 4, 4 ; 7 - mapgroup OLIVINE_MART, 4, 6 ; 8 - mapgroup ROUTE_38_ECRUTEAK_GATE, 4, 5 ; 9 - mapgroup ROUTE_39_BARN, 4, 4 ; 10 - mapgroup ROUTE_39_FARMHOUSE, 4, 4 ; 11 - mapgroup ROUTE_38, 9, 20 ; 12 - mapgroup ROUTE_39, 18, 10 ; 13 - mapgroup OLIVINE_CITY, 18, 20 ; 14 - - newgroup ; 2 - - mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 ; 1 - mapgroup MAHOGANY_GYM, 9, 5 ; 2 - mapgroup MAHOGANY_POKECENTER_1F, 4, 5 ; 3 - mapgroup ROUTE_42_ECRUTEAK_GATE, 4, 5 ; 4 - mapgroup ROUTE_42, 9, 30 ; 5 - mapgroup ROUTE_44, 9, 30 ; 6 - mapgroup MAHOGANY_TOWN, 9, 10 ; 7 - - newgroup ; 3 - - mapgroup SPROUT_TOWER_1F, 8, 10 ; 1 - mapgroup SPROUT_TOWER_2F, 8, 10 ; 2 - mapgroup SPROUT_TOWER_3F, 8, 10 ; 3 - mapgroup TIN_TOWER_1F, 9, 10 ; 4 - mapgroup TIN_TOWER_2F, 9, 10 ; 5 - mapgroup TIN_TOWER_3F, 9, 10 ; 6 - mapgroup TIN_TOWER_4F, 9, 10 ; 7 - mapgroup TIN_TOWER_5F, 9, 10 ; 8 - mapgroup TIN_TOWER_6F, 9, 10 ; 9 - mapgroup TIN_TOWER_7F, 9, 10 ; 10 - mapgroup TIN_TOWER_8F, 9, 10 ; 11 - mapgroup TIN_TOWER_9F, 9, 10 ; 12 - mapgroup BURNED_TOWER_1F, 9, 10 ; 13 - mapgroup BURNED_TOWER_B1F, 9, 10 ; 14 - mapgroup NATIONAL_PARK, 27, 20 ; 15 - mapgroup NATIONAL_PARK_BUG_CONTEST, 27, 20 ; 16 - mapgroup RADIO_TOWER_1F, 4, 9 ; 17 - mapgroup RADIO_TOWER_2F, 4, 9 ; 18 - mapgroup RADIO_TOWER_3F, 4, 9 ; 19 - mapgroup RADIO_TOWER_4F, 4, 9 ; 20 - mapgroup RADIO_TOWER_5F, 4, 9 ; 21 - mapgroup RUINS_OF_ALPH_OUTSIDE, 18, 10 ; 22 - mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4 ; 23 - mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4 ; 24 - mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4 ; 25 - mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4 ; 26 - mapgroup RUINS_OF_ALPH_INNER_CHAMBER, 14, 10 ; 27 - mapgroup RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 ; 28 - mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4 ; 29 - mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4 ; 30 - mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4 ; 31 - mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4 ; 32 - mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10 ; 33 - mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10 ; 34 - mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10 ; 35 - mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10 ; 36 - mapgroup UNION_CAVE_1F, 18, 10 ; 37 - mapgroup UNION_CAVE_B1F, 18, 10 ; 38 - mapgroup UNION_CAVE_B2F, 18, 10 ; 39 - mapgroup SLOWPOKE_WELL_B1F, 9, 10 ; 40 - mapgroup SLOWPOKE_WELL_B2F, 9, 10 ; 41 - mapgroup OLIVINE_LIGHTHOUSE_1F, 9, 10 ; 42 - mapgroup OLIVINE_LIGHTHOUSE_2F, 9, 10 ; 43 - mapgroup OLIVINE_LIGHTHOUSE_3F, 9, 10 ; 44 - mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10 ; 45 - mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10 ; 46 - mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10 ; 47 - mapgroup MAHOGANY_MART_1F, 4, 4 ; 48 - mapgroup TEAM_ROCKET_BASE_B1F, 9, 15 ; 49 - mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50 - mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51 - mapgroup ILEX_FOREST, 27, 15 ; 52 - mapgroup WAREHOUSE_ENTRANCE, 18, 15 ; 53 - mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54 - mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55 - mapgroup UNDERGROUND_WAREHOUSE, 9, 10 ; 56 - mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57 - mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58 - mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59 - mapgroup MOUNT_MORTAR_B1F, 18, 20 ; 60 - mapgroup ICE_PATH_1F, 18, 20 ; 61 - mapgroup ICE_PATH_B1F, 18, 10 ; 62 - mapgroup ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10 ; 63 - mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5 ; 64 - mapgroup ICE_PATH_B3F, 9, 10 ; 65 - mapgroup WHIRL_ISLAND_NW, 9, 5 ; 66 - mapgroup WHIRL_ISLAND_NE, 9, 10 ; 67 - mapgroup WHIRL_ISLAND_SW, 9, 10 ; 68 - mapgroup WHIRL_ISLAND_CAVE, 9, 5 ; 69 - mapgroup WHIRL_ISLAND_SE, 9, 5 ; 70 - mapgroup WHIRL_ISLAND_B1F, 18, 20 ; 71 - mapgroup WHIRL_ISLAND_B2F, 18, 10 ; 72 - mapgroup WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10 ; 73 - mapgroup SILVER_CAVE_ROOM_1, 18, 10 ; 74 - mapgroup SILVER_CAVE_ROOM_2, 18, 15 ; 75 - mapgroup SILVER_CAVE_ROOM_3, 18, 10 ; 76 - mapgroup SILVER_CAVE_ITEM_ROOMS, 9, 10 ; 77 - mapgroup DARK_CAVE_VIOLET_ENTRANCE, 18, 20 ; 78 - mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15 ; 79 - mapgroup DRAGONS_DEN_1F, 9, 5 ; 80 - mapgroup DRAGONS_DEN_B1F, 18, 20 ; 81 - mapgroup DRAGON_SHRINE, 5, 5 ; 82 - mapgroup TOHJO_FALLS, 9, 15 ; 83 - mapgroup DIGLETTS_CAVE, 18, 10 ; 84 - mapgroup MOUNT_MOON, 9, 15 ; 85 - mapgroup UNDERGROUND, 14, 3 ; 86 - mapgroup ROCK_TUNNEL_1F, 18, 15 ; 87 - mapgroup ROCK_TUNNEL_B1F, 18, 15 ; 88 - mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 ; 89 - mapgroup SAFARI_ZONE_BETA, 18, 10 ; 90 - mapgroup VICTORY_ROAD, 36, 10 ; 91 - - newgroup ; 4 - - mapgroup ECRUTEAK_HOUSE, 9, 10 ; 1 - mapgroup WISE_TRIOS_ROOM, 4, 4 ; 2 - mapgroup ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 - mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 - mapgroup DANCE_THEATRE, 7, 6 ; 5 - mapgroup ECRUTEAK_MART, 4, 6 ; 6 - mapgroup ECRUTEAK_GYM, 9, 5 ; 7 - mapgroup ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 - mapgroup ECRUTEAK_CITY, 18, 20 ; 9 - - newgroup ; 5 - - mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1 - mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2 - mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 - mapgroup BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 - mapgroup BLACKTHORN_MART, 4, 6 ; 5 - mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6 - mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7 - mapgroup ROUTE_45, 45, 10 ; 8 - mapgroup ROUTE_46, 18, 10 ; 9 - mapgroup BLACKTHORN_CITY, 18, 20 ; 10 - - newgroup ; 6 - - mapgroup CINNABAR_POKECENTER_1F, 4, 5 ; 1 - mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8 ; 2 - mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5 ; 3 - mapgroup SEAFOAM_GYM, 4, 5 ; 4 - mapgroup ROUTE_19, 18, 10 ; 5 - mapgroup ROUTE_20, 9, 30 ; 6 - mapgroup ROUTE_21, 18, 10 ; 7 - mapgroup CINNABAR_ISLAND, 9, 10 ; 8 - - newgroup ; 7 - - mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 ; 1 - mapgroup CERULEAN_POLICE_STATION, 4, 4 ; 2 - mapgroup CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 ; 3 - mapgroup CERULEAN_POKECENTER_1F, 4, 5 ; 4 - mapgroup CERULEAN_POKECENTER_2F_BETA, 4, 8 ; 5 - mapgroup CERULEAN_GYM, 8, 5 ; 6 - mapgroup CERULEAN_MART, 4, 6 ; 7 - mapgroup ROUTE_10_POKECENTER_1F, 4, 5 ; 8 - mapgroup ROUTE_10_POKECENTER_2F_BETA, 4, 8 ; 9 - mapgroup POWER_PLANT, 9, 10 ; 10 - mapgroup BILLS_HOUSE, 4, 4 ; 11 - mapgroup ROUTE_4, 9, 20 ; 12 - mapgroup ROUTE_9, 9, 30 ; 13 - mapgroup ROUTE_10_NORTH, 9, 10 ; 14 - mapgroup ROUTE_24, 9, 10 ; 15 - mapgroup ROUTE_25, 9, 30 ; 16 - mapgroup CERULEAN_CITY, 18, 20 ; 17 - - newgroup ; 8 - - mapgroup AZALEA_POKECENTER_1F, 4, 5 ; 1 - mapgroup CHARCOAL_KILN, 4, 4 ; 2 - mapgroup AZALEA_MART, 4, 6 ; 3 - mapgroup KURTS_HOUSE, 4, 8 ; 4 - mapgroup AZALEA_GYM, 8, 5 ; 5 - mapgroup ROUTE_33, 9, 10 ; 6 - mapgroup AZALEA_TOWN, 9, 20 ; 7 - - newgroup ; 9 - - mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 ; 1 - mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 ; 2 - mapgroup ROUTE_43_MAHOGANY_GATE, 4, 5 ; 3 - mapgroup ROUTE_43_GATE, 4, 5 ; 4 - mapgroup ROUTE_43, 27, 10 ; 5 - mapgroup LAKE_OF_RAGE, 18, 20 ; 6 - - newgroup ; 10 - - mapgroup ROUTE_32, 45, 10 ; 1 - mapgroup ROUTE_35, 18, 10 ; 2 - mapgroup ROUTE_36, 9, 30 ; 3 - mapgroup ROUTE_37, 9, 10 ; 4 - mapgroup VIOLET_CITY, 18, 20 ; 5 - mapgroup VIOLET_MART, 4, 6 ; 6 - mapgroup VIOLET_GYM, 8, 5 ; 7 - mapgroup EARLS_POKEMON_ACADEMY, 8, 4 ; 8 - mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup VIOLET_POKECENTER_1F, 4, 5 ; 10 - mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4 ; 11 - mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 ; 12 - mapgroup ROUTE_32_POKECENTER_1F, 4, 5 ; 13 - mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5 ; 14 - mapgroup ROUTE_35_NATIONAL_PARK_GATE, 4, 4 ; 15 - mapgroup ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5 ; 16 - mapgroup ROUTE_36_NATIONAL_PARK_GATE, 4, 5 ; 17 - - newgroup ; 11 - - mapgroup ROUTE_34, 27, 10 ; 1 - mapgroup GOLDENROD_CITY, 18, 20 ; 2 - mapgroup GOLDENROD_GYM, 9, 10 ; 3 - mapgroup GOLDENROD_BIKE_SHOP, 4, 4 ; 4 - mapgroup GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 - mapgroup GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 - mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 - mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 - mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup GOLDENROD_NAME_RATER, 4, 4 ; 10 - mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 - mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 - mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 - mapgroup GOLDENROD_DEPT_STORE_4F, 4, 8 ; 14 - mapgroup GOLDENROD_DEPT_STORE_5F, 4, 8 ; 15 - mapgroup GOLDENROD_DEPT_STORE_6F, 4, 8 ; 16 - mapgroup GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17 - mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 - mapgroup GOLDENROD_GAME_CORNER, 7, 10 ; 19 - mapgroup GOLDENROD_POKECENTER_1F, 4, 5 ; 20 - mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 - mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 - mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 - mapgroup DAY_CARE, 4, 5 ; 24 - - newgroup ; 12 - - mapgroup ROUTE_6, 9, 10 ; 1 - mapgroup ROUTE_11, 9, 20 ; 2 - mapgroup VERMILION_CITY, 18, 20 ; 3 - mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 - mapgroup VERMILION_POKECENTER_1F, 4, 5 ; 5 - mapgroup VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6 - mapgroup POKEMON_FAN_CLUB, 4, 5 ; 7 - mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 - mapgroup VERMILION_MART, 4, 6 ; 9 - mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 - mapgroup VERMILION_GYM, 9, 5 ; 11 - mapgroup ROUTE_6_SAFFRON_GATE, 4, 5 ; 12 - mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4 ; 13 - - newgroup ; 13 - - mapgroup ROUTE_1, 18, 10 ; 1 - mapgroup PALLET_TOWN, 9, 10 ; 2 - mapgroup REDS_HOUSE_1F, 4, 4 ; 3 - mapgroup REDS_HOUSE_2F, 4, 4 ; 4 - mapgroup BLUES_HOUSE, 4, 4 ; 5 - mapgroup OAKS_LAB, 6, 5 ; 6 - - newgroup ; 14 - - mapgroup ROUTE_3, 9, 30 ; 1 - mapgroup PEWTER_CITY, 18, 20 ; 2 - mapgroup PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 ; 3 - mapgroup PEWTER_GYM, 7, 5 ; 4 - mapgroup PEWTER_MART, 4, 6 ; 5 - mapgroup PEWTER_POKECENTER_1F, 4, 5 ; 6 - mapgroup PEWTER_POKECENTER_2F_BETA, 4, 8 ; 7 - mapgroup PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8 - - newgroup ; 15 - - mapgroup OLIVINE_PORT, 18, 10 ; 1 - mapgroup VERMILION_PORT, 18, 10 ; 2 - mapgroup FAST_SHIP_1F, 9, 16 ; 3 - mapgroup FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4 ; 4 - mapgroup FAST_SHIP_CABINS_SW_SSW_NW, 16, 4 ; 5 - mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5 ; 6 - mapgroup FAST_SHIP_B1F, 8, 16 ; 7 - mapgroup OLIVINE_PORT_PASSAGE, 9, 10 ; 8 - mapgroup VERMILION_PORT_PASSAGE, 9, 10 ; 9 - mapgroup MOUNT_MOON_SQUARE, 9, 15 ; 10 - mapgroup MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11 - mapgroup TIN_TOWER_ROOF, 9, 10 ; 12 - - newgroup ; 16 - - mapgroup ROUTE_23, 9, 10 ; 1 - mapgroup INDIGO_PLATEAU_POKECENTER_1F, 7, 9 ; 2 - mapgroup WILLS_ROOM, 9, 5 ; 3 - mapgroup KOGAS_ROOM, 9, 5 ; 4 - mapgroup BRUNOS_ROOM, 9, 5 ; 5 - mapgroup KARENS_ROOM, 9, 5 ; 6 - mapgroup LANCES_ROOM, 12, 5 ; 7 - mapgroup HALL_OF_FAME, 7, 5 ; 8 - - newgroup ; 17 - - mapgroup ROUTE_13, 9, 30 ; 1 - mapgroup ROUTE_14, 18, 10 ; 2 - mapgroup ROUTE_15, 9, 20 ; 3 - mapgroup ROUTE_18, 9, 10 ; 4 - mapgroup FUCHSIA_CITY, 18, 20 ; 5 - mapgroup FUCHSIA_MART, 4, 6 ; 6 - mapgroup SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 - mapgroup FUCHSIA_GYM, 9, 5 ; 8 - mapgroup FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup FUCHSIA_POKECENTER_1F, 4, 5 ; 10 - mapgroup FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11 - mapgroup SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12 - mapgroup ROUTE_15_FUCHSIA_GATE, 4, 5 ; 13 - - newgroup ; 18 - - mapgroup ROUTE_8, 9, 20 ; 1 - mapgroup ROUTE_12, 27, 10 ; 2 - mapgroup ROUTE_10_SOUTH, 9, 10 ; 3 - mapgroup LAVENDER_TOWN, 9, 10 ; 4 - mapgroup LAVENDER_POKECENTER_1F, 4, 5 ; 5 - mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6 - mapgroup MR_FUJIS_HOUSE, 4, 5 ; 7 - mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 ; 8 - mapgroup LAVENDER_NAME_RATER, 4, 4 ; 9 - mapgroup LAVENDER_MART, 4, 6 ; 10 - mapgroup SOUL_HOUSE, 4, 5 ; 11 - mapgroup LAV_RADIO_TOWER_1F, 4, 10 ; 12 - mapgroup ROUTE_8_SAFFRON_GATE, 4, 5 ; 13 - mapgroup ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 - - newgroup ; 19 - - mapgroup ROUTE_28, 9, 20 ; 1 - mapgroup SILVER_CAVE_OUTSIDE, 18, 20 ; 2 - mapgroup SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3 - mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 - - newgroup ; 20 - - mapgroup POKECENTER_2F, 4, 8 ; 1 - mapgroup TRADE_CENTER, 4, 5 ; 2 - mapgroup COLOSSEUM, 4, 5 ; 3 - mapgroup TIME_CAPSULE, 4, 5 ; 4 - mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5 - mapgroup MOBILE_BATTLE_ROOM, 4, 5 ; 6 - - newgroup ; 21 - - mapgroup ROUTE_7, 9, 10 ; 1 - mapgroup ROUTE_16, 9, 10 ; 2 - mapgroup ROUTE_17, 45, 10 ; 3 - mapgroup CELADON_CITY, 18, 20 ; 4 - mapgroup CELADON_DEPT_STORE_1F, 4, 8 ; 5 - mapgroup CELADON_DEPT_STORE_2F, 4, 8 ; 6 - mapgroup CELADON_DEPT_STORE_3F, 4, 8 ; 7 - mapgroup CELADON_DEPT_STORE_4F, 4, 8 ; 8 - mapgroup CELADON_DEPT_STORE_5F, 4, 8 ; 9 - mapgroup CELADON_DEPT_STORE_6F, 4, 8 ; 10 - mapgroup CELADON_DEPT_STORE_ELEVATOR, 2, 2 ; 11 - mapgroup CELADON_MANSION_1F, 5, 4 ; 12 - mapgroup CELADON_MANSION_2F, 5, 4 ; 13 - mapgroup CELADON_MANSION_3F, 5, 4 ; 14 - mapgroup CELADON_MANSION_ROOF, 5, 4 ; 15 - mapgroup CELADON_MANSION_ROOF_HOUSE, 4, 4 ; 16 - mapgroup CELADON_POKECENTER_1F, 4, 5 ; 17 - mapgroup CELADON_POKECENTER_2F_BETA, 4, 8 ; 18 - mapgroup CELADON_GAME_CORNER, 7, 10 ; 19 - mapgroup CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 ; 20 - mapgroup CELADON_GYM, 9, 5 ; 21 - mapgroup CELADON_CAFE, 4, 6 ; 22 - mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23 - mapgroup ROUTE_16_GATE, 4, 5 ; 24 - mapgroup ROUTE_7_SAFFRON_GATE, 4, 5 ; 25 - mapgroup ROUTE_17_18_GATE, 4, 5 ; 26 - - newgroup ; 22 - - mapgroup ROUTE_40, 18, 10 ; 1 - mapgroup ROUTE_41, 27, 25 ; 2 - mapgroup CIANWOOD_CITY, 27, 15 ; 3 - mapgroup MANIAS_HOUSE, 4, 4 ; 4 - mapgroup CIANWOOD_GYM, 9, 5 ; 5 - mapgroup CIANWOOD_POKECENTER_1F, 4, 5 ; 6 - mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7 - mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8 - mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10 - mapgroup BATTLE_TOWER_1F, 5, 8 ; 11 - mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12 - mapgroup BATTLE_TOWER_ELEVATOR, 2, 2 ; 13 - mapgroup BATTLE_TOWER_HALLWAY, 2, 11 ; 14 - mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5 ; 15 - mapgroup BATTLE_TOWER_OUTSIDE, 14, 10 ; 16 - - newgroup ; 23 - - mapgroup ROUTE_2, 27, 10 ; 1 - mapgroup ROUTE_22, 9, 20 ; 2 - mapgroup VIRIDIAN_CITY, 18, 20 ; 3 - mapgroup VIRIDIAN_GYM, 9, 5 ; 4 - mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 ; 5 - mapgroup TRAINER_HOUSE_1F, 7, 5 ; 6 - mapgroup TRAINER_HOUSE_B1F, 8, 5 ; 7 - mapgroup VIRIDIAN_MART, 4, 6 ; 8 - mapgroup VIRIDIAN_POKECENTER_1F, 4, 5 ; 9 - mapgroup VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10 - mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 - mapgroup ROUTE_2_GATE, 4, 5 ; 12 - mapgroup VICTORY_ROAD_GATE, 9, 10 ; 13 - - newgroup ; 24 - - mapgroup ROUTE_26, 54, 10 ; 1 - mapgroup ROUTE_27, 9, 40 ; 2 - mapgroup ROUTE_29, 9, 30 ; 3 - mapgroup NEW_BARK_TOWN, 9, 10 ; 4 - mapgroup ELMS_LAB, 6, 5 ; 5 - mapgroup KRISS_HOUSE_1F, 4, 5 ; 6 - mapgroup KRISS_HOUSE_2F, 3, 4 ; 7 - mapgroup KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 - mapgroup ELMS_HOUSE, 4, 4 ; 9 - mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 - mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 - mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 - mapgroup ROUTE_29_46_GATE, 4, 5 ; 13 - - newgroup ; 25 - - mapgroup ROUTE_5, 9, 10 ; 1 - mapgroup SAFFRON_CITY, 18, 20 ; 2 - mapgroup FIGHTING_DOJO, 6, 5 ; 3 - mapgroup SAFFRON_GYM, 9, 10 ; 4 - mapgroup SAFFRON_MART, 4, 6 ; 5 - mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6 - mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7 - mapgroup MR_PSYCHICS_HOUSE, 4, 4 ; 8 - mapgroup SAFFRON_TRAIN_STATION, 9, 10 ; 9 - mapgroup SILPH_CO_1F, 4, 8 ; 10 - mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11 - mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12 - mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4 ; 13 - mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14 - mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 - - newgroup ; 26 - - mapgroup ROUTE_30, 27, 10 ; 1 - mapgroup ROUTE_31, 9, 20 ; 2 - mapgroup CHERRYGROVE_CITY, 9, 20 ; 3 - mapgroup CHERRYGROVE_MART, 4, 6 ; 4 - mapgroup CHERRYGROVE_POKECENTER_1F, 4, 5 ; 5 - mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 - mapgroup GUIDE_GENTS_HOUSE, 4, 4 ; 7 - mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 - mapgroup ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 - mapgroup MR_POKEMONS_HOUSE, 4, 4 ; 10 - mapgroup ROUTE_31_VIOLET_GATE, 4, 5 ; 11 - - ; map permissions (wPermission) const_value SET 1 const TOWN diff --git a/constants/map_dimension_constants.asm b/constants/map_dimension_constants.asm new file mode 100644 index 000000000..d7fead006 --- /dev/null +++ b/constants/map_dimension_constants.asm @@ -0,0 +1,473 @@ +; map group ids +; `newgroup` indexes are for: +; - MapGroupPointers (see maps/map_headers.asm) +; - OutdoorSprites (see data/outdoor_sprites.asm) +; - MapGroupRoofs (see data/mapgroup_roofs.asm) +; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see maps/map_headers.asm) + const_def + + newgroup ; 1 + + mapgroup OLIVINE_POKECENTER_1F, 4, 5 ; 1 + mapgroup OLIVINE_GYM, 8, 5 ; 2 + mapgroup OLIVINE_TIMS_HOUSE, 4, 4 ; 3 + mapgroup OLIVINE_HOUSE_BETA, 4, 4 ; 4 + mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 + mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 + mapgroup OLIVINE_CAFE, 4, 4 ; 7 + mapgroup OLIVINE_MART, 4, 6 ; 8 + mapgroup ROUTE_38_ECRUTEAK_GATE, 4, 5 ; 9 + mapgroup ROUTE_39_BARN, 4, 4 ; 10 + mapgroup ROUTE_39_FARMHOUSE, 4, 4 ; 11 + mapgroup ROUTE_38, 9, 20 ; 12 + mapgroup ROUTE_39, 18, 10 ; 13 + mapgroup OLIVINE_CITY, 18, 20 ; 14 + + newgroup ; 2 + + mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 ; 1 + mapgroup MAHOGANY_GYM, 9, 5 ; 2 + mapgroup MAHOGANY_POKECENTER_1F, 4, 5 ; 3 + mapgroup ROUTE_42_ECRUTEAK_GATE, 4, 5 ; 4 + mapgroup ROUTE_42, 9, 30 ; 5 + mapgroup ROUTE_44, 9, 30 ; 6 + mapgroup MAHOGANY_TOWN, 9, 10 ; 7 + + newgroup ; 3 + + mapgroup SPROUT_TOWER_1F, 8, 10 ; 1 + mapgroup SPROUT_TOWER_2F, 8, 10 ; 2 + mapgroup SPROUT_TOWER_3F, 8, 10 ; 3 + mapgroup TIN_TOWER_1F, 9, 10 ; 4 + mapgroup TIN_TOWER_2F, 9, 10 ; 5 + mapgroup TIN_TOWER_3F, 9, 10 ; 6 + mapgroup TIN_TOWER_4F, 9, 10 ; 7 + mapgroup TIN_TOWER_5F, 9, 10 ; 8 + mapgroup TIN_TOWER_6F, 9, 10 ; 9 + mapgroup TIN_TOWER_7F, 9, 10 ; 10 + mapgroup TIN_TOWER_8F, 9, 10 ; 11 + mapgroup TIN_TOWER_9F, 9, 10 ; 12 + mapgroup BURNED_TOWER_1F, 9, 10 ; 13 + mapgroup BURNED_TOWER_B1F, 9, 10 ; 14 + mapgroup NATIONAL_PARK, 27, 20 ; 15 + mapgroup NATIONAL_PARK_BUG_CONTEST, 27, 20 ; 16 + mapgroup RADIO_TOWER_1F, 4, 9 ; 17 + mapgroup RADIO_TOWER_2F, 4, 9 ; 18 + mapgroup RADIO_TOWER_3F, 4, 9 ; 19 + mapgroup RADIO_TOWER_4F, 4, 9 ; 20 + mapgroup RADIO_TOWER_5F, 4, 9 ; 21 + mapgroup RUINS_OF_ALPH_OUTSIDE, 18, 10 ; 22 + mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4 ; 23 + mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4 ; 24 + mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4 ; 25 + mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4 ; 26 + mapgroup RUINS_OF_ALPH_INNER_CHAMBER, 14, 10 ; 27 + mapgroup RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 ; 28 + mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4 ; 29 + mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4 ; 30 + mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4 ; 31 + mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4 ; 32 + mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10 ; 33 + mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10 ; 34 + mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10 ; 35 + mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10 ; 36 + mapgroup UNION_CAVE_1F, 18, 10 ; 37 + mapgroup UNION_CAVE_B1F, 18, 10 ; 38 + mapgroup UNION_CAVE_B2F, 18, 10 ; 39 + mapgroup SLOWPOKE_WELL_B1F, 9, 10 ; 40 + mapgroup SLOWPOKE_WELL_B2F, 9, 10 ; 41 + mapgroup OLIVINE_LIGHTHOUSE_1F, 9, 10 ; 42 + mapgroup OLIVINE_LIGHTHOUSE_2F, 9, 10 ; 43 + mapgroup OLIVINE_LIGHTHOUSE_3F, 9, 10 ; 44 + mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10 ; 45 + mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10 ; 46 + mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10 ; 47 + mapgroup MAHOGANY_MART_1F, 4, 4 ; 48 + mapgroup TEAM_ROCKET_BASE_B1F, 9, 15 ; 49 + mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50 + mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51 + mapgroup ILEX_FOREST, 27, 15 ; 52 + mapgroup WAREHOUSE_ENTRANCE, 18, 15 ; 53 + mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54 + mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55 + mapgroup UNDERGROUND_WAREHOUSE, 9, 10 ; 56 + mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57 + mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58 + mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59 + mapgroup MOUNT_MORTAR_B1F, 18, 20 ; 60 + mapgroup ICE_PATH_1F, 18, 20 ; 61 + mapgroup ICE_PATH_B1F, 18, 10 ; 62 + mapgroup ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10 ; 63 + mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5 ; 64 + mapgroup ICE_PATH_B3F, 9, 10 ; 65 + mapgroup WHIRL_ISLAND_NW, 9, 5 ; 66 + mapgroup WHIRL_ISLAND_NE, 9, 10 ; 67 + mapgroup WHIRL_ISLAND_SW, 9, 10 ; 68 + mapgroup WHIRL_ISLAND_CAVE, 9, 5 ; 69 + mapgroup WHIRL_ISLAND_SE, 9, 5 ; 70 + mapgroup WHIRL_ISLAND_B1F, 18, 20 ; 71 + mapgroup WHIRL_ISLAND_B2F, 18, 10 ; 72 + mapgroup WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10 ; 73 + mapgroup SILVER_CAVE_ROOM_1, 18, 10 ; 74 + mapgroup SILVER_CAVE_ROOM_2, 18, 15 ; 75 + mapgroup SILVER_CAVE_ROOM_3, 18, 10 ; 76 + mapgroup SILVER_CAVE_ITEM_ROOMS, 9, 10 ; 77 + mapgroup DARK_CAVE_VIOLET_ENTRANCE, 18, 20 ; 78 + mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15 ; 79 + mapgroup DRAGONS_DEN_1F, 9, 5 ; 80 + mapgroup DRAGONS_DEN_B1F, 18, 20 ; 81 + mapgroup DRAGON_SHRINE, 5, 5 ; 82 + mapgroup TOHJO_FALLS, 9, 15 ; 83 + mapgroup DIGLETTS_CAVE, 18, 10 ; 84 + mapgroup MOUNT_MOON, 9, 15 ; 85 + mapgroup UNDERGROUND, 14, 3 ; 86 + mapgroup ROCK_TUNNEL_1F, 18, 15 ; 87 + mapgroup ROCK_TUNNEL_B1F, 18, 15 ; 88 + mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 ; 89 + mapgroup SAFARI_ZONE_BETA, 18, 10 ; 90 + mapgroup VICTORY_ROAD, 36, 10 ; 91 + + newgroup ; 4 + + mapgroup ECRUTEAK_HOUSE, 9, 10 ; 1 + mapgroup WISE_TRIOS_ROOM, 4, 4 ; 2 + mapgroup ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 + mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 + mapgroup DANCE_THEATRE, 7, 6 ; 5 + mapgroup ECRUTEAK_MART, 4, 6 ; 6 + mapgroup ECRUTEAK_GYM, 9, 5 ; 7 + mapgroup ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 + mapgroup ECRUTEAK_CITY, 18, 20 ; 9 + + newgroup ; 5 + + mapgroup BLACKTHORN_GYM_1F, 9, 5 ; 1 + mapgroup BLACKTHORN_GYM_2F, 9, 5 ; 2 + mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 + mapgroup BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 + mapgroup BLACKTHORN_MART, 4, 6 ; 5 + mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 ; 6 + mapgroup MOVE_DELETERS_HOUSE, 4, 4 ; 7 + mapgroup ROUTE_45, 45, 10 ; 8 + mapgroup ROUTE_46, 18, 10 ; 9 + mapgroup BLACKTHORN_CITY, 18, 20 ; 10 + + newgroup ; 6 + + mapgroup CINNABAR_POKECENTER_1F, 4, 5 ; 1 + mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8 ; 2 + mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5 ; 3 + mapgroup SEAFOAM_GYM, 4, 5 ; 4 + mapgroup ROUTE_19, 18, 10 ; 5 + mapgroup ROUTE_20, 9, 30 ; 6 + mapgroup ROUTE_21, 18, 10 ; 7 + mapgroup CINNABAR_ISLAND, 9, 10 ; 8 + + newgroup ; 7 + + mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 ; 1 + mapgroup CERULEAN_POLICE_STATION, 4, 4 ; 2 + mapgroup CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 ; 3 + mapgroup CERULEAN_POKECENTER_1F, 4, 5 ; 4 + mapgroup CERULEAN_POKECENTER_2F_BETA, 4, 8 ; 5 + mapgroup CERULEAN_GYM, 8, 5 ; 6 + mapgroup CERULEAN_MART, 4, 6 ; 7 + mapgroup ROUTE_10_POKECENTER_1F, 4, 5 ; 8 + mapgroup ROUTE_10_POKECENTER_2F_BETA, 4, 8 ; 9 + mapgroup POWER_PLANT, 9, 10 ; 10 + mapgroup BILLS_HOUSE, 4, 4 ; 11 + mapgroup ROUTE_4, 9, 20 ; 12 + mapgroup ROUTE_9, 9, 30 ; 13 + mapgroup ROUTE_10_NORTH, 9, 10 ; 14 + mapgroup ROUTE_24, 9, 10 ; 15 + mapgroup ROUTE_25, 9, 30 ; 16 + mapgroup CERULEAN_CITY, 18, 20 ; 17 + + newgroup ; 8 + + mapgroup AZALEA_POKECENTER_1F, 4, 5 ; 1 + mapgroup CHARCOAL_KILN, 4, 4 ; 2 + mapgroup AZALEA_MART, 4, 6 ; 3 + mapgroup KURTS_HOUSE, 4, 8 ; 4 + mapgroup AZALEA_GYM, 8, 5 ; 5 + mapgroup ROUTE_33, 9, 10 ; 6 + mapgroup AZALEA_TOWN, 9, 20 ; 7 + + newgroup ; 9 + + mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 ; 1 + mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 ; 2 + mapgroup ROUTE_43_MAHOGANY_GATE, 4, 5 ; 3 + mapgroup ROUTE_43_GATE, 4, 5 ; 4 + mapgroup ROUTE_43, 27, 10 ; 5 + mapgroup LAKE_OF_RAGE, 18, 20 ; 6 + + newgroup ; 10 + + mapgroup ROUTE_32, 45, 10 ; 1 + mapgroup ROUTE_35, 18, 10 ; 2 + mapgroup ROUTE_36, 9, 30 ; 3 + mapgroup ROUTE_37, 9, 10 ; 4 + mapgroup VIOLET_CITY, 18, 20 ; 5 + mapgroup VIOLET_MART, 4, 6 ; 6 + mapgroup VIOLET_GYM, 8, 5 ; 7 + mapgroup EARLS_POKEMON_ACADEMY, 8, 4 ; 8 + mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9 + mapgroup VIOLET_POKECENTER_1F, 4, 5 ; 10 + mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4 ; 11 + mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 ; 12 + mapgroup ROUTE_32_POKECENTER_1F, 4, 5 ; 13 + mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5 ; 14 + mapgroup ROUTE_35_NATIONAL_PARK_GATE, 4, 4 ; 15 + mapgroup ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5 ; 16 + mapgroup ROUTE_36_NATIONAL_PARK_GATE, 4, 5 ; 17 + + newgroup ; 11 + + mapgroup ROUTE_34, 27, 10 ; 1 + mapgroup GOLDENROD_CITY, 18, 20 ; 2 + mapgroup GOLDENROD_GYM, 9, 10 ; 3 + mapgroup GOLDENROD_BIKE_SHOP, 4, 4 ; 4 + mapgroup GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 + mapgroup GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 + mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 + mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 + mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 + mapgroup GOLDENROD_NAME_RATER, 4, 4 ; 10 + mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 + mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 + mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 + mapgroup GOLDENROD_DEPT_STORE_4F, 4, 8 ; 14 + mapgroup GOLDENROD_DEPT_STORE_5F, 4, 8 ; 15 + mapgroup GOLDENROD_DEPT_STORE_6F, 4, 8 ; 16 + mapgroup GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17 + mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 + mapgroup GOLDENROD_GAME_CORNER, 7, 10 ; 19 + mapgroup GOLDENROD_POKECENTER_1F, 4, 5 ; 20 + mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 + mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 + mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 + mapgroup DAY_CARE, 4, 5 ; 24 + + newgroup ; 12 + + mapgroup ROUTE_6, 9, 10 ; 1 + mapgroup ROUTE_11, 9, 20 ; 2 + mapgroup VERMILION_CITY, 18, 20 ; 3 + mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 + mapgroup VERMILION_POKECENTER_1F, 4, 5 ; 5 + mapgroup VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6 + mapgroup POKEMON_FAN_CLUB, 4, 5 ; 7 + mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 + mapgroup VERMILION_MART, 4, 6 ; 9 + mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 + mapgroup VERMILION_GYM, 9, 5 ; 11 + mapgroup ROUTE_6_SAFFRON_GATE, 4, 5 ; 12 + mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4 ; 13 + + newgroup ; 13 + + mapgroup ROUTE_1, 18, 10 ; 1 + mapgroup PALLET_TOWN, 9, 10 ; 2 + mapgroup REDS_HOUSE_1F, 4, 4 ; 3 + mapgroup REDS_HOUSE_2F, 4, 4 ; 4 + mapgroup BLUES_HOUSE, 4, 4 ; 5 + mapgroup OAKS_LAB, 6, 5 ; 6 + + newgroup ; 14 + + mapgroup ROUTE_3, 9, 30 ; 1 + mapgroup PEWTER_CITY, 18, 20 ; 2 + mapgroup PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 ; 3 + mapgroup PEWTER_GYM, 7, 5 ; 4 + mapgroup PEWTER_MART, 4, 6 ; 5 + mapgroup PEWTER_POKECENTER_1F, 4, 5 ; 6 + mapgroup PEWTER_POKECENTER_2F_BETA, 4, 8 ; 7 + mapgroup PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8 + + newgroup ; 15 + + mapgroup OLIVINE_PORT, 18, 10 ; 1 + mapgroup VERMILION_PORT, 18, 10 ; 2 + mapgroup FAST_SHIP_1F, 9, 16 ; 3 + mapgroup FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4 ; 4 + mapgroup FAST_SHIP_CABINS_SW_SSW_NW, 16, 4 ; 5 + mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5 ; 6 + mapgroup FAST_SHIP_B1F, 8, 16 ; 7 + mapgroup OLIVINE_PORT_PASSAGE, 9, 10 ; 8 + mapgroup VERMILION_PORT_PASSAGE, 9, 10 ; 9 + mapgroup MOUNT_MOON_SQUARE, 9, 15 ; 10 + mapgroup MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11 + mapgroup TIN_TOWER_ROOF, 9, 10 ; 12 + + newgroup ; 16 + + mapgroup ROUTE_23, 9, 10 ; 1 + mapgroup INDIGO_PLATEAU_POKECENTER_1F, 7, 9 ; 2 + mapgroup WILLS_ROOM, 9, 5 ; 3 + mapgroup KOGAS_ROOM, 9, 5 ; 4 + mapgroup BRUNOS_ROOM, 9, 5 ; 5 + mapgroup KARENS_ROOM, 9, 5 ; 6 + mapgroup LANCES_ROOM, 12, 5 ; 7 + mapgroup HALL_OF_FAME, 7, 5 ; 8 + + newgroup ; 17 + + mapgroup ROUTE_13, 9, 30 ; 1 + mapgroup ROUTE_14, 18, 10 ; 2 + mapgroup ROUTE_15, 9, 20 ; 3 + mapgroup ROUTE_18, 9, 10 ; 4 + mapgroup FUCHSIA_CITY, 18, 20 ; 5 + mapgroup FUCHSIA_MART, 4, 6 ; 6 + mapgroup SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 + mapgroup FUCHSIA_GYM, 9, 5 ; 8 + mapgroup FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 + mapgroup FUCHSIA_POKECENTER_1F, 4, 5 ; 10 + mapgroup FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11 + mapgroup SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12 + mapgroup ROUTE_15_FUCHSIA_GATE, 4, 5 ; 13 + + newgroup ; 18 + + mapgroup ROUTE_8, 9, 20 ; 1 + mapgroup ROUTE_12, 27, 10 ; 2 + mapgroup ROUTE_10_SOUTH, 9, 10 ; 3 + mapgroup LAVENDER_TOWN, 9, 10 ; 4 + mapgroup LAVENDER_POKECENTER_1F, 4, 5 ; 5 + mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6 + mapgroup MR_FUJIS_HOUSE, 4, 5 ; 7 + mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 ; 8 + mapgroup LAVENDER_NAME_RATER, 4, 4 ; 9 + mapgroup LAVENDER_MART, 4, 6 ; 10 + mapgroup SOUL_HOUSE, 4, 5 ; 11 + mapgroup LAV_RADIO_TOWER_1F, 4, 10 ; 12 + mapgroup ROUTE_8_SAFFRON_GATE, 4, 5 ; 13 + mapgroup ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 + + newgroup ; 19 + + mapgroup ROUTE_28, 9, 20 ; 1 + mapgroup SILVER_CAVE_OUTSIDE, 18, 20 ; 2 + mapgroup SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3 + mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 + + newgroup ; 20 + + mapgroup POKECENTER_2F, 4, 8 ; 1 + mapgroup TRADE_CENTER, 4, 5 ; 2 + mapgroup COLOSSEUM, 4, 5 ; 3 + mapgroup TIME_CAPSULE, 4, 5 ; 4 + mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5 + mapgroup MOBILE_BATTLE_ROOM, 4, 5 ; 6 + + newgroup ; 21 + + mapgroup ROUTE_7, 9, 10 ; 1 + mapgroup ROUTE_16, 9, 10 ; 2 + mapgroup ROUTE_17, 45, 10 ; 3 + mapgroup CELADON_CITY, 18, 20 ; 4 + mapgroup CELADON_DEPT_STORE_1F, 4, 8 ; 5 + mapgroup CELADON_DEPT_STORE_2F, 4, 8 ; 6 + mapgroup CELADON_DEPT_STORE_3F, 4, 8 ; 7 + mapgroup CELADON_DEPT_STORE_4F, 4, 8 ; 8 + mapgroup CELADON_DEPT_STORE_5F, 4, 8 ; 9 + mapgroup CELADON_DEPT_STORE_6F, 4, 8 ; 10 + mapgroup CELADON_DEPT_STORE_ELEVATOR, 2, 2 ; 11 + mapgroup CELADON_MANSION_1F, 5, 4 ; 12 + mapgroup CELADON_MANSION_2F, 5, 4 ; 13 + mapgroup CELADON_MANSION_3F, 5, 4 ; 14 + mapgroup CELADON_MANSION_ROOF, 5, 4 ; 15 + mapgroup CELADON_MANSION_ROOF_HOUSE, 4, 4 ; 16 + mapgroup CELADON_POKECENTER_1F, 4, 5 ; 17 + mapgroup CELADON_POKECENTER_2F_BETA, 4, 8 ; 18 + mapgroup CELADON_GAME_CORNER, 7, 10 ; 19 + mapgroup CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 ; 20 + mapgroup CELADON_GYM, 9, 5 ; 21 + mapgroup CELADON_CAFE, 4, 6 ; 22 + mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23 + mapgroup ROUTE_16_GATE, 4, 5 ; 24 + mapgroup ROUTE_7_SAFFRON_GATE, 4, 5 ; 25 + mapgroup ROUTE_17_18_GATE, 4, 5 ; 26 + + newgroup ; 22 + + mapgroup ROUTE_40, 18, 10 ; 1 + mapgroup ROUTE_41, 27, 25 ; 2 + mapgroup CIANWOOD_CITY, 27, 15 ; 3 + mapgroup MANIAS_HOUSE, 4, 4 ; 4 + mapgroup CIANWOOD_GYM, 9, 5 ; 5 + mapgroup CIANWOOD_POKECENTER_1F, 4, 5 ; 6 + mapgroup CIANWOOD_PHARMACY, 4, 4 ; 7 + mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 ; 8 + mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9 + mapgroup POKE_SEERS_HOUSE, 4, 4 ; 10 + mapgroup BATTLE_TOWER_1F, 5, 8 ; 11 + mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12 + mapgroup BATTLE_TOWER_ELEVATOR, 2, 2 ; 13 + mapgroup BATTLE_TOWER_HALLWAY, 2, 11 ; 14 + mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5 ; 15 + mapgroup BATTLE_TOWER_OUTSIDE, 14, 10 ; 16 + + newgroup ; 23 + + mapgroup ROUTE_2, 27, 10 ; 1 + mapgroup ROUTE_22, 9, 20 ; 2 + mapgroup VIRIDIAN_CITY, 18, 20 ; 3 + mapgroup VIRIDIAN_GYM, 9, 5 ; 4 + mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 ; 5 + mapgroup TRAINER_HOUSE_1F, 7, 5 ; 6 + mapgroup TRAINER_HOUSE_B1F, 8, 5 ; 7 + mapgroup VIRIDIAN_MART, 4, 6 ; 8 + mapgroup VIRIDIAN_POKECENTER_1F, 4, 5 ; 9 + mapgroup VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10 + mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 + mapgroup ROUTE_2_GATE, 4, 5 ; 12 + mapgroup VICTORY_ROAD_GATE, 9, 10 ; 13 + + newgroup ; 24 + + mapgroup ROUTE_26, 54, 10 ; 1 + mapgroup ROUTE_27, 9, 40 ; 2 + mapgroup ROUTE_29, 9, 30 ; 3 + mapgroup NEW_BARK_TOWN, 9, 10 ; 4 + mapgroup ELMS_LAB, 6, 5 ; 5 + mapgroup KRISS_HOUSE_1F, 4, 5 ; 6 + mapgroup KRISS_HOUSE_2F, 3, 4 ; 7 + mapgroup KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + mapgroup ELMS_HOUSE, 4, 4 ; 9 + mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 + mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 + mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 + mapgroup ROUTE_29_46_GATE, 4, 5 ; 13 + + newgroup ; 25 + + mapgroup ROUTE_5, 9, 10 ; 1 + mapgroup SAFFRON_CITY, 18, 20 ; 2 + mapgroup FIGHTING_DOJO, 6, 5 ; 3 + mapgroup SAFFRON_GYM, 9, 10 ; 4 + mapgroup SAFFRON_MART, 4, 6 ; 5 + mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6 + mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7 + mapgroup MR_PSYCHICS_HOUSE, 4, 4 ; 8 + mapgroup SAFFRON_TRAIN_STATION, 9, 10 ; 9 + mapgroup SILPH_CO_1F, 4, 8 ; 10 + mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11 + mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12 + mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4 ; 13 + mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 ; 14 + mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 + + newgroup ; 26 + + mapgroup ROUTE_30, 27, 10 ; 1 + mapgroup ROUTE_31, 9, 20 ; 2 + mapgroup CHERRYGROVE_CITY, 9, 20 ; 3 + mapgroup CHERRYGROVE_MART, 4, 6 ; 4 + mapgroup CHERRYGROVE_POKECENTER_1F, 4, 5 ; 5 + mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 + mapgroup GUIDE_GENTS_HOUSE, 4, 4 ; 7 + mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 + mapgroup ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 + mapgroup MR_POKEMONS_HOUSE, 4, 4 ; 10 + mapgroup ROUTE_31_VIOLET_GATE, 4, 5 ; 11 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 743325ea3..14635d729 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -274,74 +274,5 @@ NUM_POKEMON EQU const_value +- 1 const EGG ; fd const MON_FE ; fe -; party_struct members (see macros/wram.asm) -MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)" -MON_ITEM EQUS "(PartyMon1Item - PartyMon1)" -MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)" -MON_ID EQUS "(PartyMon1ID - PartyMon1)" -MON_EXP EQUS "(PartyMon1Exp - PartyMon1)" -MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)" -MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)" -MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)" -MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)" -MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)" -MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)" -MON_DVS EQUS "(PartyMon1DVs - PartyMon1)" -MON_PP EQUS "(PartyMon1PP - PartyMon1)" -MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)" -MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)" -MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)" -MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)" -MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)" -MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)" -MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)" -MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)" -MON_STATUS EQUS "(PartyMon1Status - PartyMon1)" -MON_HP EQUS "(PartyMon1HP - PartyMon1)" -MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)" -MON_ATK EQUS "(PartyMon1Attack - PartyMon1)" -MON_DEF EQUS "(PartyMon1Defense - PartyMon1)" -MON_SPD EQUS "(PartyMon1Speed - PartyMon1)" -MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)" -MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)" -BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)" -PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)" -REDMON_STRUCT_LENGTH EQU 44 - -; MonMenuOptions indexes (see engine/mon_menu.asm) -const_value SET 1 -; moves - const MONMENU_CUT ; 1 - const MONMENU_FLY ; 2 - const MONMENU_SURF ; 3 - const MONMENU_STRENGTH ; 4 - const MONMENU_WATERFALL ; 5 - const MONMENU_FLASH ; 6 - const MONMENU_WHIRLPOOL ; 7 - const MONMENU_DIG ; 8 - const MONMENU_TELEPORT ; 9 - const MONMENU_SOFTBOILED ; 10 - const MONMENU_HEADBUTT ; 11 - const MONMENU_ROCKSMASH ; 12 - const MONMENU_MILKDRINK ; 13 - const MONMENU_SWEETSCENT ; 14 -; options - const MONMENU_STATS ; 15 - const MONMENU_SWITCH ; 16 - const MONMENU_ITEM ; 17 - const MONMENU_CANCEL ; 18 - const MONMENU_MOVE ; 19 - const MONMENU_MAIL ; 20 - const MONMENU_ERROR ; 21 - -; MonMenuOptions types -MONMENU_FIELD_MOVE EQU 0 -MONMENU_MENUOPTION EQU 1 - -NUM_MONMENU_ITEMS EQU 8 - -; maximum number of party pokemon -PARTY_LENGTH EQU 6 - ; number of Unown forms NUM_UNOWN EQU 26 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 08d5bdbd8..a840beb1f 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -27,6 +27,45 @@ const_value SET 1 const NO_EGGS ; f +; party_struct members (see macros/wram.asm) +MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)" +MON_ITEM EQUS "(PartyMon1Item - PartyMon1)" +MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)" +MON_ID EQUS "(PartyMon1ID - PartyMon1)" +MON_EXP EQUS "(PartyMon1Exp - PartyMon1)" +MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)" +MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)" +MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)" +MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)" +MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)" +MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)" +MON_DVS EQUS "(PartyMon1DVs - PartyMon1)" +MON_PP EQUS "(PartyMon1PP - PartyMon1)" +MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)" +MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)" +MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)" +MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)" +MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)" +MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)" +MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)" +MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)" +MON_STATUS EQUS "(PartyMon1Status - PartyMon1)" +MON_HP EQUS "(PartyMon1HP - PartyMon1)" +MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)" +MON_ATK EQUS "(PartyMon1Attack - PartyMon1)" +MON_DEF EQUS "(PartyMon1Defense - PartyMon1)" +MON_SPD EQUS "(PartyMon1Speed - PartyMon1)" +MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)" +MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)" +BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)" +PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)" +REDMON_STRUCT_LENGTH EQU 44 + + +; maximum number of party pokemon +PARTY_LENGTH EQU 6 + + ; IconPointers indexes (see gfx/icon_pointers.asm) const_def const ICON_NULL @@ -99,6 +138,8 @@ HAPPINESS_THRESHOLD_1 EQU 100 HAPPINESS_THRESHOLD_2 EQU 200 +; wild data + NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size @@ -113,3 +154,36 @@ SWARM_YANMA EQU 1 FISHSWARM_QWILFISH EQU 1 FISHSWARM_REMORAID EQU 2 + + +; MonMenuOptions indexes (see engine/mon_menu.asm) +const_value SET 1 +; moves + const MONMENU_CUT ; 1 + const MONMENU_FLY ; 2 + const MONMENU_SURF ; 3 + const MONMENU_STRENGTH ; 4 + const MONMENU_WATERFALL ; 5 + const MONMENU_FLASH ; 6 + const MONMENU_WHIRLPOOL ; 7 + const MONMENU_DIG ; 8 + const MONMENU_TELEPORT ; 9 + const MONMENU_SOFTBOILED ; 10 + const MONMENU_HEADBUTT ; 11 + const MONMENU_ROCKSMASH ; 12 + const MONMENU_MILKDRINK ; 13 + const MONMENU_SWEETSCENT ; 14 +; options + const MONMENU_STATS ; 15 + const MONMENU_SWITCH ; 16 + const MONMENU_ITEM ; 17 + const MONMENU_CANCEL ; 18 + const MONMENU_MOVE ; 19 + const MONMENU_MAIL ; 20 + const MONMENU_ERROR ; 21 + +; MonMenuOptions types +MONMENU_FIELD_MOVE EQU 0 +MONMENU_MENUOPTION EQU 1 + +NUM_MONMENU_ITEMS EQU 8 From 2e41368ac4a4c409cd97a1afe166a7f9a363eb1e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:11:30 -0500 Subject: [PATCH 20/35] Factor out one more data table --- battle/objects/functions.asm | 20 +++++--------------- data/ball_colors.asm | 13 +++++++++++++ 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 data/ball_colors.asm diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm index 3af7b6dad..77c56c7b2 100755 --- a/battle/objects/functions.asm +++ b/battle/objects/functions.asm @@ -424,7 +424,7 @@ BattleAnimFunction_PokeBallBlocked: ; cd212 (33:5212) ret GetBallAnimPal: ; cd249 (33:5249) - ld hl, .balls + ld hl, BallColors ld a, [rSVBK] push af ld a, $1 @@ -448,22 +448,12 @@ GetBallAnimPal: ; cd249 (33:5249) add hl, bc ld [hl], a ret - ; cd26c (33:526c) -.balls - db MASTER_BALL, PAL_BATTLE_OB_GREEN - db ULTRA_BALL, PAL_BATTLE_OB_YELLOW - db GREAT_BALL, PAL_BATTLE_OB_BLUE - db POKE_BALL, PAL_BATTLE_OB_RED - db HEAVY_BALL, PAL_BATTLE_OB_GRAY - db LEVEL_BALL, PAL_BATTLE_OB_BROWN - db LURE_BALL, PAL_BATTLE_OB_BLUE - db FAST_BALL, PAL_BATTLE_OB_BLUE - db FRIEND_BALL, PAL_BATTLE_OB_YELLOW - db MOON_BALL, PAL_BATTLE_OB_GRAY - db LOVE_BALL, PAL_BATTLE_OB_RED - db -1, PAL_BATTLE_OB_GRAY + +BallColors: +INCLUDE "data/ball_colors.asm" ; cd284 + BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable .anon_dw diff --git a/data/ball_colors.asm b/data/ball_colors.asm new file mode 100644 index 000000000..9b6cdc50a --- /dev/null +++ b/data/ball_colors.asm @@ -0,0 +1,13 @@ +; colors of balls thrown in battle + db MASTER_BALL, PAL_BATTLE_OB_GREEN + db ULTRA_BALL, PAL_BATTLE_OB_YELLOW + db GREAT_BALL, PAL_BATTLE_OB_BLUE + db POKE_BALL, PAL_BATTLE_OB_RED + db HEAVY_BALL, PAL_BATTLE_OB_GRAY + db LEVEL_BALL, PAL_BATTLE_OB_BROWN + db LURE_BALL, PAL_BATTLE_OB_BLUE + db FAST_BALL, PAL_BATTLE_OB_BLUE + db FRIEND_BALL, PAL_BATTLE_OB_YELLOW + db MOON_BALL, PAL_BATTLE_OB_GRAY + db LOVE_BALL, PAL_BATTLE_OB_RED + db -1, PAL_BATTLE_OB_GRAY From 8c2c9e91b50daf8e13c0833524d5f36ba67bb4f8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:13:38 -0500 Subject: [PATCH 21/35] Better file name --- data/{hm_blocks.asm => field_move_blocks.asm} | 0 event/overworld.asm | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename data/{hm_blocks.asm => field_move_blocks.asm} (100%) diff --git a/data/hm_blocks.asm b/data/field_move_blocks.asm similarity index 100% rename from data/hm_blocks.asm rename to data/field_move_blocks.asm diff --git a/event/overworld.asm b/event/overworld.asm index 221f02a4f..d50c158e9 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -278,7 +278,7 @@ CheckOverworldTileArrays: ; c840 ret -INCLUDE "data/hm_blocks.asm" +INCLUDE "data/field_move_blocks.asm" OWFlash: ; c8ac From 4afc2f01ef96e6e94f3171c1c6bac84e70596854 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:35:35 -0500 Subject: [PATCH 22/35] Add member constants for the base data struct, same as most other structs --- battle/core.asm | 4 +- constants/pokemon_data_constants.asm | 89 ++++++++++++++++++---------- data/base_stats.asm | 2 - engine/link.asm | 4 +- home.asm | 8 +-- home/map.asm | 4 +- main.asm | 4 +- tilesets/tileset_headers.asm | 2 - wram.asm | 6 +- 9 files changed, 75 insertions(+), 48 deletions(-) diff --git a/battle/core.asm b/battle/core.asm index 21409c2a4..8c4ab73e4 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3484,8 +3484,8 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 add hl, bc ld a, [hl] dec a - ld hl, BaseData + 7 ; type - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_TYPES + ld bc, BASE_DATA_SIZE call AddNTimes ld de, EnemyMonType ld bc, 2 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index a840beb1f..3c6b77206 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,3 +1,30 @@ +; base data struct members (see data/base_stats/*.asm) +BASE_DEX_NO EQUS "(BaseDexNo - CurBaseData)" +BASE_STATS EQUS "(BaseStats - CurBaseData)" +BASE_HP EQUS "(BaseHP - CurBaseData)" +BASE_ATK EQUS "(BaseAttack - CurBaseData)" +BASE_SPD EQUS "(BaseSpeed - CurBaseData)" +BASE_SAT EQUS "(BaseSpecialAttack - CurBaseData)" +BASE_SDF EQUS "(BaseSpecialDefense - CurBaseData)" +BASE_TYPES EQUS "(BaseType - CurBaseData)" +BASE_TYPE_1 EQUS "(BaseType1 - CurBaseData)" +BASE_TYPE_2 EQUS "(BaseType2 - CurBaseData)" +BASE_CATCH_RATE EQUS "(BaseCatchRate - CurBaseData)" +BASE_EXP EQUS "(BaseExp - CurBaseData)" +BASE_ITEMS EQUS "(BaseItems - CurBaseData)" +BASE_ITEM_1 EQUS "(BaseItem1 - CurBaseData)" +BASE_ITEM_2 EQUS "(BaseItem2 - CurBaseData)" +BASE_GENDER EQUS "(BaseGender - CurBaseData)" +BASE_UNKNOWN_1 EQUS "(BaseUnknown1 - CurBaseData)" +BASE_EGG_STEPS EQUS "(BaseEggSteps - CurBaseData)" +BASE_UNKNOWN_2 EQUS "(BaseUnknown2 - CurBaseData)" +BASE_PIC_SIZE EQUS "(BasePicSize - CurBaseData)" +BASE_PADDING EQUS "(BasePadding - CurBaseData)" +BASE_GROWTH_RATE EQUS "(BaseGrowthRate - CurBaseData)" +BASE_EGG_GROUPS EQUS "(BaseEggGroups - CurBaseData)" +BASE_TMHM EQUS "(BaseTMHM - CurBaseData)" +BASE_DATA_SIZE EQUS "(CurBaseDataEnd - CurBaseData)" + ; BaseGrowthRate values ; GrowthRates indexes (see main.asm) const_def @@ -28,37 +55,37 @@ const_value SET 1 ; party_struct members (see macros/wram.asm) -MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)" -MON_ITEM EQUS "(PartyMon1Item - PartyMon1)" -MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)" -MON_ID EQUS "(PartyMon1ID - PartyMon1)" -MON_EXP EQUS "(PartyMon1Exp - PartyMon1)" -MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)" -MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)" -MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)" -MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)" -MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)" -MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)" -MON_DVS EQUS "(PartyMon1DVs - PartyMon1)" -MON_PP EQUS "(PartyMon1PP - PartyMon1)" -MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)" -MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)" -MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)" -MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)" -MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)" -MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)" -MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)" -MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)" -MON_STATUS EQUS "(PartyMon1Status - PartyMon1)" -MON_HP EQUS "(PartyMon1HP - PartyMon1)" -MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)" -MON_ATK EQUS "(PartyMon1Attack - PartyMon1)" -MON_DEF EQUS "(PartyMon1Defense - PartyMon1)" -MON_SPD EQUS "(PartyMon1Speed - PartyMon1)" -MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)" -MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)" -BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)" -PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)" +MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)" +MON_ITEM EQUS "(PartyMon1Item - PartyMon1)" +MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)" +MON_ID EQUS "(PartyMon1ID - PartyMon1)" +MON_EXP EQUS "(PartyMon1Exp - PartyMon1)" +MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)" +MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)" +MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)" +MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)" +MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)" +MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)" +MON_DVS EQUS "(PartyMon1DVs - PartyMon1)" +MON_PP EQUS "(PartyMon1PP - PartyMon1)" +MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)" +MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)" +MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)" +MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)" +MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)" +MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)" +MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)" +MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)" +MON_STATUS EQUS "(PartyMon1Status - PartyMon1)" +MON_HP EQUS "(PartyMon1HP - PartyMon1)" +MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)" +MON_ATK EQUS "(PartyMon1Attack - PartyMon1)" +MON_DEF EQUS "(PartyMon1Defense - PartyMon1)" +MON_SPD EQUS "(PartyMon1Speed - PartyMon1)" +MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)" +MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)" +BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)" +PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)" REDMON_STRUCT_LENGTH EQU 44 diff --git a/data/base_stats.asm b/data/base_stats.asm index b3e67d9a8..6ce415691 100644 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -1,6 +1,4 @@ -BaseData0:: INCLUDE "data/base_stats/bulbasaur.asm" -BaseData1:: INCLUDE "data/base_stats/ivysaur.asm" INCLUDE "data/base_stats/venusaur.asm" INCLUDE "data/base_stats/charmander.asm" diff --git a/engine/link.asm b/engine/link.asm index 1aac20489..f7e0b2ad4 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -737,8 +737,8 @@ Link_PrepPartyData_Gen1: ; 28499 .skip_steel push bc dec a - ld hl, BaseData + 7 ; type - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_TYPES + ld bc, BASE_DATA_SIZE call AddNTimes ld bc, 2 ld a, BANK(BaseData) diff --git a/home.asm b/home.asm index 7e2cc786f..b2e96b160 100644 --- a/home.asm +++ b/home.asm @@ -1704,11 +1704,11 @@ GetBaseData:: ; 3856 ; Get BaseData dec a - ld bc, BaseData1 - BaseData0 + ld bc, BASE_DATA_SIZE ld hl, BaseData call AddNTimes ld de, CurBaseData - ld bc, BaseData1 - BaseData0 + ld bc, BASE_DATA_SIZE call CopyBytes jr .end @@ -1881,8 +1881,8 @@ Function392d:: ; 392d dec a ld b, 0 add hl, bc - ld hl, BaseData + 0 - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_DEX_NO + ld bc, BASE_DATA_SIZE call AddNTimes ld a, BANK(BaseData) call GetFarHalfword diff --git a/home/map.asm b/home/map.asm index fb6b2d738..6e0e6e3a9 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2374,12 +2374,12 @@ LoadTilesetHeader:: ; 2d27 push bc ld hl, Tilesets - ld bc, Tileset1 - Tileset0 + ld bc, TilesetHeaderEnd - TilesetHeader ld a, [wTileset] call AddNTimes ld de, TilesetBank - ld bc, Tileset1 - Tileset0 + ld bc, TilesetHeaderEnd - TilesetHeader ld a, BANK(Tilesets) call FarCopyBytes diff --git a/main.asm b/main.asm index 829118d99..c65cea3d4 100644 --- a/main.asm +++ b/main.asm @@ -3919,8 +3919,8 @@ GetGender: ; 50bdd push bc ld a, [CurPartySpecies] dec a - ld hl, BaseData + BaseGender - CurBaseData - ld bc, BaseData1 - BaseData + ld hl, BaseData + BASE_GENDER + ld bc, BASE_DATA_SIZE call AddNTimes pop bc diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index d96931c17..777569f38 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -7,9 +7,7 @@ tileset: macro dw \1PalMap endm -Tileset0:: tileset Tileset0 -Tileset1:: tileset TilesetJohto1 tileset TilesetJohto2 tileset TilesetKanto diff --git a/wram.asm b/wram.asm index e7ed6741c..0dd30a8f4 100644 --- a/wram.asm +++ b/wram.asm @@ -1997,6 +1997,7 @@ TilesetCollisionAddress:: dw ; d1e0 TilesetAnim:: dw ; bank 3f ; d1e2 ds 2 ; unused ; d1e4 TilesetPalettes:: dw ; bank 3f ; d1e6 +TilesetHeaderEnd:: EvolvableFlags:: flag_array PARTY_LENGTH ; d1e8 @@ -2109,7 +2110,9 @@ BaseType1:: db ; d23d BaseType2:: db ; d23e BaseCatchRate:: db ; d23f BaseExp:: db ; d240 -BaseItems:: dw ; d241 +BaseItems:: ; d241 +BaseItem1:: db ; d241 +BaseItem2:: db ; d242 BaseGender:: db ; d243 BaseUnknown1:: db ; d244 BaseEggSteps:: db ; d245 @@ -2119,6 +2122,7 @@ BasePadding:: ds 4 ; d248 BaseGrowthRate:: db ; d24c BaseEggGroups:: db ; d24d BaseTMHM:: flag_array NUM_TM_HM_TUTOR ; d24e +CurBaseDataEnd:: CurDamage:: dw ; d256 From 720cdc72b2e777174578b7bfdd4cca283b4b5106 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:41:18 -0500 Subject: [PATCH 23/35] Comments distinguish "move effects" and "effect commands" Effect command enums are used like constants, not macros --- battle/effect_command_pointers.asm | 1 + battle/moves/move_effects_pointers.asm | 1 + constants.asm | 1 + .../move_effect.asm => constants/effect_command_constants.asm | 3 ++- macros.asm | 2 -- 5 files changed, 5 insertions(+), 3 deletions(-) rename macros/move_effect.asm => constants/effect_command_constants.asm (99%) diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index 8a9014fa5..60c658dfc 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -1,6 +1,7 @@ dw 0 ; padding BattleCommandPointers: ; 3fd28 +; entries correspond to constants/effect_command_constants.asm dw BattleCommand_CheckTurn ; 34084 dw BattleCommand_CheckObedience ; 343db dw BattleCommand_UsedMoveText ; 34541 diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm index 2e4f1ea31..d15beedb7 100644 --- a/battle/moves/move_effects_pointers.asm +++ b/battle/moves/move_effects_pointers.asm @@ -1,3 +1,4 @@ +; entries correspond to EFFECT_* constants dw NormalHit dw DoSleep dw PoisonHit diff --git a/constants.asm b/constants.asm index ffdf247e5..5d47dd065 100644 --- a/constants.asm +++ b/constants.asm @@ -7,6 +7,7 @@ INCLUDE "constants/wram_constants.asm" INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" +INCLUDE "constants/effect_command_constants.asm" INCLUDE "constants/battle_constants.asm" INCLUDE "constants/map_dimension_constants.asm" INCLUDE "constants/map_constants.asm" diff --git a/macros/move_effect.asm b/constants/effect_command_constants.asm similarity index 99% rename from macros/move_effect.asm rename to constants/effect_command_constants.asm index d3761c9a1..0d86e66a1 100644 --- a/macros/move_effect.asm +++ b/constants/effect_command_constants.asm @@ -1,10 +1,11 @@ +; BattleCommandPointers indexes (see battle/effect_commands.asm) + command: macro enum \1_command \1 equs "db \1_command" endm enum_start 1 - command checkturn ; 01 command checkobedience ; 02 command usedmovetext ; 03 diff --git a/macros.asm b/macros.asm index 9ada1e62a..f9913bce2 100644 --- a/macros.asm +++ b/macros.asm @@ -1,11 +1,9 @@ INCLUDE "macros/enum.asm" INCLUDE "macros/basestats.asm" - INCLUDE "macros/event.asm" INCLUDE "macros/sound.asm" INCLUDE "macros/text.asm" INCLUDE "macros/charmap.asm" -INCLUDE "macros/move_effect.asm" INCLUDE "macros/move_anim.asm" INCLUDE "macros/movement.asm" INCLUDE "macros/map.asm" From e6f6a753306865b2b4522850fd98665dc9546876 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 17:51:04 -0500 Subject: [PATCH 24/35] Move the rest of gfx/misc/ into specific directories --- Makefile | 3 +-- engine/color.asm | 2 +- engine/mysterygift.asm | 4 ++-- gfx/{misc => mobile}/mobile_adapter.png | Bin gfx/{misc => mystery_gift}/mystery_gift.png | Bin gfx/{misc => mystery_gift}/mystery_gift_jp.png | Bin gfx/{misc => sgb}/gbc_only.2bpp.lz.4a5bba0e | Bin gfx/{misc => sgb}/gbc_only.png | Bin gfx/{misc => sgb}/sgb_border.png | Bin gfx/{misc => unknown}/unknown_egg.2bpp.lz.a5b6cbfa | Bin gfx/{misc => unknown}/unknown_egg.png | Bin main.asm | 2 +- misc/crystal_misc.asm | 2 +- misc/gbc_only.asm | 2 +- 14 files changed, 7 insertions(+), 8 deletions(-) rename gfx/{misc => mobile}/mobile_adapter.png (100%) rename gfx/{misc => mystery_gift}/mystery_gift.png (100%) rename gfx/{misc => mystery_gift}/mystery_gift_jp.png (100%) rename gfx/{misc => sgb}/gbc_only.2bpp.lz.4a5bba0e (100%) rename gfx/{misc => sgb}/gbc_only.png (100%) rename gfx/{misc => sgb}/sgb_border.png (100%) rename gfx/{misc => unknown}/unknown_egg.2bpp.lz.a5b6cbfa (100%) rename gfx/{misc => unknown}/unknown_egg.png (100%) diff --git a/Makefile b/Makefile index be1ca99c7..6979e7ce9 100644 --- a/Makefile +++ b/Makefile @@ -197,11 +197,10 @@ gfx/trainer_card/kris_card.2bpp: rgbgfx += -h gfx/battle/dude.2bpp: rgbgfx += -h -gfx/misc/unknown_egg.2bpp: rgbgfx += -h - gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/unknown_egg.2bpp: rgbgfx += -h gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace diff --git a/engine/color.asm b/engine/color.asm index 29b6656d5..add8c24ac 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1859,7 +1859,7 @@ SGBBorderPalettes: RGB 31, 31, 25 SGBBorder: -INCBIN "gfx/misc/sgb_border.2bpp" +INCBIN "gfx/sgb/sgb_border.2bpp" Palettes_a8be: RGB 30, 26, 15 diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm index ae40d0992..8204ab332 100755 --- a/engine/mysterygift.asm +++ b/engine/mysterygift.asm @@ -1411,7 +1411,7 @@ InitMysteryGiftLayout: ; 105153 (41:5153) ret MysteryGiftGFX: ; 105258 -INCBIN "gfx/misc/mystery_gift.2bpp" +INCBIN "gfx/mystery_gift/mystery_gift.2bpp" MysteryGiftGFXEnd: Function105688: ; 105688 (41:5688) @@ -1732,4 +1732,4 @@ Function1057d7: ; 1057d7 (41:57d7) ; japanese mystery gift gfx MysteryGiftJP_GFX: ; 105930 -INCBIN "gfx/misc/mystery_gift_jp.2bpp" +INCBIN "gfx/mystery_gift/mystery_gift_jp.2bpp" diff --git a/gfx/misc/mobile_adapter.png b/gfx/mobile/mobile_adapter.png similarity index 100% rename from gfx/misc/mobile_adapter.png rename to gfx/mobile/mobile_adapter.png diff --git a/gfx/misc/mystery_gift.png b/gfx/mystery_gift/mystery_gift.png similarity index 100% rename from gfx/misc/mystery_gift.png rename to gfx/mystery_gift/mystery_gift.png diff --git a/gfx/misc/mystery_gift_jp.png b/gfx/mystery_gift/mystery_gift_jp.png similarity index 100% rename from gfx/misc/mystery_gift_jp.png rename to gfx/mystery_gift/mystery_gift_jp.png diff --git a/gfx/misc/gbc_only.2bpp.lz.4a5bba0e b/gfx/sgb/gbc_only.2bpp.lz.4a5bba0e similarity index 100% rename from gfx/misc/gbc_only.2bpp.lz.4a5bba0e rename to gfx/sgb/gbc_only.2bpp.lz.4a5bba0e diff --git a/gfx/misc/gbc_only.png b/gfx/sgb/gbc_only.png similarity index 100% rename from gfx/misc/gbc_only.png rename to gfx/sgb/gbc_only.png diff --git a/gfx/misc/sgb_border.png b/gfx/sgb/sgb_border.png similarity index 100% rename from gfx/misc/sgb_border.png rename to gfx/sgb/sgb_border.png diff --git a/gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa b/gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa similarity index 100% rename from gfx/misc/unknown_egg.2bpp.lz.a5b6cbfa rename to gfx/unknown/unknown_egg.2bpp.lz.a5b6cbfa diff --git a/gfx/misc/unknown_egg.png b/gfx/unknown/unknown_egg.png similarity index 100% rename from gfx/misc/unknown_egg.png rename to gfx/unknown/unknown_egg.png diff --git a/main.asm b/main.asm index c65cea3d4..d5354fe72 100644 --- a/main.asm +++ b/main.asm @@ -4611,7 +4611,7 @@ Unknown_53d84: ; unreferenced UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. -INCBIN "gfx/misc/unknown_egg.2bpp.lz" +INCBIN "gfx/unknown/unknown_egg.2bpp.lz" SECTION "bank19", ROMX diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index fb9637d4c..aa5c704fd 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "Misc Crystal", ROMX MobileAdapterGFX:: -INCBIN "gfx/misc/mobile_adapter.2bpp" +INCBIN "gfx/mobile/mobile_adapter.2bpp" Function17a68f:: ; 17a68f (5e:668f) diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index f4b3eba8b..a77a44d72 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38 GBCOnlyGFX: ; 4eb76 -INCBIN "gfx/misc/gbc_only.2bpp.lz" +INCBIN "gfx/sgb/gbc_only.2bpp.lz" ; 4f0bc From 2d644f5077fa9ec43009ea5ec072e6ade9a1f61b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 18:04:23 -0500 Subject: [PATCH 25/35] Name some gfx/unknown/ files --- Makefile | 12 ++++++------ engine/link.asm | 2 +- event/photo.asm | 4 ++-- gfx/font.asm | 2 +- gfx/unknown/{171db1.png => ascii_font.png} | Bin gfx/unknown/{016d9c.png => bold_a.png} | Bin gfx/unknown/{016da4.png => bold_b.png} | Bin gfx/unknown/{0f8f34.png => bold_font.png} | Bin gfx/unknown/{0488cb.png => down_arrow.png} | Bin ...pp.lz.3eaf004f => egg_animated.2bpp.lz.3eaf004f} | Bin gfx/unknown/{1715a4.png => egg_animated.png} | Bin ...nonmatching.png => egg_animated_nonmatching.png} | Bin .../{16c79b.tilemap => mobile_splash.attrmap} | Bin gfx/unknown/{16c173.png => mobile_splash.png} | Bin .../{16c633.tilemap => mobile_splash.tilemap} | Bin ....lz.5d6d2ad4 => pichu_animated.2bpp.lz.5d6d2ad4} | Bin gfx/unknown/{170d16.png => pichu_animated.png} | Bin gfx/unknown/{029f54.png => unused_border.png} | Bin gfx/unknown/{0488c3.png => up_arrow.png} | Bin misc/mobile_12.asm | 4 ++-- misc/mobile_5b.asm | 6 +++--- misc/mobile_5c.asm | 7 ++++--- 22 files changed, 19 insertions(+), 18 deletions(-) rename gfx/unknown/{171db1.png => ascii_font.png} (100%) rename gfx/unknown/{016d9c.png => bold_a.png} (100%) rename gfx/unknown/{016da4.png => bold_b.png} (100%) rename gfx/unknown/{0f8f34.png => bold_font.png} (100%) rename gfx/unknown/{0488cb.png => down_arrow.png} (100%) rename gfx/unknown/{1715a4.2bpp.lz.3eaf004f => egg_animated.2bpp.lz.3eaf004f} (100%) rename gfx/unknown/{1715a4.png => egg_animated.png} (100%) rename gfx/unknown/{1715a4_nonmatching.png => egg_animated_nonmatching.png} (100%) rename gfx/unknown/{16c79b.tilemap => mobile_splash.attrmap} (100%) rename gfx/unknown/{16c173.png => mobile_splash.png} (100%) rename gfx/unknown/{16c633.tilemap => mobile_splash.tilemap} (100%) rename gfx/unknown/{170d16.2bpp.lz.5d6d2ad4 => pichu_animated.2bpp.lz.5d6d2ad4} (100%) rename gfx/unknown/{170d16.png => pichu_animated.png} (100%) rename gfx/unknown/{029f54.png => unused_border.png} (100%) rename gfx/unknown/{0488c3.png => up_arrow.png} (100%) diff --git a/Makefile b/Makefile index 6979e7ce9..d3158c341 100644 --- a/Makefile +++ b/Makefile @@ -200,13 +200,13 @@ gfx/battle/dude.2bpp: rgbgfx += -h gfx/pokegear/pokegear.2bpp: rgbgfx += -x2 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/ascii_font.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/bold_font.1bpp: tools/gfx += --trim-whitespace +gfx/unknown/egg_animated.2bpp: tools/gfx += --trim-whitespace +gfx/unknown/egg_animated_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/mobile_splash.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/unknown/pichu_animated.2bpp: tools/gfx += --trim-whitespace gfx/unknown/unknown_egg.2bpp: rgbgfx += -h -gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace -gfx/unknown/16c173.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace -gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace %.bin: ; diff --git a/engine/link.asm b/engine/link.asm index f7e0b2ad4..b57e49e1e 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -2579,5 +2579,5 @@ Special_CableClubCheckWhichChris: ; 29f47 GFX_29f54: ; 29f54 ; unreferenced -INCBIN "gfx/unknown/029f54.2bpp" +INCBIN "gfx/unknown/unused_border.2bpp" ; 29fe4 diff --git a/event/photo.asm b/event/photo.asm index c47445fc5..fea57a368 100755 --- a/event/photo.asm +++ b/event/photo.asm @@ -214,9 +214,9 @@ UnownDexVacantString: ; 16d9c UnownDexATile: ; 16d9c -INCBIN "gfx/unknown/016d9c.1bpp" +INCBIN "gfx/unknown/bold_a.1bpp" UnownDexBTile: ; 16da4 -INCBIN "gfx/unknown/016da4.1bpp" +INCBIN "gfx/unknown/bold_b.1bpp" ; 16dac PlaceUnownPrinterFrontpic: ; 16dac diff --git a/gfx/font.asm b/gfx/font.asm index 99e8505b7..f2efefd37 100755 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -59,7 +59,7 @@ INCBIN "gfx/mobile/overworld_phone_icon.2bpp" ; f8f34 GFX_f8f34: ; unused bold letters + unown chars -INCBIN "gfx/unknown/0f8f34.1bpp" +INCBIN "gfx/unknown/bold_font.1bpp" ; f9204 TextBoxSpaceGFX: ; f9204 diff --git a/gfx/unknown/171db1.png b/gfx/unknown/ascii_font.png similarity index 100% rename from gfx/unknown/171db1.png rename to gfx/unknown/ascii_font.png diff --git a/gfx/unknown/016d9c.png b/gfx/unknown/bold_a.png similarity index 100% rename from gfx/unknown/016d9c.png rename to gfx/unknown/bold_a.png diff --git a/gfx/unknown/016da4.png b/gfx/unknown/bold_b.png similarity index 100% rename from gfx/unknown/016da4.png rename to gfx/unknown/bold_b.png diff --git a/gfx/unknown/0f8f34.png b/gfx/unknown/bold_font.png similarity index 100% rename from gfx/unknown/0f8f34.png rename to gfx/unknown/bold_font.png diff --git a/gfx/unknown/0488cb.png b/gfx/unknown/down_arrow.png similarity index 100% rename from gfx/unknown/0488cb.png rename to gfx/unknown/down_arrow.png diff --git a/gfx/unknown/1715a4.2bpp.lz.3eaf004f b/gfx/unknown/egg_animated.2bpp.lz.3eaf004f similarity index 100% rename from gfx/unknown/1715a4.2bpp.lz.3eaf004f rename to gfx/unknown/egg_animated.2bpp.lz.3eaf004f diff --git a/gfx/unknown/1715a4.png b/gfx/unknown/egg_animated.png similarity index 100% rename from gfx/unknown/1715a4.png rename to gfx/unknown/egg_animated.png diff --git a/gfx/unknown/1715a4_nonmatching.png b/gfx/unknown/egg_animated_nonmatching.png similarity index 100% rename from gfx/unknown/1715a4_nonmatching.png rename to gfx/unknown/egg_animated_nonmatching.png diff --git a/gfx/unknown/16c79b.tilemap b/gfx/unknown/mobile_splash.attrmap similarity index 100% rename from gfx/unknown/16c79b.tilemap rename to gfx/unknown/mobile_splash.attrmap diff --git a/gfx/unknown/16c173.png b/gfx/unknown/mobile_splash.png similarity index 100% rename from gfx/unknown/16c173.png rename to gfx/unknown/mobile_splash.png diff --git a/gfx/unknown/16c633.tilemap b/gfx/unknown/mobile_splash.tilemap similarity index 100% rename from gfx/unknown/16c633.tilemap rename to gfx/unknown/mobile_splash.tilemap diff --git a/gfx/unknown/170d16.2bpp.lz.5d6d2ad4 b/gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 similarity index 100% rename from gfx/unknown/170d16.2bpp.lz.5d6d2ad4 rename to gfx/unknown/pichu_animated.2bpp.lz.5d6d2ad4 diff --git a/gfx/unknown/170d16.png b/gfx/unknown/pichu_animated.png similarity index 100% rename from gfx/unknown/170d16.png rename to gfx/unknown/pichu_animated.png diff --git a/gfx/unknown/029f54.png b/gfx/unknown/unused_border.png similarity index 100% rename from gfx/unknown/029f54.png rename to gfx/unknown/unused_border.png diff --git a/gfx/unknown/0488c3.png b/gfx/unknown/up_arrow.png similarity index 100% rename from gfx/unknown/0488c3.png rename to gfx/unknown/up_arrow.png diff --git a/misc/mobile_12.asm b/misc/mobile_12.asm index ea1e25bb8..efe138162 100755 --- a/misc/mobile_12.asm +++ b/misc/mobile_12.asm @@ -1021,10 +1021,10 @@ Function488b9: ; 488b9 (12:48b9) ; 488c3 (12:48c3) GFX_488c3: ; 488c3 -INCBIN "gfx/unknown/0488c3.2bpp" +INCBIN "gfx/unknown/up_arrow.2bpp" GFX_488cb: ; 488cb -INCBIN "gfx/unknown/0488cb.2bpp" +INCBIN "gfx/unknown/down_arrow.2bpp" Function488d3: ; 488d3 (12:48d3) call Function48283 diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index d317f2af3..679f04342 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -221,13 +221,13 @@ MobileSystemSplashScreen_InitGFX: ; 16c108 ; 16c173 .Tiles: -INCBIN "gfx/unknown/16c173.2bpp" +INCBIN "gfx/unknown/mobile_splash.2bpp" .TileMap: -INCBIN "gfx/unknown/16c633.tilemap" +INCBIN "gfx/unknown/mobile_splash.tilemap" .AttrMap: -INCBIN "gfx/unknown/16c79b.tilemap" +INCBIN "gfx/unknown/mobile_splash.attrmap" UnknownMobilePalettes_16c903: ; 16c903 INCLUDE "gfx/unknown/16c903.pal" diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 2f1f1555c..5b7418a0f 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -305,10 +305,10 @@ Function170d02: ; 170d02 ; 170d16 LZ_170d16: -INCBIN "gfx/unknown/170d16.2bpp.lz" +INCBIN "gfx/unknown/pichu_animated.2bpp.lz" LZ_1715a4: -INCBIN "gfx/unknown/1715a4.2bpp.lz" +INCBIN "gfx/unknown/egg_animated.2bpp.lz" GFX_171848: INCBIN "gfx/unknown/171848.2bpp" @@ -817,8 +817,9 @@ Palette_171d71: RGB 21, 21, 20 RGB 11, 11, 10 RGB 0, 0, 0 + GFX_171db1: -INCBIN "gfx/unknown/171db1.2bpp" +INCBIN "gfx/unknown/ascii_font.2bpp" Tilemap_172491: INCBIN "gfx/unknown/172491.tilemap" Tilemap_17251d: From dc4357b7fa120c47c1af9937eb809c1cc7ddbfd6 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 18:39:39 -0500 Subject: [PATCH 26/35] "Pic Pointers" and "Unown Pic Pointers" must start at the same address Use `|` not `+` to combine bitmasks --- engine/phone.asm | 2 +- gfx/pics.asm | 9 +++------ pokecrystal.link | 2 ++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/engine/phone.asm b/engine/phone.asm index ce9cfa081..5050c8044 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -165,7 +165,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad) callba CheckTime pop af - and MORN + DAY + NITE + and MORN | DAY | NITE and c pop de diff --git a/gfx/pics.asm b/gfx/pics.asm index 7e0aebb5c..8616265f0 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1,20 +1,17 @@ INCLUDE "includes.asm" -SECTION "Pic Pointers", ROMX +; PicPointers and UnownPicPointers are assumed to start at the same address, +; but in different banks. This is enforced in pokecrystal.link. +SECTION "Pic Pointers", ROMX PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm" - SECTION "Unown Pic Pointers", ROMX - -; Unown pic pointers are assumed to start at the same address as PicPointers, -; but in a different bank. UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm" SECTION "Trainer Pic Pointers", ROMX - TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm" diff --git a/pokecrystal.link b/pokecrystal.link index 555a61123..59fe55079 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -191,9 +191,11 @@ ROMX $46 ROMX $47 "bank47" ROMX $48 + org $4000 "Pic Pointers" "Pics 1" ROMX $49 + org $4000 "Unown Pic Pointers" "Pics 2" ROMX $4a From 11b9bcb9e549f7414998a87fc01dfc27b34e76ce Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 21:25:36 -0500 Subject: [PATCH 27/35] Start a docs directory; documentation still needs to be written --- docs/music_commands.md | 93 ++++++++++ docs/scripting_commands.md | 345 +++++++++++++++++++++++++++++++++++++ 2 files changed, 438 insertions(+) create mode 100644 docs/music_commands.md create mode 100644 docs/scripting_commands.md diff --git a/docs/music_commands.md b/docs/music_commands.md new file mode 100644 index 000000000..f757a3bd5 --- /dev/null +++ b/docs/music_commands.md @@ -0,0 +1,93 @@ +# Music Commands + +## **`musicheader`** *n*, *index*, *address* + +## **`cry_header`** *n*, *index*, *address* + +## **`note`** *pitch*, *octave* + +## **`sound`** *pitch*, *octave*, *intensity*, *frequency* + +## **`noise`** *pitch*, *duration*, *intensity*, *frequency* + +## `$D0`−`$D7`: **`octave`** *n* + +## `$D8`: **`notetype`** *length*[, *intensity*] + +## `$D9`: **`pitchoffset`** *octave*, *key* + +## `$DA`: **`tempo`** *tempo* + +## `$DB`: **`dutycycle`** *duty_cycle* + +## `$DC`: **`intensity`** *intensity* + +## `$DD`: **`soundinput`** *input* + +## `$DE`: **`sound_duty`** *a*, *b*, *c*, *d* + +## `$DF`: **`togglesfx`** + +## `$E0`: **`slidepitchto`** *duration*, *octave*, *pitch* + +## `$E1`: **`vibrato`** *delay*, *extent* + +## `$E2`: **`unknownmusic0xe2`** *unknown* + +## `$E3`: **`togglenoise`** *id* + +## `$E4`: **`panning`** *tracks* + +## `$E5`: **`volume`** *volume* + +## `$E6`: **`tone`** *tone* + +## `$E7`: **`unknownmusic0xe7`** *unknown* + +## `$E8`: **`unknownmusic0xe8`** *unknown* + +## `$E9`: **`tempo_relative`** *value* + +## `$EA`: **`restartchannel`** *address* + +## `$EB`: **`newsong`** *id* + +## `$EC`: **`sfxpriorityon`** + +## `$ED`: **`sfxpriorityoff`** + +## `$EE`: **`unknownmusic0xee`** *address* + +## `$EF`: **`stereopanning`** *tracks* + +## `$F0`: **`sfxtogglenoise`** *id* + +## `$F1`: **`music0xf1`** + +## `$F2`: **`music0xf2`** + +## `$F3`: **`music0xf3`** + +## `$F4`: **`music0xf4`** + +## `$F5`: **`music0xf5`** + +## `$F6`: **`music0xf6`** + +## `$F7`: **`music0xf7`** + +## `$F8`: **`music0xf8`** + +## `$F9`: **`unknownmusic0xf9`** + +## `$FA`: **`setcondition`** *condition* + +## `$FB`: **`jumpif`** *condition*, *address* + +## `$FC`: **`jumpchannel`** *address* + +## `$FD`: **`loopchannel`** *count*, *address* + +## `$FE`: **`callchannel`** *address* + +## `$FF`: **`endchannel`** diff --git a/docs/scripting_commands.md b/docs/scripting_commands.md new file mode 100644 index 000000000..f952c628a --- /dev/null +++ b/docs/scripting_commands.md @@ -0,0 +1,345 @@ +# Scripting Commands + +## `$00`: **`scall`** *script* + +## `$01`: **`farscall`** *script* + +## `$02`: **`ptcall`** *script* + +## `$03`: **`jump`** *script* + +## `$04`: **`farjump`** *script* + +## `$05`: **`ptjump`** *script* + +## `$06`: **`if_equal`** *byte*, *script* + +## `$07`: **`if_not_equal`** *byte*, *script* + +## `$08`: **`iffalse`** *script* + +## `$09`: **`iftrue`** *script* + +## `$0A`: **`if_greater_than`** *byte*, *script* + +## `$0B`: **`if_less_than`** *byte*, *script* + +## `$0C`: **`jumpstd`** *std_script* + +## `$0D`: **`callstd`** *std_script* + +## `$0E`: **`callasm`** *asm* + +## `$0F`: **`special`** *special_pointer* + +## `$10`: **`ptcallasm`** *asm* + +## `$11`: **`checkmaptriggers`** *map* + +## `$12`: **`domaptrigger`** *map*, *trigger_id* + +## `$13`: **`checktriggers`** + +## `$14`: **`dotrigger`** *trigger_id* + +## `$15`: **`writebyte`** *value* + +## `$16`: **`addvar`** *value* + +## `$17`: **`random`** *value* + +## `$18`: **`checkver`** + +## `$19`: **`copybytetovar`** *address* + +## `$1A`: **`copyvartobyte`** *address* + +## `$1B`: **`loadvar`** *address*, *value* + +## `$1C`: **`checkcode`** *variable* + +## `$1D`: **`writevarcode`** *variable* + +## `$1E`: **`writecode`** *variable*, *value* + +## `$1F`: **`giveitem`** *item_id*[, *quantity*=1] + +## `$20`: **`takeitem`** *item_id*[, *quantity*=1] + +## `$21`: **`checkitem`** *item_id* + +## `$22`: **`givemoney`** *account*, *value* + +## `$23`: **`takemoney`** *account*, *value* + +## `$24`: **`checkmoney`** *account*, *value* + +## `$25`: **`givecoins`** *value* + +## `$26`: **`takecoins`** *value* + +## `$27`: **`checkcoins`** *value* + +## `$28`: **`addcellnum`** *contact_id* + +## `$29`: **`delcellnum`** *contact_id* + +## `$2A`: **`checkcellnum`** *contact_id* + +## `$2B`: **`checktime`** *time* + +- **`checkmorn`**: `checktime MORN` +- **`checkday`**: `checktime DAY` +- **`checknite`**: `checktime NITE` + +## `$2C`: **`checkpoke`** *mon_id* + +## `$2D`: **`givepoke`** *mon_id*, *level*[, *item*=0[, *trainer*=0, *ot_name*, *nickname*]] + +## `$2E`: **`giveegg`** *mon_id*, *level* + +## `$2F`: **`givepokeitem`** *pointer* + +## `$30`: **`checkpokeitem`** *pointer* + +## `$31`: **`checkevent`** *event_flag* + +## `$32`: **`clearevent`** *event_flag* + +## `$33`: **`setevent`** *event_flag* + +## `$34`: **`checkflag`** *engine_flag* + +## `$35`: **`clearflag`** *engine_flag* + +## `$36`: **`setflag`** *engine_flag* + +## `$37`: **`wildon`** + +## `$38`: **`wildoff`** + +## `$39`: **`xycompare`** *pointer* + +## `$3A`: **`warpmod`** *warp_id*, *map* + +## `$3B`: **`blackoutmod`** *map* + +## `$3C`: **`warp`** *map*, *x*, *y* + +## `$3D`: **`readmoney`** *account*, *memory* + +## `$3E`: **`readcoins`** *memory* + +## `$3F`: **`RAM2MEM`** *memory* + +## `$40`: **`pokenamemem`** *mon_id*, *memory* + +## `$41`: **`itemtotext`** *item_id*, *memory* + +## `$42`: **`mapnametotext`** *memory* + +## `$43`: **`trainertotext`** *trainer_id*, *trainer_group*, *memory* + +## `$44`: **`stringtotext`** *text_pointer*, *memory* + +## `$45`: **`itemnotify`** + +## `$46`: **`pocketisfull`** + +## `$47`: **`opentext`** + +## `$48`: **`refreshscreen`** *dummy* + +## `$49`: **`closetext`** + +## `$4A`: **`loadbytec2cf`** *byte* + +## `$4B`: **`farwritetext`** *text_pointer* + +## `$4C`: **`writetext`** *text_pointer* + +## `$4D`: **`repeattext`** *byte1*, *byte2* + +## `$4E`: **`yesorno`** + +## `$4F`: **`loadmenudata`** *data_pointer* + +## `$50`: **`closewindow`** + +## `$51`: **`jumptextfaceplayer`** *text_pointer* + +## `$52`: **`farjumptext`** *text_pointer* + +## `$53`: **`jumptext`** *text_pointer* + +## `$54`: **`waitbutton`** + +## `$55`: **`buttonsound`** + +## `$56`: **`pokepic`** *mon_id* + +## `$57`: **`closepokepic`** + +## `$58`: **`_2dmenu`** + +## `$59`: **`verticalmenu`** + +## `$5A`: **`loadpikachudata`** + +## `$5B`: **`randomwildmon`** + +## `$5C`: **`loadmemtrainer`** + +## `$5D`: **`loadwildmon`** *mon_id*, *level* + +## `$5E`: **`loadtrainer`** *trainer_group*, *trainer_id* + +## `$5F`: **`startbattle`** + +## `$60`: **`reloadmapafterbattle`** + +## `$61`: **`catchtutorial`** *byte* + +## `$62`: **`trainertext`** *which_text* + +## `$63`: **`trainerflagaction`** *action* + +## `$64`: **`winlosstext`** *win_text_pointer*, *loss_text_pointer* + +## `$65`: **`scripttalkafter`** + +## `$66`: **`end_if_just_battled`** + +## `$67`: **`check_just_battled`** + +## `$68`: **`setlasttalked`** *person* + +## `$69`: **`applymovement`** *person*, *data_pointer* + +## `$6A`: **`applymovement2`** *data_pointer* + +## `$6B`: **`faceplayer`** + +## `$6C`: **`faceperson`** *person1*, *person2* + +## `$6D`: **`variablesprite`** *variable_sprite_id*, *sprite_id* + +## `$6E`: **`disappear`** *person* + +## `$6F`: **`appear`** *person* + +## `$70`: **`follow`** *person2*, *person1* + +## `$71`: **`stopfollow`** + +## `$72`: **`moveperson`** *person*, *x*, *y* + +## `$73`: **`writepersonxy`** *person* + +## `$74`: **`loademote`** *emote_id* + +## `$75`: **`showemote`** *emote_id*, *person*, *length* + +## `$76`: **`spriteface`** *person*, *facing* + +## `$77`: **`follownotexact`** *person2*, *person1* + +## `$78`: **`earthquake`** *param* + +## `$79`: **`changemap`** *bank*, *blockdata_pointer* + +## `$7A`: **`changeblock`** *x*, *y*, *block* + +## `$7B`: **`reloadmap`** + +## `$7C`: **`reloadmappart`** + +## `$7D`: **`writecmdqueue`** *queue_pointer* + +## `$7E`: **`delcmdqueue`** *byte* + +## `$7F`: **`playmusic`** *music_id* + +## `$80`: **`encountermusic`** + +## `$81`: **`musicfadeout`** *music_id*, *length* + +## `$82`: **`playmapmusic`** + +## `$83`: **`dontrestartmapmusic`** + +## `$84`: **`cry`** *mon_id* + +## `$85`: **`playsound`** *sfx_id* + +## `$86`: **`waitsfx`** + +## `$87`: **`warpsound`** + +## `$88`: **`specialsound`** + +## `$89`: **`passtoengine`** *data_pointer* + +## `$8A`: **`newloadmap`** *which_method* + +## `$8B`: **`pause`** *length* + +## `$8C`: **`deactivatefacing`** *length* + +## `$8D`: **`priorityjump`** *script* + +## `$8E`: **`warpcheck`** + +## `$8F`: **`ptpriorityjump`** *script* + +## `$90`: **`return`** + +## `$91`: **`end`** + +## `$92`: **`reloadandreturn`** *which_method* + +## `$93`: **`end_all`** + +## `$94`: **`pokemart`** *dialog_id*, *mart_id* + +## `$95`: **`elevator`** *floor_list* + +## `$96`: **`trade`** *trade_id* + +## `$97`: **`askforphonenumber`** *contact_id* + +## `$98`: **`phonecall`** *call_id* + +## `$99`: **`hangup`** + +## `$9A`: **`describedecoration`** *byte* + +## `$9B`: **`fruittree`** *tree_id* + +## `$9C`: **`specialphonecall`** *call_id* + +## `$9D`: **`checkphonecall`** + +## `$9E`: **`verbosegiveitem`** *item_id*[, *quantity*=1] + +## `$9F`: **`verbosegiveitem2`** *item_id*, *variable* + +## `$A0`: **`swarm`** *swarm_id*, *map* + +## `$A1`: **`halloffame`** + +## `$A2`: **`credits`** + +## `$A3`: **`warpfacing`** *facing*, *map*, *x*, *y* + +## `$A4`: **`battletowertext`** *memory* + +## `$A5`: **`landmarktotext`** *landmark_id*, *memory* + +## `$A6`: **`trainerclassname`** *trainer_group*, *memory* + +## `$A7`: **`name`** *type*, *id*, *memory* + +## `$A8`: **`wait`** *duration* + +## `$A9`: **`check_save`** From 20f98e1403afa900464fb5bf17514c19cbda1bfc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 21:40:21 -0500 Subject: [PATCH 28/35] Start documentation for map scripts --- docs/map_scripts.md | 31 ++++ docs/music_commands.md | 92 +++++----- docs/scripting_commands.md | 346 ++++++++++++++++++------------------- 3 files changed, 250 insertions(+), 219 deletions(-) create mode 100644 docs/map_scripts.md diff --git a/docs/map_scripts.md b/docs/map_scripts.md new file mode 100644 index 000000000..6ff3f5152 --- /dev/null +++ b/docs/map_scripts.md @@ -0,0 +1,31 @@ +# Map Scripts + +## `const_value set 2` + +## *`MapName`*`_MapScriptHeader:` + +## `.MapTriggers:` + +**`maptrigger `**___`script`___ + +## `.MapCallbacks:` + +**`dbw `**___`type`___**`, `**___`script`___ + +## *`MapName`*`_MapScriptHeader:` + +## `.Warps:` + +**`warp_def `**___`y`___**`, `**___`x`___**`, `**___`id`___**`, `**___`map`___ + +## `.XYTriggers:` + +**`xy_trigger `**___`id`___**`, `**___`y`___**`, `**___`x`___**`, $0, `**___`script`___**`, $0, $0`** + +## `.Signposts:` + +**`signpost `**___`y`___**`, `**___`x`___**`, `**___`type`___**`, `**___`script``___ + +## `.PersonEvents:` + +**`person_event `**___`sprite`___**`, `**___`y`___**`, `**___`x`___**`, `**___`movement`___**`, `**___`ry`___**`, `**___`rx`___**`, `**___`hour`___**`, `**___`day`___**`, `**___`palette`___**`, `**___`type`___**`, `**___`range`___**`, `**___`script`___**`, `**___`flag`___ diff --git a/docs/music_commands.md b/docs/music_commands.md index f757a3bd5..564ac010a 100644 --- a/docs/music_commands.md +++ b/docs/music_commands.md @@ -1,93 +1,93 @@ # Music Commands -## **`musicheader`** *n*, *index*, *address* +## `musicheader` *n*, *index*, *address* -## **`cry_header`** *n*, *index*, *address* +## `cry_header` *n*, *index*, *address* -## **`note`** *pitch*, *octave* +## `note` *pitch*, *octave* -## **`sound`** *pitch*, *octave*, *intensity*, *frequency* +## `sound` *pitch*, *octave*, *intensity*, *frequency* -## **`noise`** *pitch*, *duration*, *intensity*, *frequency* +## `noise` *pitch*, *duration*, *intensity*, *frequency* -## `$D0`−`$D7`: **`octave`** *n* +## `$D0`−`$D7`: `octave` *n* -## `$D8`: **`notetype`** *length*[, *intensity*] +## `$D8`: `notetype` *length*[, *intensity*] -## `$D9`: **`pitchoffset`** *octave*, *key* +## `$D9`: `pitchoffset` *octave*, *key* -## `$DA`: **`tempo`** *tempo* +## `$DA`: `tempo` *tempo* -## `$DB`: **`dutycycle`** *duty_cycle* +## `$DB`: `dutycycle` *duty_cycle* -## `$DC`: **`intensity`** *intensity* +## `$DC`: `intensity` *intensity* -## `$DD`: **`soundinput`** *input* +## `$DD`: `soundinput` *input* -## `$DE`: **`sound_duty`** *a*, *b*, *c*, *d* +## `$DE`: `sound_duty` *a*, *b*, *c*, *d* -## `$DF`: **`togglesfx`** +## `$DF`: `togglesfx` -## `$E0`: **`slidepitchto`** *duration*, *octave*, *pitch* +## `$E0`: `slidepitchto` *duration*, *octave*, *pitch* -## `$E1`: **`vibrato`** *delay*, *extent* +## `$E1`: `vibrato` *delay*, *extent* -## `$E2`: **`unknownmusic0xe2`** *unknown* +## `$E2`: `unknownmusic0xe2` *unknown* -## `$E3`: **`togglenoise`** *id* +## `$E3`: `togglenoise` *id* -## `$E4`: **`panning`** *tracks* +## `$E4`: `panning` *tracks* -## `$E5`: **`volume`** *volume* +## `$E5`: `volume` *volume* -## `$E6`: **`tone`** *tone* +## `$E6`: `tone` *tone* -## `$E7`: **`unknownmusic0xe7`** *unknown* +## `$E7`: `unknownmusic0xe7` *unknown* -## `$E8`: **`unknownmusic0xe8`** *unknown* +## `$E8`: `unknownmusic0xe8` *unknown* -## `$E9`: **`tempo_relative`** *value* +## `$E9`: `tempo_relative` *value* -## `$EA`: **`restartchannel`** *address* +## `$EA`: `restartchannel` *address* -## `$EB`: **`newsong`** *id* +## `$EB`: `newsong` *id* -## `$EC`: **`sfxpriorityon`** +## `$EC`: `sfxpriorityon` -## `$ED`: **`sfxpriorityoff`** +## `$ED`: `sfxpriorityoff` -## `$EE`: **`unknownmusic0xee`** *address* +## `$EE`: `unknownmusic0xee` *address* -## `$EF`: **`stereopanning`** *tracks* +## `$EF`: `stereopanning` *tracks* -## `$F0`: **`sfxtogglenoise`** *id* +## `$F0`: `sfxtogglenoise` *id* -## `$F1`: **`music0xf1`** +## `$F1`: `music0xf1` -## `$F2`: **`music0xf2`** +## `$F2`: `music0xf2` -## `$F3`: **`music0xf3`** +## `$F3`: `music0xf3` -## `$F4`: **`music0xf4`** +## `$F4`: `music0xf4` -## `$F5`: **`music0xf5`** +## `$F5`: `music0xf5` -## `$F6`: **`music0xf6`** +## `$F6`: `music0xf6` -## `$F7`: **`music0xf7`** +## `$F7`: `music0xf7` -## `$F8`: **`music0xf8`** +## `$F8`: `music0xf8` -## `$F9`: **`unknownmusic0xf9`** +## `$F9`: `unknownmusic0xf9` -## `$FA`: **`setcondition`** *condition* +## `$FA`: `setcondition` *condition* -## `$FB`: **`jumpif`** *condition*, *address* +## `$FB`: `jumpif` *condition*, *address* -## `$FC`: **`jumpchannel`** *address* +## `$FC`: `jumpchannel` *address* -## `$FD`: **`loopchannel`** *count*, *address* +## `$FD`: `loopchannel` *count*, *address* -## `$FE`: **`callchannel`** *address* +## `$FE`: `callchannel` *address* -## `$FF`: **`endchannel`** +## `$FF`: `endchannel` diff --git a/docs/scripting_commands.md b/docs/scripting_commands.md index f952c628a..32ba7d338 100644 --- a/docs/scripting_commands.md +++ b/docs/scripting_commands.md @@ -1,345 +1,345 @@ # Scripting Commands -## `$00`: **`scall`** *script* +## `$00`: `scall` *script* -## `$01`: **`farscall`** *script* +## `$01`: `farscall` *script* -## `$02`: **`ptcall`** *script* +## `$02`: `ptcall` *script* -## `$03`: **`jump`** *script* +## `$03`: `jump` *script* -## `$04`: **`farjump`** *script* +## `$04`: `farjump` *script* -## `$05`: **`ptjump`** *script* +## `$05`: `ptjump` *script* -## `$06`: **`if_equal`** *byte*, *script* +## `$06`: `if_equal` *byte*, *script* -## `$07`: **`if_not_equal`** *byte*, *script* +## `$07`: `if_not_equal` *byte*, *script* -## `$08`: **`iffalse`** *script* +## `$08`: `iffalse` *script* -## `$09`: **`iftrue`** *script* +## `$09`: `iftrue` *script* -## `$0A`: **`if_greater_than`** *byte*, *script* +## `$0A`: `if_greater_than` *byte*, *script* -## `$0B`: **`if_less_than`** *byte*, *script* +## `$0B`: `if_less_than` *byte*, *script* -## `$0C`: **`jumpstd`** *std_script* +## `$0C`: `jumpstd` *std_script* -## `$0D`: **`callstd`** *std_script* +## `$0D`: `callstd` *std_script* -## `$0E`: **`callasm`** *asm* +## `$0E`: `callasm` *asm* -## `$0F`: **`special`** *special_pointer* +## `$0F`: `special` *special_pointer* -## `$10`: **`ptcallasm`** *asm* +## `$10`: `ptcallasm` *asm* -## `$11`: **`checkmaptriggers`** *map* +## `$11`: `checkmaptriggers` *map* -## `$12`: **`domaptrigger`** *map*, *trigger_id* +## `$12`: `domaptrigger` *map*, *trigger_id* -## `$13`: **`checktriggers`** +## `$13`: `checktriggers` -## `$14`: **`dotrigger`** *trigger_id* +## `$14`: `dotrigger` *trigger_id* -## `$15`: **`writebyte`** *value* +## `$15`: `writebyte` *value* -## `$16`: **`addvar`** *value* +## `$16`: `addvar` *value* -## `$17`: **`random`** *value* +## `$17`: `random` *value* -## `$18`: **`checkver`** +## `$18`: `checkver` -## `$19`: **`copybytetovar`** *address* +## `$19`: `copybytetovar` *address* -## `$1A`: **`copyvartobyte`** *address* +## `$1A`: `copyvartobyte` *address* -## `$1B`: **`loadvar`** *address*, *value* +## `$1B`: `loadvar` *address*, *value* -## `$1C`: **`checkcode`** *variable* +## `$1C`: `checkcode` *variable* -## `$1D`: **`writevarcode`** *variable* +## `$1D`: `writevarcode` *variable* -## `$1E`: **`writecode`** *variable*, *value* +## `$1E`: `writecode` *variable*, *value* -## `$1F`: **`giveitem`** *item_id*[, *quantity*=1] +## `$1F`: `giveitem` *item_id*[, *quantity*=1] -## `$20`: **`takeitem`** *item_id*[, *quantity*=1] +## `$20`: `takeitem` *item_id*[, *quantity*=1] -## `$21`: **`checkitem`** *item_id* +## `$21`: `checkitem` *item_id* -## `$22`: **`givemoney`** *account*, *value* +## `$22`: `givemoney` *account*, *value* -## `$23`: **`takemoney`** *account*, *value* +## `$23`: `takemoney` *account*, *value* -## `$24`: **`checkmoney`** *account*, *value* +## `$24`: `checkmoney` *account*, *value* -## `$25`: **`givecoins`** *value* +## `$25`: `givecoins` *value* -## `$26`: **`takecoins`** *value* +## `$26`: `takecoins` *value* -## `$27`: **`checkcoins`** *value* +## `$27`: `checkcoins` *value* -## `$28`: **`addcellnum`** *contact_id* +## `$28`: `addcellnum` *contact_id* -## `$29`: **`delcellnum`** *contact_id* +## `$29`: `delcellnum` *contact_id* -## `$2A`: **`checkcellnum`** *contact_id* +## `$2A`: `checkcellnum` *contact_id* -## `$2B`: **`checktime`** *time* +## `$2B`: `checktime` *time* -- **`checkmorn`**: `checktime MORN` -- **`checkday`**: `checktime DAY` -- **`checknite`**: `checktime NITE` +- **`checkmorn`:** `checktime MORN` +- **`checkday`:** `checktime DAY` +- **`checknite`:** `checktime NITE` -## `$2C`: **`checkpoke`** *mon_id* +## `$2C`: `checkpoke` *mon_id* -## `$2D`: **`givepoke`** *mon_id*, *level*[, *item*=0[, *trainer*=0, *ot_name*, *nickname*]] +## `$2D`: `givepoke` *mon_id*, *level*[, *item*=0[, *trainer*=0, *ot_name*, *nickname*]] -## `$2E`: **`giveegg`** *mon_id*, *level* +## `$2E`: `giveegg` *mon_id*, *level* -## `$2F`: **`givepokeitem`** *pointer* +## `$2F`: `givepokeitem` *pointer* -## `$30`: **`checkpokeitem`** *pointer* +## `$30`: `checkpokeitem` *pointer* -## `$31`: **`checkevent`** *event_flag* +## `$31`: `checkevent` *event_flag* -## `$32`: **`clearevent`** *event_flag* +## `$32`: `clearevent` *event_flag* -## `$33`: **`setevent`** *event_flag* +## `$33`: `setevent` *event_flag* -## `$34`: **`checkflag`** *engine_flag* +## `$34`: `checkflag` *engine_flag* -## `$35`: **`clearflag`** *engine_flag* +## `$35`: `clearflag` *engine_flag* -## `$36`: **`setflag`** *engine_flag* +## `$36`: `setflag` *engine_flag* -## `$37`: **`wildon`** +## `$37`: `wildon` -## `$38`: **`wildoff`** +## `$38`: `wildoff` -## `$39`: **`xycompare`** *pointer* +## `$39`: `xycompare` *pointer* -## `$3A`: **`warpmod`** *warp_id*, *map* +## `$3A`: `warpmod` *warp_id*, *map* -## `$3B`: **`blackoutmod`** *map* +## `$3B`: `blackoutmod` *map* -## `$3C`: **`warp`** *map*, *x*, *y* +## `$3C`: `warp` *map*, *x*, *y* -## `$3D`: **`readmoney`** *account*, *memory* +## `$3D`: `readmoney` *account*, *memory* -## `$3E`: **`readcoins`** *memory* +## `$3E`: `readcoins` *memory* -## `$3F`: **`RAM2MEM`** *memory* +## `$3F`: `RAM2MEM` *memory* -## `$40`: **`pokenamemem`** *mon_id*, *memory* +## `$40`: `pokenamemem` *mon_id*, *memory* -## `$41`: **`itemtotext`** *item_id*, *memory* +## `$41`: `itemtotext` *item_id*, *memory* -## `$42`: **`mapnametotext`** *memory* +## `$42`: `mapnametotext` *memory* -## `$43`: **`trainertotext`** *trainer_id*, *trainer_group*, *memory* +## `$43`: `trainertotext` *trainer_id*, *trainer_group*, *memory* -## `$44`: **`stringtotext`** *text_pointer*, *memory* +## `$44`: `stringtotext` *text_pointer*, *memory* -## `$45`: **`itemnotify`** +## `$45`: `itemnotify` -## `$46`: **`pocketisfull`** +## `$46`: `pocketisfull` -## `$47`: **`opentext`** +## `$47`: `opentext` -## `$48`: **`refreshscreen`** *dummy* +## `$48`: `refreshscreen` *dummy* -## `$49`: **`closetext`** +## `$49`: `closetext` -## `$4A`: **`loadbytec2cf`** *byte* +## `$4A`: `loadbytec2cf` *byte* -## `$4B`: **`farwritetext`** *text_pointer* +## `$4B`: `farwritetext` *text_pointer* -## `$4C`: **`writetext`** *text_pointer* +## `$4C`: `writetext` *text_pointer* -## `$4D`: **`repeattext`** *byte1*, *byte2* +## `$4D`: `repeattext` *byte1*, *byte2* -## `$4E`: **`yesorno`** +## `$4E`: `yesorno` -## `$4F`: **`loadmenudata`** *data_pointer* +## `$4F`: `loadmenudata` *data_pointer* -## `$50`: **`closewindow`** +## `$50`: `closewindow` -## `$51`: **`jumptextfaceplayer`** *text_pointer* +## `$51`: `jumptextfaceplayer` *text_pointer* -## `$52`: **`farjumptext`** *text_pointer* +## `$52`: `farjumptext` *text_pointer* -## `$53`: **`jumptext`** *text_pointer* +## `$53`: `jumptext` *text_pointer* -## `$54`: **`waitbutton`** +## `$54`: `waitbutton` -## `$55`: **`buttonsound`** +## `$55`: `buttonsound` -## `$56`: **`pokepic`** *mon_id* +## `$56`: `pokepic` *mon_id* -## `$57`: **`closepokepic`** +## `$57`: `closepokepic` -## `$58`: **`_2dmenu`** +## `$58`: `_2dmenu` -## `$59`: **`verticalmenu`** +## `$59`: `verticalmenu` -## `$5A`: **`loadpikachudata`** +## `$5A`: `loadpikachudata` -## `$5B`: **`randomwildmon`** +## `$5B`: `randomwildmon` -## `$5C`: **`loadmemtrainer`** +## `$5C`: `loadmemtrainer` -## `$5D`: **`loadwildmon`** *mon_id*, *level* +## `$5D`: `loadwildmon` *mon_id*, *level* -## `$5E`: **`loadtrainer`** *trainer_group*, *trainer_id* +## `$5E`: `loadtrainer` *trainer_group*, *trainer_id* -## `$5F`: **`startbattle`** +## `$5F`: `startbattle` -## `$60`: **`reloadmapafterbattle`** +## `$60`: `reloadmapafterbattle` -## `$61`: **`catchtutorial`** *byte* +## `$61`: `catchtutorial` *byte* -## `$62`: **`trainertext`** *which_text* +## `$62`: `trainertext` *which_text* -## `$63`: **`trainerflagaction`** *action* +## `$63`: `trainerflagaction` *action* -## `$64`: **`winlosstext`** *win_text_pointer*, *loss_text_pointer* +## `$64`: `winlosstext` *win_text_pointer*, *loss_text_pointer* -## `$65`: **`scripttalkafter`** +## `$65`: `scripttalkafter` -## `$66`: **`end_if_just_battled`** +## `$66`: `end_if_just_battled` -## `$67`: **`check_just_battled`** +## `$67`: `check_just_battled` -## `$68`: **`setlasttalked`** *person* +## `$68`: `setlasttalked` *person* -## `$69`: **`applymovement`** *person*, *data_pointer* +## `$69`: `applymovement` *person*, *data_pointer* -## `$6A`: **`applymovement2`** *data_pointer* +## `$6A`: `applymovement2` *data_pointer* -## `$6B`: **`faceplayer`** +## `$6B`: `faceplayer` -## `$6C`: **`faceperson`** *person1*, *person2* +## `$6C`: `faceperson` *person1*, *person2* -## `$6D`: **`variablesprite`** *variable_sprite_id*, *sprite_id* +## `$6D`: `variablesprite` *variable_sprite_id*, *sprite_id* -## `$6E`: **`disappear`** *person* +## `$6E`: `disappear` *person* -## `$6F`: **`appear`** *person* +## `$6F`: `appear` *person* -## `$70`: **`follow`** *person2*, *person1* +## `$70`: `follow` *person2*, *person1* -## `$71`: **`stopfollow`** +## `$71`: `stopfollow` -## `$72`: **`moveperson`** *person*, *x*, *y* +## `$72`: `moveperson` *person*, *x*, *y* -## `$73`: **`writepersonxy`** *person* +## `$73`: `writepersonxy` *person* -## `$74`: **`loademote`** *emote_id* +## `$74`: `loademote` *emote_id* -## `$75`: **`showemote`** *emote_id*, *person*, *length* +## `$75`: `showemote` *emote_id*, *person*, *length* -## `$76`: **`spriteface`** *person*, *facing* +## `$76`: `spriteface` *person*, *facing* -## `$77`: **`follownotexact`** *person2*, *person1* +## `$77`: `follownotexact` *person2*, *person1* -## `$78`: **`earthquake`** *param* +## `$78`: `earthquake` *param* -## `$79`: **`changemap`** *bank*, *blockdata_pointer* +## `$79`: `changemap` *bank*, *blockdata_pointer* -## `$7A`: **`changeblock`** *x*, *y*, *block* +## `$7A`: `changeblock` *x*, *y*, *block* -## `$7B`: **`reloadmap`** +## `$7B`: `reloadmap` -## `$7C`: **`reloadmappart`** +## `$7C`: `reloadmappart` -## `$7D`: **`writecmdqueue`** *queue_pointer* +## `$7D`: `writecmdqueue` *queue_pointer* -## `$7E`: **`delcmdqueue`** *byte* +## `$7E`: `delcmdqueue` *byte* -## `$7F`: **`playmusic`** *music_id* +## `$7F`: `playmusic` *music_id* -## `$80`: **`encountermusic`** +## `$80`: `encountermusic` -## `$81`: **`musicfadeout`** *music_id*, *length* +## `$81`: `musicfadeout` *music_id*, *length* -## `$82`: **`playmapmusic`** +## `$82`: `playmapmusic` -## `$83`: **`dontrestartmapmusic`** +## `$83`: `dontrestartmapmusic` -## `$84`: **`cry`** *mon_id* +## `$84`: `cry` *mon_id* -## `$85`: **`playsound`** *sfx_id* +## `$85`: `playsound` *sfx_id* -## `$86`: **`waitsfx`** +## `$86`: `waitsfx` -## `$87`: **`warpsound`** +## `$87`: `warpsound` -## `$88`: **`specialsound`** +## `$88`: `specialsound` -## `$89`: **`passtoengine`** *data_pointer* +## `$89`: `passtoengine` *data_pointer* -## `$8A`: **`newloadmap`** *which_method* +## `$8A`: `newloadmap` *which_method* -## `$8B`: **`pause`** *length* +## `$8B`: `pause` *length* -## `$8C`: **`deactivatefacing`** *length* +## `$8C`: `deactivatefacing` *length* -## `$8D`: **`priorityjump`** *script* +## `$8D`: `priorityjump` *script* -## `$8E`: **`warpcheck`** +## `$8E`: `warpcheck` -## `$8F`: **`ptpriorityjump`** *script* +## `$8F`: `ptpriorityjump` *script* -## `$90`: **`return`** +## `$90`: `return` -## `$91`: **`end`** +## `$91`: `end` -## `$92`: **`reloadandreturn`** *which_method* +## `$92`: `reloadandreturn` *which_method* -## `$93`: **`end_all`** +## `$93`: `end_all` -## `$94`: **`pokemart`** *dialog_id*, *mart_id* +## `$94`: `pokemart` *dialog_id*, *mart_id* -## `$95`: **`elevator`** *floor_list* +## `$95`: `elevator` *floor_list* -## `$96`: **`trade`** *trade_id* +## `$96`: `trade` *trade_id* -## `$97`: **`askforphonenumber`** *contact_id* +## `$97`: `askforphonenumber` *contact_id* -## `$98`: **`phonecall`** *call_id* +## `$98`: `phonecall` *call_id* -## `$99`: **`hangup`** +## `$99`: `hangup` -## `$9A`: **`describedecoration`** *byte* +## `$9A`: `describedecoration` *byte* -## `$9B`: **`fruittree`** *tree_id* +## `$9B`: `fruittree` *tree_id* -## `$9C`: **`specialphonecall`** *call_id* +## `$9C`: `specialphonecall` *call_id* -## `$9D`: **`checkphonecall`** +## `$9D`: `checkphonecall` -## `$9E`: **`verbosegiveitem`** *item_id*[, *quantity*=1] +## `$9E`: `verbosegiveitem` *item_id*[, *quantity*=1] -## `$9F`: **`verbosegiveitem2`** *item_id*, *variable* +## `$9F`: `verbosegiveitem2` *item_id*, *variable* -## `$A0`: **`swarm`** *swarm_id*, *map* +## `$A0`: `swarm` *swarm_id*, *map* -## `$A1`: **`halloffame`** +## `$A1`: `halloffame` -## `$A2`: **`credits`** +## `$A2`: `credits` -## `$A3`: **`warpfacing`** *facing*, *map*, *x*, *y* +## `$A3`: `warpfacing` *facing*, *map*, *x*, *y* -## `$A4`: **`battletowertext`** *memory* +## `$A4`: `battletowertext` *memory* -## `$A5`: **`landmarktotext`** *landmark_id*, *memory* +## `$A5`: `landmarktotext` *landmark_id*, *memory* -## `$A6`: **`trainerclassname`** *trainer_group*, *memory* +## `$A6`: `trainerclassname` *trainer_group*, *memory* -## `$A7`: **`name`** *type*, *id*, *memory* +## `$A7`: `name` *type*, *id*, *memory* -## `$A8`: **`wait`** *duration* +## `$A8`: `wait` *duration* -## `$A9`: **`check_save`** +## `$A9`: `check_save` From 19a3d1b6e456e416fd57eb1fd28333174aecbef4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 21:45:26 -0500 Subject: [PATCH 29/35] Fix Markdown formatting for example lines --- docs/map_scripts.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 6ff3f5152..722faa37a 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -6,26 +6,26 @@ ## `.MapTriggers:` -**`maptrigger `**___`script`___ +### `maptrigger `*`script`* ## `.MapCallbacks:` -**`dbw `**___`type`___**`, `**___`script`___ +### `dbw `*`type`*`, `*`script`* ## *`MapName`*`_MapScriptHeader:` ## `.Warps:` -**`warp_def `**___`y`___**`, `**___`x`___**`, `**___`id`___**`, `**___`map`___ +### `warp_def `*`y`*`, `*`x`*`, `*`id`*`, `*`map`* ## `.XYTriggers:` -**`xy_trigger `**___`id`___**`, `**___`y`___**`, `**___`x`___**`, $0, `**___`script`___**`, $0, $0`** +### `xy_trigger `*`id`*`, `*`y`*`, `*`x`*`, $0, `*`script`*`, $0, $0` ## `.Signposts:` -**`signpost `**___`y`___**`, `**___`x`___**`, `**___`type`___**`, `**___`script``___ +### `signpost `*`y`*`, `*`x`*`, `*`type`*`, `*`script`* ## `.PersonEvents:` -**`person_event `**___`sprite`___**`, `**___`y`___**`, `**___`x`___**`, `**___`movement`___**`, `**___`ry`___**`, `**___`rx`___**`, `**___`hour`___**`, `**___`day`___**`, `**___`palette`___**`, `**___`type`___**`, `**___`range`___**`, `**___`script`___**`, `**___`flag`___ +### `person_event `*`sprite`*`, `*`y`*`, `*`x`*`, `*`movement`*`, `*`ry`*`, `*`rx`*`, `*`hour`*`, `*`day`*`, `*`palette`*`, `*`type`*`, `*`range`*`, `*`script`*`, `*`flag`* From fe9cb90049ab0ab3a2fbb988539ed46afb0b6433 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 22:02:20 -0500 Subject: [PATCH 30/35] Fix map script documentation formatting --- docs/map_scripts.md | 115 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 101 insertions(+), 14 deletions(-) diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 722faa37a..72d8561b6 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -1,31 +1,118 @@ # Map Scripts + ## `const_value set 2` -## *`MapName`*`_MapScriptHeader:` +### `const _` -## `.MapTriggers:` -### `maptrigger `*`script`* +## `MapName_MapScriptHeader:` -## `.MapCallbacks:` -### `dbw `*`type`*`, `*`script`* +## `.MapTriggers: db ` -## *`MapName`*`_MapScriptHeader:` +### `maptrigger