From edf42a54d5b95780725e50605672fec29a9936f1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Oct 2015 13:19:41 -0400 Subject: More labels, including fns responsible for partymon generation --- wram.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index e862e3938..7850c2d5d 100644 --- a/wram.asm +++ b/wram.asm @@ -1842,7 +1842,7 @@ wd25e:: ds 4 wd262:: ds 1 wd263:: ds 1 wd264:: ds 1 -GetPokemonName_Parameter:: +wNamedObjectIndexBuffer:: wd265:: ds 1 wd266:: ds 1 wd267:: ds 1 @@ -1956,7 +1956,7 @@ RedsName:: ds NAME_LENGTH ; d49e GreensName:: ds NAME_LENGTH ; d4a9 wd4b4:: ds 1 -wd4b5:: ds 1 +wSpawnAfterChampion:: ds 1 ; init time set at newgame StartDay:: ; d4b6 -- cgit v1.2.3 From 96b0e448c4ce6a5dc43653a1c927a530fe64aece Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 7 Oct 2015 21:27:32 -0400 Subject: Labeling of AI item and wild encounter functions --- wram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 7850c2d5d..88343cd1a 100644 --- a/wram.asm +++ b/wram.asm @@ -1914,7 +1914,7 @@ wd44e:: ds 1 wd44f:: ds 1 wd450:: ds 1 wd451:: ds 1 -wd452:: ds 1 +wWildEncounterCooldown:: ds 1 wd453:: ds 1 wd454:: ds 1 ds 4 -- cgit v1.2.3 From b68913a782baee1334e9614661c712ff27895e8e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 9 Oct 2015 23:09:03 -0400 Subject: More radio labels --- wram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 88343cd1a..4913ddbe1 100644 --- a/wram.asm +++ b/wram.asm @@ -2150,7 +2150,7 @@ PCItemsEnd:: ds 1 wPokegearFlags:: ds 1 -wd958:: ds 1 +wRadioTuningKnob:: ds 1 wd959:: ds 2 WhichRegisteredItem:: ; d95b ds 1 -- cgit v1.2.3 From d42330ed8b591db79c43ef680edc5965d6a7b14b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 10 Oct 2015 17:03:04 -0400 Subject: Annotation of PrintNum arguments in bc, and radio functions --- wram.asm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 4913ddbe1..128092942 100644 --- a/wram.asm +++ b/wram.asm @@ -4,7 +4,7 @@ flag_array: MACRO ds ((\1) + 7) / 8 ENDM -box_struct_length EQU 24 + NUM_MOVES * 2 +box_struct_length EQU 24 + NUM_MOVES * 2 ; 32 box_struct: MACRO \1Species:: db \1Item:: db @@ -30,6 +30,7 @@ box_struct: MACRO \1End:: ENDM +party_struct_length EQU box_struct_length + 16 party_struct: MACRO box_struct \1 \1Status:: db @@ -1352,17 +1353,22 @@ wd001:: ds 1 wd002:: PhoneScriptBank:: DefaultFlypoint:: ; d002 +LuckyNumberDigit1Buffer:: ds 1 wd003:: +LuckyNumberDigit2Buffer:: PhoneCallerLo:: ds 1 wd004:: +LuckyNumberDigit3Buffer:: PhoneCallerHi:: ds 1 wd005:: +LuckyNumberDigit4Buffer:: StartFlypoint:: ; d005 ds 1 wd006:: +LuckyNumberDigit5Buffer:: EndFlypoint:: ; d006 ds 1 @@ -1717,8 +1723,11 @@ MovementType:: Buffer2:: ; d1eb ds 1 +Buffer3:: wd1ec:: ds 1 +Buffer4:: wd1ed:: ds 1 +Buffer5:: wd1ee:: ds 1 wd1ef:: ds 1 wd1f0:: ds 1 @@ -1842,6 +1851,7 @@ wd25e:: ds 4 wd262:: ds 1 wd263:: ds 1 wd264:: ds 1 +wFoundMatchingIDInParty:: wNamedObjectIndexBuffer:: wd265:: ds 1 wd266:: ds 1 @@ -2384,7 +2394,8 @@ FruitTreeFlags:: ; dc27 ds 5 -wdc2d:: ds 4 +wLuckyNumberDayBuffer:: ds 2 + ds 2 wSpecialPhoneCallID:: ds 2 wdc33:: ds 2 wdc35:: ds 4 @@ -2416,9 +2427,8 @@ wdc77:: ds 2 wdc79:: ds 1 wdc7a:: ds 2 wdc7c:: ds 33 -wdc9d:: ds 2 -wdc9f:: ds 1 -wdca0:: ds 1 +wLuckyNumberShowFlag:: ds 2 +wLuckyIDNumber:: ds 2 wdca1:: ds 3 wdca4:: ds 1 -- cgit v1.2.3 From 327faac497b4195dbf1d3c8dbfeb2adcda9deb27 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 11 Oct 2015 12:15:03 -0400 Subject: Magikarp functions moved to event/magikarp.asm --- wram.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 128092942..85b8f6614 100644 --- a/wram.asm +++ b/wram.asm @@ -1191,6 +1191,7 @@ CurSpecies:: ; cf60 wcf61:: ds 2 wcf63:: ds 1 wNrOfBeatenBattleTowerTrainers:: +wMomBankDigitCursorPosition:: wcf64:: ds 1 IF !DEF(CRYSTAL11) wPokedexStatus:: @@ -2579,9 +2580,9 @@ wdfe4:: ds 1 wdfe5:: ds 1 wdfe6:: ds 1 wdfe7:: ds 1 -wdfe8:: ds 1 -wdfe9:: ds 1 - ds 1 +wBestMagikarpLengthFeet:: ds 1 +wBestMagikarpLengthInches:: ds 1 +wMagikarpRecordHoldersName:: ds 1 ds 1 wdfec:: ds 1 ds 3 -- cgit v1.2.3 From 0c39f6e273910be3b0ed9317e73c40615d789ae3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 12 Oct 2015 12:33:24 -0400 Subject: Happiness and Mystery Gift constants --- wram.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 85b8f6614..6c7d08f26 100644 --- a/wram.asm +++ b/wram.asm @@ -1854,6 +1854,7 @@ wd263:: ds 1 wd264:: ds 1 wFoundMatchingIDInParty:: wNamedObjectIndexBuffer:: +wCurTMHM:: wd265:: ds 1 wd266:: ds 1 wd267:: ds 1 -- cgit v1.2.3 From 8c2766e1b955b6b23a78d014340f51a281b2a114 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 11:37:10 -0400 Subject: ldtile and dwtile macros added and globally implemented --- wram.asm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 6c7d08f26..822676377 100644 --- a/wram.asm +++ b/wram.asm @@ -2583,17 +2583,11 @@ wdfe6:: ds 1 wdfe7:: ds 1 wBestMagikarpLengthFeet:: ds 1 wBestMagikarpLengthInches:: ds 1 -wMagikarpRecordHoldersName:: ds 1 - ds 1 -wdfec:: ds 1 - ds 3 - - ds 5 +wMagikarpRecordHoldersName:: ds NAME_LENGTH wdff5:: wPokemonDataEnd:: - SECTION "Pic Animations", WRAMX, BANK [2] w2_d000:: ds $168 -- cgit v1.2.3 From 12f9dca7a59afa64388ae3aebc6e04c383992da9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 13 Oct 2015 14:29:34 -0400 Subject: Final descriptive label in tilesets/animations.asm --- wram.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 822676377..874dc0a4e 100644 --- a/wram.asm +++ b/wram.asm @@ -1956,8 +1956,8 @@ wCrystalDataEnd:: wd479:: ds 2 +wGameData:: wPlayerData:: - PlayerID:: ; d47b ds 2 @@ -2587,6 +2587,7 @@ wMagikarpRecordHoldersName:: ds NAME_LENGTH wdff5:: wPokemonDataEnd:: +wGameDataEnd:: SECTION "Pic Animations", WRAMX, BANK [2] -- cgit v1.2.3