From 699495bfcb732559114ad1450e704844a86308a1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 13:37:15 -0500 Subject: [PATCH] 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