mirror of
https://github.com/pret/pokegold-spaceworld.git
synced 2026-04-24 23:10:52 -05:00
Identified wBattleMon and wEnemyMon structs
This commit is contained in:
DrippingYellow
parent
630163ffe4
commit
a2ce32bbde
|
|
@ -51,14 +51,7 @@ DEF NUM_MAP_PALETTES EQU const_value
|
|||
const FISHGROUP_REMORAID
|
||||
const FISHGROUP_QWILFISH_NO_SWARM
|
||||
|
||||
; connection directions (see data/maps/data.asm)
|
||||
const_def
|
||||
const EAST_F
|
||||
const WEST_F
|
||||
const SOUTH_F
|
||||
const NORTH_F
|
||||
|
||||
; wMapConnections
|
||||
; wMapConnections / connection directions (see data/maps/data.asm)
|
||||
const_def
|
||||
shift_const EAST
|
||||
shift_const WEST
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
; MenuHeader flags
|
||||
const_def
|
||||
shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set.
|
||||
shift_const MENU_UNUSED_1
|
||||
shift_const MENU_UNUSED_2
|
||||
const_skip 2
|
||||
shift_const MENU_NO_CLICK_SFX
|
||||
shift_const MENU_SPRITE_ANIMS
|
||||
shift_const MENU_UNUSED_3
|
||||
shift_const MENU_UNUSED
|
||||
shift_const MENU_BACKUP_TILES
|
||||
shift_const MENU_BACKUP_TILES_2
|
||||
|
||||
|
|
@ -32,6 +31,22 @@
|
|||
shift_const SCROLLINGMENU_ENABLE_START
|
||||
shift_const SCROLLINGMENU_ENABLE_SELECT
|
||||
|
||||
; _2DMenu more flags
|
||||
const_def
|
||||
shift_const _2DMENU_EXIT_RIGHT ; 0
|
||||
shift_const _2DMENU_EXIT_LEFT ; 1
|
||||
shift_const _2DMENU_EXIT_UP ; 2
|
||||
shift_const _2DMENU_EXIT_DOWN ; 3
|
||||
shift_const _2DMENU_WRAP_LEFT_RIGHT ; 4
|
||||
shift_const _2DMENU_WRAP_UP_DOWN ; 5
|
||||
shift_const _2DMENU_ENABLE_SPRITE_ANIMS ; 6
|
||||
shift_const _2DMENU_DISABLE_JOYPAD_FILTER ; 7
|
||||
|
||||
; _2DMenu more flags 2
|
||||
const_def
|
||||
const_skip 7
|
||||
shift_const _2DMENU_EXITING ; 7
|
||||
|
||||
|
||||
; MonMenuOptions indexes (see data/mon_menu.asm)
|
||||
; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
|
||||
|
|
@ -41,28 +56,24 @@
|
|||
const MONMENUITEM_FLY ; 2
|
||||
const MONMENUITEM_SURF ; 3
|
||||
const MONMENUITEM_STRENGTH ; 4
|
||||
const MONMENUITEM_WATERFALL ; 5
|
||||
const MONMENUITEM_FLASH ; 6
|
||||
const MONMENUITEM_WHIRLPOOL ; 7
|
||||
const MONMENUITEM_FLASH ; 5
|
||||
const MONMENUITEM_WHIRLPOOL ; 6
|
||||
const MONMENUITEM_BOUNCE ; 7
|
||||
const MONMENUITEM_DIG ; 8
|
||||
const MONMENUITEM_TELEPORT ; 9
|
||||
const MONMENUITEM_SOFTBOILED ; 10
|
||||
const MONMENUITEM_HEADBUTT ; 11
|
||||
const MONMENUITEM_ROCKSMASH ; 12
|
||||
const MONMENUITEM_MILKDRINK ; 13
|
||||
const MONMENUITEM_SWEETSCENT ; 14
|
||||
; options
|
||||
const MONMENUITEM_STATS ; 15
|
||||
const MONMENUITEM_SWITCH ; 16
|
||||
const MONMENUITEM_ITEM ; 17
|
||||
const MONMENUITEM_CANCEL ; 18
|
||||
const MONMENUITEM_MOVE ; 19
|
||||
const MONMENUITEM_MAIL ; 20
|
||||
const MONMENUITEM_ERROR ; 21
|
||||
const MONMENUITEM_STATS ; 11
|
||||
const MONMENUITEM_SWITCH ; 12
|
||||
const MONMENUITEM_ITEM ; 13
|
||||
const MONMENUITEM_CANCEL ; 14
|
||||
const MONMENUITEM_MOVE ; 15
|
||||
const MONMENUITEM_MAIL ; 16
|
||||
const MONMENUITEM_ERROR ; 17
|
||||
|
||||
; MonMenuOptions categories
|
||||
DEF MONMENU_FIELD_MOVE EQU 0
|
||||
DEF MONMENU_MENUOPTION EQU 1
|
||||
DEF MONMENU_MENUOPTION EQU 0
|
||||
DEF MONMENU_FIELD_MOVE EQU 1
|
||||
|
||||
DEF NUM_MONMENU_ITEMS EQU 8
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ GiveItemPredef::
|
|||
add_predef Function28d6e
|
||||
add_predef Function40ac7
|
||||
add_predef Function40000
|
||||
add_predef Function40b5c ; 30
|
||||
add_predef ConvertMon_1to2 ; 30
|
||||
add_predef CopyMonToTempMon
|
||||
add_predef ListMoves
|
||||
add_predef Function50bcd
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ FieldDebug_DoVRAMViewer:
|
|||
call .LoadPokemon
|
||||
ld de, $9310
|
||||
ld a, 3
|
||||
ld [wcdd8], a
|
||||
ld [wTempBattleMonSpecies], a
|
||||
predef Function3f04a
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -3029,7 +3029,7 @@ Function6445:
|
|||
call CopyBytes
|
||||
.sub_645d
|
||||
ld hl, wPartyMon1Moves
|
||||
ld bc, $0030
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
ld a, [wCurPartyMon]
|
||||
call AddNTimes
|
||||
ld d, h
|
||||
|
|
@ -3080,12 +3080,12 @@ Function6445:
|
|||
jp nz, .sub_64eb
|
||||
ld h, d
|
||||
ld l, e
|
||||
ld de, wca04
|
||||
ld de, wBattleMonMoves
|
||||
ld bc, $0004
|
||||
call CopyBytes
|
||||
ld bc, $0011
|
||||
add hl, bc
|
||||
ld de, wca0a
|
||||
ld de, wBattleMonPP
|
||||
ld bc, $0004
|
||||
call CopyBytes
|
||||
jp .sub_64eb
|
||||
|
|
|
|||
|
|
@ -879,7 +879,7 @@ Functiond8b6:
|
|||
ld a, [wBattleMode]
|
||||
and a
|
||||
jr z, .sub_d91b
|
||||
ld a, [wcdda]
|
||||
ld a, [wEnemyMonItem]
|
||||
ld [de], a
|
||||
.sub_d91b
|
||||
inc de
|
||||
|
|
@ -1002,14 +1002,14 @@ Functiond8b6:
|
|||
inc de
|
||||
jr .sub_da0a
|
||||
.sub_d9d3
|
||||
ld a, [wcddf]
|
||||
ld a, [wEnemyMonDVs]
|
||||
ld [de], a
|
||||
inc de
|
||||
ld a, [wcde0]
|
||||
ld a, [wEnemyMonDVs + 1]
|
||||
ld [de], a
|
||||
inc de
|
||||
push hl
|
||||
ld hl, wcde1
|
||||
ld hl, wEnemyMonPP
|
||||
ld b, $04
|
||||
.sub_d9e3
|
||||
ld a, [hli]
|
||||
|
|
@ -1027,23 +1027,23 @@ Functiond8b6:
|
|||
ld a, [wCurPartyLevel]
|
||||
ld [de], a
|
||||
inc de
|
||||
ld a, [wcde7]
|
||||
ld a, [wEnemyMonStatus]
|
||||
ld [de], a
|
||||
inc de
|
||||
ld a, [wcde8]
|
||||
ld a, [wEnemyMonStatus + 1]
|
||||
ld [de], a
|
||||
inc de
|
||||
ld a, [wcde9]
|
||||
ld a, [wEnemyMonHP]
|
||||
ld [de], a
|
||||
inc de
|
||||
ld a, [wcdea]
|
||||
ld a, [wEnemyMonHP + 1]
|
||||
ld [de], a
|
||||
inc de
|
||||
.sub_da0a
|
||||
ld a, [wBattleMode]
|
||||
dec a
|
||||
jr nz, .sub_da1c
|
||||
ld hl, wcdeb
|
||||
ld hl, wEnemyMonMaxHP
|
||||
ld bc, $000c
|
||||
call CopyBytes
|
||||
pop hl
|
||||
|
|
@ -1608,7 +1608,7 @@ Functiondd5c:
|
|||
dec b
|
||||
jr nz, .sub_de17
|
||||
.sub_de2a
|
||||
ld hl, wcdd9
|
||||
ld hl, wEnemyMon
|
||||
ld de, wBoxMon1
|
||||
ld bc, $0006
|
||||
call CopyBytes
|
||||
|
|
@ -1642,7 +1642,7 @@ Functiondd5c:
|
|||
inc de
|
||||
dec b
|
||||
jr nz, .sub_de5c
|
||||
ld hl, wcddf
|
||||
ld hl, wEnemyMonDVs
|
||||
ld b, $07
|
||||
.sub_de66
|
||||
ld a, [hli]
|
||||
|
|
@ -1676,7 +1676,7 @@ Functionde79:
|
|||
scf
|
||||
ret z
|
||||
ld a, [wCurPartySpecies]
|
||||
ld [wcdd7], a
|
||||
ld [wTempEnemyMonSpecies], a
|
||||
xor a
|
||||
ld [wca44], a
|
||||
ld hl, AddPokemonToBox
|
||||
|
|
@ -2769,11 +2769,11 @@ Function6734:
|
|||
|
||||
_UseItem:
|
||||
ld a, [wCurItem]
|
||||
ld [wce37], a
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
call GetItemName
|
||||
call CopyStringToStringBuffer2
|
||||
ld a, $01
|
||||
ld [wFieldMoveSucceeded], a
|
||||
ld [wItemEffectSucceeded], a
|
||||
ld a, [wCurItem]
|
||||
cp $c4
|
||||
jp nc, Functionf678
|
||||
|
|
@ -2789,11 +2789,11 @@ _UseItem:
|
|||
jp hl
|
||||
|
||||
Tablee7a5:
|
||||
dw Functione8f9
|
||||
dw Functione8f9
|
||||
dw PokeBallEffect ; ITEM_MASTER_BALL
|
||||
dw PokeBallEffect ; ITEM_ULTRA_BALL
|
||||
dw Functionf66f
|
||||
dw Functione8f9
|
||||
dw Functione8f9
|
||||
dw PokeBallEffect ; ITEM_GREAT_BALL
|
||||
dw PokeBallEffect ; ITEM_POKE_BALL
|
||||
dw Functionec95
|
||||
dw Functioneca4
|
||||
dw Functioned00
|
||||
|
|
@ -2960,50 +2960,64 @@ Tablee7a5:
|
|||
dw Functionf672
|
||||
dw Functionf672
|
||||
|
||||
Functione8f9:
|
||||
PokeBallEffect:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
dec a
|
||||
jp nz, Functionf7ae
|
||||
jp nz, UseBallInTrainerBattle
|
||||
|
||||
ld a, [wPartyCount]
|
||||
cp $06
|
||||
jr nz, .sub_e913
|
||||
cp PARTY_LENGTH
|
||||
jr nz, .room_in_party
|
||||
|
||||
ld a, [wBoxListLength]
|
||||
cp $1e
|
||||
jp z, Functionf7d8
|
||||
.sub_e913
|
||||
cp MONS_PER_BOX
|
||||
jp z, Ball_BoxIsFullMessage
|
||||
|
||||
.room_in_party
|
||||
xor a
|
||||
ld [wce35], a
|
||||
call Functionec7a
|
||||
call ReturnToBattle_UseBall
|
||||
|
||||
ld hl, ItemUsedText
|
||||
call PrintText
|
||||
ld a, [wcdfe]
|
||||
|
||||
ld a, [wEnemyMonCatchRate]
|
||||
ld b, a
|
||||
ld a, [wCurItem]
|
||||
cp $01
|
||||
cp ITEM_MASTER_BALL
|
||||
jp z, .sub_e9d6
|
||||
cp $02
|
||||
jr z, .sub_e941
|
||||
cp $04
|
||||
jr z, .sub_e936
|
||||
jr .sub_e947
|
||||
.sub_e936
|
||||
|
||||
cp ITEM_ULTRA_BALL
|
||||
jr z, .ultra_ball_modifier
|
||||
|
||||
cp ITEM_GREAT_BALL
|
||||
jr z, .great_ball_modifier
|
||||
|
||||
; POKE_BALL
|
||||
jr .regular_ball
|
||||
|
||||
; 1.5x modifier
|
||||
.great_ball_modifier
|
||||
ld a, b
|
||||
srl a
|
||||
add b
|
||||
ld b, a
|
||||
jr nc, .sub_e947
|
||||
jr nc, .regular_ball
|
||||
ld b, $ff
|
||||
jr .sub_e947
|
||||
.sub_e941
|
||||
jr .regular_ball
|
||||
|
||||
; 2.0x modifier
|
||||
.ultra_ball_modifier
|
||||
sla b
|
||||
jr nc, .sub_e947
|
||||
jr nc, .regular_ball
|
||||
ld b, $ff
|
||||
.sub_e947
|
||||
|
||||
.regular_ball
|
||||
ld a, b
|
||||
ldh [hQuotient+2], a
|
||||
ld hl, wcde9
|
||||
ldh [hMultiplicand + 2], a
|
||||
ld hl, wEnemyMonHP
|
||||
ld b, [hl]
|
||||
inc hl
|
||||
ld c, [hl]
|
||||
|
|
@ -3056,7 +3070,7 @@ Functione8f9:
|
|||
ld a, $01
|
||||
.sub_e998
|
||||
ld b, a
|
||||
ld a, [wcde7]
|
||||
ld a, [wEnemyMonStatus]
|
||||
and $27
|
||||
ld c, $0a
|
||||
jr nz, .sub_e9a9
|
||||
|
|
@ -3072,7 +3086,7 @@ Functione8f9:
|
|||
.sub_e9af
|
||||
ld d, a
|
||||
push de
|
||||
ld a, [wca03]
|
||||
ld a, [wBattleMonItem]
|
||||
ld hl, Function37e3d
|
||||
ld a, BANK(Function37e3d)
|
||||
call FarCall_hl
|
||||
|
|
@ -3093,22 +3107,22 @@ Functione8f9:
|
|||
jr z, .sub_e9d6
|
||||
jr nc, .sub_e9d9
|
||||
.sub_e9d6
|
||||
ld a, [wcdd9]
|
||||
ld a, [wEnemyMonSpecies]
|
||||
.sub_e9d9
|
||||
ld [wce35], a
|
||||
ld c, $14
|
||||
call DelayFrames
|
||||
ld a, [wCurItem]
|
||||
ld [wca5c], a
|
||||
ld de, $0100
|
||||
ld [wBattleAnimParam], a
|
||||
ld de, ANIM_THROW_POKE_BALL
|
||||
ld a, e
|
||||
ld [wccc0], a
|
||||
ld [wFXAnimID], a
|
||||
ld a, d
|
||||
ld [wccc1], a
|
||||
ld [wFXAnimID + 1], a
|
||||
xor a
|
||||
ldh [hBattleTurn], a
|
||||
ld [wMapBlocksAddress], a
|
||||
ld [wcccd], a
|
||||
ld [wNumHits], a
|
||||
predef PlayBattleAnim
|
||||
ld a, [wce35]
|
||||
and a
|
||||
|
|
@ -3127,7 +3141,7 @@ Functione8f9:
|
|||
ld hl, BallSoCloseText
|
||||
jp z, .sub_eb59
|
||||
.sub_ea29
|
||||
ld hl, wcde9
|
||||
ld hl, wEnemyMonHP
|
||||
ld a, [hli]
|
||||
push af
|
||||
ld a, [hli]
|
||||
|
|
@ -3136,7 +3150,7 @@ Functione8f9:
|
|||
ld a, [hl]
|
||||
push af
|
||||
push hl
|
||||
ld hl, wcdda
|
||||
ld hl, wEnemyMonItem
|
||||
ld a, [hl]
|
||||
push af
|
||||
push hl
|
||||
|
|
@ -3144,19 +3158,19 @@ Functione8f9:
|
|||
bit 3, [hl]
|
||||
jr z, .sub_ea48
|
||||
ld a, $84
|
||||
ld [wcdd7], a
|
||||
ld [wTempEnemyMonSpecies], a
|
||||
jr .sub_ea55
|
||||
.sub_ea48
|
||||
set 3, [hl]
|
||||
ld hl, wcad0
|
||||
ld a, [wcddf]
|
||||
ld a, [wEnemyMonDVs]
|
||||
ld [hli], a
|
||||
ld a, [wcde0]
|
||||
ld a, [wEnemyMonDVs + 1]
|
||||
ld [hl], a
|
||||
.sub_ea55
|
||||
ld a, [wcdd7]
|
||||
ld a, [wTempEnemyMonSpecies]
|
||||
ld [wCurPartySpecies], a
|
||||
ld a, [wcde6]
|
||||
ld a, [wEnemyMonLevel]
|
||||
ld [wCurPartyLevel], a
|
||||
ld hl, AddPokemonToBox
|
||||
ld a, BANK(AddPokemonToBox)
|
||||
|
|
@ -3172,7 +3186,7 @@ Functione8f9:
|
|||
ld [hld], a
|
||||
pop af
|
||||
ld [hl], a
|
||||
ld a, [wcdd9]
|
||||
ld a, [wEnemyMonSpecies]
|
||||
ld [wce35], a
|
||||
ld [wCurPartySpecies], a
|
||||
ld [wce37], a
|
||||
|
|
@ -3202,7 +3216,7 @@ Functione8f9:
|
|||
ld hl, NewDexDataText_2
|
||||
call PrintText
|
||||
call ClearSprites
|
||||
ld a, [wcdd9]
|
||||
ld a, [wEnemyMonSpecies]
|
||||
ld [wce37], a
|
||||
predef Function40ac7
|
||||
.sub_eac7
|
||||
|
|
@ -3354,7 +3368,7 @@ Textec69:
|
|||
line "なまえを つけますか"
|
||||
done
|
||||
|
||||
Functionec7a:
|
||||
ReturnToBattle_UseBall:
|
||||
call ClearPalettes
|
||||
ld hl, Call_LoadBattleGraphics
|
||||
ld a, BANK(Call_LoadBattleGraphics)
|
||||
|
|
@ -3369,7 +3383,7 @@ Functionec7a:
|
|||
Functionec95:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, BANK(Function86a0)
|
||||
ld hl, Function86a0
|
||||
jp FarCall_hl
|
||||
|
|
@ -3428,7 +3442,7 @@ Functionecd5:
|
|||
Functioned00:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, $05
|
||||
call Functionf0cf
|
||||
jr c, .sub_ed32
|
||||
|
|
@ -3447,7 +3461,7 @@ Functioned00:
|
|||
jr z, .sub_ed2f
|
||||
jp Functionf7a2
|
||||
.sub_ed2f
|
||||
call Functionf7e2
|
||||
call WontHaveAnyEffectMessage
|
||||
.sub_ed32
|
||||
xor a
|
||||
ld [wFieldMoveSucceeded], a
|
||||
|
|
@ -3456,7 +3470,7 @@ Functioned00:
|
|||
Functioned37:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
call Functionf0cf
|
||||
jp c, Functionedbe
|
||||
|
|
@ -3590,7 +3604,7 @@ Dataee38:
|
|||
Functionee42:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
call Functionf0cf
|
||||
jp c, Functionedbe
|
||||
|
|
@ -3688,7 +3702,7 @@ Functionee42:
|
|||
Functionef02:
|
||||
ld a, [wPartyCount]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
call Functionf0cf
|
||||
jp c, Functionf100
|
||||
|
|
@ -3709,14 +3723,14 @@ Functionef17:
|
|||
call Functionf113
|
||||
jr nc, .sub_ef50
|
||||
xor a
|
||||
ld [wca10], a
|
||||
ld [wBattleMonStatus], a
|
||||
ld hl, wca3f
|
||||
res 0, [hl]
|
||||
ld hl, wca3b
|
||||
res 0, [hl]
|
||||
ld a, $24
|
||||
call GetPartyParamLocation
|
||||
ld de, wca14
|
||||
ld de, wBattleMonMaxHP
|
||||
ld bc, $000a
|
||||
call CopyBytes
|
||||
predef Function3e1a4
|
||||
|
|
@ -3758,7 +3772,7 @@ Dataef77:
|
|||
Functionef8c:
|
||||
ld a, [wPartyCount]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
call Functionf0cf
|
||||
jp c, Functionf100
|
||||
|
|
@ -3805,7 +3819,7 @@ Functionefed:
|
|||
Functionefee:
|
||||
ld a, [wPartyCount]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
call Functionf0cf
|
||||
jp c, Functionf100
|
||||
|
|
@ -3837,13 +3851,13 @@ Functionefee:
|
|||
ld hl, wca3b
|
||||
res 0, [hl]
|
||||
xor a
|
||||
ld [wca10], a
|
||||
ld [wBattleMonStatus], a
|
||||
ld a, $22
|
||||
call GetPartyParamLocation
|
||||
ld a, [hli]
|
||||
ld [wca12], a
|
||||
ld [wBattleMonHP], a
|
||||
ld a, [hld]
|
||||
ld [wca13], a
|
||||
ld [wBattleMonHP + 1], a
|
||||
.sub_f049
|
||||
call Functionf0b0
|
||||
ld a, $f5
|
||||
|
|
@ -3858,7 +3872,7 @@ Functionf05a:
|
|||
Functionf05b:
|
||||
ld a, [wPartyCount]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
call Functionf0cf
|
||||
jp c, Functionf100
|
||||
|
|
@ -3882,9 +3896,9 @@ Functionf05b:
|
|||
ld a, $22
|
||||
call GetPartyParamLocation
|
||||
ld a, [hli]
|
||||
ld [wca12], a
|
||||
ld [wBattleMonHP], a
|
||||
ld a, [hld]
|
||||
ld [wca13], a
|
||||
ld [wBattleMonHP + 1], a
|
||||
.sub_f09e
|
||||
call Functionf0b0
|
||||
ld a, $f5
|
||||
|
|
@ -3931,7 +3945,7 @@ Functionf0d8:
|
|||
ret
|
||||
|
||||
Functionf0fb:
|
||||
call Functionf7e2
|
||||
call WontHaveAnyEffectMessage
|
||||
jr Functionf104
|
||||
|
||||
Functionf100:
|
||||
|
|
@ -4238,7 +4252,7 @@ Functionf2cc:
|
|||
Functionf2ce:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, b
|
||||
ld [wce2d], a
|
||||
jp Functionf793
|
||||
|
|
@ -4246,7 +4260,7 @@ Functionf2ce:
|
|||
Functionf2dc:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld hl, wca3e
|
||||
set 0, [hl]
|
||||
jp Functionf793
|
||||
|
|
@ -4254,7 +4268,7 @@ Functionf2dc:
|
|||
Functionf2eb:
|
||||
ld a, [wBattleMode]
|
||||
dec a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, $01
|
||||
ld [wce06], a
|
||||
jp Functionf793
|
||||
|
|
@ -4262,7 +4276,7 @@ Functionf2eb:
|
|||
Functionf2fa:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld hl, wca3e
|
||||
set 1, [hl]
|
||||
jp Functionf793
|
||||
|
|
@ -4270,7 +4284,7 @@ Functionf2fa:
|
|||
Functionf309:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp z, Functionf7dd
|
||||
jp z, IsntTheTimeMessage
|
||||
ld hl, wca3e
|
||||
set 2, [hl]
|
||||
jp Functionf793
|
||||
|
|
@ -4279,7 +4293,7 @@ Functionf318:
|
|||
ld a, [wBattleMode]
|
||||
and a
|
||||
jr nz, .sub_f327
|
||||
call Functionf7dd
|
||||
call IsntTheTimeMessage
|
||||
ld a, $02
|
||||
ld [wFieldMoveSucceeded], a
|
||||
ret
|
||||
|
|
@ -4326,11 +4340,11 @@ Functionf355:
|
|||
ld hl, wOTPartyMon1Status
|
||||
call Functionf397
|
||||
.sub_f36e
|
||||
ld hl, wca10
|
||||
ld hl, wBattleMonStatus
|
||||
ld a, [hl]
|
||||
and b
|
||||
ld [hl], a
|
||||
ld hl, wcde7
|
||||
ld hl, wEnemyMonStatus
|
||||
ld a, [hl]
|
||||
and b
|
||||
ld [hl], a
|
||||
|
|
@ -4409,7 +4423,7 @@ Functionf3fd:
|
|||
Functionf413:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld hl, Textf424
|
||||
call MenuTextBox
|
||||
call CloseWindow
|
||||
|
|
@ -4426,14 +4440,14 @@ Textf42f:
|
|||
|
||||
Functionf437:
|
||||
call Functionf49f
|
||||
jp c, Functionf7dd
|
||||
jp c, IsntTheTimeMessage
|
||||
ld bc, $0585
|
||||
ld a, $01
|
||||
jr Functionf478
|
||||
|
||||
Functionf444:
|
||||
call Functionf49f
|
||||
jp c, Functionf7dd
|
||||
jp c, IsntTheTimeMessage
|
||||
.sub_f44a
|
||||
call Random
|
||||
srl a
|
||||
|
|
@ -4461,7 +4475,7 @@ Dataf46a:
|
|||
|
||||
Functionf46e:
|
||||
call Functionf49f
|
||||
jp c, Functionf7dd
|
||||
jp c, IsntTheTimeMessage
|
||||
call Functionf9d9
|
||||
ld a, e
|
||||
|
||||
|
|
@ -4517,7 +4531,7 @@ Functionf49f:
|
|||
Functionf4ca:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
|
||||
Functionf4d1:
|
||||
ld a, [wCurItem]
|
||||
|
|
@ -4589,7 +4603,7 @@ Functionf550:
|
|||
ld hl, wPartyMon1PP
|
||||
ld bc, $0030
|
||||
call AddNTimes
|
||||
ld de, wca0a
|
||||
ld de, wBattleMonPP
|
||||
ld bc, $0004
|
||||
call CopyBytes
|
||||
.sub_f572
|
||||
|
|
@ -4609,7 +4623,7 @@ Functionf588:
|
|||
ld [wMonType], a
|
||||
call GetMaxPPOfMove
|
||||
ld hl, wPartyMon1Moves
|
||||
ld bc, $0030
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
call GetMthMoveOfNthPartymon
|
||||
ld bc, $0015
|
||||
add hl, bc
|
||||
|
|
@ -4650,7 +4664,7 @@ Functionf5bd:
|
|||
.sub_f5ca
|
||||
push bc
|
||||
ld hl, wPartyMon1Moves
|
||||
ld bc, $0030
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
call GetMthMoveOfNthPartymon
|
||||
ld a, [hl]
|
||||
and a
|
||||
|
|
@ -4670,7 +4684,7 @@ Functionf5bd:
|
|||
jp nz, Functionf550
|
||||
|
||||
Functionf5f0:
|
||||
call Functionf7e2
|
||||
call WontHaveAnyEffectMessage
|
||||
|
||||
Functionf5f3:
|
||||
call ClearPalettes
|
||||
|
|
@ -4710,19 +4724,19 @@ Textf64c:
|
|||
Functionf65d:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld hl, TryTeleport
|
||||
ld a, $0b
|
||||
jp FarCall_hl
|
||||
|
||||
Functionf66c:
|
||||
jp Functionf7dd
|
||||
jp IsntTheTimeMessage
|
||||
|
||||
Functionf66f:
|
||||
jp Functionf7dd
|
||||
jp IsntTheTimeMessage
|
||||
|
||||
Functionf672:
|
||||
jp Functionf7dd
|
||||
jp IsntTheTimeMessage
|
||||
|
||||
Functionf675:
|
||||
jp Functionfaba
|
||||
|
|
@ -4730,7 +4744,7 @@ Functionf675:
|
|||
Functionf678:
|
||||
ld a, [wBattleMode]
|
||||
and a
|
||||
jp nz, Functionf7dd
|
||||
jp nz, IsntTheTimeMessage
|
||||
ld a, [wCurItem]
|
||||
sub $c9
|
||||
push af
|
||||
|
|
@ -4855,17 +4869,17 @@ Functionf7a2:
|
|||
call TossItem
|
||||
ret
|
||||
|
||||
Functionf7ae:
|
||||
call Functionec7a
|
||||
ld de, $0100
|
||||
UseBallInTrainerBattle:
|
||||
call ReturnToBattle_UseBall
|
||||
ld de, ANIM_THROW_POKE_BALL
|
||||
ld a, e
|
||||
ld [wccc0], a
|
||||
ld [wFXAnimID], a
|
||||
ld a, d
|
||||
ld [wccc1], a
|
||||
ld [wFXAnimID + 1], a
|
||||
xor a
|
||||
ld [wca5c], a
|
||||
ld [wBattleAnimParam], a
|
||||
ldh [hBattleTurn], a
|
||||
ld [wcccd], a
|
||||
ld [wNumHits], a
|
||||
predef PlayBattleAnim
|
||||
ld hl, BallBlockedText
|
||||
call PrintText
|
||||
|
|
@ -4873,32 +4887,32 @@ Functionf7ae:
|
|||
call PrintText
|
||||
jr Functionf7a2
|
||||
|
||||
Functionf7d8:
|
||||
Ball_BoxIsFullMessage:
|
||||
ld hl, BallBoxFullText
|
||||
jr Functionf7f4
|
||||
jr CantUseItemMessage
|
||||
|
||||
Functionf7dd:
|
||||
IsntTheTimeMessage:
|
||||
ld hl, ItemOakWarningText
|
||||
jr Functionf7f4
|
||||
jr CantUseItemMessage
|
||||
|
||||
Functionf7e2:
|
||||
WontHaveAnyEffectMessage:
|
||||
ld hl, ItemWontHaveAnyEffectText
|
||||
jr Functionf7f4
|
||||
jr CantUseItemMessage
|
||||
|
||||
Functionf7e7:
|
||||
BelongsToSomeoneElseMessage: ; unreferenced
|
||||
ld hl, ItemBelongsToSomeoneElseText
|
||||
jr Functionf7f4
|
||||
jr CantUseItemMessage
|
||||
|
||||
Functionf7ec:
|
||||
CyclingIsntAllowedMessage: ; unreferenced
|
||||
ld hl, NoCyclingText
|
||||
jr Functionf7f4
|
||||
jr CantUseItemMessage
|
||||
|
||||
Functionf7f1:
|
||||
CantGetOnYourBikeMessage: ; unreferenced
|
||||
ld hl, ItemCantGetOnText
|
||||
|
||||
Functionf7f4:
|
||||
CantUseItemMessage:
|
||||
xor a
|
||||
ld [wFieldMoveSucceeded], a
|
||||
ld [wItemEffectSucceeded], a
|
||||
jp PrintText
|
||||
|
||||
ItemOakWarningText:
|
||||
|
|
@ -4992,7 +5006,7 @@ GetMaxPPOfMove:
|
|||
dec a
|
||||
jr z, .got_nonpartymon ; TEMPMON
|
||||
|
||||
ld hl, wca04 ; WILDMON
|
||||
ld hl, wBattleMonMoves ; WILDMON
|
||||
|
||||
.got_nonpartymon ; TEMPMON, WILDMON
|
||||
call GetMthMoveOfCurrentMon
|
||||
|
|
|
|||
|
|
@ -1256,7 +1256,7 @@ asm_4831:
|
|||
call MenuBox
|
||||
call PlaceVerticalMenuItems
|
||||
call MenuBoxCoord2Tile
|
||||
ld de, $0015
|
||||
ld de, SCREEN_WIDTH + 1
|
||||
add hl, de
|
||||
ld de, wMoney
|
||||
ld bc, $4306
|
||||
|
|
@ -1287,7 +1287,7 @@ asm_24868:
|
|||
asm_24872:
|
||||
call MenuBox
|
||||
call MenuBoxCoord2Tile
|
||||
ld de, $0015
|
||||
ld de, SCREEN_WIDTH + 1
|
||||
add hl, de
|
||||
ld de, wMoney
|
||||
ld bc, $4306
|
||||
|
|
@ -1301,99 +1301,115 @@ MenuHeader24888:
|
|||
dw 0
|
||||
db 1
|
||||
|
||||
asm_24890:
|
||||
ld hl, .MenuHeader2489a
|
||||
UnreferencedMenu_24890:
|
||||
; An unreferenced, nonfunctional menu that resembles the field debug menu.
|
||||
ld hl, .MenuData
|
||||
call LoadMenuHeader
|
||||
call VerticalMenu
|
||||
ret
|
||||
|
||||
.MenuHeader2489a:
|
||||
.MenuData:
|
||||
db MENU_BACKUP_TILES
|
||||
menu_coords 0, 0, 6, 10
|
||||
dw .text_248a2
|
||||
dw .MenuText
|
||||
db 1
|
||||
|
||||
.text_248a2:
|
||||
db "たエ゛うる@"
|
||||
db "かう@"
|
||||
db "やめる@"
|
||||
db "くさかり@"
|
||||
db "とんでけ@"
|
||||
db "どんぶらこ@"
|
||||
db "フルパワー@"
|
||||
db "ひかりゴケ@"
|
||||
db "うずしお@"
|
||||
db "とびはねる@"
|
||||
db "あなをほる@"
|
||||
db "テレポート@"
|
||||
db "タマゴうみ@"
|
||||
.MenuText:
|
||||
db (STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING)
|
||||
db 3 ; amount of options
|
||||
db "うる@" ; Switch
|
||||
db "かう@" ; Buy
|
||||
db "やめる@" ; Cancel
|
||||
db "くさかり@" ; "Mower"? (replaced by Uproot)
|
||||
db "とんでけ@" ; "Flight"? (replaced by Wind Ride)
|
||||
db "どんぶらこ@" ; "Splash"? (replaced by Water Sport)
|
||||
db "フルパワー@" ; "Full Power" (replaced by Strong Arm)
|
||||
db "ひかりゴケ@" ; Bright Moss
|
||||
db "うずしお@" ; Whirlpool
|
||||
db "とびはねる@" ; Bounce
|
||||
db "あなをほる@" ; Dig
|
||||
db "テレポート@" ; Teleport
|
||||
db "タマゴうみ@" ; Softboiled
|
||||
|
||||
Text248e7:
|
||||
db "つよさをみる@"
|
||||
db "ならびかえ@"
|
||||
db "そうび@"
|
||||
db "キャンセル@"
|
||||
db "もちわざ@"
|
||||
db "メール@"
|
||||
db "エラー！@"
|
||||
; MonMenuOptionStrings indexes
|
||||
const_def 1
|
||||
const MONMENUVALUE_STATS ; 1
|
||||
const MONMENUVALUE_SWITCH ; 2
|
||||
const MONMENUVALUE_ITEM ; 3
|
||||
const MONMENUVALUE_CANCEL ; 4
|
||||
const MONMENUVALUE_MOVE ; 5
|
||||
const MONMENUVALUE_MAIL ; 6
|
||||
const MONMENUVALUE_ERROR ; 7
|
||||
DEF NUM_MONMENUVALUES EQU const_value - 1
|
||||
|
||||
Data2490c:
|
||||
db $f5, $01
|
||||
db $f6, $02
|
||||
db $f7, $03
|
||||
db $f8, $04
|
||||
db $f9, $05
|
||||
db $fa, $06
|
||||
db $fb, $07
|
||||
db $5b, $08
|
||||
db $64, $09
|
||||
db $87, $0a
|
||||
db $ff
|
||||
MonMenuOptionStrings:
|
||||
db "つよさをみる@" ; Stats
|
||||
db "ならびかえ@" ; Switch
|
||||
db "そうび@" ; Item
|
||||
db "キャンセル@" ; Cancel
|
||||
db "もちわざ@" ; Moves
|
||||
db "メール@" ; Mail
|
||||
db "エラー！@" ; Error!
|
||||
|
||||
Data24921:
|
||||
db $01, $01, $f5
|
||||
db $01, $02, $f6
|
||||
db $01, $03, $f7
|
||||
db $01, $04, $f8
|
||||
db $01, $05, $f9
|
||||
db $01, $06, $fa
|
||||
db $01, $07, $fb
|
||||
db $01, $08, $5b
|
||||
db $01, $09, $64
|
||||
db $01, $0a, $87
|
||||
db $00, $0b, $01
|
||||
db $00, $0c, $02
|
||||
db $00, $0d, $03
|
||||
db $00, $0e, $04
|
||||
db $00, $0f, $05
|
||||
db $00, $10, $06
|
||||
db $00, $11, $07
|
||||
db $ff
|
||||
Unreferenced_FieldMoveList:
|
||||
; Possibly how the
|
||||
db MOVE_UPROOT, MONMENUITEM_CUT
|
||||
db MOVE_WIND_RIDE, MONMENUITEM_FLY
|
||||
db MOVE_WATER_SPORT, MONMENUITEM_SURF
|
||||
db MOVE_STRONG_ARM, MONMENUITEM_STRENGTH
|
||||
db MOVE_BRIGHT_MOSS, MONMENUITEM_FLASH
|
||||
db MOVE_WHIRLPOOL, MONMENUITEM_WHIRLPOOL
|
||||
db MOVE_BOUNCE, MONMENUITEM_BOUNCE
|
||||
db MOVE_DIG, MONMENUITEM_DIG
|
||||
db MOVE_TELEPORT, MONMENUITEM_TELEPORT
|
||||
db MOVE_SOFTBOILED, MONMENUITEM_SOFTBOILED
|
||||
db -1
|
||||
|
||||
Function24955::
|
||||
MonMenuOptions:
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, MOVE_UPROOT
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, MOVE_WIND_RIDE
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_SURF, MOVE_WATER_SPORT
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH, MOVE_STRONG_ARM
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_FLASH, MOVE_BRIGHT_MOSS
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL, MOVE_WHIRLPOOL
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_BOUNCE, MOVE_BOUNCE
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_DIG, MOVE_DIG
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT, MOVE_TELEPORT
|
||||
db MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, MOVE_SOFTBOILED
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_STATS, MONMENUVALUE_STATS
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_SWITCH, MONMENUVALUE_SWITCH
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_ITEM, MONMENUVALUE_ITEM
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_CANCEL, MONMENUVALUE_CANCEL
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_MOVE, MONMENUVALUE_MOVE
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL
|
||||
db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR
|
||||
db -1
|
||||
|
||||
MonSubmenu::
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
call asm_24a0c
|
||||
callfar Function_8f1cb
|
||||
ld hl, .MenuHeader2497d
|
||||
call GetMonSubmenuItems
|
||||
callfar FreezeMonIcons
|
||||
ld hl, .MenuHeader
|
||||
call LoadMenuHeader
|
||||
call asm_24985
|
||||
call asm_249c9
|
||||
call .GetTopCoord
|
||||
call PopulateMonMenu
|
||||
|
||||
ld a, 1
|
||||
ldh [hBGMapMode], a
|
||||
call asm_24997
|
||||
call MonMenuLoop
|
||||
ld [wMenuSelection], a
|
||||
call CloseWindow
|
||||
ret
|
||||
|
||||
.MenuHeader2497d:
|
||||
db $40
|
||||
menu_coords 11, 0, $13, $11
|
||||
.MenuHeader:
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 11, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
|
||||
dw 0
|
||||
db 1
|
||||
db 1 ; default option
|
||||
|
||||
asm_24985:
|
||||
ld a, [wFieldMoveScriptID]
|
||||
.GetTopCoord:
|
||||
ld a, [wMonSubmenuCount]
|
||||
inc a
|
||||
add a
|
||||
ld b, a
|
||||
|
|
@ -1404,179 +1420,193 @@ asm_24985:
|
|||
call MenuBox
|
||||
ret
|
||||
|
||||
asm_24997:
|
||||
ld a, $a0
|
||||
ld [wMenuDataHeaderEnd], a
|
||||
ld a, [wFieldMoveScriptID]
|
||||
MonMenuLoop:
|
||||
ld a, (STATICMENU_CURSOR | STATICMENU_WRAP)
|
||||
ld [wMenuDataFlags], a
|
||||
ld a, [wMonSubmenuCount]
|
||||
ld [wMenuDataItems], a
|
||||
call InitVerticalMenuCursor
|
||||
|
||||
ld hl, w2DMenuFlags
|
||||
set 6, [hl]
|
||||
set _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
|
||||
|
||||
call Get2DMenuJoypad
|
||||
ldh a, [hJoyDown]
|
||||
bit 0, a
|
||||
jr nz, asm_249bc
|
||||
bit 1, a
|
||||
jr nz, asm_249b9
|
||||
jr asm_24997
|
||||
asm_249b9:
|
||||
ld a, $0e
|
||||
bit A_BUTTON_F, a
|
||||
jr nz, .select
|
||||
bit B_BUTTON_F, a
|
||||
jr nz, .cancel
|
||||
jr MonMenuLoop
|
||||
|
||||
.cancel:
|
||||
ld a, MONMENUITEM_CANCEL
|
||||
ret
|
||||
|
||||
asm_249bc:
|
||||
ld a, [w2DMenuDataEnd]
|
||||
.select:
|
||||
ld a, [wMenuCursorY]
|
||||
dec a
|
||||
ld c, a
|
||||
ld b, $00
|
||||
ld hl, wMapBlocksAddress
|
||||
ld b, 0
|
||||
ld hl, wMonSubmenuItems
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
ret
|
||||
|
||||
asm_249c9:
|
||||
PopulateMonMenu:
|
||||
call MenuBoxCoord2Tile
|
||||
ld bc, $002a
|
||||
ld bc, 2*SCREEN_WIDTH + 2
|
||||
add hl, bc
|
||||
ld de, wMapBlocksAddress
|
||||
asm_249d3:
|
||||
ld de, wMonSubmenuItems
|
||||
.loop
|
||||
ld a, [de]
|
||||
inc de
|
||||
cp $ff
|
||||
ret z
|
||||
push de
|
||||
push hl
|
||||
call asm_249e8
|
||||
call GetMonMenuString
|
||||
pop hl
|
||||
call PlaceString
|
||||
ld bc, $0028
|
||||
ld bc, 2*SCREEN_WIDTH
|
||||
add hl, bc
|
||||
pop de
|
||||
jr asm_249d3
|
||||
asm_249e8:
|
||||
jr .loop
|
||||
|
||||
GetMonMenuString:
|
||||
dec a
|
||||
ld b, a
|
||||
add a
|
||||
add b
|
||||
ld c, a
|
||||
ld b, $00
|
||||
ld hl, Data24921
|
||||
ld hl, MonMenuOptions
|
||||
add hl, bc
|
||||
ld a, [hli]
|
||||
and a
|
||||
jr z, asm_24a00
|
||||
and a ; if MONMENU_MENUOPTION
|
||||
jr z, .NotMove
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
ld [wNamedObjectIndexBuffer], a
|
||||
call Unreferenced_GetMoveName
|
||||
ret
|
||||
|
||||
asm_24a00:
|
||||
.NotMove:
|
||||
inc hl
|
||||
ld a, [hl]
|
||||
dec a
|
||||
ld hl, Text248e7
|
||||
ld hl, MonMenuOptionStrings
|
||||
call GetNthString
|
||||
ld d, h
|
||||
ld e, l
|
||||
ret
|
||||
|
||||
asm_24a0c:
|
||||
call asm_24a78
|
||||
ld a, $02
|
||||
GetMonSubmenuItems:
|
||||
call ResetMonSubmenu
|
||||
ld a, MON_MOVES
|
||||
call GetPartyParamLocation
|
||||
ld d, h
|
||||
ld e, l
|
||||
ld hl, wMapBlocksAddress
|
||||
ld c, $04
|
||||
asm_24a1b:
|
||||
ld hl, wMonSubmenuItems
|
||||
ld c, NUM_MOVES
|
||||
|
||||
.loop
|
||||
push bc
|
||||
push de
|
||||
ld a, [de]
|
||||
and a
|
||||
jr z, asm_24a2b
|
||||
and a ; no move in this slot
|
||||
jr z, .next
|
||||
|
||||
push hl
|
||||
call asm_24a63
|
||||
call IsFieldMove
|
||||
|
||||
pop hl
|
||||
jr nc, asm_24a2b
|
||||
call asm_24a93
|
||||
asm_24a2b:
|
||||
jr nc, .next
|
||||
call AddMonMenuItem
|
||||
|
||||
.next
|
||||
pop de
|
||||
inc de
|
||||
pop bc
|
||||
dec c
|
||||
jr nz, asm_24a1b
|
||||
ld a, $0b
|
||||
call asm_24a93
|
||||
ld a, $0c
|
||||
call asm_24a93
|
||||
ld a, $0f
|
||||
call asm_24a93
|
||||
jr nz, .loop
|
||||
|
||||
ld a, MONMENUITEM_STATS
|
||||
call AddMonMenuItem
|
||||
ld a, MONMENUITEM_SWITCH
|
||||
call AddMonMenuItem
|
||||
ld a, MONMENUITEM_MOVE
|
||||
call AddMonMenuItem
|
||||
|
||||
push hl
|
||||
ld a, $01
|
||||
ld a, MON_ITEM
|
||||
call GetPartyParamLocation
|
||||
ld a, [hl]
|
||||
pop hl
|
||||
cp $9e
|
||||
ld a, $0d
|
||||
jr nz, asm_24a50
|
||||
ld a, $10
|
||||
asm_24a50:
|
||||
call asm_24a93
|
||||
ld a, [wFieldMoveScriptID]
|
||||
cp $08
|
||||
jr z, asm_24a5f
|
||||
ld a, $0e
|
||||
call asm_24a93
|
||||
asm_24a5f:
|
||||
call asm_24a86
|
||||
cp ITEM_MAIL
|
||||
ld a, MONMENUITEM_ITEM
|
||||
jr nz, .notmail
|
||||
ld a, MONMENUITEM_MAIL
|
||||
|
||||
.notmail
|
||||
call AddMonMenuItem
|
||||
ld a, [wMonSubmenuCount]
|
||||
cp NUM_MONMENU_ITEMS
|
||||
jr z, .maxitems
|
||||
|
||||
ld a, MONMENUITEM_CANCEL
|
||||
call AddMonMenuItem
|
||||
|
||||
.maxitems
|
||||
call TerminateMonSubmenu
|
||||
ret
|
||||
|
||||
asm_24a63:
|
||||
IsFieldMove:
|
||||
ld b, a
|
||||
ld hl, Data24921
|
||||
asm_24a67:
|
||||
ld hl, MonMenuOptions
|
||||
.next
|
||||
ld a, [hli]
|
||||
cp $ff
|
||||
jr z, asm_24a77
|
||||
and a
|
||||
jr z, asm_24a77
|
||||
cp -1
|
||||
jr z, .nope
|
||||
and a ; MONMENU_MENUOPTION
|
||||
jr z, .nope
|
||||
ld d, [hl]
|
||||
inc hl
|
||||
ld a, [hli]
|
||||
cp b
|
||||
jr nz, asm_24a67
|
||||
jr nz, .next
|
||||
ld a, d
|
||||
scf
|
||||
asm_24a77:
|
||||
|
||||
.nope
|
||||
ret
|
||||
|
||||
asm_24a78:
|
||||
ResetMonSubmenu:
|
||||
xor a
|
||||
ld [wFieldMoveScriptID], a
|
||||
ld hl, wMapBlocksAddress
|
||||
ld bc, $9
|
||||
ld [wMonSubmenuCount], a
|
||||
ld hl, wMonSubmenuItems
|
||||
ld bc, NUM_MONMENU_ITEMS + 1
|
||||
call ByteFill
|
||||
ret
|
||||
|
||||
asm_24a86:
|
||||
ld a, [wFieldMoveScriptID]
|
||||
TerminateMonSubmenu:
|
||||
ld a, [wMonSubmenuCount]
|
||||
ld e, a
|
||||
ld d, $00
|
||||
ld hl, wMapBlocksAddress
|
||||
ld d, 0
|
||||
ld hl, wMonSubmenuItems
|
||||
add hl, de
|
||||
ld [hl], $ff
|
||||
ld [hl], -1
|
||||
ret
|
||||
|
||||
asm_24a93:
|
||||
AddMonMenuItem:
|
||||
push hl
|
||||
push de
|
||||
push af
|
||||
ld a, [wFieldMoveScriptID]
|
||||
ld a, [wMonSubmenuCount]
|
||||
ld e, a
|
||||
inc a
|
||||
ld [wFieldMoveScriptID], a
|
||||
ld [wMonSubmenuCount], a
|
||||
ld d, $00
|
||||
ld hl, wMapBlocksAddress
|
||||
ld hl, wMonSubmenuItems
|
||||
add hl, de
|
||||
pop af
|
||||
ld [hl], a
|
||||
|
|
@ -1584,8 +1614,8 @@ asm_24a93:
|
|||
pop hl
|
||||
ret
|
||||
|
||||
asm_24aa9:
|
||||
ld hl, .MenuHeader24ae9
|
||||
BattleMonMenu:
|
||||
ld hl, .MenuHeader
|
||||
call CopyMenuHeader
|
||||
xor a
|
||||
ldh [hBGMapMode], a
|
||||
|
|
@ -1593,45 +1623,50 @@ asm_24aa9:
|
|||
call UpdateSprites
|
||||
call PlaceVerticalMenuItems
|
||||
call WaitBGMap
|
||||
|
||||
ld hl, wMenuDataPointer
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
ld de, wMenuDataHeaderEnd
|
||||
ld bc, $8
|
||||
ld de, wMenuData2
|
||||
ld bc, $8 ; TODO: constantify
|
||||
call CopyBytes
|
||||
ld a, [wMenuDataHeaderEnd]
|
||||
bit 7, a
|
||||
jr z, .asm_24ae4
|
||||
|
||||
ld a, [wMenuDataFlags]
|
||||
bit STATICMENU_CURSOR_F, a
|
||||
jr z, .set_carry
|
||||
call InitVerticalMenuCursor
|
||||
ld hl, w2DMenuFlags
|
||||
set 6, [hl]
|
||||
set _2DMENU_ENABLE_SPRITE_ANIMS_F, [hl]
|
||||
call Get2DMenuJoypad
|
||||
bit 1, a
|
||||
jr z, .asm_24ae6
|
||||
bit B_BUTTON_F, a
|
||||
jr z, .clear_carry
|
||||
ret z
|
||||
.asm_24ae4:
|
||||
|
||||
.set_carry:
|
||||
scf
|
||||
ret
|
||||
|
||||
.asm_24ae6:
|
||||
.clear_carry:
|
||||
and a
|
||||
ret
|
||||
|
||||
ret
|
||||
|
||||
.MenuHeader24ae9:
|
||||
db 0
|
||||
menu_coords 11, 11, $13, $11
|
||||
dw .text_24af1
|
||||
db 1
|
||||
.MenuHeader:
|
||||
db 0 ; flags
|
||||
menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
|
||||
dw .MenuText
|
||||
db 1 ; default option
|
||||
|
||||
.text_24af1:
|
||||
db "たエ゛とりかえる@"
|
||||
db "つよさをみる@"
|
||||
db "キャンセル@"
|
||||
.MenuText:
|
||||
db (STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING)
|
||||
db 3
|
||||
db "とりかえる@" ; Switch
|
||||
db "つよさをみる@" ; Stats
|
||||
db "キャンセル@" ; Cancel
|
||||
|
||||
asm_24b06:
|
||||
LoadBattleMenu:
|
||||
ld hl, MenuHeader24b24
|
||||
jr asm_24b0e
|
||||
|
||||
|
|
@ -1654,10 +1689,13 @@ MenuHeader24b24:
|
|||
db 1
|
||||
|
||||
.text_24b2c:
|
||||
db "ア<TA!>ガたたかう@"
|
||||
db "どうぐ@"
|
||||
db "#@"
|
||||
db "にげる@"
|
||||
db STATICMENU_CURSOR
|
||||
dn 2, 2
|
||||
db 5
|
||||
db "たたかう@" ; "FIGHT"
|
||||
db "どうぐ@" ; "ITEM"
|
||||
db "#@" ; "<PK><MN>"
|
||||
db "にげる@" ; "RUN"
|
||||
|
||||
MenuHeader24b3e:
|
||||
db MENU_BACKUP_TILES
|
||||
|
|
@ -1666,10 +1704,13 @@ MenuHeader24b3e:
|
|||
db 1
|
||||
|
||||
.text_24b46:
|
||||
db "ア<TA!>ジサファりボール× @"
|
||||
db "エサをなげる@"
|
||||
db "いしをなげる@"
|
||||
db "にげる@"
|
||||
db STATICMENU_CURSOR
|
||||
dn 2, 2
|
||||
db 11
|
||||
db "サファりボール× @" ; "SAFARI BALL× @"
|
||||
db "エサをなげる@" ; "BAIT"
|
||||
db "いしをなげる@" ; "THROW ROCK"
|
||||
db "にげる@" ; "RUN"
|
||||
|
||||
asm_24b67:
|
||||
call CopyMenuData
|
||||
|
|
|
|||
|
|
@ -217,8 +217,7 @@ asm_2d4a3:
|
|||
ld [wCurSpecies], a
|
||||
ld b, a
|
||||
ld hl, $c395
|
||||
ld a, $3f
|
||||
call Predef
|
||||
predef PrintMoveType
|
||||
ld hl, $c3b9
|
||||
call Function2d663
|
||||
ld hl, $c39b
|
||||
|
|
@ -226,10 +225,10 @@ asm_2d4a3:
|
|||
call PlaceString
|
||||
ld a, [wCurSpecies]
|
||||
dec a
|
||||
ld hl, Data418b8
|
||||
ld bc, $7
|
||||
ld hl, Moves + MOVE_POWER
|
||||
ld bc, MOVE_LENGTH
|
||||
call AddNTimes
|
||||
ld a, BANK(Data418b8)
|
||||
ld a, BANK(Moves)
|
||||
call GetFarByte
|
||||
ld hl, $c3a0
|
||||
cp $2
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -897,7 +897,7 @@ GetGender::
|
|||
jr z, .wBoxMon
|
||||
|
||||
; else: WildMon
|
||||
ld hl, wcddf
|
||||
ld hl, wEnemyMonDVs
|
||||
jr .DVs
|
||||
|
||||
.PartyMon
|
||||
|
|
@ -1112,7 +1112,7 @@ Function507cf::
|
|||
add hl, bc
|
||||
ld a, [hl]
|
||||
ld [wCurPartySpecies], a
|
||||
ld [wcdd8], a
|
||||
ld [wTempBattleMonSpecies], a
|
||||
and a
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ SGB_BattleColors:
|
|||
call CopyBytes
|
||||
|
||||
ld a, [wca3f]
|
||||
ld hl, wca02
|
||||
ld hl, wBattleMon
|
||||
call Function9567
|
||||
jr c, .sub_92f7
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ SGB_BattleColors:
|
|||
.sub_92f7
|
||||
ld b, a
|
||||
ld a, [wca44]
|
||||
ld hl, wcdd7
|
||||
ld hl, wTempEnemyMonSpecies
|
||||
call Function9567
|
||||
jr c, .sub_9308
|
||||
ld e, $01
|
||||
|
|
@ -490,11 +490,11 @@ Function95b0:
|
|||
ret
|
||||
|
||||
Function95cc:
|
||||
ld hl, wcddf
|
||||
ld hl, wEnemyMonDVs
|
||||
ldh a, [hBattleTurn]
|
||||
and a
|
||||
jr nz, .sub_95d7
|
||||
ld hl, wca08
|
||||
ld hl, wBattleMonDVs
|
||||
.sub_95d7
|
||||
call Function95b0
|
||||
ld hl, wcae1
|
||||
|
|
|
|||
|
|
@ -580,7 +580,7 @@ DebugSelectedItemMenu:
|
|||
db 01
|
||||
|
||||
.DebugSelectedItemMenuText
|
||||
db $C0
|
||||
db (STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING)
|
||||
db 3
|
||||
db "つかう@" ; use
|
||||
db "すてる@" ; toss
|
||||
|
|
@ -593,7 +593,7 @@ SelectedItemMenu:
|
|||
db 01
|
||||
|
||||
.SelectedItemMenuText
|
||||
db $C0
|
||||
db (STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING)
|
||||
db 2
|
||||
db "つかう@" ; use
|
||||
db "すてる@" ; toss
|
||||
|
|
@ -935,7 +935,7 @@ SelectedPokemonSubmenu:
|
|||
hlcoord 1, 13
|
||||
lb bc, 4, $12
|
||||
call ClearBox
|
||||
callfar Function24955
|
||||
callfar MonSubmenu
|
||||
call GetCurNick
|
||||
ld a, [wMenuSelection]
|
||||
ld hl, PartyJumpTable
|
||||
|
|
@ -975,7 +975,7 @@ PartyCheckLessThanTwo:
|
|||
jp PartyPrompt
|
||||
|
||||
PartyHeldItem:
|
||||
callfar Function_8f1cb
|
||||
callfar FreezeMonIcons
|
||||
ld hl, .HoldItemMenu
|
||||
call LoadMenuHeader
|
||||
call VerticalMenu
|
||||
|
|
@ -1582,10 +1582,10 @@ PartySelectionInputs:
|
|||
predef PrintMoveType
|
||||
ld a, [wCurSpecies]
|
||||
dec a
|
||||
ld hl, Data418b8
|
||||
ld bc, $7
|
||||
ld hl, Moves + MOVE_POWER
|
||||
ld bc, MOVE_LENGTH
|
||||
call AddNTimes
|
||||
ld a, BANK(Data418b8)
|
||||
ld a, BANK(Moves)
|
||||
call GetFarByte
|
||||
hlcoord 15, 12
|
||||
cp 2
|
||||
|
|
@ -1650,7 +1650,7 @@ PartySelectionInputs:
|
|||
call SwapEntries
|
||||
ld a, [wBattleMode]
|
||||
jr z, .NotInBattle
|
||||
ld hl, wca04
|
||||
ld hl, wBattleMonMoves
|
||||
ld bc, $0020
|
||||
ld a, [wCurPartyMon]
|
||||
call AddNTimes
|
||||
|
|
|
|||
|
|
@ -291,11 +291,11 @@ AddRandomPokemonToBox:
|
|||
xor a
|
||||
ld [wca44], a
|
||||
call RandomUnder246
|
||||
ld [wcdd7], a
|
||||
ld [wTempEnemyMonSpecies], a
|
||||
ld a, $05
|
||||
ld [wCurPartyLevel], a
|
||||
callfar AddPokemonToBox
|
||||
ld a, [wcdd7]
|
||||
ld a, [wTempEnemyMonSpecies]
|
||||
ld [wCurPartySpecies], a
|
||||
callfar Functiondd5c
|
||||
pop af
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ Function1130b:
|
|||
cp PARTY_LENGTH
|
||||
jr c, .bigjump
|
||||
ld a, [wBoxListLength]
|
||||
cp $1E
|
||||
cp MONS_PER_BOX
|
||||
jr nc, .fullbox
|
||||
xor a
|
||||
ld [wca44], a
|
||||
ld a, [wCurPartySpecies]
|
||||
ld [wcdd7], a
|
||||
ld [wTempEnemyMonSpecies], a
|
||||
callfar AddPokemonToBox
|
||||
call RecievePokemon
|
||||
predef Functiondd5c
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ GetCryIndex::
|
|||
push af
|
||||
ld a, d
|
||||
ld [wce37], a
|
||||
farcall Function40b45
|
||||
farcall ConvertMon_2to1
|
||||
ld a, [wce37]
|
||||
dec a
|
||||
ld c, a
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ Function385a::
|
|||
jr asm_3865
|
||||
|
||||
Function385d::
|
||||
callfar Function_8f1cb
|
||||
callfar FreezeMonIcons
|
||||
asm_3865:
|
||||
pop hl
|
||||
call MenuTextBox
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ ENDM
|
|||
|
||||
MACRO shift_const
|
||||
DEF \1 EQU (1 << const_value)
|
||||
DEF const_value += const_inc
|
||||
const \1_F
|
||||
ENDM
|
||||
|
||||
MACRO const_skip
|
||||
|
|
|
|||
144
ram/wram.asm
144
ram/wram.asm
|
|
@ -398,65 +398,18 @@ wPlayerMoveStruct:: move_struct wPlayerMoveStruct
|
|||
wEnemyMonNickname:: ds 6
|
||||
wBattleMonNickname:: ds 6
|
||||
|
||||
wca02:: ds 1
|
||||
wca03:: ds 1
|
||||
wca04:: ds 1
|
||||
wca05:: ds 1
|
||||
|
||||
ds 2
|
||||
|
||||
wca08:: ds 1
|
||||
wca09:: ds 1
|
||||
wca0a:: ds 1
|
||||
|
||||
ds 3
|
||||
|
||||
wca0e:: ds 1
|
||||
|
||||
wBattleMonLevel::
|
||||
wca0f:: ds 1 ; Player's mon level
|
||||
|
||||
wIntroJumptableIndex::
|
||||
wca10:: ds 1
|
||||
|
||||
UNION
|
||||
wBattleMon:: battle_struct wBattleMon
|
||||
NEXTU
|
||||
ds 14
|
||||
wIntroJumptableIndex:: db
|
||||
wIntroBGMapPointer:: ds 2
|
||||
NEXTU
|
||||
wca11:: ds 1
|
||||
wca12:: ds 1
|
||||
ENDU
|
||||
|
||||
UNION
|
||||
wIntroTilemapPointer:: ds 2
|
||||
NEXTU
|
||||
wca13:: ds 1
|
||||
wca14:: ds 1
|
||||
ENDU
|
||||
|
||||
UNION
|
||||
wIntroTilesPointer:: ds 2
|
||||
wIntroFrameCounter1:: ds 1
|
||||
NEXTU
|
||||
|
||||
wca15:: ds 1
|
||||
wca16:: ds 1
|
||||
wca17:: ds 1
|
||||
|
||||
ENDU
|
||||
|
||||
wca18::
|
||||
wIntroFrameCounter2:: ds 1
|
||||
|
||||
wIntroSpriteStateFlag:: ds 1
|
||||
|
||||
wca1a:: ds 1
|
||||
wca1b:: ds 1
|
||||
wca1c:: ds 1
|
||||
ds 1
|
||||
wca1e:: ds 1
|
||||
ds 1
|
||||
wca20:: ds 1
|
||||
wca21:: ds 1
|
||||
ENDU
|
||||
wca22:: ds 1
|
||||
wca23:: ds 1
|
||||
wca24:: ds 1
|
||||
|
|
@ -513,7 +466,10 @@ wca58:: ds 1
|
|||
wca59:: ds 1
|
||||
wca5a:: ds 1
|
||||
wca5b:: ds 1
|
||||
|
||||
wBattleAnimParam::
|
||||
wca5c:: ds 1
|
||||
|
||||
wca5d:: ds 1
|
||||
|
||||
ds $1d
|
||||
|
|
@ -844,8 +800,8 @@ wSpriteOutputPtrCached:: ds 2
|
|||
wSpriteDecodeTable0Ptr:: ds 2
|
||||
wSpriteDecodeTable1Ptr:: ds 2
|
||||
|
||||
wccc0:: ds 1
|
||||
wccc1:: ds 1
|
||||
wFXAnimID:: dw
|
||||
;wccc1:: ds 1
|
||||
wccc2:: ds 1
|
||||
wccc3:: ds 1
|
||||
wccc4:: ds 1
|
||||
|
|
@ -860,7 +816,7 @@ wBGP:: db
|
|||
wOBP0:: db
|
||||
wOBP1:: db
|
||||
|
||||
wcccd:: ds 1
|
||||
wNumHits:: db
|
||||
|
||||
wDisableVBlankWYUpdate:: db
|
||||
wSGB:: db
|
||||
|
|
@ -937,6 +893,7 @@ SECTION "CD3C", WRAM0[$CD3C]
|
|||
wcd3c:: db
|
||||
wRegularItemsCursor:: db
|
||||
wBackpackAndKeyItemsCursor:: db
|
||||
wBattleMenuCursorPosition::
|
||||
wStartmenuCursor:: db
|
||||
wcd40:: db
|
||||
wCurBattleMon::
|
||||
|
|
@ -971,6 +928,9 @@ wFarCallBCBuffer::
|
|||
wcd56:: ds 1
|
||||
wNumMoves::
|
||||
wcd57:: ds 1
|
||||
|
||||
wItemEffectSucceeded::
|
||||
wBattlePlayerAction::
|
||||
wFieldMoveSucceeded:: db
|
||||
wVramState:: db
|
||||
|
||||
|
|
@ -1046,10 +1006,16 @@ wFieldMoveScriptID:: db
|
|||
wMapBlocksAddress:: dw
|
||||
wReplacementBlock:: db
|
||||
|
||||
NEXTU
|
||||
wMonSubmenuCount:: db
|
||||
wMonSubmenuItems:: ds NUM_MONMENU_ITEMS + 1
|
||||
NEXTU
|
||||
|
||||
wHPBarMaxHP:: dw
|
||||
wHPBarOldHP:: dw
|
||||
wHPBarNewHP:: dw
|
||||
wHPBarDelta:: dw
|
||||
wHPBarHPDifference:: dw
|
||||
|
||||
NEXTU
|
||||
|
||||
|
|
@ -1065,23 +1031,16 @@ wPlayerEffectivenessVsEnemyMons:: db
|
|||
ds 1
|
||||
|
||||
wcdc6:: db
|
||||
|
||||
ENDU
|
||||
|
||||
UNION
|
||||
|
||||
wHPBarNewHP:: dw
|
||||
|
||||
NEXTU
|
||||
|
||||
wcdc7:: db
|
||||
wcdc8:: db
|
||||
ds 1
|
||||
wcdca:: db
|
||||
|
||||
ENDU
|
||||
|
||||
wHPBarDelta:: db
|
||||
wcdca:: db
|
||||
wHPBarHPDifference:: dw
|
||||
|
||||
|
||||
|
||||
|
||||
UNION
|
||||
|
||||
|
|
@ -1096,53 +1055,14 @@ wcdd4: ds 1
|
|||
ds 1
|
||||
ENDU
|
||||
|
||||
wcdd7:: ds 1
|
||||
wcdd8:: ds 1
|
||||
wcdd9:: ds 1
|
||||
wcdda:: ds 1
|
||||
wcddb:: ds 1
|
||||
wcddc:: ds 1
|
||||
wcddd:: ds 1
|
||||
wcdde:: ds 1
|
||||
wcddf:: ds 1
|
||||
wcde0:: ds 1
|
||||
wcde1:: ds 1
|
||||
wcde2:: ds 1
|
||||
wcde3:: ds 1
|
||||
wcde4:: ds 1
|
||||
wcde5:: ds 1
|
||||
wcde6:: ds 1
|
||||
wcde7:: ds 1 ; Level?
|
||||
wcde8:: ds 1
|
||||
wcde9:: ds 1
|
||||
wcdea:: ds 1
|
||||
wcdeb:: ds 1
|
||||
wcdec:: ds 1
|
||||
wcded:: ds 1
|
||||
wcdee:: ds 1
|
||||
wcdef:: ds 1
|
||||
wTempEnemyMonSpecies:: ds 1
|
||||
wTempBattleMonSpecies:: ds 1
|
||||
|
||||
ds 1
|
||||
|
||||
wcdf1:: ds 1
|
||||
wcdf2:: ds 1
|
||||
wcdf3:: ds 1
|
||||
wEnemyMon:: battle_struct wEnemyMon
|
||||
wEnemyMonBaseStats:: ds NUM_EXP_STATS
|
||||
|
||||
ds 1
|
||||
|
||||
wcdf5:: ds 1
|
||||
|
||||
ds 1
|
||||
|
||||
wcdf7:: ds 1
|
||||
|
||||
ds 1
|
||||
|
||||
wcdf9:: ds 1
|
||||
|
||||
ds 4
|
||||
|
||||
wcdfe:: ds 1
|
||||
wEnemyMonCatchRate:: db
|
||||
wcdff:: ds 1
|
||||
wBattleMode:: db
|
||||
wce01:: ds 1
|
||||
|
|
@ -1243,6 +1163,8 @@ wce37::
|
|||
db
|
||||
|
||||
wce38:: ds 1
|
||||
|
||||
wNumFleeAttempts::
|
||||
wce39:: ds 1
|
||||
|
||||
SECTION "CE3A", WRAM0[$CE3A]
|
||||
|
|
|
|||
6
shim.sym
6
shim.sym
|
|
@ -50,8 +50,8 @@
|
|||
10:40A6 ShowPokedexMenu
|
||||
10:4AC7 Function40ac7
|
||||
10:4B07 Function40b07
|
||||
10:4B45 Function40b45
|
||||
10:4B5C Function40b5c
|
||||
10:4B45 ConvertMon_2to1
|
||||
10:4B5C ConvertMon_1to2
|
||||
10:5F93 Function4af93
|
||||
10:5FA1 Function41fa1
|
||||
10:61F8 Function421f8
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
23:60cc MenuMonIconGfx
|
||||
23:70CC Function8f0cc
|
||||
23:70E3 Function8f0e3
|
||||
23:71CB Function_8f1cb
|
||||
23:71CB FreezeMonIcons
|
||||
23:71F2 Function8f1f2
|
||||
|
||||
32:76FF Functioncb6ff
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user