Address some comments from padz

4 files changed, 56 insertions, 18 deletions

diff --git a/data/sprite_engine.asm b/data/sprite_engine.asm
index 3a6c13d4f..ba7528905 100755
--- a/data/sprite_engine.asm
+++ b/data/sprite_engine.asm
@@ -1560,13 +1560,14 @@ Unknown_8e6a5: ; 8e6a5
 	dsprite  0,  0,  1,  4, $53, $01
 ; 8e706
 Unknown_8e706: ; Broken 2bpp pointers
-	dbbw $80, $01, $672a ; 128-tile 2bpp at 1:672a (inside Multiply)
-	dbbw $80, $01, $672a
-	dbbw $80, $01, $672a
-	dbbw $80, $01, $672a
-	dbbw $10, $37, $672a ; 16-tile 2bpp at 37:672a (within Tileset11GFX)
-	dbbw $10, $11, $672a ; 16-tile 2bpp at 11:672a (empty data)
-	dbbw $10, $39, $672a ; 16-tile 2bpp at 39:672a (empty data)
-	dbbw $10, $24, $672a ; 16-tile 2bpp at 24:672a (inside Function926f7)
-	dbbw $10, $21, $672a ; 16-tile 2bpp at 21:672a (inside Function8671c)
+	dbbw $80, $01, .deleted ; 128-tile 2bpp at 1:672a (inside Multiply)
+	dbbw $80, $01, .deleted
+	dbbw $80, $01, .deleted
+	dbbw $80, $01, .deleted
+	dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within Tileset11GFX)
+	dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
+	dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
+	dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)
+	dbbw $10, $21, .deleted ; 16-tile 2bpp at 21:672a (inside Function8671c)
+.deleted
 ; 8e72a (23:672a)
diff --git a/macros.asm b/macros.asm
index 486c6e519..b6c209a38 100644
--- a/macros.asm
+++ b/macros.asm
@@ -16,7 +16,6 @@ INCLUDE "macros/mobile.asm"
 INCLUDE "macros/trainer.asm"
 INCLUDE "macros/trade_anim.asm"
 
-
 RGB: MACRO
 	dw ((\3) << 10) + ((\2) << 5) + (\1)
 	ENDM
diff --git a/sram.asm b/sram.asm
index 8728031ac..b103e7bc7 100644
--- a/sram.asm
+++ b/sram.asm
@@ -135,13 +135,50 @@ s1_b277::
 sLinkBattleStatsEnd::
 
 sHallOfFame:: ; b2c0
-rept NUM_HOF_TEAMS
-IF STRLEN("test\@") == 6
-sHallOfFame\@:: hall_of_fame sHallOfFame\@
-ELSE
-sHallOfFame0\@:: hall_of_fame sHallOfFame0\@
-ENDC
-endr
+; temporary until I can find a way to macrofy it
+	hall_of_fame sHallOfFame01
+	hall_of_fame sHallOfFame02
+	hall_of_fame sHallOfFame03
+	hall_of_fame sHallOfFame04
+	hall_of_fame sHallOfFame05
+	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::
 
 sMobileEventIndex:: ds 1
diff --git a/wram.asm b/wram.asm
index abb378165..f57d29a8c 100644
--- a/wram.asm
+++ b/wram.asm
@@ -166,6 +166,7 @@ hof_mon: MACRO
 endm
 
 hall_of_fame: MACRO
+\1::
 \1WinCount:: ds 1
 \1Mon1:: hof_mon \1Mon1	
 \1Mon2:: hof_mon \1Mon2	
@@ -544,7 +545,7 @@ wOddEggOTName:: ds PKMN_NAME_LENGTH
 wBT_OTTemp:: battle_tower_struct wBT_OTTemp
 	ds wBT_OTTemp - @
 
-wHallOfFameTemp:: hall_of_fame wHallOfFameTemp
+	hall_of_fame wHallOfFameTemp
 	ds wHallOfFameTemp - @
 
 wMisc:: ; ds $28 * 6