pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Events and some WRAM cleanup

Browse Source
This commit is contained in:
PikalaxALT
2015-12-18 20:07:09 -05:00
parent d644406f61
commit 3d36f1a837
60 changed files with 752 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/ai/items.asm
View File

@@ -866,7 +866,7 @@ PrintText_UsedItemOn: ; 38571
ld [wd265], a ld [wd265], a
call GetItemName call GetItemName
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, wd050 ld de, wMonOrItemNameBuffer
ld bc, ITEM_NAME_LENGTH ld bc, ITEM_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, TextJump_EnemyUsedOn ld hl, TextJump_EnemyUsedOn

2
battle/core.asm
View File

@@ -8809,7 +8809,7 @@ endr
ld hl, wPayDayMoney + 2 ld hl, wPayDayMoney + 2
ld de, Money + 2 ld de, Money + 2
call AddBattleMoneyToAccount call AddBattleMoneyToAccount
ld hl, BattleText_PlayerPickuedUpPayDayMoney ld hl, BattleText_PlayerPickedUpPayDayMoney
call StdBattleTextBox call StdBattleTextBox
ld a, [InBattleTowerBattle] ld a, [InBattleTowerBattle]
bit 0, a bit 0, a

22
constants/sprite_constants.asm
View File

@@ -377,14 +377,14 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_FRAMESET_07 const SPRITE_ANIM_FRAMESET_07
const SPRITE_ANIM_FRAMESET_08 const SPRITE_ANIM_FRAMESET_08
const SPRITE_ANIM_FRAMESET_09 const SPRITE_ANIM_FRAMESET_09
const SPRITE_ANIM_FRAMESET_0A const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO
const SPRITE_ANIM_FRAMESET_0B const SPRITE_ANIM_FRAMESET_0B
const SPRITE_ANIM_FRAMESET_0C const SPRITE_ANIM_FRAMESET_0C
const SPRITE_ANIM_FRAMESET_SLOT_GOLEM const SPRITE_ANIM_FRAMESET_SLOT_GOLEM
const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY
const SPRITE_ANIM_FRAMESET_0F const SPRITE_ANIM_FRAMESET_0F
const SPRITE_ANIM_FRAMESET_SLOTS_EGG const SPRITE_ANIM_FRAMESET_SLOTS_EGG
const SPRITE_ANIM_FRAMESET_11 const SPRITE_ANIM_FRAMESET_WALK_CYCLE
const SPRITE_ANIM_FRAMESET_12 const SPRITE_ANIM_FRAMESET_12
const SPRITE_ANIM_FRAMESET_13 const SPRITE_ANIM_FRAMESET_13
const SPRITE_ANIM_FRAMESET_14 const SPRITE_ANIM_FRAMESET_14
@@ -396,7 +396,7 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_FRAMESET_1A const SPRITE_ANIM_FRAMESET_1A
const SPRITE_ANIM_FRAMESET_1B const SPRITE_ANIM_FRAMESET_1B
const SPRITE_ANIM_FRAMESET_1C const SPRITE_ANIM_FRAMESET_1C
const SPRITE_ANIM_FRAMESET_1D const SPRITE_ANIM_FRAMESET_LEAF
const SPRITE_ANIM_FRAMESET_1E const SPRITE_ANIM_FRAMESET_1E
const SPRITE_ANIM_FRAMESET_1F const SPRITE_ANIM_FRAMESET_1F
const SPRITE_ANIM_FRAMESET_20 const SPRITE_ANIM_FRAMESET_20
@@ -435,13 +435,13 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_FRAMESET_41 const SPRITE_ANIM_FRAMESET_41
const_def const_def
const SPRITE_ANIM_SEQ_00 const SPRITE_ANIM_SEQ_NULL
const SPRITE_ANIM_SEQ_01 const SPRITE_ANIM_SEQ_01
const SPRITE_ANIM_SEQ_02 const SPRITE_ANIM_SEQ_02
const SPRITE_ANIM_SEQ_03 const SPRITE_ANIM_SEQ_03
const SPRITE_ANIM_SEQ_04 const SPRITE_ANIM_SEQ_04
const SPRITE_ANIM_SEQ_05 const SPRITE_ANIM_SEQ_05
const SPRITE_ANIM_SEQ_06 const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO
const SPRITE_ANIM_SEQ_07 const SPRITE_ANIM_SEQ_07
const SPRITE_ANIM_SEQ_08 const SPRITE_ANIM_SEQ_08
const SPRITE_ANIM_SEQ_SLOT_GOLEM const SPRITE_ANIM_SEQ_SLOT_GOLEM
@@ -457,9 +457,9 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_SEQ_13 const SPRITE_ANIM_SEQ_13
const SPRITE_ANIM_SEQ_14 const SPRITE_ANIM_SEQ_14
const SPRITE_ANIM_SEQ_15 const SPRITE_ANIM_SEQ_15
const SPRITE_ANIM_SEQ_16 const SPRITE_ANIM_SEQ_FLY_FROM
const SPRITE_ANIM_SEQ_17 const SPRITE_ANIM_SEQ_FLY_LEAF
const SPRITE_ANIM_SEQ_18 const SPRITE_ANIM_SEQ_FLY_TO
const SPRITE_ANIM_SEQ_19 const SPRITE_ANIM_SEQ_19
const SPRITE_ANIM_SEQ_1A const SPRITE_ANIM_SEQ_1A
const SPRITE_ANIM_SEQ_1B const SPRITE_ANIM_SEQ_1B
@@ -475,14 +475,14 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_INDEX_00 const SPRITE_ANIM_INDEX_00
const SPRITE_ANIM_INDEX_01 const SPRITE_ANIM_INDEX_01
const SPRITE_ANIM_INDEX_02 const SPRITE_ANIM_INDEX_02
const SPRITE_ANIM_INDEX_03 const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
const SPRITE_ANIM_INDEX_04 const SPRITE_ANIM_INDEX_04
const SPRITE_ANIM_INDEX_05 const SPRITE_ANIM_INDEX_05
const SPRITE_ANIM_INDEX_SLOT_GOLEM const SPRITE_ANIM_INDEX_SLOT_GOLEM
const SPRITE_ANIM_INDEX_SLOTS_CHANSEY const SPRITE_ANIM_INDEX_SLOTS_CHANSEY
const SPRITE_ANIM_INDEX_SLOTS_EGG const SPRITE_ANIM_INDEX_SLOTS_EGG
const SPRITE_ANIM_INDEX_09 const SPRITE_ANIM_INDEX_09
const SPRITE_ANIM_INDEX_0A const SPRITE_ANIM_INDEX_WALK_CYCLE
const SPRITE_ANIM_INDEX_0B const SPRITE_ANIM_INDEX_0B
const SPRITE_ANIM_INDEX_0C const SPRITE_ANIM_INDEX_0C
const SPRITE_ANIM_INDEX_0D const SPRITE_ANIM_INDEX_0D
@@ -496,7 +496,7 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_INDEX_15 const SPRITE_ANIM_INDEX_15
const SPRITE_ANIM_INDEX_LEAF const SPRITE_ANIM_INDEX_LEAF
const SPRITE_ANIM_INDEX_CUT_TREE const SPRITE_ANIM_INDEX_CUT_TREE
const SPRITE_ANIM_INDEX_18 const SPRITE_ANIM_INDEX_FLY_LEAF
const SPRITE_ANIM_INDEX_19 const SPRITE_ANIM_INDEX_19
const SPRITE_ANIM_INDEX_1A const SPRITE_ANIM_INDEX_1A
const SPRITE_ANIM_INDEX_1B const SPRITE_ANIM_INDEX_1B

