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

Mon submenu, engine/menu.asm

Browse Source
This commit is contained in:
PikalaxALT 2015-11-04 14:02:11 -05:00
parent 94c720832a
commit cf5d726b7f
27 changed files with 1057 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
battle/core.asm
View File

@ -2860,13 +2860,13 @@ Function3d1f8: ; 3d1f8
.asm_3d20a .asm_3d20a
lb bc, 1, 7 lb bc, 1, 7
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wcfa9] ld a, [MenuSelection2]
jr c, .asm_3d217 jr c, .asm_3d217
and a and a
ret ret
.asm_3d217 .asm_3d217
ld a, [wcfa9] ld a, [MenuSelection2]
cp $1 cp $1
jr z, .asm_3d20a jr z, .asm_3d20a
ld hl, PartyMon1Speed ld hl, PartyMon1Speed
@ -3684,7 +3684,7 @@ Function3d74b: ; 3d74b
call StdBattleTextBox call StdBattleTextBox
lb bc, 1, 7 lb bc, 1, 7
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
jr nz, .asm_3d79a jr nz, .asm_3d79a
call Function3d2f7 call Function3d2f7
@ -5288,7 +5288,7 @@ Function3e234: ; 3e234
.asm_3e25d .asm_3e25d
call Function3f47c call Function3f47c
ld a, $1 ld a, $1
ld [wcfa9], a ld [MenuSelection2], a
call ExitMenu call ExitMenu
call Function3df2c call Function3df2c
call WaitBGMap call WaitBGMap
@ -5328,7 +5328,7 @@ Function3e299:
call Function3e2f5 call Function3e2f5
jr c, .asm_3e2c8 jr c, .asm_3e2c8
call Function1bee call Function1bee
ld a, [wcfa9] ld a, [MenuSelection2]
cp $1 cp $1
jp z, Function3e358 jp z, Function3e358
cp $2 cp $2
@ -5533,7 +5533,7 @@ BattleMonEntrance: ; 3e40b
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, $2 ld a, $2
ld [wcfa9], a ld [MenuSelection2], a
ret ret
; 3e459 ; 3e459
@ -5563,7 +5563,7 @@ PassedBattleMonEntrance: ; 3e459
BattleMenu_Run: ; 3e489 BattleMenu_Run: ; 3e489
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
ld a, $3 ld a, $3
ld [wcfa9], a ld [MenuSelection2], a
ld hl, BattleMonSpeed ld hl, BattleMonSpeed
ld de, EnemyMonSpeed ld de, EnemyMonSpeed
call TryToRunAwayFromBattle call TryToRunAwayFromBattle
@ -5659,7 +5659,7 @@ MoveSelectionScreen: ; 3e4bc
inc a inc a
.asm_3e53e .asm_3e53e
ld [wcfa9], a ld [MenuSelection2], a
ld a, $1 ld a, $1
ld [wcfaa], a ld [wcfaa], a
ld a, [wd0eb] ld a, [wd0eb]
@ -5726,9 +5726,9 @@ MoveSelectionScreen: ; 3e4bc
xor a xor a
ld [wd0e3], a ld [wd0e3], a
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
ld [wcfa9], a ld [MenuSelection2], a
ld b, a ld b, a
ld a, [wd235] ld a, [wd235]
dec a dec a
@ -5751,7 +5751,7 @@ MoveSelectionScreen: ; 3e4bc
ret nz ret nz
ld hl, BattleMonPP ld hl, BattleMonPP
ld a, [wcfa9] ld a, [MenuSelection2]
ld c, a ld c, a
ld b, 0 ld b, 0
add hl, bc add hl, bc
@ -5767,7 +5767,7 @@ MoveSelectionScreen: ; 3e4bc
ld a, [wc6e1] ld a, [wc6e1]
and a and a
jr nz, .asm_3e606 jr nz, .asm_3e606
ld a, [wcfa9] ld a, [MenuSelection2]
ld hl, BattleMonMoves ld hl, BattleMonMoves
ld c, a ld c, a
ld b, 0 ld b, 0
@ -5797,17 +5797,17 @@ MoveSelectionScreen: ; 3e4bc
; 3e61d ; 3e61d
.asm_3e61d .asm_3e61d
ld a, [wcfa9] ld a, [MenuSelection2]
and a and a
jp nz, .asm_3e57a jp nz, .asm_3e57a
ld a, [wd0eb] ld a, [wd0eb]
inc a inc a
ld [wcfa9], a ld [MenuSelection2], a
jp .asm_3e57a jp .asm_3e57a
; 3e62e ; 3e62e
.asm_3e62e ; 3e62e .asm_3e62e ; 3e62e
ld a, [wcfa9] ld a, [MenuSelection2]
ld b, a ld b, a
ld a, [wd0eb] ld a, [wd0eb]
rept 2 rept 2
@ -5816,7 +5816,7 @@ endr
cp b cp b
jp nz, .asm_3e57a jp nz, .asm_3e57a
ld a, $1 ld a, $1
ld [wcfa9], a ld [MenuSelection2], a
jp .asm_3e57a jp .asm_3e57a
; 3e643 ; 3e643
@ -5833,7 +5833,7 @@ endr
swap a swap a
and $f and $f
ld b, a ld b, a
ld a, [wcfa9] ld a, [MenuSelection2]
cp b cp b
jr nz, .asm_3e671 jr nz, .asm_3e671
ld a, [hl] ld a, [hl]
@ -5852,7 +5852,7 @@ endr
ld a, [hl] ld a, [hl]
and $f and $f
ld b, a ld b, a
ld a, [wcfa9] ld a, [MenuSelection2]
swap a swap a
add b add b
ld [hl], a ld [hl], a
@ -5886,7 +5886,7 @@ endr
ld d, h ld d, h
ld e, l ld e, l
pop hl pop hl
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
ld c, a ld c, a
ld b, 0 ld b, 0
@ -5899,7 +5899,7 @@ endr
ret ret
.asm_3e6bf .asm_3e6bf
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wd0e3], a ld [wd0e3], a
jp MoveSelectionScreen jp MoveSelectionScreen
; 3e6c8 ; 3e6c8
@ -5921,7 +5921,7 @@ MoveInfoBox: ; 3e6c8
swap a swap a
and $f and $f
ld b, a ld b, a
ld a, [wcfa9] ld a, [MenuSelection2]
cp b cp b
jr nz, .asm_3e6f4 jr nz, .asm_3e6f4
@ -5931,11 +5931,11 @@ MoveInfoBox: ; 3e6c8
jr .done jr .done
.asm_3e6f4 .asm_3e6f4
ld hl, wcfa9 ld hl, MenuSelection2
dec [hl] dec [hl]
call SetPlayerTurn call SetPlayerTurn
ld hl, BattleMonMoves ld hl, BattleMonMoves
ld a, [wcfa9] ld a, [MenuSelection2]
ld c, a ld c, a
ld b, 0 ld b, 0
add hl, bc add hl, bc
@ -5948,7 +5948,7 @@ MoveInfoBox: ; 3e6c8
ld [MonType], a ld [MonType], a
callab Functionf8ec callab Functionf8ec
ld hl, wcfa9 ld hl, MenuSelection2
ld c, [hl] ld c, [hl]
inc [hl] inc [hl]
ld b, 0 ld b, 0
@ -7250,9 +7250,9 @@ Function3edad: ; 3edad
ld hl, VTiles2 tile $73 ld hl, VTiles2 tile $73
lb bc, BANK(GFX_f8ae0), 6 lb bc, BANK(GFX_f8ae0), 6
call Get1bpp call Get1bpp
ld de, GFX_f8b10 ld de, ExpBarGFX
ld hl, VTiles2 tile $55 ld hl, VTiles2 tile $55
lb bc, BANK(GFX_f8b10), 8 lb bc, BANK(ExpBarGFX), 8
jp Get2bpp jp Get2bpp
; 3edd1 ; 3edd1

