pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

engine/mart.asm

Browse Source
This commit is contained in:
PikalaxALT 2015-11-11 14:12:46 -05:00
parent 4b35fa0582
commit b522b0f165
20 changed files with 1491 additions and 1360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
battle/core.asm
View File

@ -7389,6 +7389,7 @@ FinishBattleAnim: ; 3ee27
GiveExperiencePoints: ; 3ee3b GiveExperiencePoints: ; 3ee3b
; Give experience. ; Give experience.
; Don't give experience if linked or in the Battle Tower.
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
ret nz ret nz
@ -7499,20 +7500,20 @@ endr
jr z, .no_boost jr z, .no_boost
.boosted .boosted
call DoubleExp call BoostExp
ld a, $1 ld a, $1
.no_boost .no_boost
ld [StringBuffer2 + 2], a ld [StringBuffer2 + 2], a
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
call nz, DoubleExp call nz, BoostExp
push bc push bc
ld a, MON_ITEM ld a, MON_ITEM
call GetPartyParamLocation call GetPartyParamLocation
ld a, [hl] ld a, [hl]
cp LUCKY_EGG cp LUCKY_EGG
call z, DoubleExp call z, BoostExp
ld a, [hQuotient + 2] ld a, [hQuotient + 2]
ld [StringBuffer2 + 1], a ld [StringBuffer2 + 1], a
ld a, [hQuotient + 1] ld a, [hQuotient + 1]
@ -7796,14 +7797,18 @@ Function3f0d4: ; 3f0d4
ret ret
; 3f106 ; 3f106
DoubleExp: ; 3f106 BoostExp: ; 3f106
; Multiply experience by 1.5x
push bc push bc
; load experience value
ld a, [hProduct + 2] ld a, [hProduct + 2]
ld b, a ld b, a
ld a, [hProduct + 3] ld a, [hProduct + 3]
ld c, a ld c, a
; halve it
srl b srl b
rr c rr c
; add it back to the whole exp value
add c add c
ld [hProduct + 3], a ld [hProduct + 3], a
ld a, [hProduct + 2] ld a, [hProduct + 2]

37
constants/misc_constants.asm
View File

@ -187,3 +187,40 @@ NUM_JOHTO_BADGES EQU const_value
const EARTHBADGE const EARTHBADGE
NUM_KANTO_BADGES EQU const_value NUM_KANTO_BADGES EQU const_value
NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
const_def
const JUMPTABLE_8D24B_FUNCTION_00
const JUMPTABLE_8D24B_FUNCTION_01
const JUMPTABLE_8D24B_FUNCTION_02
const JUMPTABLE_8D24B_FUNCTION_03
const JUMPTABLE_8D24B_FUNCTION_04
const JUMPTABLE_8D24B_FUNCTION_05
const JUMPTABLE_8D24B_FUNCTION_06
const JUMPTABLE_8D24B_FUNCTION_07
const JUMPTABLE_8D24B_FUNCTION_08
const JUMPTABLE_8D24B_FUNCTION_09
const JUMPTABLE_8D24B_FUNCTION_0A
const JUMPTABLE_8D24B_FUNCTION_0B
const JUMPTABLE_8D24B_FUNCTION_0C
const JUMPTABLE_8D24B_FUNCTION_0D
const JUMPTABLE_8D24B_FUNCTION_0E
const JUMPTABLE_8D24B_FUNCTION_0F
const JUMPTABLE_8D24B_FUNCTION_10
const JUMPTABLE_8D24B_FUNCTION_11
const JUMPTABLE_8D24B_FUNCTION_12
const JUMPTABLE_8D24B_FUNCTION_13
const JUMPTABLE_8D24B_FUNCTION_14
const JUMPTABLE_8D24B_FUNCTION_15
const JUMPTABLE_8D24B_FUNCTION_16
const JUMPTABLE_8D24B_FUNCTION_17
const JUMPTABLE_8D24B_FUNCTION_18
const JUMPTABLE_8D24B_FUNCTION_19
const JUMPTABLE_8D24B_FUNCTION_1A
const JUMPTABLE_8D24B_FUNCTION_1B
const JUMPTABLE_8D24B_FUNCTION_1C
const JUMPTABLE_8D24B_FUNCTION_1D
const JUMPTABLE_8D24B_FUNCTION_1E
const JUMPTABLE_8D24B_FUNCTION_1F
const JUMPTABLE_8D24B_FUNCTION_20
const JUMPTABLE_8D24B_FUNCTION_21
const JUMPTABLE_8D24B_FUNCTION_22

2
engine/color.asm
View File

@ -319,7 +319,7 @@ Function8bec: ; 8bec
ld a, [EnemySafeguardCount] ld a, [EnemySafeguardCount]
and $3 and $3
call Function9663 call Function9663
call Function323d call LoadDETile
ret ret
; 8c1d ; 8c1d

1000
engine/mart.asm Executable file
View File

File diff suppressed because it is too large Load Diff

20
engine/pack.asm
View File

