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

Add commented numbers to map/group constants

Browse Source
This commit is contained in:
PikalaxALT
2015-10-17 20:49:34 -04:00
parent f53d65c536
commit 52605b764a
8 changed files with 532 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
battle/core.asm
View File

@@ -5268,7 +5268,7 @@ Function3e234: ; 3e234
call Function3df2c call Function3df2c
call WaitBGMap call WaitBGMap
call Function309d call Function309d
call Function1fbf call ResetTextRelatedRAM
call Function3ee27 call Function3ee27
and a and a
ret ret
@@ -5279,7 +5279,7 @@ Function3e234: ; 3e234
ld a, [wd0ee] ld a, [wd0ee]
and $c0 and $c0
ld [wd0ee], a ld [wd0ee], a
call Function1fbf call ResetTextRelatedRAM
call Function32f9 call Function32f9
scf scf
ret ret

855
constants/map_constants.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/predef.asm
View File

@@ -82,7 +82,7 @@ PredefPointers:: ; 856b
add_predef Predef_LoadSGBLayout add_predef Predef_LoadSGBLayout
add_predef Function91d11 add_predef Function91d11
add_predef CheckContestMon add_predef CheckContestMon
add_predef Function8c20f add_predef Predef_StartBattle
add_predef Predef35 add_predef Predef35
add_predef Predef36 add_predef Predef36
add_predef PlayBattleAnim add_predef PlayBattleAnim

2
engine/scripting.asm
View File

@@ -3011,7 +3011,7 @@ Script_reloadandreturn: ; 0x97b16
Script_loadfont: ; 0x97b1c Script_loadfont: ; 0x97b1c
; script command 0x47 ; script command 0x47
call Function2e08 call LoadFont
ret ret
; 0x97b20 ; 0x97b20

17
home/menu.asm
View File

@@ -486,21 +486,23 @@ endr
ret ret
; 1fbf ; 1fbf
Function1fbf:: ; 1fbf ResetTextRelatedRAM:: ; 1fbf
ld hl, wcf71 ld hl, wcf71
call Function1ff0 call .bytefill
ld hl, wcf81 ld hl, wcf81
call Function1ff0 call .bytefill
ld hl, wcf91 ld hl, wcf91
call Function1ff0 call .bytefill
ld hl, wcfa1 ld hl, wcfa1
call Function1ff0 call .bytefill
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $7 ld a, $7
ld [rSVBK], a ld [rSVBK], a
xor a xor a
ld hl, $dfff ld hl, w7_dfff
rept 2 rept 2
ld [hld], a ld [hld], a
endr endr
@@ -508,12 +510,13 @@ endr
ld [wcf71], a ld [wcf71], a
ld a, h ld a, h
ld [wcf72], a ld [wcf72], a
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ret ret
; 1ff0 ; 1ff0
Function1ff0:: ; 1ff0 .bytefill: ; 1ff0
ld bc, $0010 ld bc, $0010
xor a xor a
call ByteFill call ByteFill

10
home/window.asm
View File

@@ -1,6 +1,6 @@
ResetWindow:: ; 2dba ResetWindow:: ; 2dba
call Function1fbf call ResetTextRelatedRAM
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function6454) ; and BANK(Function64bf) ld a, BANK(Function6454) ; and BANK(Function64bf)
@@ -30,7 +30,7 @@ Function2dcf:: ; 2dcf
; 2de2 ; 2de2
Function2de2:: ; 2de2 Function2de2:: ; 2de2
call Function1fbf call ResetTextRelatedRAM
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function2173 call Function2173
@@ -46,8 +46,8 @@ Function2de2:: ; 2de2
ret ret
; 2e08 ; 2e08
Function2e08:: ; 2e08 LoadFont:: ; 2e08
call Function1fbf call ResetTextRelatedRAM
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function6454) ; and BANK(Function64bf) ld a, BANK(Function6454) ; and BANK(Function64bf)
@@ -68,7 +68,9 @@ Function2e20:: ; 2e20
push af push af
ld a, $1 ld a, $1
ld [hOAMUpdate], a ld [hOAMUpdate], a
callba Function104110 callba Function104110
pop af pop af
ld [hOAMUpdate], a ld [hOAMUpdate], a
ret ret