3
constants/misc_constants.asm
View File

@ -7,6 +7,7 @@ MAX_PC_ITEMS EQU 50
; strings ; strings
PLAYER_NAME_LENGTH EQU 8 PLAYER_NAME_LENGTH EQU 8
BOX_NAME_LENGTH EQU 9
PKMN_NAME_LENGTH EQU 11 PKMN_NAME_LENGTH EQU 11
MOVE_NAME_LENGTH EQU 13 MOVE_NAME_LENGTH EQU 13
ITEM_NAME_LENGTH EQU 13 ITEM_NAME_LENGTH EQU 13
@ -161,3 +162,5 @@ const_value = 1
HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111 HMENURETURN_ASM EQU %11111111
NUM_MON_SUBMENU_ITEMS EQU 8

27
constants/pokemon_constants.asm
View File

@ -292,3 +292,30 @@ MON_SDF EQUS "PartyMon1SpclDef - PartyMon1"
BOXMON_STRUCT_LENGTH EQUS "PartyMon1End - PartyMon1" BOXMON_STRUCT_LENGTH EQUS "PartyMon1End - PartyMon1"
PARTYMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1" PARTYMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1"
SCRATCHMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1Item" SCRATCHMON_STRUCT_LENGTH EQUS "PartyMon1StatsEnd - PartyMon1Item"
const_value SET 1
const MONMENU_CUT ; 1
const MONMENU_FLY ; 2
const MONMENU_SURF ; 3
const MONMENU_STRENGTH ; 4
const MONMENU_WATERFALL ; 5
const MONMENU_FLASH ; 6
const MONMENU_WHIRLPOOL ; 7
const MONMENU_DIG ; 8
const MONMENU_TELEPORT ; 9
const MONMENU_SOFTBOILED ; 10
const MONMENU_HEADBUTT ; 11
const MONMENU_ROCKSMASH ; 12
const MONMENU_MILKDRINK ; 13
const MONMENU_SWEETSCENT ; 14
const MONMENU_STATS ; 15
const MONMENU_SWITCH ; 16
const MONMENU_ITEM ; 17
const MONMENU_CANCEL ; 18
const MONMENU_MOVE ; 19
const MONMENU_MAIL ; 20
const MONMENU_ERROR ; 21
MONMENU_FIELD_MOVE EQU 0
MONMENU_MENUOPTION EQU 1