@ -67,7 +67,7 @@ Function10067: ; 10067 (4:4067)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0df] ld a, [wd0df]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0df], a ld [wd0df], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -95,7 +95,7 @@ Function100a6: ; 100a6 (4:40a6)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e0] ld a, [wd0e0]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e0], a ld [wd0e0], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -225,7 +225,7 @@ Function10198: ; 10198 (4:4198)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e1] ld a, [wd0e1]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e1], a ld [wd0e1], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -725,7 +725,7 @@ Function104fa: ; 104fa (4:44fa)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0df] ld a, [wd0df]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0df], a ld [wd0df], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -753,7 +753,7 @@ Function10539: ; 10539 (4:4539)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e0] ld a, [wd0e0]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e0], a ld [wd0e0], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -804,7 +804,7 @@ Function105a6: ; 105a6 (4:45a6)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e1] ld a, [wd0e1]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e1], a ld [wd0e1], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -1010,7 +1010,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0df] ld a, [wd0df]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0df], a ld [wd0df], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -1026,7 +1026,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e0] ld a, [wd0e0]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e0], a ld [wd0e0], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -1051,7 +1051,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e1] ld a, [wd0e1]
ld [wd0e4], a ld [wd0e4], a
call Function350c call HandleScrollingMenu
ld a, [wd0e4] ld a, [wd0e4]
ld [wd0e1], a ld [wd0e1], a
ld a, [MenuSelection2] ld a, [MenuSelection2]
@ -1237,7 +1237,7 @@ Function1085a: ; 1085a (4:485a)
call InitPocket call InitPocket
pop hl pop hl
call CopyMenuDataHeader call CopyMenuDataHeader
call Function350c call HandleScrollingMenu
ret ret
Function10866: ; 10866 (4:4866) Function10866: ; 10866 (4:4866)

2
engine/scripting.asm
View File

@ -2970,7 +2970,7 @@ Script_reloadmappart:: ; 0x97ae3
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function2173 call OverworldTextModeSwitch
call Function2914 call Function2914
callba Function104061 callba Function104061
call UpdateSprites call UpdateSprites

2
event/buena.asm
View File

@ -252,7 +252,7 @@ Function8b0e2: ; 8b0e2
ld [hBGMapMode], a ld [hBGMapMode], a
call Function352f call Function352f
call UpdateSprites call UpdateSprites
call Function350c call HandleScrollingMenu
ld a, [MenuSelection] ld a, [MenuSelection]
ld c, a ld c, a
ld a, [MenuSelection2] ld a, [MenuSelection2]

2
event/kurt.asm
View File

@ -67,7 +67,7 @@ Kurt_SelectApricorn: ; 88055
ld [hBGMapMode], a ld [hBGMapMode], a
call Function352f call Function352f
call UpdateSprites call UpdateSprites
call Function350c call HandleScrollingMenu
ld a, [wcf73] ld a, [wcf73]
cp $2 cp $2
jr z, .nope jr z, .nope

0
gfx/unknown/08c9cc.2bpp → gfx/misc/cut_grass.2bpp
View File

0
gfx/unknown/08c98c.2bpp → gfx/misc/cut_tree.2bpp
View File

24
home.asm
View File

@ -561,7 +561,7 @@ Function3200:: ; 0x3200
; 0x3218 ; 0x3218
Function3218:: ; 3218 IsCGB:: ; 3218
ld a, [hCGB] ld a, [hCGB]
and a and a
ret ret
@ -579,9 +579,10 @@ Function321c:: ; 321c
ld a, 1 ld a, 1
ld [hBGMapMode], a ld [hBGMapMode], a
jr Function323d jr LoadDETile
.dmg .dmg
; WaitBGMap
ld a, 1 ld a, 1
ld [hBGMapMode], a ld [hBGMapMode], a
ld c, 4 ld c, 4
@ -594,16 +595,16 @@ Function3238:: ; 3238
and a and a
jr z, WaitBGMap jr z, WaitBGMap
Function323d:: ; 323d LoadDETile:: ; 323d
jr Function3246 jr .LoadDETile
; 323f ; 323f
Function323f:: ; 323f .unreferenced_323f ; 323f
callba Function104000 callba Function104000
ret ret
; 3246 ; 3246
Function3246:: ; 3246 .LoadDETile ; 3246
ld a, [hBGMapMode] ld a, [hBGMapMode]
push af push af
xor a xor a
@ -623,11 +624,11 @@ Function3246:: ; 3246
ld a, 1 ; BANK(VTiles3) ld a, 1 ; BANK(VTiles3)
ld [rVBK], a ld [rVBK], a
hlcoord 0, 0, AttrMap hlcoord 0, 0, AttrMap
call Function327b call .StackPointerMagic
ld a, 0 ; BANK(VTiles0) ld a, 0 ; BANK(VTiles0)
ld [rVBK], a ld [rVBK], a
hlcoord 0, 0 hlcoord 0, 0
call Function327b call .StackPointerMagic
.wait2 .wait2
ld a, [rLY] ld a, [rLY]
@ -642,7 +643,7 @@ Function3246:: ; 3246
ret ret
; 327b ; 327b
Function327b:: ; 327b .StackPointerMagic ; 327b
; Copy all tiles to VBGMap ; Copy all tiles to VBGMap
ld [hSPBuffer], sp ld [hSPBuffer], sp
ld sp, hl ld sp, hl
@ -1146,7 +1147,7 @@ GetMoveName:: ; 34f8
; 350c ; 350c
Function350c:: ; 350c HandleScrollingMenu:: ; 350c
call CopyMenuData2 call CopyMenuData2
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -1891,7 +1892,7 @@ PrintBCDNumber:: ; 38bb
bit 5, b bit 5, b
jr z, .loop jr z, .loop
bit 7, b bit 7, b
jr nz, .loop jr nz, .loop ; skip currency symbol
ld [hl], "¥" ld [hl], "¥"
inc hl inc hl
.loop .loop
@ -1941,6 +1942,7 @@ PrintBCDDigit:: ; 38f2
add a, "0" add a, "0"
ld [hli], a ld [hli], a
jp PrintLetterDelay jp PrintLetterDelay
.zeroDigit .zeroDigit
bit 7, b ; either printing leading zeroes or already reached a nonzero digit? bit 7, b ; either printing leading zeroes or already reached a nonzero digit?
jr z, .outputDigit ; if so, print a zero digit jr z, .outputDigit ; if so, print a zero digit

4
home/map.asm
View File

