summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2017-11-30 20:27:25 +0100
committermid-kid <esteve.varela@gmail.com>2017-11-30 20:35:58 +0100
commita1fc73603e0719975cf74021b0f70e9dfdfa8ff3 (patch)
treef3d70e335330e1832a0d93c3a7ffeb568543ddc9
parent7a2a20528136b9a2452a313cd50c46a45f9a5cb0 (diff)
Label all of PARTYMENUACTION_*
It's pretty clear what it's used for. PartyMenuActionText is used for two things: 1) Storing what kind of action we're going to do (<$10) 2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0) In the former case, if GetPartyMenuTilemapPointers is ran, it will be used to pick a sequence of actions that should be done, specified in the table, and it'll print the corresponding string using the PartyMenuStrings table. The items in the sequence of actions that should be done are in WritePartyMenuTilemap. Strangely enough, one possible value is left completely unused: PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's male counterpart, and as such I don't believe it was used in the japanese version either, since it doesn't matter which gender your 'mon is when you put 'em in the daycare.
-rw-r--r--battle/core.asm2
-rw-r--r--constants/item_constants.asm16
-rwxr-xr-xengine/npctrade.asm2
-rw-r--r--engine/pack.asm2
-rwxr-xr-xengine/startmenu.asm2
-rwxr-xr-xengine/tmhm2.asm2
-rwxr-xr-xevent/daycare.asm2
-rwxr-xr-xmisc/mobile_12_2.asm2
8 files changed, 15 insertions, 15 deletions
diff --git a/battle/core.asm b/battle/core.asm
index 9b644ca5b..1bffd407e 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -2995,7 +2995,7 @@ SelectBattleMon: ; 3d329
PickPartyMonInBattle: ; 3d33c
.loop
- ld a, $2 ; Which PKMN?
+ ld a, PARTYMENUACTION_SWITCH ; Which PKMN?
ld [PartyMenuActionText], a
call JumpToPartyMenuAndPrintText
call SelectBattleMon
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 71cc2ba60..76eaba5ca 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -416,16 +416,16 @@ ITEMMENU_CLOSE EQU 6
; PartyMenuActionText
const_def
- const PARTYMENUACTION_00
+ const PARTYMENUACTION_CHOOSE_POKEMON
const PARTYMENUACTION_HEALING_ITEM
- const PARTYMENUACTION_02
- const PARTYMENUACTION_TEACH_TM
- const PARTYMENUACTION_04
+ const PARTYMENUACTION_SWITCH
+ const PARTYMENUACTION_TEACH_TMHM
+ const PARTYMENUACTION_MOVE
const PARTYMENUACTION_EVO_STONE
- const PARTYMENUACTION_06
- const PARTYMENUACTION_07
- const PARTYMENUACTION_08
- const PARTYMENUACTION_MOBILE
+ const PARTYMENUACTION_GIVE_MON
+ const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
+ const PARTYMENUACTION_GIVE_ITEM
+ const PARTYMENUACTION_MOBILE ; mobile
const_value set $f0
const PARTYMENUTEXT_HEAL_PSN
diff --git a/engine/npctrade.asm b/engine/npctrade.asm
index f28734ea9..01631d051 100755
--- a/engine/npctrade.asm
+++ b/engine/npctrade.asm
@@ -39,7 +39,7 @@ NPCTrade:: ; fcba8
jr c, .done
; Select givemon from party
- ld b, 6
+ ld b, PARTYMENUACTION_GIVE_MON
callba SelectTradeOrDaycareMon
ld a, TRADE_CANCEL
jr c, .done
diff --git a/engine/pack.asm b/engine/pack.asm
index 8a63d22e5..dad9a799d 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -603,7 +603,7 @@ GiveItem: ; 103fd
push af
res NO_TEXT_SCROLL, a
ld [Options], a
- ld a, $8
+ ld a, PARTYMENUACTION_GIVE_ITEM
ld [PartyMenuActionText], a
call ClearBGPalettes
callba LoadPartyMenuGFX
diff --git a/engine/startmenu.asm b/engine/startmenu.asm
index a935b8a07..32999cacb 100755
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -745,7 +745,7 @@ SwitchPartyMons: ; 12aec
callba HoldSwitchmonIcon
callba InitPartyMenuNoCancel
- ld a, 4
+ ld a, PARTYMENUACTION_MOVE
ld [PartyMenuActionText], a
callba WritePartyMenuTilemap
callba PrintPartyMenuText
diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm
index 6e32fdae8..8d19aaf81 100755
--- a/engine/tmhm2.asm
+++ b/engine/tmhm2.asm
@@ -80,7 +80,7 @@ ChooseMonToLearnTMHM_NoRefresh: ; 2c80a
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
callba InitPartyMenuGFX
- ld a, $3 ; TeachWhichPKMNString
+ ld a, PARTYMENUACTION_TEACH_TMHM
ld [PartyMenuActionText], a
.loopback
callba WritePartyMenuTilemap
diff --git a/event/daycare.asm b/event/daycare.asm
index a6d8842a9..b521deeff 100755
--- a/event/daycare.asm
+++ b/event/daycare.asm
@@ -123,7 +123,7 @@ DayCareAskDepositPokemon: ; 16798
jr c, .OnlyOneMon
ld a, DAYCARETEXT_WHICH_ONE
call PrintDayCareText
- ld b, 6
+ ld b, PARTYMENUACTION_GIVE_MON
callba SelectTradeOrDaycareMon
jr c, .Declined
ld a, [CurPartySpecies]
diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm
index 2bdd6ddc3..37179c122 100755
--- a/misc/mobile_12_2.asm
+++ b/misc/mobile_12_2.asm
@@ -316,7 +316,7 @@ Function4aa25: ; 4aa25
call Function4aad3
Function4aa34: ; 4aa34
- ld a, $9
+ ld a, PARTYMENUACTION_MOBILE
ld [PartyMenuActionText], a
callba WritePartyMenuTilemap
xor a