587
engine/menu.asm Executable file
View File

File diff suppressed because it is too large Load Diff

24
engine/pack.asm
View File

@ -70,7 +70,7 @@ Function10067: ; 10067 (4:4067)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0df], a ld [wd0df], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wItemsPocketCursor], a ld [wItemsPocketCursor], a
ld b, $7 ld b, $7
ld c, $3 ld c, $3
@ -98,7 +98,7 @@ Function100a6: ; 100a6 (4:40a6)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e0], a ld [wd0e0], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wKeyItemsPocketCursor], a ld [wKeyItemsPocketCursor], a
ld b, $3 ld b, $3
ld c, $7 ld c, $7
@ -141,7 +141,7 @@ Function100e8: ; 100e8 (4:40e8)
call ExitMenu call ExitMenu
pop hl pop hl
ret c ret c
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
call Function1086b call Function1086b
jp [hl] jp [hl]
@ -228,7 +228,7 @@ Function10198: ; 10198 (4:4198)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e1], a ld [wd0e1], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wBallsPocketCursor], a ld [wBallsPocketCursor], a
ld b, $1 ld b, $1
ld c, $5 ld c, $5
@ -301,7 +301,7 @@ Function101c5: ; 101c5 (4:41c5)
call ExitMenu call ExitMenu
pop hl pop hl
ret c ret c
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
call Function1086b call Function1086b
jp [hl] jp [hl]
@ -728,7 +728,7 @@ Function104fa: ; 104fa (4:44fa)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0df], a ld [wd0df], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wItemsPocketCursor], a ld [wItemsPocketCursor], a
ld b, $7 ld b, $7
ld c, $3 ld c, $3
@ -756,7 +756,7 @@ Function10539: ; 10539 (4:4539)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e0], a ld [wd0e0], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wKeyItemsPocketCursor], a ld [wKeyItemsPocketCursor], a
ld b, $3 ld b, $3
ld c, $7 ld c, $7
@ -807,7 +807,7 @@ Function105a6: ; 105a6 (4:45a6)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e1], a ld [wd0e1], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wBallsPocketCursor], a ld [wBallsPocketCursor], a
ld b, $1 ld b, $1
ld c, $5 ld c, $5
@ -836,7 +836,7 @@ Function105dc: ; 105dc (4:45dc)
call ExitMenu call ExitMenu
pop hl pop hl
ret c ret c
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
call Function1086b call Function1086b
jp [hl] jp [hl]
@ -1013,7 +1013,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0df], a ld [wd0df], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wItemsPocketCursor], a ld [wItemsPocketCursor], a
ret ret
@ -1029,7 +1029,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e0], a ld [wd0e0], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wKeyItemsPocketCursor], a ld [wKeyItemsPocketCursor], a
ret ret
@ -1054,7 +1054,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
call Function350c call Function350c
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e1], a ld [wd0e1], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wBallsPocketCursor], a ld [wBallsPocketCursor], a
ret ret

