pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Address some comments from padz

Browse Source
This commit is contained in:
PikalaxALT 2015-12-05 08:08:01 -05:00
parent 81ea723b04
commit e83a5bae87
4 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/sprite_engine.asm
View File

@ -1560,13 +1560,14 @@ Unknown_8e6a5: ; 8e6a5
dsprite 0, 0, 1, 4, $53, $01 dsprite 0, 0, 1, 4, $53, $01
; 8e706 ; 8e706
Unknown_8e706: ; Broken 2bpp pointers Unknown_8e706: ; Broken 2bpp pointers
dbbw $80, $01, $672a ; 128-tile 2bpp at 1:672a (inside Multiply) dbbw $80, $01, .deleted ; 128-tile 2bpp at 1:672a (inside Multiply)
dbbw $80, $01, $672a dbbw $80, $01, .deleted
dbbw $80, $01, $672a dbbw $80, $01, .deleted
dbbw $80, $01, $672a dbbw $80, $01, .deleted
dbbw $10, $37, $672a ; 16-tile 2bpp at 37:672a (within Tileset11GFX) dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within Tileset11GFX)
dbbw $10, $11, $672a ; 16-tile 2bpp at 11:672a (empty data) dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
dbbw $10, $39, $672a ; 16-tile 2bpp at 39:672a (empty data) dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
dbbw $10, $24, $672a ; 16-tile 2bpp at 24:672a (inside Function926f7) dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
dbbw $10, $21, $672a ; 16-tile 2bpp at 21:672a (inside Function8671c) dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c)
.deleted
; 8e72a (23:672a) ; 8e72a (23:672a)

1
macros.asm
View File

@ -16,7 +16,6 @@ INCLUDE "macros/mobile.asm"
INCLUDE "macros/trainer.asm" INCLUDE "macros/trainer.asm"
INCLUDE "macros/trade_anim.asm" INCLUDE "macros/trade_anim.asm"
RGB: MACRO RGB: MACRO
dw ((\3) << 10) + ((\2) << 5) + (\1) dw ((\3) << 10) + ((\2) << 5) + (\1)
ENDM ENDM

51
sram.asm
View File

@ -135,13 +135,50 @@ s1_b277::
sLinkBattleStatsEnd:: sLinkBattleStatsEnd::
sHallOfFame:: ; b2c0 sHallOfFame:: ; b2c0
rept NUM_HOF_TEAMS ; temporary until I can find a way to macrofy it
IF STRLEN("test\@") == 6 hall_of_fame sHallOfFame01
sHallOfFame\@:: hall_of_fame sHallOfFame\@ hall_of_fame sHallOfFame02
ELSE hall_of_fame sHallOfFame03
sHallOfFame0\@:: hall_of_fame sHallOfFame0\@ hall_of_fame sHallOfFame04
ENDC hall_of_fame sHallOfFame05
endr hall_of_fame sHallOfFame06
hall_of_fame sHallOfFame07
hall_of_fame sHallOfFame08
hall_of_fame sHallOfFame09
hall_of_fame sHallOfFame10
hall_of_fame sHallOfFame11
hall_of_fame sHallOfFame12
hall_of_fame sHallOfFame13
hall_of_fame sHallOfFame14
hall_of_fame sHallOfFame15
hall_of_fame sHallOfFame16
hall_of_fame sHallOfFame17
hall_of_fame sHallOfFame18
hall_of_fame sHallOfFame19
hall_of_fame sHallOfFame20
hall_of_fame sHallOfFame21
hall_of_fame sHallOfFame22
hall_of_fame sHallOfFame23
hall_of_fame sHallOfFame24
hall_of_fame sHallOfFame25
hall_of_fame sHallOfFame26
hall_of_fame sHallOfFame27
hall_of_fame sHallOfFame28
hall_of_fame sHallOfFame29
hall_of_fame sHallOfFame30
; x = 1
; rept NUM_HOF_TEAMS
; ; PRINTT("{x}\n")
; if STRLEN({x}) == 2
; PRINTT(STRSUB({x},2,1))
; hall_of_fame STRCAT("sHallOfFame0", STRSUB({x},2,1))
; else
; PRINTT(STRSUB({x},2,2))
; hall_of_fame STRCAT("sHallOfFame", STRSUB({x},2,2))
; endc
; x = x + 1
; endr
sHallOfFameEnd:: sHallOfFameEnd::
sMobileEventIndex:: ds 1 sMobileEventIndex:: ds 1

3
wram.asm
View File

@ -166,6 +166,7 @@ hof_mon: MACRO
endm endm
hall_of_fame: MACRO hall_of_fame: MACRO
\1::
\1WinCount:: ds 1 \1WinCount:: ds 1
\1Mon1:: hof_mon \1Mon1 \1Mon1:: hof_mon \1Mon1
\1Mon2:: hof_mon \1Mon2 \1Mon2:: hof_mon \1Mon2
@ -544,7 +545,7 @@ wOddEggOTName:: ds PKMN_NAME_LENGTH
wBT_OTTemp:: battle_tower_struct wBT_OTTemp wBT_OTTemp:: battle_tower_struct wBT_OTTemp
ds wBT_OTTemp - @ ds wBT_OTTemp - @
wHallOfFameTemp:: hall_of_fame wHallOfFameTemp hall_of_fame wHallOfFameTemp
ds wHallOfFameTemp - @ ds wHallOfFameTemp - @
wMisc:: ; ds $28 * 6 wMisc:: ; ds $28 * 6