113
main.asm
View File

@@ -111,7 +111,7 @@ Function5b44: ; 5b44
call ClearTileMap call ClearTileMap
call Functione5f call Functione5f
call Functione51 call Functione51
call Function1fbf call ResetTextRelatedRAM
ret ret
; 5b54 ; 5b54
@@ -1461,7 +1461,7 @@ CopyrightString: ; 63fd
GameInit:: ; 642e GameInit:: ; 642e
callba Function14f1c callba Function14f1c
call Function1fbf call ResetTextRelatedRAM
call WhiteBGMap call WhiteBGMap
call ClearTileMap call ClearTileMap
ld a, $98 ld a, $98
@@ -1481,6 +1481,7 @@ Function6454:: ; 6454
call DelayFrame call DelayFrame
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
ld [hOAMUpdate], a ld [hOAMUpdate], a
ld a, [hBGMapMode] ld a, [hBGMapMode]
@@ -1488,6 +1489,7 @@ Function6454:: ; 6454
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function6473 call Function6473
pop af pop af
ld [hBGMapMode], a ld [hBGMapMode], a
pop af pop af
@@ -1504,7 +1506,7 @@ Function6473: ; 6473
ld a, $90 ld a, $90
ld [hWY], a ld [hWY], a
call Function2173 call Function2173
ld a, $9c ld a, VBGMap1 / $100
call Function64b9 call Function64b9
call Function2e20 call Function2e20
callba Function49409 callba Function49409
@@ -1514,8 +1516,8 @@ Function6473: ; 6473
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [hWY], a ld [hWY], a
callba Function64db callba Function64db ; no need to callba
ld a, $98 ld a, VBGMap0 / $100
call Function64b9 call Function64b9
xor a xor a
ld [wd152], a ld [wd152], a
@@ -1540,7 +1542,9 @@ Function64bf:: ; 64bf
push af push af
ld a, $1 ld a, $1
ld [hOAMUpdate], a ld [hOAMUpdate], a
call Function64cd call Function64cd
pop af pop af
ld [hOAMUpdate], a ld [hOAMUpdate], a
ret ret
@@ -12419,7 +12423,7 @@ UnknownText_0x125c8: ; 0x125c8
StartMenu:: ; 125cd StartMenu:: ; 125cd
call Function1fbf call ResetTextRelatedRAM
ld de, SFX_MENU ld de, SFX_MENU
call PlaySFX call PlaySFX
@@ -14393,7 +14397,7 @@ SelectMenu:: ; 13327
jp UseRegisteredItem jp UseRegisteredItem
.NotRegistered .NotRegistered
call Function2e08 call LoadFont
ld b, BANK(ItemMayBeRegisteredText) ld b, BANK(ItemMayBeRegisteredText)
ld hl, ItemMayBeRegisteredText ld hl, ItemMayBeRegisteredText
call MapTextbox call MapTextbox
@@ -14527,7 +14531,7 @@ UseRegisteredItem: ; 133c3
; 133df ; 133df
.NoFunction ; 133df .NoFunction ; 133df
call Function2e08 call LoadFont
call CantUseItem call CantUseItem
call Function2dcf call Function2dcf
and a and a
@@ -14535,7 +14539,7 @@ UseRegisteredItem: ; 133c3
; 133ea ; 133ea
.Current ; 133ea .Current ; 133ea
call Function2e08 call LoadFont
call DoItemEffect call DoItemEffect
call Function2dcf call Function2dcf
and a and a
@@ -32782,7 +32786,7 @@ Function2c10d: ; 2c10d
ld de, OTPartyCount ld de, OTPartyCount
call Function2c059 call Function2c059
ld hl, wcfc4 ld hl, wcfc4
ld a, $50 ld a, "@"
ld [hli], a ld [hli], a
ld [hl], $68 ld [hl], $68
ld hl, Sprites + $18 ld hl, Sprites + $18
@@ -32792,7 +32796,7 @@ Function2c10d: ; 2c10d
Function2c143: ; 2c143 Function2c143: ; 2c143
ld de, Buffer1 ld de, Buffer1
ld c, $6 ld c, $6
.asm_2c148 .loop
ld a, [wcfc5] ld a, [wcfc5]
ld [hli], a ld [hli], a
ld a, [wcfc4] ld a, [wcfc4]
@@ -32808,7 +32812,7 @@ Function2c143: ; 2c143
ld [wcfc4], a ld [wcfc4], a
inc de inc de
dec c dec c
jr nz, .asm_2c148 jr nz, .loop
ret ret
; 2c165 ; 2c165
@@ -32828,20 +32832,20 @@ Function2c1b2: ; 2c1b2
call WhiteBGMap call WhiteBGMap
call Functione5f call Functione5f
hlcoord 2, 3 hlcoord 2, 3
ld b, $9 ld b, 9
ld c, $e ld c, 14
call TextBox call TextBox
hlcoord 4, 5 hlcoord 4, 5
ld de, PlayerName ld de, PlayerName
call PlaceString call PlaceString
hlcoord 4, 10 hlcoord 4, 10
ld de, wd26b ld de, OTPlayerName
call PlaceString call PlaceString
hlcoord 9, 8 hlcoord 9, 8
ld a, $69 ld a, $69
ld [hli], a ld [hli], a
ld [hl], $6a ld [hl], $6a
callba Function2c10d callba Function2c10d ; no need to callba
ld b, $8 ld b, $8
call GetSGBLayout call GetSGBLayout
call Function32f9 call Function32f9
@@ -34113,9 +34117,12 @@ ConvertBerriesToBerryJuice: ; 2ede6
; 2ee18 ; 2ee18
Function2ee18: ; 2ee18 Function2ee18: ; 2ee18
; If we're not in a communications room,
; we don't need to be here.
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
ret z ret z
callba Function2c1b2 callba Function2c1b2
ld c, 150 ld c, 150
call DelayFrames call DelayFrames
@@ -34132,20 +34139,21 @@ Function2ee2f: ; 2ee2f
ld b, 6 ld b, 6
ld hl, PartyMon1HP ld hl, PartyMon1HP
ld de, PartyMon2 - PartyMon1 - 1 ld de, PartyMon2 - PartyMon1 - 1
.asm_2ee3d
.loop
ld a, [hli] ld a, [hli]
or [hl] or [hl]
jr nz, .asm_2ee45 jr nz, .okay
add hl, de add hl, de
dec b dec b
jr nz, .asm_2ee3d jr nz, .loop
.asm_2ee45 .okay
ld de, PartyMon1Level - PartyMon1HP ld de, PartyMon1Level - PartyMon1HP
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [BattleMonLevel], a ld [BattleMonLevel], a
predef Function8c20f predef Predef_StartBattle
callba Function3ed9f callba Function3ed9f
ld a, 1 ld a, 1
ld [hBGMapMode], a ld [hBGMapMode], a
@@ -34305,7 +34313,7 @@ endr
callab ResetEnemyStatLevels callab ResetEnemyStatLevels
call Function1fbf call ResetTextRelatedRAM
ld hl, hBGMapAddress ld hl, hBGMapAddress
xor a xor a
@@ -40135,7 +40143,7 @@ Function49ed0: ; 49ed0
call ClearTileMap call ClearTileMap
call Functione5f call Functione5f
call Functione51 call Functione51
call Function1fbf call ResetTextRelatedRAM
ret ret
; 49ee0 ; 49ee0
@@ -54554,7 +54562,7 @@ endr
; 8c20f ; 8c20f
Function8c20f: ; 8c20f Predef_StartBattle: ; 8c20f
call Function8c26d call Function8c26d
ld a, [rBGP] ld a, [rBGP]
ld [wcfc7], a ld [wcfc7], a
@@ -54581,13 +54589,16 @@ Function8c20f: ; 8c20f
push af push af
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld hl, Unkn1Pals ld hl, Unkn1Pals
ld bc, $0040 ld bc, $0040
xor a xor a
call ByteFill call ByteFill
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ld a, $ff
ld a, %11111111
ld [wcfc7], a ld [wcfc7], a
call DmgToCgbBGPals call DmgToCgbBGPals
call DelayFrame call DelayFrame
@@ -54596,6 +54607,7 @@ Function8c20f: ; 8c20f
ld [hLCDStatCustom + 1], a ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a ld [hLCDStatCustom + 2], a
ld [hSCY], a ld [hSCY], a
ld a, $1 ld a, $1
ld [rSVBK], a ld [rSVBK], a
pop af pop af
@@ -54619,7 +54631,7 @@ Function8c26d: ; 8c26d
call Function8c2aa call Function8c2aa
.resume .resume
ld a, $90 ld a, SCREEN_HEIGHT_PX
ld [hWY], a ld [hWY], a
call DelayFrame call DelayFrame
xor a xor a
@@ -54630,7 +54642,7 @@ rept 2
ld [hli], a ld [hli], a
endr endr
ld [hl], a ld [hl], a
call Function8c6d8 call WipeLYOverrides
ret ret
; 8c2a0 ; 8c2a0
@@ -54647,15 +54659,18 @@ Function8c2aa: ; 8c2aa
ld b, BANK(GFX_8c2f4) ld b, BANK(GFX_8c2f4)
ld c, 2 ld c, 2
call Request2bpp call Request2bpp
ld a, [rVBK] ld a, [rVBK]
push af push af
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
ld de, GFX_8c2f4 ld de, GFX_8c2f4
ld hl, VTiles1 tile $7e ld hl, VTiles4 tile $7e
ld b, BANK(GFX_8c2f4) ld b, BANK(GFX_8c2f4)
ld c, 2 ld c, 2
call Request2bpp call Request2bpp
pop af pop af
ld [rVBK], a ld [rVBK], a
ret ret
@@ -54669,6 +54684,7 @@ Function8c2cf: ; 8c2cf
push hl push hl
ld hl, w6_d000 ld hl, w6_d000
ld bc, $28 * $10 ld bc, $28 * $10
.loop .loop
ld [hl], -1 ld [hl], -1
inc hl inc hl
@@ -54676,6 +54692,7 @@ Function8c2cf: ; 8c2cf
ld a, c ld a, c
or b or b
jr nz, .loop jr nz, .loop
pop hl pop hl
ld de, w6_d000 ld de, w6_d000
ld b, BANK(Function8c2cf) ; BANK(@) ld b, BANK(Function8c2cf) ; BANK(@)
@@ -54705,7 +54722,7 @@ endr
; 8c323 ; 8c323
.jumptable: ; 8c323 (23:4323) .jumptable: ; 8c323 (23:4323)
dw .DetermineWhichAnimation ; 00 dw StartTrainerBattle_DetermineWhichAnimation ; 00
; Animation 1: cave ; Animation 1: cave
dw StartTrainerBattle_LoadPokeBallGraphics ; 01 dw StartTrainerBattle_LoadPokeBallGraphics ; 01
@@ -54751,7 +54768,7 @@ endr
dw StartTrainerBattle_Finish ; 20 dw StartTrainerBattle_Finish ; 20
.DetermineWhichAnimation: ; 8c365 (23:4365) StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
; The screen flashes a different number of ; The screen flashes a different number of
; times depending on the level of your lead ; times depending on the level of your lead
; Pokemon relative to the opponent's. ; Pokemon relative to the opponent's.
@@ -55272,27 +55289,27 @@ PokeBallTransition:
db %00001111, %11110000 db %00001111, %11110000
db %00000011, %11000000 db %00000011, %11000000
Function8c6d8: ; 8c6d8 WipeLYOverrides: ; 8c6d8
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $5 ld a, $5
ld [rSVBK], a ld [rSVBK], a
ld hl, LYOverrides ld hl, LYOverrides
call Function8c6ef call .wipe
ld hl, LYOverridesBackup ld hl, LYOverridesBackup
call Function8c6ef call .wipe
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ret ret
; 8c6ef ; 8c6ef
Function8c6ef: ; 8c6ef .wipe: ; 8c6ef
xor a xor a
ld c, $90 ld c, SCREEN_HEIGHT_PX
.asm_8c6f2 .loop
ld [hli], a ld [hli], a
dec c dec c
jr nz, .asm_8c6f2 jr nz, .loop
ret ret
; 8c6f7 ; 8c6f7
@@ -55341,7 +55358,7 @@ endr
sine_wave $100 sine_wave $100
; 8c768 ; 8c768
macro_8c792: macro zoombox: macro
; width, height, start y, start x ; width, height, start y, start x
db \1, \2 db \1, \2
dwcoord \3, \4 dwcoord \3, \4
@@ -55379,20 +55396,20 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
; 8c792 (23:4792) ; 8c792 (23:4792)
.boxes: ; 8c792 .boxes: ; 8c792
macro_8c792 4, 2, 8, 8 zoombox 4, 2, 8, 8
macro_8c792 6, 4, 7, 7 zoombox 6, 4, 7, 7
macro_8c792 8, 6, 6, 6 zoombox 8, 6, 6, 6
macro_8c792 10, 8, 5, 5 zoombox 10, 8, 5, 5
macro_8c792 12, 10, 4, 4 zoombox 12, 10, 4, 4
macro_8c792 14, 12, 3, 3 zoombox 14, 12, 3, 3
macro_8c792 16, 14, 2, 2 zoombox 16, 14, 2, 2
macro_8c792 18, 16, 1, 1 zoombox 18, 16, 1, 1
macro_8c792 20, 18, 0, 0 zoombox 20, 18, 0, 0
db -1 db -1
; 8c7b7 ; 8c7b7
.Copy: ; 8c7b7 (23:47b7) .Copy: ; 8c7b7 (23:47b7)
ld a, -1 ld a, $ff
.row .row
push bc push bc
push hl push hl

9
wram.asm
View File

@@ -1872,15 +1872,14 @@ TimeOfDay:: ; d269
ds 1 ds 1
ds 1 ds 1
SECTION "Enemy Party", WRAMX, BANK [1]
OTPlayerName::
wd26b:: ds 1 wd26b:: ds 1
wd26c:: ds 1 wd26c:: ds 1
wd26d:: ds 4 wd26d:: ds 4
wd271:: ds 5 wd271:: ds 5
wd276:: ds 10 wd276:: ds 10
SECTION "Enemy Party", WRAMX, BANK [1]
OTPartyCount:: ds 1 ; d280 OTPartyCount:: ds 1 ; d280
OTPartySpecies:: ds PARTY_LENGTH ; d281 OTPartySpecies:: ds PARTY_LENGTH ; d281
OTPartyEnd:: ds 1 OTPartyEnd:: ds 1
@@ -2741,3 +2740,7 @@ w6_d400:: ds $200
w6_d600:: ds $600 w6_d600:: ds $600
INCLUDE "sram.asm" INCLUDE "sram.asm"
SECTION "WRAM 7", WRAMX, BANK [7]
w7_d000:: ds $1000 - 1
w7_dfff:: ds 1