2
engine/save.asm
View File

@ -212,7 +212,7 @@ SaveTheGame_yesorno: ; 14baf
call LoadMenuTextBox call LoadMenuTextBox
lb bc, 0, 7 lb bc, 0, 7
call PlaceYesNoBox call PlaceYesNoBox
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
call WriteBackup call WriteBackup
push af push af

2
engine/scripting.asm
View File

@ -515,7 +515,7 @@ Script_interpretmenu2: ; 0x96f30
ld a, [ScriptBank] ld a, [ScriptBank]
ld hl, InterpretMenu2 ld hl, InterpretMenu2
rst FarCall rst FarCall
ld a, [wcfa9] ld a, [MenuSelection2]
jr nc, .ok jr nc, .ok
xor a xor a
.ok .ok

4
event/buena.asm
View File

@ -201,7 +201,7 @@ Function8b09e: ; 8b09e
ld [hBGMapMode], a ld [hBGMapMode], a
ld hl, MenuDataHeader_0x8b0d1 ld hl, MenuDataHeader_0x8b0d1
call CopyMenuDataHeader call CopyMenuDataHeader
call Function1cbb call MenuBox
call UpdateSprites call UpdateSprites
call GetMemTileCoord call GetMemTileCoord
ld bc, $0015 ld bc, $0015
@ -255,7 +255,7 @@ Function8b0e2: ; 8b0e2
call Function350c call Function350c
ld a, [MenuSelection] ld a, [MenuSelection]
ld c, a ld c, a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [MenuSelection], a ld [MenuSelection], a
ld a, [wcf73] ld a, [wcf73]
cp $2 cp $2

4
event/kurt.asm
View File

@ -40,7 +40,7 @@ Special_SelectApricornForKurt: ; 88018
and a and a
jr z, .done jr z, .done
ld [CurItem], a ld [CurItem], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld c, a ld c, a
push bc push bc
call Kurt_PrintTextHowMany call Kurt_PrintTextHowMany
@ -135,7 +135,7 @@ Kurt_SelectQuantity: ; 880c2
.loop .loop
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1cbb call MenuBox
call UpdateSprites call UpdateSprites
call .PlaceApricornName call .PlaceApricornName
call PlaceApricornQuantity call PlaceApricornQuantity

2
event/mom.asm
View File

@ -109,7 +109,7 @@ endr
call InterpretMenu2 call InterpretMenu2
call WriteBackup call WriteBackup
jr c, .cancel jr c, .cancel
ld a, [wcfa9] ld a, [MenuSelection2]
cp $1 cp $1
jr z, .withdraw jr z, .withdraw
cp $2 cp $2

2
event/move_deleter.asm
View File

@ -25,7 +25,7 @@ MoveDeletion:
call Function2b74 call Function2b74
pop af pop af
jr c, .asm_2c5c3 jr c, .asm_2c5c3
ld a, [wcfa9] ld a, [MenuSelection2]
push af push af
ld a, [CurSpecies] ld a, [CurSpecies]
ld [wd265], a ld [wd265], a

2
event/unown.asm
View File

@ -122,7 +122,7 @@ Special_DisplayUnownWords: ; 8ae68
call LoadMenuDataHeader call LoadMenuDataHeader
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1cbb call MenuBox
call UpdateSprites call UpdateSprites
call Function321c call Function321c
call GetMemTileCoord call GetMemTileCoord

0
gfx/unknown/0f8b10.2bpp → gfx/battle/expbar.2bpp
View File

26
home/menu.asm
View File

