ref: e32cf1bfd1dd39b72ee672f3815986cc8b1a9406
parent: 395ebd83866161a93276f030bbf67f6ac0895f0f
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun May 17 16:59:15 EDT 2020
Miscellaneous cleanup noted in #709
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -1046,7 +1046,7 @@
.asm_38aaa
push hl
ld hl, wPlayerUsedMoves
- ld c, 4
+ ld c, NUM_MOVES
.asm_38ab0
ld a, [hli]
@@ -1511,7 +1511,7 @@
.asm_38ce7
push hl
ld b, a
- ld c, 4
+ ld c, NUM_MOVES
ld hl, wBattleMonMoves
ld de, wBattleMonPP
@@ -2147,10 +2147,10 @@
jr nc, .asm_39020
ld a, [wEnemyAccLevel]
- cp 7
+ cp BASE_STAT_LEVEL
jr c, .asm_39020
ld a, [wPlayerEvaLevel]
- cp 8
+ cp BASE_STAT_LEVEL + 1
jr nc, .asm_39020
; Otherwise, 80% chance to greatly encourage this move.
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -277,13 +277,13 @@
ldh a, [hCGB]
and a
jr nz, .cgb
- ld hl, wPlayerLightScreenCount
+ ld hl, wBetaPokerSGBPals
jp PushSGBPals
.cgb
- ld a, [wEnemyLightScreenCount] ; col
+ ld a, [wBetaPokerSGBCol]
ld c, a
- ld a, [wEnemyReflectCount] ; row
+ ld a, [wBetaPokerSGBRow]
hlcoord 0, 0, wAttrmap
ld de, SCREEN_WIDTH
.loop
@@ -294,10 +294,10 @@
jr .loop
.done
- ld b, $0
+ ld b, 0
add hl, bc
lb bc, 6, 4
- ld a, [wEnemySafeguardCount] ; value
+ ld a, [wBetaPokerSGBAttr]
and $3
call FillBoxCGB
call CopyTilemapAtOnce
--- a/engine/gfx/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
@@ -450,7 +450,7 @@
ldh [hMapObjectIndexBuffer], a
ret
-_Get2bpp::
+HDMATransfer2bpp::
; 2bpp when [rLCDC] & $80
; switch to WRAM bank 6
ldh a, [rSVBK]
@@ -494,7 +494,7 @@
ldh [rSVBK], a
ret
-_Get1bpp::
+HDMATransfer1bpp::
; 1bpp when [rLCDC] & $80
.loop
ld a, c
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -333,7 +333,7 @@
.SGB_BetaPoker:
ld hl, BlkPacket_9a86
- ld de, wPlayerLightScreenCount ; ???
+ ld de, wBetaPokerSGBPals
ld bc, PALPACKET_LENGTH
call CopyBytes
ld hl, PalPacket_BetaPoker
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -110,8 +110,7 @@
ShowMoney_TerminatorString:
db "@"
-Unreferenced_Function24b8f:
-; related to safari?
+Unreferenced_StartMenu_PrintSafariGameStatus:
ld hl, wOptions
ld a, [hl]
push af
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -5,7 +5,7 @@
bit rLCDC_ENABLE, a
jp z, Copy2bpp
- homecall _Get2bpp
+ homecall HDMATransfer2bpp
ret
@@ -14,7 +14,7 @@
bit rLCDC_ENABLE, a
jp z, Copy1bpp
- homecall _Get1bpp
+ homecall HDMATransfer1bpp
ret
--- a/wram.asm
+++ b/wram.asm
@@ -640,6 +640,7 @@
; see wPlayerScreens
db
+UNION ; c701
wPlayerSafeguardCount:: db ; c701
wPlayerLightScreenCount:: db ; c702
wPlayerReflectCount:: db ; c703
@@ -648,7 +649,19 @@
wEnemySafeguardCount:: db ; c705
wEnemyLightScreenCount:: db ; c706
wEnemyReflectCount:: db ; c707
- ds 2
+ ds 1
+
+NEXTU ; c701
+ ds 1
+wBetaPokerSGBPals:: dw ; c702
+ ds 1
+wBetaPokerSGBAttr:: db ; c705
+wBetaPokerSGBCol:: db ; c706
+wBetaPokerSGBRow:: db ; c707
+ ds 1
+ENDU ; c708
+
+ ds 1
wBattleWeather:: ; c70a
; 00 normal
--
⑨