diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-06-20 17:56:18 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-03 22:56:49 +0200 |
| commit | 79bb2784e92de0524c69c87556f7647861c47fb8 (patch) | |
| tree | efe71aea7b0308cd79142bda67fe71dcc787f600 /engine | |
| parent | 248763b238b6f8e8cb0bc0c5db05a270f1931ae7 (diff) | |
Better label 2D menu data
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/items/item_effects.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 32 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 28 |
3 files changed, 27 insertions, 35 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 4de0fc3bc..36bdd8a8d 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1141,7 +1141,7 @@ EvoStoneEffect: cp EVERSTONE jr z, .NoEffect - ld a, $1 + ld a, TRUE ld [wForceEvolution], a farcall EvolvePokemon diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index c8d35a59f..fd51ae928 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -811,8 +811,8 @@ ChooseMoveToDelete: .ChooseMoveToDelete call SetUpMoveScreenBG - ld de, DeleteMoveScreenAttrs - call SetMenuAttributes + ld de, DeleteMoveScreen2DMenuData + call Load2DMenuData call SetUpMoveList ld hl, w2DMenuFlags1 set 6, [hl] @@ -848,12 +848,12 @@ ChooseMoveToDelete: pop af ret -DeleteMoveScreenAttrs: - db 3, 1 - db 3, 1 - db $40, $00 - dn 2, 0 - db D_UP | D_DOWN | A_BUTTON | B_BUTTON +DeleteMoveScreen2DMenuData: + db 3, 1 ; cursor start y, x + db 3, 1 ; rows, columns + db $40, $00 ; flags + dn 2, 0 ; cursor offset + db D_UP | D_DOWN | A_BUTTON | B_BUTTON ; accepted buttons ManagePokemonMoves: ld a, [wCurPartySpecies] @@ -878,8 +878,8 @@ MoveScreenLoop: ld [wPartyMenuCursor], a call SetUpMoveScreenBG call PlaceMoveScreenArrows - ld de, MoveScreenAttributes - call SetMenuAttributes + ld de, MoveScreen2DMenuData + call Load2DMenuData .loop call SetUpMoveList ld hl, w2DMenuFlags1 @@ -1077,12 +1077,12 @@ MoveScreenLoop: call ClearSprites jp ClearTilemap -MoveScreenAttributes: - db 3, 1 - db 3, 1 - db $40, $00 - dn 2, 0 - db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON +MoveScreen2DMenuData: + db 3, 1 ; cursor start y, x + db 3, 1 ; rows, columns + db $40, $00 ; flags + dn 2, 0 ; cursor offsets + db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ; accepted buttons String_MoveWhere: db "Where?@" diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index c9f4dde31..fe470ed96 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -612,8 +612,8 @@ InitPartyMenuWithCancel: ; with cancel xor a ld [wSwitchMon], a - ld de, PartyMenuAttributes - call SetMenuAttributes + ld de, PartyMenu2DMenuData + call Load2DMenuData ld a, [wPartyCount] inc a ld [w2DMenuNumRows], a ; list length @@ -637,8 +637,8 @@ InitPartyMenuWithCancel: InitPartyMenuNoCancel: ; no cancel - ld de, PartyMenuAttributes - call SetMenuAttributes + ld de, PartyMenu2DMenuData + call Load2DMenuData ld a, [wPartyCount] ld [w2DMenuNumRows], a ; list length ld b, a @@ -656,20 +656,12 @@ InitPartyMenuNoCancel: ld [wMenuJoypadFilter], a ret -PartyMenuAttributes: -; cursor y -; cursor x -; num rows -; num cols -; bit 6: animate sprites bit 5: wrap around -; ? -; distance between items (hi: y, lo: x) -; allowed buttons (mask) - db 1, 0 - db 0, 1 - db $60, $00 - dn 2, 0 - db 0 +PartyMenu2DMenuData: + db 1, 0 ; cursor start y, x + db 0, 1 ; rows, columns + db $60, $00 ; flags + dn 2, 0 ; cursor offset + db 0 ; accepted buttons PartyMenuSelect: ; sets carry if exitted menu. |