@ -74,12 +74,12 @@ Call_ExitMenu:: ; 1d7d
InterpretMenu2:: InterpretMenu2::
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1cbb call MenuBox
call UpdateSprites call UpdateSprites
call Function1c89 call Function1c89
call Function321c call Function321c
call Function1c66 call Function1c66
ld a, [wcf91] ld a, [wMenuData2Flags]
bit 7, a bit 7, a
jr z, .cancel jr z, .cancel
call Function1c10 call Function1c10
@ -99,7 +99,7 @@ GetMenu2:: ; 1dab
call LoadMenuDataHeader call LoadMenuDataHeader
call InterpretMenu2 call InterpretMenu2
call WriteBackup call WriteBackup
ld a, [wcfa9] ld a, [MenuSelection2]
ret ret
; 1db8 ; 1db8
@ -168,7 +168,7 @@ InterpretTwoOptionMenu:: ; 1dfe
call WriteBackup call WriteBackup
pop af pop af
jr c, .no jr c, .no
ld a, [wcfa9] ld a, [MenuSelection2]
cp 2 ; no cp 2 ; no
jr z, .no jr z, .no
and a and a
@ -176,7 +176,7 @@ InterpretTwoOptionMenu:: ; 1dfe
.no .no
ld a, 2 ld a, 2
ld [wcfa9], a ld [MenuSelection2], a
scf scf
ret ret
; 1e1d ; 1e1d
@ -249,7 +249,7 @@ MenuFunc_1e7f::
call Function1c66 call Function1c66
call Function1ebd call Function1ebd
call Function1ea6 call Function1ea6
call Function1cbb call MenuBox
ret ret
MenuWriteText:: MenuWriteText::
@ -274,7 +274,7 @@ Function1ea6:: ; 1ea6
ld a, [wMenuBorderRightCoord] ld a, [wMenuBorderRightCoord]
sub c sub c
ld c, a ld c, a
ld a, [wcf92] ld a, [wMenuData2Items]
add a add a
inc a inc a
ld b, a ld b, a
@ -305,7 +305,7 @@ Function1ebd:: ; 1ebd
ld d, h ld d, h
ld e, l ld e, l
ld a, [hl] ld a, [hl]
ld [wcf92], a ld [wMenuData2Items], a
ret ret
; 1eda ; 1eda
@ -342,13 +342,13 @@ Function1efb:: ; 1efb
Function1eff:: ; 1eff Function1eff:: ; 1eff
call Function1c10 call Function1c10
ld hl, wcfa8 ld hl, wcfa8
ld a, [wcf91] ld a, [wMenuData2Flags]
bit 3, a bit 3, a
jr z, .asm_1f0e jr z, .asm_1f0e
set 3, [hl] set 3, [hl]
.asm_1f0e .asm_1f0e
ld a, [wcf91] ld a, [wMenuData2Flags]
bit 2, a bit 2, a
jr z, .asm_1f19 jr z, .asm_1f19
set 5, [hl] set 5, [hl]
@ -403,13 +403,13 @@ Function1f2a:: ; 1f2a
.asm_1f57 .asm_1f57
call Function1ebd call Function1ebd
ld a, [wcfa9] ld a, [MenuSelection2]
ld l, a ld l, a
ld h, $0 ld h, $0
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [MenuSelection], a ld [MenuSelection], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
and a and a
ret ret
@ -491,7 +491,7 @@ ResetTextRelatedRAM:: ; 1fbf
call .bytefill call .bytefill
ld hl, wcf81 ld hl, wcf81
call .bytefill call .bytefill
ld hl, wcf91 ld hl, wMenuData2Flags
call .bytefill call .bytefill
ld hl, wcfa1 ld hl, wcfa1
call .bytefill call .bytefill

10
home/tilemap.asm
View File