4
engine/breeding/egg.asm
View File

@@ -575,7 +575,7 @@ GetHeritableMoves: ; 17197
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
cp DITTO cp DITTO
jr z, .ditto2 jr z, .ditto2
ld a, [wDittoInDaycare] ld a, [wBreedMotherOrNonDitto]
and a and a
ret z ret z
ld hl, wBreedMon1Moves ld hl, wBreedMon1Moves
@@ -633,7 +633,7 @@ GetBreedmonMovePointer: ; 1720b
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
cp DITTO cp DITTO
jr z, .ditto jr z, .ditto
ld a, [wDittoInDaycare] ld a, [wBreedMotherOrNonDitto]
and a and a
ret z ret z

2
engine/clock_reset.asm
View File

@@ -95,7 +95,7 @@ RestartClock: ; 20021 (8:4021)
ld [StringBuffer2 + 2], a ld [StringBuffer2 + 2], a
xor a xor a
ld [StringBuffer2 + 3], a ld [StringBuffer2 + 3], a
call Function677 call InitTime
call .PrintTime call .PrintTime
ld hl, .Text_ClockReset ld hl, .Text_ClockReset
call PrintText call PrintText

2
engine/crystal_intro.asm
View File

@@ -80,7 +80,7 @@ Copyright_GFPresents: ; e4579
callba ClearSpriteAnims callba ClearSpriteAnims
depixel 10, 11, 4, 0 depixel 10, 11, 4, 0
ld a, SPRITE_ANIM_INDEX_03 ld a, SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
ld hl, $7 ld hl, $7
add hl, bc add hl, bc