@ -95,7 +95,7 @@ GetMapTrigger:: ; 2147
ret ret
; 2173 ; 2173
Function2173:: ; 2173 OverworldTextModeSwitch:: ; 2173
call LoadMapPart call LoadMapPart
call FarCallSwapTextboxPalettes call FarCallSwapTextboxPalettes
ret ret
@ -2038,7 +2038,7 @@ Function2bae:: ; 2bae
ld c, a ld c, a
call SwitchToAnyMapBank call SwitchToAnyMapBank
callba Function8c001 callba Function8c001
call Function2173 call OverworldTextModeSwitch
call Function2821 call Function2821
ld a, 9 ld a, 9
call SkipMusic call SkipMusic

2
home/window.asm
View File

@ -35,7 +35,7 @@ Function2de2:: ; 2de2
call ResetTextRelatedRAM call ResetTextRelatedRAM
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function2173 call OverworldTextModeSwitch
call Function2e20 call Function2e20
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a

2
hram.asm
View File

@ -72,6 +72,8 @@ hMoneyTemp EQU $ffc3
hLCDStatCustom EQU $ffc6 hLCDStatCustom EQU $ffc6
hFFC9 EQU $ffc9
hLinkPlayerNumber EQU $ffcb hLinkPlayerNumber EQU $ffcb
hSerialSend EQU $ffcd hSerialSend EQU $ffcd

1480
main.asm
View File

File diff suppressed because it is too large Load Diff

2
misc/mobile_22_2.asm
View File

@ -828,7 +828,7 @@ Function8b7bd: ; 8b7bd
call Function8b75d call Function8b75d
call UpdateSprites call UpdateSprites
call Function89209 call Function89209
call Function350c call HandleScrollingMenu
call Function8920f call Function8920f
ld a, [wcf73] ld a, [wcf73]
cp $2 cp $2

16
misc/mobile_40.asm
View File

@ -86,7 +86,7 @@ Function100082: ; 100082
ld [hMapAnims], a ld [hMapAnims], a
ld [hLCDStatCustom], a ld [hLCDStatCustom], a
ld a, $1 ld a, $1
ld [$ffc9], a ld [hFFC9], a
ld [hMobile], a ld [hMobile], a
ei ei
ret ret
@ -95,7 +95,7 @@ Function100082: ; 100082
Function1000a4: ; 1000a4 Function1000a4: ; 1000a4
di di
xor a xor a
ld [$ffc9], a ld [hFFC9], a
ld [hMobile], a ld [hMobile], a
xor a xor a
ld [hVBlank], a ld [hVBlank], a
@ -168,7 +168,7 @@ Function1000fa: ; 1000fa
and $13 and $13
ld [rIE], a ld [rIE], a
xor a xor a
ld [$ffc9], a ld [hFFC9], a
ld [hMobile], a ld [hMobile], a
ei ei
ld a, [wLinkMode] ld a, [wLinkMode]
@ -176,7 +176,7 @@ Function1000fa: ; 1000fa
xor a xor a
ld [wLinkMode], a ld [wLinkMode], a
ld a, $4 ld a, $4
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
callba Function11619d callba Function11619d
ld hl, wcd29 ld hl, wcd29
set 6, [hl] set 6, [hl]
@ -4393,7 +4393,7 @@ Function101cc2: ; 101cc2 ; unreferenced
Function101cc8: ; 101cc8 Function101cc8: ; 101cc8
ld a, $1 ld a, $1
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ld a, $1 ld a, $1
ld [wc30d], a ld [wc30d], a
ld hl, wcd29 ld hl, wcd29
@ -4406,7 +4406,7 @@ Function101cc8: ; 101cc8
Function101cdf: ; 101cdf Function101cdf: ; 101cdf
ld a, $6 ld a, $6
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ld a, $1 ld a, $1
ld [wc30d], a ld [wc30d], a
ld hl, wcd29 ld hl, wcd29
@ -4419,7 +4419,7 @@ Function101cdf: ; 101cdf
Function101cf6: ; 101cf6 Function101cf6: ; 101cf6
ld a, $b ld a, $b
ld [wPartyMonMenuIconAnims + 1], a ld [wc314 + 1], a
ld a, [wcd25] ld a, [wcd25]
inc a inc a
ld [wcd25], a ld [wcd25], a
@ -4428,7 +4428,7 @@ Function101cf6: ; 101cf6
Function101d03: ; 101d03 Function101d03: ; 101d03
ld a, $e ld a, $e
ld [wPartyMonMenuIconAnims + 1], a ld [wc314 + 1], a
ld a, [wcd25] ld a, [wcd25]
inc a inc a
ld [wcd25], a ld [wcd25], a

86
misc/mobile_45.asm
View File

