summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorentrpntr <12521136+entrpntr@users.noreply.github.com>2020-06-12 10:04:31 -0400
committerGitHub <noreply@github.com>2020-06-12 10:04:31 -0400
commitf8a6b98eedbcdf3aa89209897c80452037355754 (patch)
tree4e89b30f492cff405d8fcea0886faadff94d1804 /wram.asm
parentf2e472b14173521b0f73fa917e5fb75a54a000dd (diff)
parent0c0f9b42bc1426f2dcdff9f9016bb3fa946b4d49 (diff)
Merge pull request #48 from entrpntr/bank39
Disassemble bank $39, kill the baserom dependency
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm28
1 files changed, 25 insertions, 3 deletions
diff --git a/wram.asm b/wram.asm
index 4a52dbcc..c6bb3220 100644
--- a/wram.asm
+++ b/wram.asm
@@ -612,10 +612,18 @@ wc8f9:: ds 7
NEXTU ; c700
; LCD expects wLYOverrides to have an alignment of $100
wLYOverrides:: ds SCREEN_HEIGHT_PX
-wLYOverridesEnd:: ds 112
+wLYOverridesEnd::
+UNION ; c790
+ ds 16
+wLYOverrides2:: ds SCREEN_HEIGHT_PX
+wLYOverrides2End::
+
+NEXTU ; c790
+ ds $100 - SCREEN_HEIGHT_PX
wLYOverridesBackup:: ds SCREEN_HEIGHT_PX
-wLYOverridesBackupEnd:: ds 112
+wLYOverridesBackupEnd:: ds $100 - SCREEN_HEIGHT_PX
+ENDU
UNION ; c900
; blank credits tile buffer
@@ -720,8 +728,22 @@ wPlayerMoveStruct:: move_struct wPlayerMoveStruct
wEnemyMonNick:: ds MON_NAME_LENGTH ; caf6
wBattleMonNick:: ds MON_NAME_LENGTH ; cb01
+UNION ; cb0c
+; battle mon
wBattleMon:: battle_struct wBattleMon ; cb0c
+NEXTU ; cb0c
+; intro water/grass/fire cutscene data
+ ds 4
+wIntroJumptableIndex:: db
+wIntroBGMapPointer:: dw
+wIntroTilemapPointer:: dw
+wIntroTilesPointer:: dw
+wIntroFrameCounter1:: db
+wIntroFrameCounter2:: db
+wcb19:: db
+ENDU ; cb2c
+
wcb2c:: ds 1 ; cb2c
wcb2d:: ds 1 ; cb2d
wEnemyTrainerItem1:: db ; cb2e
@@ -1114,7 +1136,7 @@ wce65:: db
wce66:: db
NEXTU ; ce64
-; intro and title data
+; gfpresents, title, and intro menu timers
wIntroSceneFrameCounter:: db
UNION ; ce65
wIntroSceneTimer:: db