8
engine/decorations.asm
View File

@@ -6,7 +6,7 @@ InitDecorations: ; 26751 (9:6751)
ret ret
_KrisDecorationMenu: ; 0x2675c _KrisDecorationMenu: ; 0x2675c
ld a, [wcf76] ld a, [wWhichIndexSet]
push af push af
ld hl, .MenuDataHeader ld hl, .MenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
@@ -30,7 +30,7 @@ _KrisDecorationMenu: ; 0x2675c
.exit_menu .exit_menu
call ExitMenu call ExitMenu
pop af pop af
ld [wcf76], a ld [wWhichIndexSet], a
ld a, [Buffer5] ld a, [Buffer5]
ld c, a ld c, a
ret ret
@@ -74,7 +74,7 @@ _KrisDecorationMenu: ; 0x2675c
.FindCategoriesWithOwnedDecos: ; 26806 .FindCategoriesWithOwnedDecos: ; 26806
xor a xor a
ld [wcf76], a ld [wWhichIndexSet], a
call .ClearStringBuffer2 call .ClearStringBuffer2
call .FindOwndDecos call .FindOwndDecos
ld a, 7 ld a, 7
@@ -374,7 +374,7 @@ PopulateDecoCategoryMenu: ; 2695b
cp 8 cp 8
jr nc, .beyond_eight jr nc, .beyond_eight
xor a xor a
ld [wcf76], a ld [wWhichIndexSet], a
ld hl, .NonscrollingMenuDataHeader ld hl, .NonscrollingMenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
call DoNthMenu call DoNthMenu

2
engine/learn.asm
View File

@@ -4,7 +4,7 @@ LearnMove: ; 6508
ld hl, PartyMonNicknames ld hl, PartyMonNicknames
call GetNick call GetNick
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, wd050_MonNick ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH ld bc, PKMN_NAME_LENGTH
call CopyBytes call CopyBytes

2
engine/main_menu.asm
View File

@@ -12,7 +12,7 @@ MainMenu: ; 49cdc
ld hl, GameTimerPause ld hl, GameTimerPause
res 0, [hl] res 0, [hl]
call Function49da4 call Function49da4
ld [wcf76], a ld [wWhichIndexSet], a
call Function49e09 call Function49e09
ld hl, MenuDataHeader_0x49d14 ld hl, MenuDataHeader_0x49d14
call LoadMenuDataHeader call LoadMenuDataHeader

33
engine/mart.asm
View File

@@ -70,10 +70,10 @@ BargainShop: ; 15a84
Pharmacist: ; 15aae Pharmacist: ; 15aae
call FarReadMart call FarReadMart
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
ld hl, UnknownText_0x15e90 ld hl, Text_Pharmacist_Intro
call MartTextBox call MartTextBox
call BuyMenu call BuyMenu
ld hl, UnknownText_0x15eae ld hl, Text_Pharmacist_ComeAgain
call MartTextBox call MartTextBox
ret ret
; 15ac4 ; 15ac4
@@ -493,7 +493,7 @@ BuyMenuLoop: ; 15cef
.useless_pointer .useless_pointer
call MartAskPurchaseQuantity call MartAskPurchaseQuantity
jr c, .cancel jr c, .cancel
call Function15d97 call MartConfirmPurchase
jr c, .cancel jr c, .cancel
ld de, Money ld de, Money
ld bc, hMoneyTemp ld bc, hMoneyTemp
@@ -551,7 +551,7 @@ StandardMartAskPurchaseQuantity:
ret ret
; 15d97 ; 15d97
Function15d97: ; 15d97 MartConfirmPurchase: ; 15d97
predef PartyMonItemName predef PartyMonItemName
ld a, MARTTEXT_COSTS_THIS_MUCH ld a, MARTTEXT_COSTS_THIS_MUCH
call LoadBuyMenuText call LoadBuyMenuText
@@ -764,7 +764,7 @@ Text_BargainShop_ComeAgain: ; 0x15e8b
db "@" db "@"
; 0x15e90 ; 0x15e90
UnknownText_0x15e90: ; 0x15e90 Text_Pharmacist_Intro: ; 0x15e90
; What's up? Need some medicine? ; What's up? Need some medicine?
text_jump UnknownText_0x1c4e5f text_jump UnknownText_0x1c4e5f
db "@" db "@"
@@ -800,7 +800,7 @@ Text_Pharmacy_InsufficientFunds: ; 0x15ea9
db "@" db "@"
; 0x15eae ; 0x15eae
UnknownText_0x15eae: ; 0x15eae Text_Pharmacist_ComeAgain: ; 0x15eae
; All right. See you around. ; All right. See you around.
text_jump UnknownText_0x1c4ef6 text_jump UnknownText_0x1c4ef6
db "@" db "@"
@@ -810,36 +810,35 @@ UnknownText_0x15eae: ; 0x15eae
SellMenu: ; 15eb3 SellMenu: ; 15eb3
call DisableSpriteUpdates call DisableSpriteUpdates
callba DepositSellInitPackBuffers callba DepositSellInitPackBuffers
.asm_15ebc .loop
callba DepositSellPack callba DepositSellPack
ld a, [wcf66] ld a, [wcf66]
and a and a
jp z, Function15ece jp z, .quit
call Function15ee0 call .TryToSellItem
jr .asm_15ebc jr .loop
; 15ece
Function15ece: ; 15ece .quit
call Function2b74 call ReturnToMapWithSpeechTextbox
and a and a
ret ret
; 15ed3 ; 15ed3
Function15ed3: ; unreferenced .NothingToSell: ; unreferenced
ld hl, UnknownText_0x15edb ld hl, .NothingToSellText
call MenuTextBoxBackup call MenuTextBoxBackup
and a and a
ret ret
; 15edb ; 15edb
UnknownText_0x15edb: ; 0x15edb .NothingToSellText: ; 0x15edb
; You don't have anything to sell. ; You don't have anything to sell.
text_jump UnknownText_0x1c4f12 text_jump UnknownText_0x1c4f12
db "@" db "@"
; 0x15ee0 ; 0x15ee0
Function15ee0: ; 15ee0 .TryToSellItem: ; 15ee0
callba CheckItemMenu callba CheckItemMenu
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
ld hl, .jumptable ld hl, .jumptable