@ -5588,14 +5588,14 @@ INCBIN "gfx/unknown/11601a.2bpp"
Function11615a: ; 11615a Function11615a: ; 11615a
xor a xor a
ld [wc30d], a ld [wc30d], a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld [wc310], a ld [wc310], a
ld [wc311], a ld [wc311], a
ld [wc312], a ld [wc312], a
ld [wc313], a ld [wc313], a
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ld [wPartyMonMenuIconAnims + 1], a ld [wc314 + 1], a
ld [wPartyMonMenuIconAnims + 4], a ld [wc314 + 4], a
ld [wc3f6], a ld [wc3f6], a
ld [wc3f8], a ld [wc3f8], a
ld [wc3f2], a ld [wc3f2], a
@ -5617,7 +5617,7 @@ Function11619d: ; 11619d
ld a, [wc30d] ld a, [wc30d]
and a and a
ret z ret z
ld a, [wPartyMonMenuIconAnims + 5] ld a, [wc314 + 5]
cp $2 cp $2
jr c, .asm_1161b4 jr c, .asm_1161b4
ld a, $a0 ld a, $a0
@ -5631,7 +5631,7 @@ Function11619d: ; 11619d
; 1161b8 ; 1161b8
Function1161b8: ; 1161b8 Function1161b8: ; 1161b8
ld a, [wPartyMonMenuIconAnims + 5] ld a, [wc314 + 5]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, Jumptable_1161c7 ld hl, Jumptable_1161c7
@ -5758,9 +5758,9 @@ Function1161d5: ; 1161d5
ld [wc2a9], a ld [wc2a9], a
ld a, d ld a, d
ld [wc2aa], a ld [wc2aa], a
ld a, [wPartyMonMenuIconAnims + 5] ld a, [wc314 + 5]
inc a inc a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ret ret
; 11628c ; 11628c
@ -5774,15 +5774,15 @@ MenuDataHeader_11628c: ; 11628c
Function116294: ; 116294 Function116294: ; 116294
callba Function170d02 callba Function170d02
ld a, [wPartyMonMenuIconAnims + 5] ld a, [wc314 + 5]
inc a inc a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld hl, wd030 ld hl, wd030
ld de, wPartyMonMenuIconAnims + 12 ld de, wc314 + 12
ld bc, $0010 ld bc, $0010
call CopyBytes call CopyBytes
ld hl, Palette_11734e ld hl, Palette_11734e
@ -5799,9 +5799,9 @@ Function116294: ; 116294
Function1162cb: ; 1162cb Function1162cb: ; 1162cb
callba Function170cc6 callba Function170cc6
ld a, [wPartyMonMenuIconAnims + 5] ld a, [wc314 + 5]
inc a inc a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $5 ld a, $5
@ -5838,7 +5838,7 @@ Function1162f2: ; 1162f2
ld c, a ld c, a
ld a, [wc30f] ld a, [wc30f]
ld b, a ld b, a
ld a, [wPartyMonMenuIconAnims + 4] ld a, [wc314 + 4]
ld e, a ld e, a
ld a, [hli] ld a, [hli]
sub e sub e
@ -5939,7 +5939,7 @@ Function11636e: ; 11636e
xor a xor a
ld [wc2aa], a ld [wc2aa], a
xor a xor a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld [wc30d], a ld [wc30d], a
ret ret
; 1163c0 ; 1163c0
@ -5961,7 +5961,7 @@ Function1163c0: ; 1163c0
push af push af
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld hl, wPartyMonMenuIconAnims + 12 ld hl, wc314 + 12
ld de, wd030 ld de, wd030
ld bc, $0010 ld bc, $0010
call CopyBytes call CopyBytes
@ -5997,7 +5997,7 @@ Function1163c0: ; 1163c0
.asm_116439 .asm_116439
xor a xor a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld [wc30d], a ld [wc30d], a
ret ret
; 116441 ; 116441
@ -6014,14 +6014,14 @@ Function116441: ; 116441
xor a xor a
ld [wc2aa], a ld [wc2aa], a
xor a xor a
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld [wc30d], a ld [wc30d], a
ret ret
; 116468 ; 116468
Function116468: ; 116468 Function116468: ; 116468
call Function116567 call Function116567
ld a, [wPartyMonMenuIconAnims] ld a, [wc314]
cp $d cp $d
jr nz, .asm_1164a8 jr nz, .asm_1164a8
ld hl, wc30e ld hl, wc30e
@ -6213,7 +6213,7 @@ Function116567: ; 116567
; 11659d ; 11659d
Function11659d: ; 11659d Function11659d: ; 11659d
ld a, [wPartyMonMenuIconAnims] ld a, [wc314]
cp $12 cp $12
ret nc ret nc
ld e, a ld e, a
@ -6289,7 +6289,7 @@ Function116600:
call Function116780 call Function116780
ret c ret c
ld a, $2 ld a, $2
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ret ret
; 116615 ; 116615
@ -6332,24 +6332,24 @@ Function116640:
call Function116780 call Function116780
ret c ret c
ld a, $7 ld a, $7
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ret ret
; 116655 ; 116655
Function116655: ; 116655 Function116655: ; 116655
xor a xor a
ld [wPartyMonMenuIconAnims + 3], a ld [wc314 + 3], a
call Function11678e call Function11678e
Function11665c: Function11665c:
ld hl, wPartyMonMenuIconAnims + 3 ld hl, wc314 + 3
ld a, $1 ld a, $1
xor [hl] xor [hl]
ld [hl], a ld [hl], a
add $4 add $4
ld c, a ld c, a
call Function11679c call Function11679c
ld a, [wPartyMonMenuIconAnims + 3] ld a, [wc314 + 3]
and a and a
jr nz, .asm_116673 jr nz, .asm_116673
ld a, $48 ld a, $48
@ -6378,7 +6378,7 @@ Function11668d:
call Function116780 call Function116780
ret c ret c
ld a, $c ld a, $c
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ret ret
; 11669f ; 11669f
@ -6393,9 +6393,9 @@ Function1166a2:
ld [wc30f], a ld [wc30f], a
ld [wc3f3], a ld [wc3f3], a
ld a, $ff ld a, $ff
ld [wPartyMonMenuIconAnims + 2], a ld [wc314 + 2], a
xor a xor a
ld [wPartyMonMenuIconAnims + 3], a ld [wc314 + 3], a
ld a, $0 ld a, $0
ld c, a ld c, a
call Function11679c call Function11679c
@ -6417,25 +6417,25 @@ Function1166d6:
cp $48 cp $48
jr nz, .asm_1166e4 jr nz, .asm_1166e4
xor a xor a
ld [wPartyMonMenuIconAnims + 2], a ld [wc314 + 2], a
.asm_1166e4 .asm_1166e4
ld a, [wc311] ld a, [wc311]
cp $ff cp $ff
ret nz ret nz
ld a, $4 ld a, $4
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
xor a xor a
ld [wPartyMonMenuIconAnims], a ld [wc314], a
ret ret
; 1166f4 ; 1166f4
Function1166f4: ; 1166f4 Function1166f4: ; 1166f4
ld [wc30e], a ld [wc30e], a
ld a, b ld a, b
ld [wPartyMonMenuIconAnims + 2], a ld [wc314 + 2], a
xor a xor a
ld [wPartyMonMenuIconAnims + 3], a ld [wc314 + 3], a
ld hl, wc30f ld hl, wc30f
.asm_116702 .asm_116702
call Random call Random
@ -6460,9 +6460,9 @@ Function1166f4: ; 1166f4
Function11671f: ; 11671f Function11671f: ; 11671f
ld [wc30f], a ld [wc30f], a
ld a, b ld a, b
ld [wPartyMonMenuIconAnims + 3], a ld [wc314 + 3], a
xor a xor a
ld [wPartyMonMenuIconAnims + 2], a ld [wc314 + 2], a
ld hl, wc30e ld hl, wc30e
.asm_11672d .asm_11672d
call Random call Random
@ -6482,11 +6482,11 @@ Function11671f: ; 11671f
Function116747: ; 116747 Function116747: ; 116747
ld hl, wc30e ld hl, wc30e
ld a, [wPartyMonMenuIconAnims + 2] ld a, [wc314 + 2]
add [hl] add [hl]
ld [hl], a ld [hl], a
ld hl, wc30f ld hl, wc30f
ld a, [wPartyMonMenuIconAnims + 3] ld a, [wc314 + 3]
add [hl] add [hl]
ld [hl], a ld [hl], a
ret ret
@ -6518,7 +6518,7 @@ Function116758: ; 116758
ld a, $4 ld a, $4
.asm_11677a .asm_11677a
ld [wPartyMonMenuIconAnims + 4], a ld [wc314 + 4], a
ret ret
; 11677e ; 11677e
@ -6526,11 +6526,11 @@ Function11677e: ; 11677e
ld a, $0 ld a, $0
Function116780: Function116780:
ld hl, wPartyMonMenuIconAnims + 1 ld hl, wc314 + 1
cp [hl] cp [hl]
jr z, .asm_11678c jr z, .asm_11678c
ld a, [hl] ld a, [hl]
ld [wPartyMonMenuIconAnims], a ld [wc314], a
scf scf
ret ret
@ -6540,15 +6540,15 @@ Function116780:
; 11678e ; 11678e
Function11678e: ; 11678e Function11678e: ; 11678e
ld hl, wPartyMonMenuIconAnims ld hl, wc314
ld a, [hl] ld a, [hl]
ld [wPartyMonMenuIconAnims + 1], a ld [wc314 + 1], a
inc [hl] inc [hl]
ret ret
; 116797 ; 116797
Function116797: ; 116797 Function116797: ; 116797
ld hl, wPartyMonMenuIconAnims ld hl, wc314
inc [hl] inc [hl]
ret ret
; 11679c ; 11679c

