diff options
| author | ehw <Knuckles500@gmail.com> | 2018-06-05 11:03:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 11:03:34 -0400 |
| commit | a62cf40b29a814188c545e47d7534b6ea3aebcc1 (patch) | |
| tree | 3db618e96e50af65d6831e4ce2540fb0435a954e /wram.asm | |
| parent | 771d125c7564a0ff1e511733114d53ad0521c3f8 (diff) | |
| parent | c4c2b3cc6ede5259a1246c195a8c1d58e6d3a35d (diff) | |
Merge pull request #4 from pret/master
Merge master
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 35 |
1 files changed, 23 insertions, 12 deletions
@@ -182,6 +182,9 @@ wEnemySubStatus3:: db ; ca42 ds $14 wTrainerClass:: ; ca57 db +; ca58 + ds $6b +wLinkBattleRNCount:: db ; cac3 ENDU @@ -351,18 +354,18 @@ wFarCallBCBuffer:: ; cd54 SECTION "CD76", WRAM0[$CD76] -wcd76:: ; cd76 - db - -wcd77:: ;cd77 - db - -wMonDexIndex: ds 1 ; cd78 +wCurItem:: db ; cd76 +wItemIndex:: db ;cd77 +wMonDexIndex: db ; cd78 SECTION "CD7D", WRAM0[$CD7D] -wItemQuantity:: ; cd7d - db +wItemQuantity:: db ; cd7d +wItemQuantityBuffer:: db ; cd7e + +SECTION "CDBA", WRAM0[$CDBA] + +wItemAttributeParamBuffer:: db ; cdba SECTION "CDBD", WRAM0[$CDBD] @@ -375,6 +378,10 @@ wLinkMode:: db ; cdbd wTargetMapUnk:: db ; cdbe ; TODO: Probably warp ID, check wTargetMapGroup:: db ; cdbf wTargetMapId:: db ; cdc0 +; cdc1 + ds $c +wLinkBattleRNs:: ds 10 ; cdcd +; cddd SECTION "CE00", WRAM0[$CE00] @@ -549,19 +556,23 @@ wTimeOfDayPalset:: db ; d158 wCurTimeOfDay:: db ; d159 +SECTION "D165", WRAM0[$D165] + +wTMsHMs:: db ; d165 + SECTION "D19E", WRAM0[$D19E] -wNumBagItems:: ; d19e - db +wNumBagItems:: db ; d19e SECTION "D1C8", WRAM0[$D1C8] wNumKeyItems:: db ; d1c8 +wKeyItems:: db ; d1c9 SECTION "D1DE", WRAM0[$D1DE] wNumBallItems:: db ; d1de - +wBallQuantities:: db ; d1df SECTION "D4AB", WRAM0[$D4AB] |