You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Consistent capitalization for map names, matching their constants
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -100,8 +100,8 @@ SPAWN_RED EQU 2
|
||||
; wPokemonWithdrawDepositParameter
|
||||
PC_WITHDRAW EQU 0
|
||||
PC_DEPOSIT EQU 1
|
||||
DAYCARE_WITHDRAW EQU 2
|
||||
DAYCARE_DEPOSIT EQU 3
|
||||
DAY_CARE_WITHDRAW EQU 2
|
||||
DAY_CARE_DEPOSIT EQU 3
|
||||
|
||||
; wCurrentDexMode
|
||||
const_def
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -13,7 +13,7 @@ SelectMonFromParty: ; 50000
|
||||
; 5001d
|
||||
|
||||
|
||||
SelectTradeOrDaycareMon: ; 5001d
|
||||
SelectTradeOrDayCareMon: ; 5001d
|
||||
ld a, b
|
||||
ld [PartyMenuActionText], a
|
||||
call DisableSpriteUpdates
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
46
maps.asm
46
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"
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user