@ -88,7 +88,7 @@ Function1c66:: ; 1c66
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, wcf91 ld de, wMenuData2Flags
ld bc, $0010 ld bc, $0010
call CopyBytes call CopyBytes
pop af pop af
@ -131,7 +131,7 @@ Function1c89:: ; 1c89
pop bc pop bc
dec b dec b
jr nz, .asm_1c9c jr nz, .asm_1c9c
ld a, [wcf91] ld a, [wMenuData2Flags]
bit 4, a bit 4, a
ret z ret z
call GetMemTileCoord call GetMemTileCoord
@ -143,7 +143,7 @@ Function1c89:: ; 1c89
jp PlaceString jp PlaceString
; 1cbb ; 1cbb
Function1cbb:: ; 1cbb MenuBox:: ; 1cbb
call GetMemTileCoord call GetMemTileCoord
call GetMenuBoxDims call GetMenuBoxDims
dec b dec b
@ -158,13 +158,13 @@ Function1cc6:: ; 1cc6
ld a, [wMenuBorderLeftCoord] ld a, [wMenuBorderLeftCoord]
ld c, a ld c, a
inc c inc c
ld a, [wcf91] ld a, [wMenuData2Flags]
bit 6, a bit 6, a
jr nz, .asm_1cd8 jr nz, .asm_1cd8
inc b inc b
.asm_1cd8 .asm_1cd8
ld a, [wcf91] ld a, [wMenuData2Flags]
bit 7, a bit 7, a
jr z, .asm_1ce0 jr z, .asm_1ce0
inc c inc c

12
items/item_effects.asm
View File

@ -2667,7 +2667,7 @@ Functionf6a7: ; f6a7
Elixer_RestorePPofAllMoves: ; f6af Elixer_RestorePPofAllMoves: ; f6af
xor a xor a
ld hl, wcfa9 ld hl, MenuSelection2
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld b, NUM_MOVES ld b, NUM_MOVES
@ -2686,7 +2686,7 @@ Elixer_RestorePPofAllMoves: ; f6af
inc [hl] inc [hl]
.cant_restore_pp .cant_restore_pp
ld hl, wcfa9 ld hl, MenuSelection2
inc [hl] inc [hl]
pop bc pop bc
dec b dec b
@ -3123,7 +3123,7 @@ Functionf84c: ; f84c
ld a, [wd265] ld a, [wd265]
dec a dec a
jr nz, .asm_f876 jr nz, .asm_f876
ld a, [wcfa9] ld a, [MenuSelection2]
inc a inc a
cp b cp b
jr nz, .asm_f87d jr nz, .asm_f87d
@ -3200,7 +3200,7 @@ Functionf8b9: ; f8b9
call GetPartyParamLocation call GetPartyParamLocation
pop de pop de
xor a ; PARTYMON xor a ; PARTYMON
ld [wcfa9], a ld [MenuSelection2], a
ld [MonType], a ld [MonType], a
ld c, NUM_MOVES ld c, NUM_MOVES
.loop .loop
@ -3220,7 +3220,7 @@ Functionf8b9: ; f8b9
add b add b
ld [de], a ld [de], a
inc de inc de
ld hl, wcfa9 ld hl, MenuSelection2
inc [hl] inc [hl]
pop hl pop hl
dec c dec c
@ -3313,7 +3313,7 @@ GetMthMoveOfNthPartymon: ; f963
call AddNTimes call AddNTimes
GetMthMoveOfCurrentMon: ; f969 GetMthMoveOfCurrentMon: ; f969
ld a, [wcfa9] ld a, [MenuSelection2]
ld c, a ld c, a
ld b, 0 ld b, 0
add hl, bc add hl, bc

1128
main.asm
View File

File diff suppressed because it is too large Load Diff

8
misc/battle_tower_47.asm
View File

@ -368,7 +368,7 @@ Function11c1ca: ; 11c1ca
ld [wcd2b], a ld [wcd2b], a
ld a, $ff ld a, $ff
ld [wcd24], a ld [wcd24], a
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
call Function11c254 call Function11c254
call WhiteBGMap call WhiteBGMap
@ -1813,7 +1813,7 @@ String_11cb31: ; 11cb31
Function11cb52: ; 11cb52 (47:4b52) Function11cb52: ; 11cb52 (47:4b52)
ld hl, Unknown_11cc01 ld hl, Unknown_11cc01
ld a, [wcfa9] ld a, [MenuSelection2]
.asm_11cb58 .asm_11cb58
dec a dec a
jr z, .asm_11cb5f jr z, .asm_11cb5f
@ -1851,7 +1851,7 @@ Function11cb66: ; 11cb66 (47:4b66)
ld a, $4 ld a, $4
call GetSRAMBank call GetSRAMBank
ld hl, $a007 ld hl, $a007
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
sla a sla a
sla a sla a
@ -1874,7 +1874,7 @@ Function11cb66: ; 11cb66 (47:4b66)
ld de, Unknown_11cfc6 ld de, Unknown_11cfc6
call Function11cfce call Function11cfce
ld hl, Unknown_11cc7e ld hl, Unknown_11cc7e
ld a, [wcfa9] ld a, [MenuSelection2]
.asm_11cbba .asm_11cbba
dec a dec a
jr z, .asm_11cbc1 jr z, .asm_11cbc1