108
misc/mobile_46.asm
View File

@ -467,7 +467,7 @@ Function1183cb: ; 1183cb
ld [wcd66], a ld [wcd66], a
ld [wcd67], a ld [wcd67], a
ld [wcd68], a ld [wcd68], a
ld [wPartyMonMenuIconAnims + 6], a ld [wc314 + 6], a
ld [wcd89], a ld [wcd89], a
ld [wcd8a], a ld [wcd8a], a
ld [wcd8b], a ld [wcd8b], a
@ -1056,7 +1056,7 @@ Function11878d: ; 11878d (46:478d)
ld a, $a ld a, $a
call Function3e32 call Function3e32
ld a, [wc3f0] ld a, [wc3f0]
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld a, [wcd34] ld a, [wcd34]
ld [wcf66], a ld [wcf66], a
ret ret
@ -1100,13 +1100,13 @@ Function118805: ; 118805 (46:4805)
ld a, $a ld a, $a
call Function3e32 call Function3e32
ld a, [wc3f0] ld a, [wc3f0]
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld a, [wcd34] ld a, [wcd34]
ld [wcf66], a ld [wcf66], a
ret ret
Function118821: ; 118821 (46:4821) Function118821: ; 118821 (46:4821)
ld a, [wPartyMonMenuIconAnims + 5] ld a, [wc314 + 5]
cp $3 cp $3
jr c, .asm_11884a jr c, .asm_11884a
cp $4 cp $4
@ -1119,7 +1119,7 @@ Function118821: ; 118821 (46:4821)
ld a, $a ld a, $a
ld [wc300], a ld [wc300], a
ld a, [wc3f0] ld a, [wc3f0]
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld a, [wcd34] ld a, [wcd34]
ld [wcf66], a ld [wcf66], a
scf scf
@ -1198,7 +1198,7 @@ Function118896: ; 118896
; 1188b0 ; 1188b0
Function1188b0: ; 1188b0 (46:48b0) Function1188b0: ; 1188b0 (46:48b0)
ld de, wPartyMonMenuIconAnims + 48 + 2 ld de, wc314 + 48 + 2
ld a, $c ld a, $c
jp Function119e2b jp Function119e2b
@ -1230,7 +1230,7 @@ Function1188c8: ; 1188c8 (46:48c8)
jp Function119e2b jp Function119e2b
Function1188e7: ; 1188e7 (46:48e7) Function1188e7: ; 1188e7 (46:48e7)
ld de, wPartyMonMenuIconAnims + 48 + 2 ld de, wc314 + 48 + 2
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
ld a, [$aa4a] ld a, [$aa4a]
@ -1250,7 +1250,7 @@ Function1188e7: ; 1188e7 (46:48e7)
Function118903: ; 118903 (46:4903) Function118903: ; 118903 (46:4903)
ld a, [wc3f0] ld a, [wc3f0]
ld [wPartyMonMenuIconAnims + 5], a ld [wc314 + 5], a
ld c, $1 ld c, $1
callba Function115e18 callba Function115e18
ld a, $8 ld a, $8
@ -1279,7 +1279,7 @@ Function118922: ; 118922
call Function119e2e call Function119e2e
Function118936: Function118936:
ld a, [wPartyMonMenuIconAnims + 6] ld a, [wc314 + 6]
and a and a
ret nz ret nz
ld hl, MenuDataHeader_119cf7 ld hl, MenuDataHeader_119cf7
@ -1562,7 +1562,7 @@ Function118b10:
jp Function119e2b jp Function119e2b
Function118b24: ; 118b24 (46:4b24) Function118b24: ; 118b24 (46:4b24)
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld a, $8 ld a, $8
ld [hli], a ld [hli], a
ld a, $c7 ld a, $c7
@ -1575,7 +1575,7 @@ Function118b24: ; 118b24 (46:4b24)
call Function119ec2 call Function119ec2
ld a, $80 ld a, $80
ld [wcd89], a ld [wcd89], a
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ret ret
; 118b42 (46:4b42) ; 118b42 (46:4b42)
@ -1910,22 +1910,22 @@ Function118ec6: ; 118ec6
call Function118440 call Function118440
call SpeechTextBox call SpeechTextBox
ld hl, $d80e ld hl, $d80e
ld de, wPartyMonMenuIconAnims + 12 ld de, wc314 + 12
ld bc, $0026 ld bc, $0026
call CopyBytes call CopyBytes
xor a xor a
ld [wPartyMonMenuIconAnims + 11], a ld [wc314 + 11], a
ld a, $20 ld a, $20
ld [wPartyMonMenuIconAnims + 7], a ld [wc314 + 7], a
ld a, $c3 ld a, $c3
ld [wPartyMonMenuIconAnims + 8], a ld [wc314 + 8], a
hlcoord 1, 14 hlcoord 1, 14
ld a, l ld a, l
ld [wPartyMonMenuIconAnims + 9], a ld [wc314 + 9], a
ld a, h ld a, h
ld [wPartyMonMenuIconAnims + 10], a ld [wc314 + 10], a
ld a, $2 ld a, $2
ld [wPartyMonMenuIconAnims + 6], a ld [wc314 + 6], a
ld a, $1d ld a, $1d
ld [wcd3c], a ld [wcd3c], a
ld a, $24 ld a, $24
@ -1998,7 +1998,7 @@ Function118f68:
ld a, [wcc60] ld a, [wcc60]
and a and a
jr z, .asm_118fba jr z, .asm_118fba
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld a, $c608 % $100 ld a, $c608 % $100
ld [hli], a ld [hli], a
ld a, $c608 / $100 ld a, $c608 / $100
@ -2019,7 +2019,7 @@ Function118f68:
call Function119ec2 call Function119ec2
ld a, $40 ld a, $40
ld [wcd89], a ld [wcd89], a
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld de, $de00 ld de, $de00
ld bc, $0200 ld bc, $0200
ld a, $2c ld a, $2c
@ -2079,7 +2079,7 @@ Function119009:
ld de, wcc60 ld de, wcc60
call Function1191ad call Function1191ad
ret c ret c
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld a, $8 ld a, $8
ld [hli], a ld [hli], a
ld a, $c6 ld a, $c6
@ -2100,7 +2100,7 @@ Function119009:
call Function119ec2 call Function119ec2
ld a, $40 ld a, $40
ld [wcd89], a ld [wcd89], a
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld de, Unkn1Pals ld de, Unkn1Pals
ld bc, $1000 ld bc, $1000
ld a, $2c ld a, $2c
@ -2627,7 +2627,7 @@ Function1193a0:
ld a, $8 ld a, $8
ld [wcd3c], a ld [wcd3c], a
call Function119ed8 call Function119ed8
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld a, wd000 % $100 ld a, wd000 % $100
ld [hli], a ld [hli], a
ld a, wd000 / $100 ld a, wd000 / $100
@ -2648,7 +2648,7 @@ Function1193a0:
call Function119ec2 call Function119ec2
ld a, $40 ld a, $40
ld [wcd89], a ld [wcd89], a
ld hl, wPartyMonMenuIconAnims + 48 + 2 ld hl, wc314 + 48 + 2
ld de, $de00 ld de, $de00
ld bc, $0200 ld bc, $0200
ld a, $2c ld a, $2c
@ -3450,7 +3450,7 @@ Function1198ee: ; 1198ee
call Function119e2e call Function119e2e
Function1198f7: Function1198f7:
ld a, [wPartyMonMenuIconAnims + 6] ld a, [wc314 + 6]
and a and a
ret nz ret nz
ld hl, $c608 + 2 ld hl, $c608 + 2
@ -3996,7 +3996,7 @@ Function119ca2:
call Function119e2e call Function119e2e
Function119cab: Function119cab:
ld a, [wPartyMonMenuIconAnims + 6] ld a, [wc314 + 6]
and a and a
ret nz ret nz
ld a, $80 ld a, $80
@ -4033,7 +4033,7 @@ Function119cc3: ; 119cc3
call Function119e2e call Function119e2e
Function119cdf: Function119cdf:
ld a, [wPartyMonMenuIconAnims + 6] ld a, [wc314 + 6]
and a and a
ret nz ret nz
ld a, $f ld a, $f
@ -4479,7 +4479,7 @@ Function119f98: ; 119f98
ld a, $1 ld a, $1
ld [wc30d], a ld [wc30d], a
ld a, $1 ld a, $1
ld [wPartyMonMenuIconAnims], a ld [wc314], a
callba Function104061 callba Function104061
and a and a
ret ret
@ -4661,7 +4661,7 @@ Function11a16d: ; 11a16d
call Function11a63c call Function11a63c
call Function11a1e6 call Function11a1e6
hlcoord 4, 2 hlcoord 4, 2
ld de, wPartyMonMenuIconAnims + 48 + 2 ld de, wc314 + 48 + 2
call PlaceString call PlaceString
call Function11a5f5 call Function11a5f5
xor a xor a
@ -4715,7 +4715,7 @@ Function11a1d6: ; 11a1d6
Function11a1e6: ; 11a1e6 Function11a1e6: ; 11a1e6
ld hl, String_11a706 ld hl, String_11a706
ld de, wPartyMonMenuIconAnims + 48 + 2 ld de, wc314 + 48 + 2
call Function11a1ff call Function11a1ff
ld hl, wcd85 ld hl, wcd85
call Function11a1ff call Function11a1ff
@ -5541,7 +5541,7 @@ endr
; 11a8fa ; 11a8fa
Function11a8fa: ; 11a8fa Function11a8fa: ; 11a8fa
ld a, [wPartyMonMenuIconAnims + 6] ld a, [wc314 + 6]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, Jumptable_11a909 ld hl, Jumptable_11a909
@ -5565,14 +5565,14 @@ Function11a90f: ; 11a90f
ld [rSVBK], a ld [rSVBK], a
call SpeechTextBox call SpeechTextBox
ld a, $50 ld a, $50
ld hl, wPartyMonMenuIconAnims + 12 ld hl, wc314 + 12
ld bc, $008c ld bc, $008c
call ByteFill call ByteFill
ld a, [wPartyMonMenuIconAnims + 7] ld a, [wc314 + 7]
ld l, a ld l, a
ld a, [wPartyMonMenuIconAnims + 8] ld a, [wc314 + 8]
ld h, a ld h, a
ld de, wPartyMonMenuIconAnims + 12 ld de, wc314 + 12
.asm_11a92c .asm_11a92c
ld a, [hli] ld a, [hli]
cp $57 cp $57
@ -5603,17 +5603,17 @@ Function11a90f: ; 11a90f
.asm_11a94f .asm_11a94f
xor a xor a
ld [wPartyMonMenuIconAnims + 11], a ld [wc314 + 11], a
ld a, $20 ld a, $20
ld [wPartyMonMenuIconAnims + 7], a ld [wc314 + 7], a
ld a, $c3 ld a, $c3
ld [wPartyMonMenuIconAnims + 8], a ld [wc314 + 8], a
hlcoord 1, 14 hlcoord 1, 14
ld a, l ld a, l
ld [wPartyMonMenuIconAnims + 9], a ld [wc314 + 9], a
ld a, h ld a, h
ld [wPartyMonMenuIconAnims + 10], a ld [wc314 + 10], a
ld hl, wPartyMonMenuIconAnims + 6 ld hl, wc314 + 6
inc [hl] inc [hl]
ld a, $3 ld a, $3
ld [rSVBK], a ld [rSVBK], a
@ -5623,7 +5623,7 @@ Function11a970:
; 11a971 ; 11a971
Function11a971: ; 11a971 Function11a971: ; 11a971
ld hl, wPartyMonMenuIconAnims + 11 ld hl, wc314 + 11
ld a, [hJoyDown] ld a, [hJoyDown]
and a and a
jr nz, .asm_11a97f jr nz, .asm_11a97f
@ -5638,34 +5638,34 @@ Function11a971: ; 11a971
and $7 and $7
ld [hl], a ld [hl], a
ld hl, wcd8d ld hl, wcd8d
ld a, [wPartyMonMenuIconAnims + 7] ld a, [wc314 + 7]
ld e, a ld e, a
ld a, [wPartyMonMenuIconAnims + 8] ld a, [wc314 + 8]
ld d, a ld d, a
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [wPartyMonMenuIconAnims + 7], a ld [wc314 + 7], a
ld a, d ld a, d
ld [wPartyMonMenuIconAnims + 8], a ld [wc314 + 8], a
ld a, $50 ld a, $50
ld [hl], a ld [hl], a
ld a, [wPartyMonMenuIconAnims + 9] ld a, [wc314 + 9]
ld l, a ld l, a
ld a, [wPartyMonMenuIconAnims + 10] ld a, [wc314 + 10]
ld h, a ld h, a
ld de, wcd8d ld de, wcd8d
call PlaceString call PlaceString
ld a, c ld a, c
ld [wPartyMonMenuIconAnims + 9], a ld [wc314 + 9], a
ld a, b ld a, b
ld [wPartyMonMenuIconAnims + 10], a ld [wc314 + 10], a
ld a, [wcd8d] ld a, [wcd8d]
cp $50 cp $50
jr nz, .asm_11a9bf jr nz, .asm_11a9bf
xor a xor a
ld [wPartyMonMenuIconAnims + 6], a ld [wc314 + 6], a
.asm_11a9bf .asm_11a9bf
ret ret
@ -5673,11 +5673,11 @@ Function11a971: ; 11a971
Function11a9c0: ; 11a9c0 Function11a9c0: ; 11a9c0
ld a, l ld a, l
ld [wPartyMonMenuIconAnims + 7], a ld [wc314 + 7], a
ld a, h ld a, h
ld [wPartyMonMenuIconAnims + 8], a ld [wc314 + 8], a
ld a, $1 ld a, $1
ld [wPartyMonMenuIconAnims + 6], a ld [wc314 + 6], a
ret ret
; 11a9ce ; 11a9ce

