diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-04-03 20:44:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 20:44:48 -0500 |
| commit | 22fec43f1812cb863ad699b357bd593222ae140c (patch) | |
| tree | 4efa162869946a9bfdbde1be498857fac3db3b39 /data/data.s | |
| parent | a2d206665c6fffbd962375f262b7fbb05c7b7478 (diff) | |
More menu work (#33)
* split adventure log menu out and decompile
* add most adventure log matchings w/ 2 nonmatchings and move some relevant data
* more work on other menus
* fully decomp debug stuff around 203B3F0
* more debug menu work
* fix CreatePartnerSelectionMenu nonmatch
* move more data and clean some data up
Diffstat (limited to 'data/data.s')
| -rw-r--r-- | data/data.s | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/data/data.s b/data/data.s index b1c3dea..23f9d6c 100644 --- a/data/data.s +++ b/data/data.s @@ -72,8 +72,8 @@ gPMDBuildVersion: @ 80B69BC .string "titlen2\0" .align 2,0 - .global gUnknown_80B69F8 -gUnknown_80B69F8: @ 80B69F8 + .global gLoadScreenBackgroundFileNames +gLoadScreenBackgroundFileNames: @ 80B69F8 .4byte titlen0_text .4byte titlen1_text .4byte titlen2_text @@ -93,8 +93,8 @@ gUnknown_80B69F8: @ 80B69F8 .string "titlen2p\0" .align 2,0 - .global gUnknown_80B6A28 -gUnknown_80B6A28: @ 80B6A28 + .global gLoadScreenBackgroundPaletteFileNames +gLoadScreenBackgroundPaletteFileNames: @ 80B6A28 .4byte titlen0p_text .4byte titlen1p_text .4byte titlen2p_text @@ -455,13 +455,19 @@ gUnknown_80B7318: @ 80B7318 .global gUnknown_80B7324 gUnknown_80B7324: @ 80B7324 - .incbin "baserom.gba", 0xB7324, 0x2C + .string "event flag expansion error %d\0" + .align 2,0 + + .global FlagJudge_Text + FlagJudge_Text: + .string "_FlagJudge\0" + .align 2,0 .global gUnknown_80B7350 gUnknown_80B7350: @ 80B7350 .4byte EventFlagFile_Text .byte 0x7C, 0x05, 0x00, 0x00 - .byte 0x44, 0x73, 0x0B, 0x08 @ Pointer to _FlagJudge + .4byte FlagJudge_Text .global gUnknown_80B735C gUnknown_80B735C: @ 80B735C |