Move some data to src and add some more headers

- Finish moving all data for main menu to src
- Move some more data to wonder_mail
- Add some headers to clean up some externs
This commit is contained in:
Seth Barberee
2021-12-31 15:36:39 -06:00
parent 3555fb7c94
commit b2e109dab1
9 changed files with 372 additions and 485 deletions

View File

@@ -4894,66 +4894,3 @@ gUnknown_80DDAE4: @ 80DDAE4
.byte 0x06, 0x00, 0x04, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DDAFC
gUnknown_80DDAFC: @ 80DDAFC
.4byte Confirm_80DDB1C
.byte 0xB, 0x00, 0x00, 0x00
.4byte Info_80DDB14
.byte 0xC, 0x00, 0x00, 0x00
.byte 0x0, 0x00, 0x00, 0x00
.byte 0xA, 0x00, 0x00, 0x00
.global Info_80DDB14
Info_80DDB14:
.string "Info\0"
.align 2,0
.global Confirm_80DDB1C
Confirm_80DDB1C:
.string "Confirm\0"
.align 2,0
.global gUnknown_80DDB24
gUnknown_80DDB24: @ 80DDB24
.4byte GameLinkCable_80DDB50
.byte 0xD, 0x00, 0x00, 0x00
.4byte Password_80DDB44
.byte 0xF, 0x00, 0x00, 0x00
.4byte gWonderMailCancel
.byte 0xA, 0x00, 0x00, 0x00
.byte 0x0, 0x00, 0x00, 0x00
.byte 0xA, 0x00, 0x00, 0x00
.global Password_80DDB44
Password_80DDB44:
.string "Password\0"
.align 2,0
.global GameLinkCable_80DDB50
GameLinkCable_80DDB50:
.string "Game Link cable\0"
.align 2,0
.global gUnknown_80DDB60
gUnknown_80DDB60: @ 80DDB60
.4byte SendPokemon_80DDB98
.byte 0x11, 0x00, 0x00, 0x00
.4byte DontSendPokemon_80DDB80
.byte 0x12, 0x00, 0x00, 0x00
.4byte gWonderMailCancel
.byte 0x0a, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00
.global DontSendPokemon_80DDB80
DontSendPokemon_80DDB80:
.string "Don{APOSTROPHE}t Send Pokémon\0"
.align 2,0
.global SendPokemon_80DDB98
SendPokemon_80DDB98:
.string "Send Pokémon\0"
.align 2,0

View File

@@ -1,120 +1,5 @@
.section .rodata
.global gUnknown_80DFBD0
gUnknown_80DFBD0: @ 80DFBD0
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DFBE8
gUnknown_80DFBE8: @ 80DFBE8
.byte 0x01, 0x00, 0x0c, 0x00
.global gUnknown_80DFBEC
gUnknown_80DFBEC: @ 80DFBEC
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x0e, 0x00
.byte 0x0e, 0x00, 0x00, 0x00
.4byte gUnknown_80DFBE8
.global gUnknown_80DFC04
gUnknown_80DFC04: @ 80DFC04
.string "News List\0"
.align 2,0
.string "pksdir0\0"
.global gUnknown_80DFC18
gUnknown_80DFC18: @ 80DFC18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnkData_80DFC30
gUnkData_80DFC30:
.byte 0x01, 0x00, 0x16, 0x00
.global gUnknown_80DFC34
gUnknown_80DFC34: @ 80DFC34
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x1A, 0x00, 0x10, 0x00
.byte 0x10, 0x00, 0x00, 0x00
.4byte gUnkData_80DFC30
.global gUnknown_80DFC4C
gUnknown_80DFC4C: @ 80DFC4C
.string "She\0"
.global gUnknown_80DFC50
gUnknown_80DFC50: @ 80DFC50
.string "He\0"
.align 2,0
.string "pksdir0\0"
.global gUnknown_80DFC5C
gUnknown_80DFC5C: @ 80DFC5C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DFC74
gUnknown_80DFC74: @ 80DFC74
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x0e, 0x00
.byte 0x0e, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gMailboxText
gMailboxText: @ 80DFC8C
.string "Mailbox\0"
.string "pksdir0\0"
.global gUnknown_80DFC9C
gUnknown_80DFC9C: @ 80DFC9C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DFCB4
gUnknown_80DFCB4: @ 80DFCB4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x0e, 0x00
.byte 0x0e, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gBulletinBoardText
gBulletinBoardText: @ 80DFCCC
.string "Bulletin Board\0"
.align 2,0
.string "pksdir0\0"
.global gUnknown_80DFCE4
gUnknown_80DFCE4: @ 80DFCE4
.byte 0x00, 0x00, 0x00, 0x00
@@ -126,18 +11,12 @@ gUnknown_80DFCE4: @ 80DFCE4
.global gUnknown_80DFCFC
gUnknown_80DFCFC: @ 80DFCFC
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x06, 0x00
.byte 0x00, 0x00
.byte 0x02, 0x00
.byte 0x02, 0x00
.byte 0x18, 0x00
.byte 0x0e, 0x00
.byte 0x0e, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x0e, 0x00
.byte 0x0e, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DFD14
gUnknown_80DFD14: @ 80DFD14
@@ -156,33 +35,21 @@ gUnknown_80DFD28: @ 80DFD28
.global gUnknown_80DFD40
gUnknown_80DFD40: @ 80DFD40
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x04, 0x00
.byte 0x00, 0x00
.byte 0x15, 0x00
.byte 0x06, 0x00
.byte 0x07, 0x00
.byte 0x03, 0x00
.byte 0x03, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.byte 0x15, 0x00, 0x06, 0x00
.byte 0x07, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DFD58
gUnknown_80DFD58: @ 80DFD58
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x04, 0x00
.byte 0x00, 0x00
.byte 0x15, 0x00
.byte 0x0f, 0x00
.byte 0x06, 0x00
.byte 0x03, 0x00
.byte 0x03, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.byte 0x15, 0x00, 0x0f, 0x00
.byte 0x06, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DFD70
gUnknown_80DFD70: @ 80DFD70
@@ -207,7 +74,7 @@ gUnknown_80DFD8C: @ 80DFD8C
gUnknown_80DFDA4: @ 80DFDA4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x0
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x0e, 0x00
.byte 0x0e, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00