14
misc/mobile_22.asm
View File

@ -259,7 +259,7 @@ Function89261: ; 89261
call Function8920f call Function8920f
pop af pop af
jr c, .done jr c, .done
ld a, [wcfa9] ld a, [MenuSelection2]
cp $2 cp $2
jr z, .done jr z, .done
and a and a
@ -2222,7 +2222,7 @@ asm_89d90: ; 89d90 (22:5d90)
push hl push hl
call _hl_ call _hl_
call Function89dab call Function89dab
ld a, [wcfa9] ld a, [MenuSelection2]
push af push af
call Function891ab call Function891ab
pop af pop af
@ -2253,7 +2253,7 @@ Function89dab: ; 89dab (22:5dab)
call PlayClickSFX call PlayClickSFX
ld a, [wcfa3] ld a, [wcfa3]
ld c, a ld c, a
ld a, [wcfa9] ld a, [MenuSelection2]
cp c cp c
jr z, .asm_89dd9 jr z, .asm_89dd9
call Function1bee call Function1bee
@ -2273,7 +2273,7 @@ Function89de0: ; 89de0 (22:5de0)
.asm_89dea .asm_89dea
call Function8a31c call Function8a31c
jr z, .asm_89dfd jr z, .asm_89dfd
ld a, [wcfa9] ld a, [MenuSelection2]
ld c, a ld c, a
push bc push bc
ld hl, Jumptable_89e04 ld hl, Jumptable_89e04
@ -2782,7 +2782,7 @@ Function8a116: ; 8a116 (22:6116)
call Function8923c call Function8923c
call Function8a17b call Function8a17b
jr c, .asm_8a16b jr c, .asm_8a16b
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wd030], a ld [wd030], a
dec d dec d
jr z, .asm_8a140 jr z, .asm_8a140
@ -2865,7 +2865,7 @@ Function8a1b0: ; 8a1b0
ld c, $12 ld c, $12
call TextBox call TextBox
hlcoord 1, 14 hlcoord 1, 14
ld a, [wcfa9] ld a, [MenuSelection2]
ld de, Strings_8a1cc ld de, Strings_8a1cc
dec a dec a
ld c, a ld c, a
@ -3104,7 +3104,7 @@ Function8a383: ; 8a383 (22:6383)
ret ret
Function8a3a2: ; 8a3a2 (22:63a2) Function8a3a2: ; 8a3a2 (22:63a2)
ld a, [wcfa9] ld a, [MenuSelection2]
dec a dec a
ld hl, DefaultFlypoint ld hl, DefaultFlypoint
ld e, a ld e, a

8
misc/mobile_22_2.asm
View File

@ -854,7 +854,7 @@ Function8b7bd: ; 8b7bd
.asm_8b824 .asm_8b824
ld c, a ld c, a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wd030], a ld [wd030], a
ld a, [wd0e4] ld a, [wd0e4]
ld [wd031], a ld [wd031], a
@ -863,7 +863,7 @@ Function8b7bd: ; 8b7bd
Function8b832: ; 8b832 Function8b832: ; 8b832
ld a, [wd0e4] ld a, [wd0e4]
ld hl, wcf92 ld hl, wMenuData2Items
sub [hl] sub [hl]
jr nc, Function8b84b jr nc, Function8b84b
xor a xor a
@ -872,7 +872,7 @@ Function8b832: ; 8b832
Function8b83e: ; 8b83e Function8b83e: ; 8b83e
ld a, [wd0e4] ld a, [wd0e4]
ld hl, wcf92 ld hl, wMenuData2Items
add [hl] add [hl]
cp $24 cp $24
jr c, Function8b84b jr c, Function8b84b
@ -880,7 +880,7 @@ Function8b83e: ; 8b83e
Function8b84b: ; 8b84b Function8b84b: ; 8b84b
ld [wd0e4], a ld [wd0e4], a
ld a, [wcfa9] ld a, [MenuSelection2]
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ret ret
; 8b855 ; 8b855

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