4
engine/mon_icons.asm
View File

@@ -243,7 +243,7 @@ Function8e97d: ; 8e97d (23:697d)
call InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_00 ld [hl], SPRITE_ANIM_SEQ_NULL
ret ret
Function8e99a: ; 8e99a (23:699a) Function8e99a: ; 8e99a (23:699a)
@@ -371,7 +371,7 @@ FreezeMonIcons: ; 8ea4a
jr z, .next jr z, .next
cp d cp d
jr z, .loadwithtwo jr z, .loadwithtwo
ld a, SPRITE_ANIM_SEQ_00 ld a, SPRITE_ANIM_SEQ_NULL
jr .ok jr .ok
.loadwithtwo .loadwithtwo

6
engine/namingscreen.asm
View File

@@ -1,7 +1,7 @@
_NamingScreen: ; 0x116b7 _NamingScreen: ; 0x116b7
call DisableSpriteUpdates call DisableSpriteUpdates
call NamingScreen call NamingScreen
call Function2b74 call ReturnToMapWithSpeechTextbox
ret ret
; 0x116c1 ; 0x116c1
@@ -174,7 +174,7 @@ Function117f5: ; 117f5 (4:57f5)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
depixel 4, 4, 4, 0 depixel 4, 4, 4, 0
ld a, SPRITE_ANIM_INDEX_0A ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_FRAMESET_ID ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
add hl, bc add hl, bc
@@ -220,7 +220,7 @@ Function11847: ; 11847 (4:5847)
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
pop de pop de
ld b, SPRITE_ANIM_INDEX_0A ld b, SPRITE_ANIM_INDEX_WALK_CYCLE
ld a, d ld a, d
cp $7a cp $7a
jr nz, .asm_11873 jr nz, .asm_11873

4
engine/npctrade.asm
View File

@@ -88,7 +88,7 @@ NPCTrade:: ; fcba8
ld [wcf64], a ld [wcf64], a
pop af pop af
ld [wJumptableIndex], a ld [wJumptableIndex], a
call Function2b74 call ReturnToMapWithSpeechTextbox
ret ret
; fcc23 ; fcc23
@@ -399,7 +399,7 @@ GetTradeMonNames: ; fce1b
ld a, [hl] ld a, [hl]
call GetTradeMonName call GetTradeMonName
ld de, wd050 ld de, wMonOrItemNameBuffer
call CopyTradeName call CopyTradeName
ld hl, StringBuffer1 ld hl, StringBuffer1

2
engine/pack.asm
View File

@@ -633,7 +633,7 @@ GiveItem: ; 103fd
push af push af
call GetCurNick call GetCurNick
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, wd050_MonNick ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH ld bc, PKMN_NAME_LENGTH
call CopyBytes call CopyBytes
call TryGiveItemToPartymon call TryGiveItemToPartymon

4
engine/party_menu.asm
View File

