diff options
| -rw-r--r-- | asm/overworld.s | 4 | ||||
| -rw-r--r-- | baserom.ips | bin | 642879 -> 642801 bytes | |||
| -rw-r--r-- | data/data.s | 67 | ||||
| -rw-r--r-- | data/overworld.s | 126 | ||||
| -rw-r--r-- | ld_script.txt | 1 |
5 files changed, 130 insertions, 68 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 1640bf2c4..3fecdfa5c 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -749,7 +749,7 @@ warp_shift: @ 8055198 str r0, [r2, 0x4] str r1, [r2, 0x8] ldr r2, _080551D0 @ =gUnknown_2031DC4 - ldr r0, _080551D4 @ =gUnknown_826D2B0 + ldr r0, _080551D4 @ =sDummyWarpData ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] @@ -763,7 +763,7 @@ _080551C4: .4byte gUnknown_2031DB4 _080551C8: .4byte gSaveBlock1Ptr _080551CC: .4byte gUnknown_2031DBC _080551D0: .4byte gUnknown_2031DC4 -_080551D4: .4byte gUnknown_826D2B0 +_080551D4: .4byte sDummyWarpData _080551D8: .4byte gUnknown_2031DCC thumb_func_end warp_shift diff --git a/baserom.ips b/baserom.ips Binary files differindex 6b0d68aba..94d61ef1f 100644 --- a/baserom.ips +++ b/baserom.ips diff --git a/data/data.s b/data/data.s index 361e2d103..179fc3817 100644 --- a/data/data.s +++ b/data/data.s @@ -3,6 +3,7 @@ #include "constants/songs.h" #include "constants/flags.h" #include "constants/region_map.h" +#include "constants/maps.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -396,69 +397,3 @@ gUnknown_826D1E4:: @ 826D1E4 gUnknown_826D250:: @ 826D250 .incbin "baserom.gba", 0x26D250, 0x44 - -sWhiteOutMoneyLossMultipliers:: @ 826D294 - .byte 2 - .byte 4 - .byte 6 - .byte 9 - .byte 12 - .byte 16 - .byte 20 - .byte 25 - .byte 30 - - .align 1 -sWhiteOutMoneyLossBadgeFlagIDs:: @ 826D29E - .2byte FLAG_BADGE01_GET - .2byte FLAG_BADGE02_GET - .2byte FLAG_BADGE03_GET - .2byte FLAG_BADGE04_GET - .2byte FLAG_BADGE05_GET - .2byte FLAG_BADGE06_GET - .2byte FLAG_BADGE07_GET - .2byte FLAG_BADGE08_GET - - .align 2 -gUnknown_826D2B0:: @ 826D2B0 - .incbin "baserom.gba", 0x26D2B0, 0x28 - -gDirectionToVectors:: @ 826D2D8 - .4byte 0, 0 - .4byte 0, 1 - .4byte 0, -1 - .4byte -1, 0 - .4byte 1, 0 - .4byte -1, 1 - .4byte 1, 1 - .4byte -1, -1 - .4byte 1, -1 - -gUnknown_826D320:: @ 826D320 - .incbin "baserom.gba", 0x26D320, 0x10 - -gUnknown_826D330:: @ 826D330 - .incbin "baserom.gba", 0x26D330, 0xC - -gUnknown_826D33C:: @ 826D33C - .4byte sub_8058684 - .4byte sub_80586A4 - .4byte sub_80586A8 - -gUnknown_826D348:: @ 826D348 - .4byte sub_80586C8 - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586C8 - .4byte sub_80586C8 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - -gUnknown_826D374:: @ 826D374 - .4byte sub_805874C - .4byte sub_8058754 - diff --git a/data/overworld.s b/data/overworld.s new file mode 100644 index 000000000..b305b3002 --- /dev/null +++ b/data/overworld.s @@ -0,0 +1,126 @@ +#include "constants/flags.h" +#include "constants/maps.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata + .align 2, 0 + +sWhiteOutMoneyLossMultipliers:: @ 826D294 + .byte 2 + .byte 4 + .byte 6 + .byte 9 + .byte 12 + .byte 16 + .byte 20 + .byte 25 + .byte 30 + + .align 1 +sWhiteOutMoneyLossBadgeFlagIDs:: @ 826D29E + .2byte FLAG_BADGE01_GET + .2byte FLAG_BADGE02_GET + .2byte FLAG_BADGE03_GET + .2byte FLAG_BADGE04_GET + .2byte FLAG_BADGE05_GET + .2byte FLAG_BADGE06_GET + .2byte FLAG_BADGE07_GET + .2byte FLAG_BADGE08_GET + + .align 2 +sDummyWarpData:: @ 826D2B0 + map MAP_UNDEFINED + .byte 0xFF + .align 1 + .2byte 0xFFFF, 0xFFFF + +sUnusedData:: @ 826D2B8 + .4byte 1200 + .4byte 3600 + .4byte 1200 + .4byte 2400 + .4byte 50 + .4byte 80 + .4byte -44 + .4byte 44 + +gDirectionToVectors:: @ 826D2D8 + .4byte 0, 0 + .4byte 0, 1 + .4byte 0, -1 + .4byte -1, 0 + .4byte 1, 0 + .4byte -1, 1 + .4byte 1, 1 + .4byte -1, -1 + .4byte 1, -1 + +gUnknown_826D320:: @ 826D320 + .4byte 0x000001f8 + @ { + @ .bg = 0, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000011d1 + @ { + @ .bg = 1, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 29, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x000021c2 + @ { + @ .bg = 2, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 28, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x000031e3 + @ { + @ .bg = 3, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 30, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } + +gUnknown_826D330:: @ 826D330 + .4byte REG_WIN0H + .4byte (2 >> 1) | ((DMA_16BIT | DMA_DEST_RELOAD | DMA_SRC_INC | DMA_REPEAT | DMA_START_HBLANK | DMA_ENABLE) << 16) + .byte 1, 0 + + .align 2 +gUnknown_826D33C:: @ 826D33C + .4byte sub_8058684 + .4byte sub_80586A4 + .4byte sub_80586A8 + +gUnknown_826D348:: @ 826D348 + .4byte sub_80586C8 + .4byte sub_80586CC + .4byte sub_80586CC + .4byte sub_80586CC + .4byte sub_80586CC + .4byte sub_80586C8 + .4byte sub_80586C8 + .4byte sub_8058734 + .4byte sub_8058734 + .4byte sub_8058734 + .4byte sub_8058734 + +gUnknown_826D374:: @ 826D374 + .4byte sub_805874C + .4byte sub_8058754 diff --git a/ld_script.txt b/ld_script.txt index 9d067f80b..4c8df51a1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -399,6 +399,7 @@ SECTIONS { src/daycare.o(.rodata); src/battle_gfx_sfx_util.o(.rodata); data/data.o(.rodata.8260270); + data/overworld.o(.rodata); data/tilesets.o(.rodata); data/maps.o(.rodata); src/fieldmap.o(.rodata); |