From 54d4818d4fac730a3aae91cf6e0d0f40e15bf292 Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 4 Feb 2013 00:22:53 -0500 Subject: Fly / town map --- wram.asm | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 129211850..831415673 100644 --- a/wram.asm +++ b/wram.asm @@ -728,11 +728,23 @@ Options2: ; cfd1 ; bit 1: menu account off/on ds 1 - ds 47 + ds 46 ; d000 - - ds 114 + ds 2 + +DefaultFlypoint: ; d002 + ds 1 +; d003 + ds 1 +; d004 + ds 1 +StartFlypoint: ; d005 + ds 1 +EndFlypoint: ; d006 + ds 1 + + ds 108 StringBuffer1: ; d073 ds 19 @@ -1066,7 +1078,13 @@ OTPartyMon6Nickname: ; d421 ds 11 -SECTION "Player",BSS[$d47b] +SECTION "Player",BSS[$d472] +PlayerGender: ; d472 +; bit 0: +; 0 male +; 1 female + ds 1 + ds 8 PlayerID: ; d47b ds 2 PlayerName: ; d47d @@ -1224,6 +1242,11 @@ Box13Name: ; dc31 Box14Name: ; dc3a ds 9 + +SECTION "FlypointPermissions", BSS[$dca5] +FlypointPermissions: ; dca5 + ds 4 + SECTION "BackupMapInfo", BSS[$dcad] ; used on maps like second floor pokécenter, which are reused, so we know which -- cgit v1.2.3 From b8f4fd6390739714f702e8f09a7b800b930175cc Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 4 Feb 2013 04:27:56 -0500 Subject: Add vram sections to wram, and minor fixes --- wram.asm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 54e26176e..c319e20d9 100644 --- a/wram.asm +++ b/wram.asm @@ -1,6 +1,22 @@ +SECTION "tiles0",VRAM[$8000] +VTiles0: +SECTION "tiles1",VRAM[$8800] +VTiles1: +SECTION "tiles2",VRAM[$9000] +VTiles2: +SECTION "bgmap0",VRAM[$9800] +VBGMap0: +SECTION "bgmap1",VRAM[$9C00] +VBGMap1: + + +; So far, WRAM banks 0 and 1 are included in this file. +; Any bank 2-7 labels are in constants.asm. + + SECTION "stack",BSS[$c000] ds 256 -Stack: ; c0ff +Stack: ; c100 SECTION "audio",BSS[$c100] @@ -326,6 +342,10 @@ TilePermissions: ; c2fe ; bit 0: right ds 1 +SECTION "icons",BSS[$c3b6] + +CurIcon: ; c3b6 + ds 1 SECTION "gfx",BSS[$c400] -- cgit v1.2.3 From 710b7ddd7f781d20afdf31e0aa9a6adfaa52cc26 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 5 Feb 2013 01:20:51 -0500 Subject: Fix box name addresses --- wram.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index c319e20d9..99999c9a5 100644 --- a/wram.asm +++ b/wram.asm @@ -1240,31 +1240,31 @@ SECTION "BoxNames",BSS[$db75] ; 8 chars + $50 Box1Name: ; db75 ds 9 -Box2Name: ; dbce +Box2Name: ; db7e ds 9 -Box3Name: ; dbd7 +Box3Name: ; db87 ds 9 -Box4Name: ; dbe0 +Box4Name: ; db90 ds 9 -Box5Name: ; dbe9 +Box5Name: ; db99 ds 9 -Box6Name: ; dbf2 +Box6Name: ; dba2 ds 9 -Box7Name: ; dbfb +Box7Name: ; dbab ds 9 -Box8Name: ; dc04 +Box8Name: ; dbb4 ds 9 -Box9Name: ; dc0d +Box9Name: ; dbbd ds 9 -Box10Name: ; dc16 +Box10Name: ; dbc6 ds 9 -Box11Name: ; dc1f +Box11Name: ; dbcf ds 9 -Box12Name: ; dc28 +Box12Name: ; dbd8 ds 9 -Box13Name: ; dc31 +Box13Name: ; dbe1 ds 9 -Box14Name: ; dc3a +Box14Name: ; dbea ds 9 -- cgit v1.2.3 From c811b20b65c27c38f4835b0f533d9740af362f73 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 5 Feb 2013 01:21:51 -0500 Subject: Move BitTable2 to a file Currently, rgbasm's maximum macro parameter length is sixteen chars. A couple wram labels were changed to accomodate this for now. --- wram.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wram.asm') diff --git a/wram.asm b/wram.asm index 99999c9a5..31b292a3e 100644 --- a/wram.asm +++ b/wram.asm @@ -1269,7 +1269,7 @@ Box14Name: ; dbea SECTION "FlypointPermissions", BSS[$dca5] -FlypointPermissions: ; dca5 +FlypointPerms: ; dca5 ds 4 SECTION "BackupMapInfo", BSS[$dcad] @@ -1421,7 +1421,7 @@ PokedexCaught: ; deb9 ds 32 UnownDex: ; ded9 ds 26 -UnownUnlockedGroups: ; def3 +UnlockedUnowns: ; def3 ds 1 SECTION "Breeding",BSS[$def5] -- cgit v1.2.3