@@ -8,7 +8,7 @@ SelectMonFromParty: ; 50000
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
call PartyMenuSelect call PartyMenuSelect
call Function2b74 call ReturnToMapWithSpeechTextbox
ret ret
; 5001d ; 5001d
@@ -25,7 +25,7 @@ SelectTradeOrDaycareMon: ; 5001d
call SetPalettes call SetPalettes
call DelayFrame call DelayFrame
call PartyMenuSelect call PartyMenuSelect
call Function2b74 call ReturnToMapWithSpeechTextbox
ret ret
; 5003f ; 5003f

4
engine/phone.asm
View File

@@ -274,7 +274,7 @@ endr
push hl push hl
call LoadCallerScript call LoadCallerScript
pop hl pop hl
ld de, wd048 ld de, wPhoneScriptPointer
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
@@ -442,7 +442,7 @@ WrongNumber: ; 90233
Script_ReceivePhoneCall: ; 0x90241 Script_ReceivePhoneCall: ; 0x90241
refreshscreen $0 refreshscreen $0
callasm RingTwice_StartCall callasm RingTwice_StartCall
ptcall wd048 ptcall wPhoneScriptPointer
waitbutton waitbutton
callasm HangUp callasm HangUp
closetext closetext

4
engine/pokecenter_pc.asm
View File

@@ -12,7 +12,7 @@ PokemonCenterPC: ; 1559a
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call .ChooseWhichPCListToUse call .ChooseWhichPCListToUse
ld [wcf76], a ld [wWhichIndexSet], a
call DoNthMenu call DoNthMenu
jr c, .shutdown jr c, .shutdown
ld a, [MenuSelection] ld a, [MenuSelection]
@@ -208,7 +208,7 @@ UnknownText_0x156ff: ; 0x156ff
_PlayersPC: ; 15704 _PlayersPC: ; 15704
ld a, b ld a, b
ld [wcf76], a ld [wWhichIndexSet], a
ld hl, UnknownText_0x157cc ld hl, UnknownText_0x157cc
call PC_DisplayTextWaitMenu call PC_DisplayTextWaitMenu
call Function15715 call Function15715

8
engine/pokegear.asm
View File

@@ -673,7 +673,7 @@ Function9102f: ; 9102f (24:502f)
Function9106a: ; 9106a Function9106a: ; 9106a
push af push af
depixel 0, 0 depixel 0, 0
ld b, SPRITE_ANIM_INDEX_0A ld b, SPRITE_ANIM_INDEX_WALK_CYCLE
ld a, [PlayerGender] ld a, [PlayerGender]
bit 0, a bit 0, a
jr z, .asm_91079 jr z, .asm_91079
@@ -709,7 +709,7 @@ Function91098: ; 91098
ld [hl], $4 ld [hl], $4
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_00 ld [hl], SPRITE_ANIM_SEQ_NULL
pop af pop af
push bc push bc
call Function910d4 call Function910d4
@@ -2781,7 +2781,7 @@ TownMapMon: ; 91f7b
ld [hl], $8 ld [hl], $8
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc add hl, bc
ld [hl], SPRITE_ANIM_SEQ_00 ld [hl], SPRITE_ANIM_SEQ_NULL
ret ret
; 91fa6 ; 91fa6
@@ -2808,7 +2808,7 @@ TownMapPlayerIcon: ; 91fa6
; Animation/palette ; Animation/palette
depixel 0, 0 depixel 0, 0
ld b, SPRITE_ANIM_INDEX_0A ; Male ld b, SPRITE_ANIM_INDEX_WALK_CYCLE ; Male
ld a, [PlayerGender] ld a, [PlayerGender]
bit 0, a bit 0, a
jr z, .got_gender jr z, .got_gender

2
engine/radio.asm
View File

@@ -274,7 +274,7 @@ endr
ld [CurPartySpecies], a ld [CurPartySpecies], a
call GetPokemonName call GetPokemonName
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, wOaksPkmnTalkPkmnNameBuffer ld de, wMonOrItemNameBuffer
ld bc, PKMN_NAME_LENGTH ld bc, PKMN_NAME_LENGTH
call CopyBytes call CopyBytes
; Now that we've chosen our wild Pokemon, ; Now that we've chosen our wild Pokemon,

2
engine/rtc.asm
View File

@@ -163,7 +163,7 @@ Function140ae: ; 140ae
ret ret
; 140ed ; 140ed
Function140ed:: ; 140ed _InitTime:: ; 140ed
call GetClock call GetClock
call FixDays call FixDays
ld hl, hRTCSeconds ld hl, hRTCSeconds

Some files were not shown because too many files have changed in this diff Show More