mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Merge commit 'd2d5c09'
Conflicts: main.asm wram.asm Git couldn't figure out what this commit did, so it was redone to merge.
This commit is contained in:
yenatch
commit
802c3149c0
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,6 +1,9 @@
|
||||
# precompiled python
|
||||
*.pyc
|
||||
|
||||
# precompiled jython
|
||||
*$py.class
|
||||
|
||||
# compiled object file
|
||||
*.o
|
||||
|
||||
@ -37,5 +40,3 @@ pokecrystal.rtc
|
||||
|
||||
# some users are dumping png.py into extras/
|
||||
extras/png.py
|
||||
|
||||
*$py.class
|
||||
|
||||
2
Makefile
2
Makefile
@ -30,7 +30,7 @@ pngs:
|
||||
lzs: $(LZ_GFX) $(TWOBPP_GFX)
|
||||
@:
|
||||
|
||||
gfx/pics/%/front.lz: gfx/pics/%/front.png gfx/pics/%/tiles.2bpp
|
||||
gfx/pics/%/front.lz: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png
|
||||
python extras/gfx.py png-to-lz --front $^
|
||||
gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png
|
||||
python extras/gfx.py png-to-2bpp $<
|
||||
|
||||
@ -31,4 +31,3 @@ Eventually this will not be necessary.
|
||||
* Hang out with us on irc: **[nucleus.kafuka.org #skeetendo](https://kiwiirc.com/client/irc.nolimitzone.com/?#skeetendo)**
|
||||
|
||||
* Disassembly of **[Pokémon Red](http://bitbucket.org/iimarckus/pokered)**.
|
||||
|
||||
|
||||
116
wram.asm
116
wram.asm
@ -1,27 +1,24 @@
|
||||
SECTION "tiles0",VRAM[$8000]
|
||||
SECTION "tiles0",VRAM[$8000],BANK[0]
|
||||
VTiles0:
|
||||
SECTION "tiles1",VRAM[$8800]
|
||||
SECTION "tiles1",VRAM[$8800],BANK[0]
|
||||
VTiles1:
|
||||
SECTION "tiles2",VRAM[$9000]
|
||||
SECTION "tiles2",VRAM[$9000],BANK[0]
|
||||
VTiles2:
|
||||
SECTION "bgmap0",VRAM[$9800]
|
||||
SECTION "bgmap0",VRAM[$9800],BANK[0]
|
||||
VBGMap0:
|
||||
SECTION "bgmap1",VRAM[$9C00]
|
||||
SECTION "bgmap1",VRAM[$9C00],BANK[0]
|
||||
VBGMap1:
|
||||
|
||||
|
||||
; WRAM banks 0 and 1 are included as BSS labels.
|
||||
; Other WRAM banks (2-7) are constants for now.
|
||||
|
||||
SECTION "WRAMBank0",WRAM0[$c000]
|
||||
|
||||
SECTION "WRAMBank0",BSS[$c000]
|
||||
|
||||
SECTION "stack",BSS[$c000]
|
||||
SECTION "stack",WRAM0[$c000]
|
||||
ds $100
|
||||
Stack: ; c100
|
||||
|
||||
|
||||
SECTION "audio",BSS[$c100]
|
||||
SECTION "audio",WRAM0[$c100]
|
||||
MusicPlaying: ; c100
|
||||
; nonzero if playing
|
||||
ds 1
|
||||
@ -309,7 +306,7 @@ CurMusic: ; c2c0
|
||||
; id of music currently playing
|
||||
ds 1
|
||||
|
||||
SECTION "auto",BSS[$c2c7]
|
||||
SECTION "auto",WRAM0[$c2c7]
|
||||
InputType: ; c2c7
|
||||
AUTO_INPUT EQU $ff
|
||||
ds 1
|
||||
@ -320,19 +317,19 @@ AutoInputBank: ; c2ca
|
||||
AutoInputLength: ; c2cb
|
||||
ds 1
|
||||
|
||||
SECTION "linkbattle",BSS[$c2dc]
|
||||
SECTION "linkbattle",WRAM0[$c2dc]
|
||||
InLinkBattle: ; c2dc
|
||||
; 0 not in link battle
|
||||
; 1 link battle
|
||||
; 4 mobile battle
|
||||
ds 1
|
||||
|
||||
SECTION "scriptengine",BSS[$c2dd]
|
||||
SECTION "scriptengine",WRAM0[$c2dd]
|
||||
ScriptVar: ; c2dd
|
||||
ds 1
|
||||
|
||||
|
||||
SECTION "tiles",BSS[$c2fa]
|
||||
SECTION "tiles",WRAM0[$c2fa]
|
||||
TileDown: ; c2fa
|
||||
ds 1
|
||||
TileUp: ; c2fb
|
||||
@ -351,12 +348,12 @@ TilePermissions: ; c2fe
|
||||
; bit 0: right
|
||||
ds 1
|
||||
|
||||
SECTION "icons",BSS[$c3b6]
|
||||
SECTION "icons",WRAM0[$c3b6]
|
||||
|
||||
CurIcon: ; c3b6
|
||||
ds 1
|
||||
|
||||
SECTION "gfx",BSS[$c400]
|
||||
SECTION "gfx",WRAM0[$c400]
|
||||
|
||||
Sprites: ; c400
|
||||
; 4 bytes per sprite
|
||||
@ -380,7 +377,7 @@ TileMap: ; c4a0
|
||||
ds 360
|
||||
|
||||
|
||||
SECTION "BattleMons",BSS[$c608]
|
||||
SECTION "BattleMons",WRAM0[$c608]
|
||||
|
||||
EnemyMoveStruct:
|
||||
EnemyMoveAnimation: ; c608
|
||||
@ -777,19 +774,19 @@ LastEnemyMove: ; c71c
|
||||
ds 1
|
||||
|
||||
|
||||
SECTION "battle",BSS[$c734]
|
||||
SECTION "battle",WRAM0[$c734]
|
||||
BattleEnded: ; c734
|
||||
ds 1
|
||||
|
||||
|
||||
SECTION "overworldmap",BSS[$c800]
|
||||
SECTION "overworldmap",WRAM0[$c800]
|
||||
OverworldMap: ; c800
|
||||
ds 1300
|
||||
OverworldMapEnd:
|
||||
|
||||
ds 12
|
||||
|
||||
SECTION "gfx2",BSS[$cd20]
|
||||
SECTION "gfx2",WRAM0[$cd20]
|
||||
CreditsPos:
|
||||
BGMapBuffer: ; cd20
|
||||
ds 2
|
||||
@ -839,7 +836,7 @@ MenuSelection:; cf74
|
||||
|
||||
|
||||
|
||||
SECTION "VBlank",BSS[$cfb1]
|
||||
SECTION "VBlank",WRAM0[$cfb1]
|
||||
OverworldDelay: ; cfb1
|
||||
ds 1
|
||||
TextDelayFrames: ; cfb2
|
||||
@ -853,7 +850,7 @@ GameTimerPause: ; cfbc
|
||||
; bit 0
|
||||
ds 1
|
||||
|
||||
SECTION "Engine",BSS[$cfc2]
|
||||
SECTION "Engine",WRAM0[$cfc2]
|
||||
FXAnimID:
|
||||
FXAnimIDLo: ; cfc2
|
||||
ds 1
|
||||
@ -901,7 +898,7 @@ Options2: ; cfd1
|
||||
ds 46
|
||||
|
||||
|
||||
SECTION "WRAMBank1",BSS[$d000]
|
||||
SECTION "WRAMBank1",WRAMX[$d000],BANK[1]
|
||||
|
||||
ds 2
|
||||
|
||||
@ -1085,11 +1082,11 @@ CurPartyLevel: ; d143
|
||||
ds 1
|
||||
|
||||
|
||||
SECTION "UsedSprites",BSS[$d154]
|
||||
SECTION "UsedSprites",WRAMX[$d154],BANK[1]
|
||||
UsedSprites: ; d154
|
||||
ds 32
|
||||
|
||||
SECTION "map",BSS[$d1a3]
|
||||
SECTION "map",WRAMX[$d1a3],BANK[1]
|
||||
|
||||
MapEventBank: ; d1a3
|
||||
ds 1
|
||||
@ -1213,7 +1210,7 @@ MovementType:
|
||||
Buffer2: ; d1eb
|
||||
ds 1
|
||||
|
||||
SECTION "BattleMons2",BSS[$d1fa]
|
||||
SECTION "BattleMons2",WRAMX[$d1fa],BANK[1]
|
||||
LinkBattleRNs: ; d1fa
|
||||
ds 10
|
||||
|
||||
@ -1399,7 +1396,7 @@ CurDamage: ; d256
|
||||
ds 2
|
||||
|
||||
|
||||
SECTION "TimeOfDay",BSS[$d269]
|
||||
SECTION "TimeOfDay",WRAMX[$d269],BANK[1]
|
||||
|
||||
TimeOfDay: ; d269
|
||||
MORN EQU 0
|
||||
@ -1408,7 +1405,7 @@ NITE EQU 2
|
||||
DARKNESS EQU 3
|
||||
ds 1
|
||||
|
||||
SECTION "OTParty",BSS[$d280]
|
||||
SECTION "OTParty",WRAMX[$d280],BANK[1]
|
||||
|
||||
OTPartyCount: ; d280
|
||||
ds 1 ; number of Pokémon in party
|
||||
@ -1538,7 +1535,7 @@ OTPartyMon5Nickname: ; d416
|
||||
OTPartyMon6Nickname: ; d421
|
||||
ds 11
|
||||
|
||||
SECTION "Scripting",BSS[$d434]
|
||||
SECTION "Scripting",WRAMX[$d434],BANK[1]
|
||||
ScriptFlags: ; d434
|
||||
SCRIPT_RUNNING EQU 2
|
||||
ds 1
|
||||
@ -1565,7 +1562,7 @@ ScriptPos: ; d43a
|
||||
ScriptDelay: ; d44d
|
||||
ds 1
|
||||
|
||||
SECTION "Player",BSS[$d472]
|
||||
SECTION "Player",WRAMX[$d472],BANK[1]
|
||||
PlayerGender: ; d472
|
||||
; bit 0:
|
||||
; 0 male
|
||||
@ -1641,7 +1638,7 @@ PlayerDirection: ; d4de
|
||||
ds 1
|
||||
|
||||
|
||||
SECTION "MapEngine",BSS[$d4e4]
|
||||
SECTION "MapEngine",WRAMX[$d4e4],BANK[1]
|
||||
StandingTile: ; d4e4
|
||||
ds 1
|
||||
StandingTile2: ; d4e5
|
||||
@ -1666,7 +1663,7 @@ PlayerSpriteY: ; d4ee
|
||||
ds 1
|
||||
|
||||
|
||||
SECTION "Objects",BSS[$d71e]
|
||||
SECTION "Objects",WRAMX[$d71e],BANK[1]
|
||||
MapObjects: ; d71e
|
||||
|
||||
PLAYER_OBJECT EQU 0
|
||||
@ -1676,12 +1673,12 @@ OBJECT_LENGTH EQU $10
|
||||
ds OBJECT_LENGTH * NUM_OBJECTS
|
||||
|
||||
|
||||
SECTION "VariableSprites",BSS[$d82e]
|
||||
SECTION "VariableSprites",WRAMX[$d82e],BANK[1]
|
||||
VariableSprites: ; d82e
|
||||
ds $10
|
||||
|
||||
|
||||
SECTION "Status",BSS[$d841]
|
||||
SECTION "Status",WRAMX[$d841],BANK[1]
|
||||
TimeOfDayPal: ; d841
|
||||
ds 1
|
||||
ds 4
|
||||
@ -1709,7 +1706,7 @@ JohtoBadges: ; d857
|
||||
KantoBadges: ; d858
|
||||
ds 1
|
||||
|
||||
SECTION "Items",BSS[$d859]
|
||||
SECTION "Items",WRAMX[$d859],BANK[1]
|
||||
TMsHMs: ; d859
|
||||
ds 57
|
||||
TMsHMsEnd
|
||||
@ -1732,7 +1729,7 @@ Balls: ; d8d8
|
||||
ds 25
|
||||
BallsEnd
|
||||
|
||||
SECTION "overworld",BSS[$d95b]
|
||||
SECTION "overworld",WRAMX[$d95b],BANK[1]
|
||||
WhichRegisteredItem: ; d95b
|
||||
REGISTERED_POCKET EQU %11000000
|
||||
REGISTERED_NUMBER EQU %00111111
|
||||
@ -1748,7 +1745,7 @@ PLAYER_SURF EQU 4
|
||||
PLAYER_SURF_PIKA EQU 8
|
||||
ds 1
|
||||
|
||||
SECTION "scriptram",BSS[$d962]
|
||||
SECTION "scriptram",WRAMX[$d962],BANK[1]
|
||||
MooMooBerries: ; d962
|
||||
ds 1 ; how many berries fed to MooMoo
|
||||
UndergroundSwitchPositions: ; d963
|
||||
@ -1756,7 +1753,7 @@ UndergroundSwitchPositions: ; d963
|
||||
FarfetchdPosition: ; d964
|
||||
ds 1 ; which position the ilex farfetch'd is in
|
||||
|
||||
SECTION "Events",BSS[$dad4]
|
||||
SECTION "Events",WRAMX[$dad4],BANK[1]
|
||||
|
||||
;RoomDecorations: ; dac6
|
||||
; db 7
|
||||
@ -1774,7 +1771,7 @@ LugiaEvent: ; dad5
|
||||
;SalesmanMahoganyTownEvent: ; db5c
|
||||
;RedGyaradosEvent: ; db5c
|
||||
|
||||
SECTION "BoxNames",BSS[$db75]
|
||||
SECTION "BoxNames",WRAMX[$db75],BANK[1]
|
||||
; 8 chars + $50
|
||||
Box1Name: ; db75
|
||||
ds 9
|
||||
@ -1805,13 +1802,13 @@ Box13Name: ; dbe1
|
||||
Box14Name: ; dbea
|
||||
ds 9
|
||||
|
||||
SECTION "bike", BSS[$dbf5]
|
||||
SECTION "bike", WRAMX[$dbf5],BANK[1]
|
||||
BikeFlags: ; dbf5
|
||||
; bit 1: always on bike
|
||||
; bit 2: downhill
|
||||
ds 1
|
||||
|
||||
SECTION "decorations", BSS[$dc0f]
|
||||
SECTION "decorations", WRAMX[$dc0f],BANK[1]
|
||||
; Sprite id of each decoration
|
||||
Bed: ; dc0f
|
||||
ds 1
|
||||
@ -1830,21 +1827,21 @@ RightOrnament: ; dc15
|
||||
BigDoll: ; dc16
|
||||
ds 1
|
||||
|
||||
SECTION "fruittrees", BSS[$dc27]
|
||||
SECTION "fruittrees", WRAMX[$dc27],BANK[1]
|
||||
FruitTreeFlags: ; dc27
|
||||
ds 1
|
||||
|
||||
SECTION "steps", BSS[$dc73]
|
||||
SECTION "steps", WRAMX[$dc73],BANK[1]
|
||||
StepCount: ; dc73
|
||||
ds 1
|
||||
PoisonStepCount: ; dc74
|
||||
ds 1
|
||||
|
||||
SECTION "FlypointPermissions", BSS[$dca5]
|
||||
SECTION "FlypointPermissions", WRAMX[$dca5],BANK[1]
|
||||
FlypointPerms: ; dca5
|
||||
ds 4
|
||||
|
||||
SECTION "BackupMapInfo", BSS[$dcad]
|
||||
SECTION "BackupMapInfo", WRAMX[$dcad],BANK[1]
|
||||
|
||||
; used on maps like second floor pokécenter, which are reused, so we know which
|
||||
; map to return to
|
||||
@ -1853,7 +1850,7 @@ BackupMapGroup: ; dcad
|
||||
BackupMapNumber: ; dcae
|
||||
ds 1
|
||||
|
||||
SECTION "PlayerMapInfo", BSS[$dcb4]
|
||||
SECTION "PlayerMapInfo", WRAMX[$dcb4],BANK[1]
|
||||
|
||||
WarpNumber: ; dcb4
|
||||
ds 1
|
||||
@ -1866,7 +1863,7 @@ YCoord: ; dcb7
|
||||
XCoord: ; dcb8
|
||||
ds 1 ; current x coordinate relative to top-left corner of current map
|
||||
|
||||
SECTION "PlayerParty",BSS[$dcd7]
|
||||
SECTION "PlayerParty",WRAMX[$dcd7],BANK[1]
|
||||
|
||||
PartyCount: ; dcd7
|
||||
ds 1 ; number of Pokémon in party
|
||||
@ -1986,7 +1983,7 @@ PartyMon5Nickname: ; de6d
|
||||
PartyMon6Nickname: ; de78
|
||||
ds 11
|
||||
|
||||
SECTION "Pokedex",BSS[$de99]
|
||||
SECTION "Pokedex",WRAMX[$de99],BANK[1]
|
||||
PokedexSeen: ; de99
|
||||
ds 32
|
||||
EndPokedexSeen:
|
||||
@ -1998,7 +1995,7 @@ UnownDex: ; ded9
|
||||
UnlockedUnowns: ; def3
|
||||
ds 1
|
||||
|
||||
SECTION "Breeding",BSS[$def5]
|
||||
SECTION "Breeding",WRAMX[$def5],BANK[1]
|
||||
DaycareMan: ; def5
|
||||
; bit 7: active
|
||||
; bit 6: monsters are compatible
|
||||
@ -2048,7 +2045,7 @@ EggSpecies: ; df7b
|
||||
ds 1
|
||||
ds 31
|
||||
|
||||
SECTION "RoamMons",BSS[$dfcf]
|
||||
SECTION "RoamMons",WRAMX[$dfcf],BANK[1]
|
||||
RoamMon1Species: ; dfcf
|
||||
ds 1
|
||||
RoamMon1Level: ; dfd0
|
||||
@ -2090,14 +2087,15 @@ RoamMon3DVs: ; dfe2
|
||||
|
||||
|
||||
|
||||
; SECTION "WRAMBank5",BSS[$d000]
|
||||
SECTION "WRAMBank5",WRAMX[$d000],BANK[5]
|
||||
|
||||
; 8 4-color palettes
|
||||
Unkn1Pals EQU $d000
|
||||
Unkn2Pals EQU $d040
|
||||
BGPals EQU $d080
|
||||
OBPals EQU $d0c0
|
||||
|
||||
|
||||
|
||||
Unkn1Pals:
|
||||
ds $40
|
||||
Unkn2Pals:
|
||||
ds $40
|
||||
BGPals:
|
||||
ds $40
|
||||
OBPals:
|
||||
ds $40
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user