49
wram.asm
View File

@ -355,6 +355,11 @@ TilePermissions:: ; c2fe
ds 1 ds 1
ds 1 ds 1
SECTION "PARTY ICONS", WRAM0 [$c300]
; wc300 - wc313 is a 10x2 dictionary.
wDict_c300:: ds 10 * 2
ds wDict_c300 - @
wc300:: ds 1 wc300:: ds 1
wc301:: ds 1 wc301:: ds 1
wc302:: ds 1 wc302:: ds 1
@ -374,11 +379,22 @@ wc310:: ds 1
wc311:: ds 1 wc311:: ds 1
wc312:: ds 1 wc312:: ds 1
wc313:: ds 1 wc313:: ds 1
wPartyMonMenuIconAnims:: ds 96 ; c314 ; wPartyMonMenuIconAnims::
wc374:: ds 48 ; c374 ; Field 0: Index
wc3a4:: ds 8 ; c3b4 ; Fields 1-3: Loaded from Unknown_8d1c4
wc3ac:: ds 8 ; c3bc wc314:: ds 16 ; c314
wc3b4:: ds 1 ; c3b4 wc324:: ds 16 ; c324
wc334:: ds 16 ; c334
wc344:: ds 16 ; c344
wc354:: ds 16 ; c354
wc364:: ds 16 ; c364
wc374:: ds 16 ; c374
wc384:: ds 16 ; c384
wc394:: ds 16 ; c394
wc3a4:: ds 8 ; c3a4
wc3ac:: ds 8 ; c3ac
; wPartyMonMenuIconAnimsEnd::
wc3b4:: ds 1 ; something to do with wc314
wc3b5:: ds 1 wc3b5:: ds 1
CurIcon:: ; c3b6 CurIcon:: ; c3b6
@ -386,8 +402,7 @@ CurIcon:: ; c3b6
wc3b7:: ds 1 wc3b7:: ds 1
wc3b8:: ds 1 wc3b8:: dw
wc3b9:: ds 1
wc3ba:: ds 1 wc3ba:: ds 1
wc3bb:: ds 1 wc3bb:: ds 1
wc3bc:: ds 1 wc3bc:: ds 1
@ -1409,6 +1424,7 @@ PhoneScriptBank::
LuckyNumberDigit1Buffer:: LuckyNumberDigit1Buffer::
wCurrentRadioLine:: wCurrentRadioLine::
wMovementBufferCount:: wMovementBufferCount::
wMartItem1BCD::
ds 1 ds 1
wd003:: wd003::
LuckyNumberDigit2Buffer:: LuckyNumberDigit2Buffer::
@ -1425,6 +1441,7 @@ wd005::
LuckyNumberDigit4Buffer:: LuckyNumberDigit4Buffer::
StartFlypoint:: ; d005 StartFlypoint:: ; d005
wNumRadioLinesPrinted:: wNumRadioLinesPrinted::
wMartItem2BCD::
ds 1 ds 1
wd006:: wd006::
LuckyNumberDigit5Buffer:: LuckyNumberDigit5Buffer::
@ -1436,8 +1453,10 @@ wd007::
MovementBuffer:: ; d007 MovementBuffer:: ; d007
ds 1 ds 1
wMartItem3BCD::
wd008:: ds 2 wd008:: ds 2
wd00a:: ds 1 wd00a:: ds 1
wMartItem4BCD::
wd00b:: ds 1 wd00b:: ds 1
wRadioText:: ds 2 * SCREEN_WIDTH wRadioText:: ds 2 * SCREEN_WIDTH
@ -1446,19 +1465,26 @@ wRadioTextEnd::
wd00c:: ds 1 wd00c:: ds 1
wd00d:: ds 1 wd00d:: ds 1
wMartItem5BCD::
wd00e:: ds 1 wd00e:: ds 1
wd00f:: ds 1 wd00f:: ds 1
wd010:: ds 1 wd010:: ds 1
wMartItem6BCD::
wd011:: ds 1 wd011:: ds 1
wd012:: ds 1 wd012:: ds 1
wd013:: ds 1 wd013:: ds 1
wMartItem7BCD::
wd014:: ds 2 wd014:: ds 2
wd016:: ds 1 wd016:: ds 1
wMartItem8BCD::
wd017:: ds 1 wd017:: ds 1
wd018:: ds 1 wd018:: ds 1
wd019:: ds 1 wd019:: ds 1
wd01a:: ds 5 wMartItem9BCD::
wd01a:: ds 3
wMartItem10BCD:: ds 2
wd01f:: ds 1 wd01f:: ds 1
wMartItemBCDEnd::
wd020:: ds 3 wd020:: ds 3
wd023:: ds 5 wd023:: ds 5
wd028:: ds 2 wd028:: ds 2
@ -1502,6 +1528,7 @@ MovementAnimation:: ; d042
wTempTrainerClass:: wTempTrainerClass::
WalkingDirection:: ; d043 WalkingDirection:: ; d043
wBargainShopFlags::
ds 1 ds 1
wTempTrainerID:: wTempTrainerID::
@ -1509,7 +1536,8 @@ FacingDirection:: ; d044
ds 1 ds 1
wSeenTextPointer:: wSeenTextPointer::
WalkingX:: ; d045 WalkingX::
wd045:: ; d045
ds 1 ds 1
WalkingY:: ; d046 WalkingY:: ; d046
ds 1 ds 1
@ -1588,7 +1616,7 @@ CurMart:: ; d0f0
ds 1 ds 1
wd0f1:: ds 1 wd0f1:: ds 1
wd0f2:: ds 14 wd0f2:: ds 14
CurMartEnd::
wd100:: ds 1 wd100:: ds 1
wd101:: ds 1 wd101:: ds 1
@ -1601,6 +1629,7 @@ CurItem:: ; d106
ds 1 ds 1
ItemCountBuffer:: ; d107 ItemCountBuffer:: ; d107
wMartItemID::
wd107:: ds 1 wd107:: ds 1
CurPartySpecies:: ; d108 CurPartySpecies:: ; d108