View File

@@ -1,168 +1,5 @@
.section .rodata
.global gUnknown_80E5CB4
gUnknown_80E5CB4: @ 80E5CB4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x0F, 0x00
.byte 0x1A, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E5CCC
gUnknown_80E5CCC: @ 80E5CCC
.byte 0xe8, 0x5c, 0x0e, 0x08
.byte 0xde, 0xff, 0x00, 0x00
.byte 0xe4, 0x5c, 0x0e, 0x08
.byte 0xde, 0xff, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xdd, 0xff, 0x00, 0x00
sUnknown_80E5CE4: @ 80E5CE4
.string " \0"
.align 2,0
.string "Start an entirely new adventure.\0"
.align 2,0
.global gUnknown_80E5D0C
gUnknown_80E5D0C: @ 80E5D0C
.4byte sUnknown_80E5D24, 0xFFDE
.4byte sUnknown_80E5CE4, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5D24: @ 80E5D24
.string "Check your career as an adventurer.\0"
.align 2, 0
.global gUnknown_80E5D48
gUnknown_80E5D48: @ 80E5D48
.4byte sUnknown_80E5D88, 0xFFDE
.4byte sUnknown_80E5D60, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5D60: @ 80E5D60
.string "It won~27t be in the release version.\0"
.align 2, 0
sUnknown_80E5D88: @ 80E5D88
.string "This is the Debug Mode.\0"
.align 2, 0
.global gUnknown_80E5DA0
gUnknown_80E5DA0: @ 80E5DA0
.4byte sUnknown_80E5DCC, 0xFFDE
.4byte sUnknown_80E5DB8, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5DB8:
.string "you last saved. \0"
.align 2, 0
sUnknown_80E5DCC:
.string "Resume your adventure from where\0"
.align 2, 0
.global gUnknown_80E5DF0
gUnknown_80E5DF0: @ 80E5DF0
.4byte sUnknown_80E5E34, 0xFFDE
.4byte sUnknown_80E5E08, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5E08:
.string "#C2Beware#R! This will delete it forever!\0"
.align 2, 0
sUnknown_80E5E34:
.string "This will delete your saved game data.\0"
.align 2, 0
.global gUnknown_80E5E5C
gUnknown_80E5E5C: @ 80E5E5C
.4byte sUnknown_80E5EA0, 0xFFDE
.4byte sUnknown_80E5E74, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5E74:
.string "passwords~2c friends may rescue each other.\0"
.align 2, 0
sUnknown_80E5EA0:
.string "Using a Game Link cable or\0"
.align 2, 0
.global gUnknown_80E5EBC
gUnknown_80E5EBC: @ 80E5EBC
.4byte sUnknown_80E5EF8, 0xFFDE
.4byte sUnknown_80E5ED4, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5ED4:
.string "trade stored items with a friend.\0"
.align 2, 0
sUnknown_80E5EF8:
.string "Using a Game Link cable~2c you can\0"
.align 2, 0
.global gUnknown_80E5F1C
gUnknown_80E5F1C: @ 80E5F1C
.4byte sUnknown_80E5F58, 0xFFDE
.4byte sUnknown_80E5F34, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5F34:
.string "You can give up waiting for rescue.\0"
.align 2, 0
sUnknown_80E5F58:
.string "You are awaiting rescue by a friend.\0"
.align 2, 0
.global gUnknown_80E5F80
gUnknown_80E5F80: @ 80E5F80
.4byte sUnknown_80E5FB0, 0xFFDE
.4byte sUnknown_80E5F98, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5F98:
.string "receive Wonder Mail.\0"
.align 2, 0
sUnknown_80E5FB0:
.string "Using passwords~2c you can\0"
.align 2, 0
.global gUnknown_80E5FCC
gUnknown_80E5FCC: @ 80E5FCC
.4byte sUnknown_80E6008, 0xFFDE
.4byte sUnknown_80E5FE4, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E5FE4:
.string "receive teams from your friends.\0"
.align 2, 0
sUnknown_80E6008:
.string "Using the Dual Slot function~2c you can\0"
.align 2, 0
.global gUnknown_80E6030
gUnknown_80E6030: @ 80E6030
.4byte sUnknown_80E6070, 0xFFDE
.4byte sUnknown_80E6048, 0xFFDE
.4byte 0, 0xFFDD
sUnknown_80E6048:
.string "go on an adventure to unknown worlds.\0"
.align 2, 0
sUnknown_80E6070:
.string "Using wireless communication~2c you can\0"
.align 2, 0
.string "pksdir0\0"
@ Start of Trade Items Data
.global gUnknown_80E60A0