diff options
| -rw-r--r-- | data/battle_7.s | 32 | ||||
| -rw-r--r-- | data/battle_interface.s | 56 | ||||
| -rw-r--r-- | data/berry_blender.s | 167 | ||||
| -rw-r--r-- | data/data3_a0_A.s | 585 | ||||
| -rw-r--r-- | data/field_door.s | 17 | ||||
| -rw-r--r-- | data/field_player_avatar.s | 83 | ||||
| -rw-r--r-- | data/fieldmap.s | 8 | ||||
| -rw-r--r-- | data/metatile_behavior.s | 8 | ||||
| -rw-r--r-- | data/pokeball.s | 14 | ||||
| -rw-r--r-- | data/rom4.s | 43 | ||||
| -rw-r--r-- | data/trade.s | 200 | ||||
| -rw-r--r-- | ld_script.txt | 12 | ||||
| -rw-r--r-- | src/new_game.c | 6 |
13 files changed, 644 insertions, 587 deletions
diff --git a/data/battle_7.s b/data/battle_7.s new file mode 100644 index 000000000..a64a39dc2 --- /dev/null +++ b/data/battle_7.s @@ -0,0 +1,32 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_0832C0D0:: @ 832C0D0 + .incbin "baserom.gba", 0x32c0d0, 0x8 + +gUnknown_0832C0D8:: @ 832C0D8 + .incbin "baserom.gba", 0x32c0d8, 0x8 + +gUnknown_0832C0E0:: @ 832C0E0 + .incbin "baserom.gba", 0x32c0e0, 0x8 + +gUnknown_0832C0E8:: @ 832C0E8 + .incbin "baserom.gba", 0x32c0e8, 0x8 + +gUnknown_0832C0F0:: @ 832C0F0 + .incbin "baserom.gba", 0x32c0f0, 0x8 + +gUnknown_0832C0F8:: @ 832C0F8 + .incbin "baserom.gba", 0x32c0f8, 0x8 + +gUnknown_0832C100:: @ 832C100 + .incbin "baserom.gba", 0x32c100, 0x8 + +gUnknown_0832C108:: @ 832C108 + .incbin "baserom.gba", 0x32c108, 0x20 + +gUnknown_0832C128:: @ 832C128 + .incbin "baserom.gba", 0x32c128, 0x18 diff --git a/data/battle_interface.s b/data/battle_interface.s new file mode 100644 index 000000000..3fd9060fd --- /dev/null +++ b/data/battle_interface.s @@ -0,0 +1,56 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_0832C140:: @ 832C140 + .incbin "baserom.gba", 0x32c140, 0x30 + +gUnknown_0832C170:: @ 832C170 + .incbin "baserom.gba", 0x32c170, 0x30 + +gUnknown_0832C1A0:: @ 832C1A0 + .incbin "baserom.gba", 0x32c1a0, 0x20 + +gUnknown_0832C1C0:: @ 832C1C0 + .incbin "baserom.gba", 0x32c1c0, 0xcc + +gUnknown_0832C28C:: @ 832C28C + .incbin "baserom.gba", 0x32c28c, 0x38 + +gUnknown_0832C2C4:: @ 832C2C4 + .incbin "baserom.gba", 0x32c2c4, 0x8 + +gUnknown_0832C2CC:: @ 832C2CC + .incbin "baserom.gba", 0x32c2cc, 0x68 + +gUnknown_0832C334:: @ 832C334 + .incbin "baserom.gba", 0x32c334, 0x8 + +gUnknown_0832C33C:: @ 832C33C + .incbin "baserom.gba", 0x32c33c, 0x8 + +gUnknown_0832C344:: @ 832C344 + .incbin "baserom.gba", 0x32c344, 0x8 + +gUnknown_0832C34C:: @ 832C34C + .incbin "baserom.gba", 0x32c34c, 0x18 + +gUnknown_0832C364:: @ 832C364 + .incbin "baserom.gba", 0x32c364, 0x30 + +gUnknown_0832C394:: @ 832C394 + .incbin "baserom.gba", 0x32c394, 0x30 + +gUnknown_0832C3C4:: @ 832C3C4 + .incbin "baserom.gba", 0x32c3c4, 0x14 + +gUnknown_0832C3D8:: @ 832C3D8 + .incbin "baserom.gba", 0x32c3d8, 0x14 + +gUnknown_0832C3EC:: @ 832C3EC + .incbin "baserom.gba", 0x32c3ec, 0xc + +gUnknown_0832C3F8:: @ 832C3F8 + .incbin "baserom.gba", 0x32c3f8, 0x8 diff --git a/data/berry_blender.s b/data/berry_blender.s new file mode 100644 index 000000000..d3360d4d8 --- /dev/null +++ b/data/berry_blender.s @@ -0,0 +1,167 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_083390D4:: @ 83390D4 + .incbin "baserom.gba", 0x3390d4, 0x20 + +gUnknown_083390F4:: @ 83390F4 + .incbin "baserom.gba", 0x3390f4, 0x400 + +gUnknown_083394F4:: @ 83394F4 + .incbin "baserom.gba", 0x3394f4, 0x246 + +gUnknown_0833973A:: @ 833973A + .incbin "baserom.gba", 0x33973a, 0x61 + +gUnknown_0833979B:: @ 833979B + .incbin "baserom.gba", 0x33979b, 0x2 + +gUnknown_0833979D:: @ 833979D + .incbin "baserom.gba", 0x33979d, 0x33 + +gUnknown_083397D0:: @ 83397D0 + .incbin "baserom.gba", 0x3397d0, 0x4a + +gUnknown_0833981A:: @ 833981A + .incbin "baserom.gba", 0x33981a, 0x17 + +gUnknown_08339831:: @ 8339831 + .incbin "baserom.gba", 0x339831, 0x27 + +gUnknown_08339858:: @ 8339858 + .incbin "baserom.gba", 0x339858, 0x3e + +gUnknown_08339896:: @ 8339896 + .incbin "baserom.gba", 0x339896, 0x1a + +gUnknown_083398B0:: @ 83398B0 + .incbin "baserom.gba", 0x3398b0, 0x2d + +gUnknown_083398DD:: @ 83398DD + .incbin "baserom.gba", 0x3398dd, 0x18 + +gUnknown_083398F5:: @ 83398F5 + .incbin "baserom.gba", 0x3398f5, 0x1f + +gUnknown_08339914:: @ 8339914 + .incbin "baserom.gba", 0x339914, 0x7 + +gUnknown_0833991B:: @ 833991B + .incbin "baserom.gba", 0x33991b, 0x6 + +gUnknown_08339921:: @ 8339921 + .incbin "baserom.gba", 0x339921, 0x7 + +gUnknown_08339928:: @ 8339928 + .incbin "baserom.gba", 0x339928, 0x6 + +gUnknown_0833992E:: @ 833992E + .incbin "baserom.gba", 0x33992e, 0xe + +gUnknown_0833993C:: @ 833993C + .incbin "baserom.gba", 0x33993c, 0x5 + +gUnknown_08339941:: @ 8339941 + .incbin "baserom.gba", 0x339941, 0x2 + +gUnknown_08339943:: @ 8339943 + .incbin "baserom.gba", 0x339943, 0x4 + +gUnknown_08339947:: @ 8339947 + .incbin "baserom.gba", 0x339947, 0x8 + +gUnknown_0833994F:: @ 833994F + .incbin "baserom.gba", 0x33994f, 0xe + +gUnknown_0833995D:: @ 833995D + .incbin "baserom.gba", 0x33995d, 0x13 + +gUnknown_08339970:: @ 8339970 + .incbin "baserom.gba", 0x339970, 0x4 + +gUnknown_08339974:: @ 8339974 + .incbin "baserom.gba", 0x339974, 0xc + +gUnknown_08339980:: @ 8339980 + .incbin "baserom.gba", 0x339980, 0x38 + +gUnknown_083399B8:: @ 83399B8 + .incbin "baserom.gba", 0x3399b8, 0x8 + +gUnknown_083399C0:: @ 83399C0 + .incbin "baserom.gba", 0x3399c0, 0x8 + +gUnknown_083399C8:: @ 83399C8 + .incbin "baserom.gba", 0x3399c8, 0x8 + +gUnknown_083399D0:: @ 83399D0 + .incbin "baserom.gba", 0x3399d0, 0xc + +gUnknown_083399DC:: @ 83399DC + .incbin "baserom.gba", 0x3399dc, 0x8 + +gUnknown_083399E4:: @ 83399E4 + .incbin "baserom.gba", 0x3399e4, 0x3 + +gUnknown_083399E7:: @ 83399E7 + .incbin "baserom.gba", 0x3399e7, 0x5 + +gUnknown_083399EC:: @ 83399EC + .incbin "baserom.gba", 0x3399ec, 0xd4 + +gUnknown_08339AC0:: @ 8339AC0 + .incbin "baserom.gba", 0x339ac0, 0x8 + +gUnknown_08339AC8:: @ 8339AC8 + .incbin "baserom.gba", 0x339ac8, 0x8 + +gUnknown_08339AD0:: @ 8339AD0 + .incbin "baserom.gba", 0x339ad0, 0x8 + +gUnknown_08339AD8:: @ 8339AD8 + .incbin "baserom.gba", 0x339ad8, 0x60 + +gUnknown_08339B38:: @ 8339B38 + .incbin "baserom.gba", 0x339b38, 0x8 + +gUnknown_08339B40:: @ 8339B40 + .incbin "baserom.gba", 0x339b40, 0x98 + +gUnknown_08339BD8:: @ 8339BD8 + .incbin "baserom.gba", 0x339bd8, 0x8 + +gUnknown_08339BE0:: @ 8339BE0 + .incbin "baserom.gba", 0x339be0, 0x44 + +gUnknown_08339C24:: @ 8339C24 + .incbin "baserom.gba", 0x339c24, 0x8 + +gUnknown_08339C2C:: @ 8339C2C + .incbin "baserom.gba", 0x339c2c, 0x2c + +gUnknown_08339C58:: @ 8339C58 + .incbin "baserom.gba", 0x339c58, 0x8 + +gUnknown_08339C60:: @ 8339C60 + .incbin "baserom.gba", 0x339c60, 0x18 + +gUnknown_08339C78:: @ 8339C78 + .incbin "baserom.gba", 0x339c78, 0x28 + +gUnknown_08339CA0:: @ 8339CA0 + .incbin "baserom.gba", 0x339ca0, 0x1e + +gUnknown_08339CBE:: @ 8339CBE + .incbin "baserom.gba", 0x339cbe, 0x5 + +gUnknown_08339CC3:: @ 8339CC3 + .incbin "baserom.gba", 0x339cc3, 0x5 + +gUnknown_08339CC8:: @ 8339CC8 + .incbin "baserom.gba", 0x339cc8, 0x4c + +gUnknown_08339D14:: @ 8339D14 + .incbin "baserom.gba", 0x339d14, 0x8 diff --git a/data/data3_a0_A.s b/data/data3_a0_A.s deleted file mode 100644 index 975b3d640..000000000 --- a/data/data3_a0_A.s +++ /dev/null @@ -1,585 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0832C0D0:: @ 832C0D0 - .incbin "baserom.gba", 0x32c0d0, 0x8 - -gUnknown_0832C0D8:: @ 832C0D8 - .incbin "baserom.gba", 0x32c0d8, 0x8 - -gUnknown_0832C0E0:: @ 832C0E0 - .incbin "baserom.gba", 0x32c0e0, 0x8 - -gUnknown_0832C0E8:: @ 832C0E8 - .incbin "baserom.gba", 0x32c0e8, 0x8 - -gUnknown_0832C0F0:: @ 832C0F0 - .incbin "baserom.gba", 0x32c0f0, 0x8 - -gUnknown_0832C0F8:: @ 832C0F8 - .incbin "baserom.gba", 0x32c0f8, 0x8 - -gUnknown_0832C100:: @ 832C100 - .incbin "baserom.gba", 0x32c100, 0x8 - -gUnknown_0832C108:: @ 832C108 - .incbin "baserom.gba", 0x32c108, 0x20 - -gUnknown_0832C128:: @ 832C128 - .incbin "baserom.gba", 0x32c128, 0x18 - -gUnknown_0832C140:: @ 832C140 - .incbin "baserom.gba", 0x32c140, 0x30 - -gUnknown_0832C170:: @ 832C170 - .incbin "baserom.gba", 0x32c170, 0x30 - -gUnknown_0832C1A0:: @ 832C1A0 - .incbin "baserom.gba", 0x32c1a0, 0x20 - -gUnknown_0832C1C0:: @ 832C1C0 - .incbin "baserom.gba", 0x32c1c0, 0xcc - -gUnknown_0832C28C:: @ 832C28C - .incbin "baserom.gba", 0x32c28c, 0x38 - -gUnknown_0832C2C4:: @ 832C2C4 - .incbin "baserom.gba", 0x32c2c4, 0x8 - -gUnknown_0832C2CC:: @ 832C2CC - .incbin "baserom.gba", 0x32c2cc, 0x68 - -gUnknown_0832C334:: @ 832C334 - .incbin "baserom.gba", 0x32c334, 0x8 - -gUnknown_0832C33C:: @ 832C33C - .incbin "baserom.gba", 0x32c33c, 0x8 - -gUnknown_0832C344:: @ 832C344 - .incbin "baserom.gba", 0x32c344, 0x8 - -gUnknown_0832C34C:: @ 832C34C - .incbin "baserom.gba", 0x32c34c, 0x18 - -gUnknown_0832C364:: @ 832C364 - .incbin "baserom.gba", 0x32c364, 0x30 - -gUnknown_0832C394:: @ 832C394 - .incbin "baserom.gba", 0x32c394, 0x30 - -gUnknown_0832C3C4:: @ 832C3C4 - .incbin "baserom.gba", 0x32c3c4, 0x14 - -gUnknown_0832C3D8:: @ 832C3D8 - .incbin "baserom.gba", 0x32c3d8, 0x14 - -gUnknown_0832C3EC:: @ 832C3EC - .incbin "baserom.gba", 0x32c3ec, 0xc - -gUnknown_0832C3F8:: @ 832C3F8 - .incbin "baserom.gba", 0x32c3f8, 0x8 - -gUnknown_0832C400:: @ 832C400 - .incbin "baserom.gba", 0x32c400, 0x60 - -gUnknown_0832C460:: @ 832C460 - .incbin "baserom.gba", 0x32c460, 0x128 - -gUnknown_0832C588:: @ 832C588 - .incbin "baserom.gba", 0x32c588, 0x138 - -gUnknown_0832C6C0:: @ 832C6C0 - .incbin "baserom.gba", 0x32c6c0, 0x1fe - -gUnknown_0832C8BE:: @ 832C8BE - .incbin "baserom.gba", 0x32c8be, 0x1fe - -gUnknown_0832CABC:: @ 832CABC - .incbin "baserom.gba", 0x32cabc, 0x800 - -gUnknown_0832D2BC:: @ 832D2BC - .incbin "baserom.gba", 0x32d2bc, 0x800 - -gUnknown_0832DABC:: @ 832DABC - .incbin "baserom.gba", 0x32dabc, 0xb - -gUnknown_0832DAC7:: @ 832DAC7 - .incbin "baserom.gba", 0x32dac7, 0x2 - -gUnknown_0832DAC9:: @ 832DAC9 - .incbin "baserom.gba", 0x32dac9, 0x2 - -gUnknown_0832DACB:: @ 832DACB - .incbin "baserom.gba", 0x32dacb, 0x7 - -gUnknown_0832DAD2:: @ 832DAD2 - .incbin "baserom.gba", 0x32dad2, 0xd - -gUnknown_0832DADF:: @ 832DADF - .incbin "baserom.gba", 0x32dadf, 0x6 - -gUnknown_0832DAE5:: @ 832DAE5 - .incbin "baserom.gba", 0x32dae5, 0x157 - -gUnknown_0832DC3C:: @ 832DC3C - .incbin "baserom.gba", 0x32dc3c, 0x8 - -gUnknown_0832DC44:: @ 832DC44 - .incbin "baserom.gba", 0x32dc44, 0x50 - -gUnknown_0832DC94:: @ 832DC94 - .incbin "baserom.gba", 0x32dc94, 0x18 - -gUnknown_0832DCAC:: @ 832DCAC - .incbin "baserom.gba", 0x32dcac, 0x38 - -gUnknown_0832DCE4:: @ 832DCE4 - .incbin "baserom.gba", 0x32dce4, 0x8 - -gUnknown_0832DCEC:: @ 832DCEC - .incbin "baserom.gba", 0x32dcec, 0x138 - -gUnknown_0832DE24:: @ 832DE24 - .incbin "baserom.gba", 0x32de24, 0x1a - -gUnknown_0832DE3E:: @ 832DE3E - .incbin "baserom.gba", 0x32de3e, 0x18 - -gUnknown_0832DE56:: @ 832DE56 - .incbin "baserom.gba", 0x32de56, 0x3e - -gUnknown_0832DE94:: @ 832DE94 - .incbin "baserom.gba", 0x32de94, 0x18 - -gUnknown_0832DEAC:: @ 832DEAC - .incbin "baserom.gba", 0x32deac, 0x10 - -gUnknown_0832DEBC:: @ 832DEBC - .incbin "baserom.gba", 0x32debc, 0x24 - -gUnknown_0832DEE0:: @ 832DEE0 - .incbin "baserom.gba", 0x32dee0, 0x4 - -gUnknown_0832DEE4:: @ 832DEE4 - .incbin "baserom.gba", 0x32dee4, 0x10 - -gUnknown_0832DEF4:: @ 832DEF4 - .incbin "baserom.gba", 0x32def4, 0x98 - -gUnknown_0832DF8C:: @ 832DF8C - .incbin "baserom.gba", 0x32df8c, 0x8 - -gUnknown_0832DF94:: @ 832DF94 - .incbin "baserom.gba", 0x32df94, 0x5 - -gUnknown_0832DF99:: @ 832DF99 - .incbin "baserom.gba", 0x32df99, 0x2027 - -gUnknown_0832FFC0:: @ 832FFC0 - .incbin "baserom.gba", 0x32ffc0, 0x1fa0 - -gUnknown_08331F60:: @ 8331F60 - .incbin "baserom.gba", 0x331f60, 0x1000 - -gUnknown_08332F60:: @ 8332F60 - .incbin "baserom.gba", 0x332f60, 0x2840 - -gUnknown_083357A0:: @ 83357A0 - .incbin "baserom.gba", 0x3357a0, 0x100 - -gUnknown_083358A0:: @ 83358A0 - .incbin "baserom.gba", 0x3358a0, 0x100 - -gUnknown_083359A0:: @ 83359A0 - .incbin "baserom.gba", 0x3359a0, 0x1000 - -gUnknown_083369A0:: @ 83369A0 - .incbin "baserom.gba", 0x3369a0, 0x1000 - -gUnknown_083379A0:: @ 83379A0 - .incbin "baserom.gba", 0x3379a0, 0x100 - -gUnknown_08337AA0:: @ 8337AA0 - .incbin "baserom.gba", 0x337aa0, 0x200 - -gUnknown_08337CA0:: @ 8337CA0 - .incbin "baserom.gba", 0x337ca0, 0x200 - -gUnknown_08337EA0:: @ 8337EA0 - .incbin "baserom.gba", 0x337ea0, 0x20 - -gUnknown_08337EC0:: @ 8337EC0 - .incbin "baserom.gba", 0x337ec0, 0x690 - -gUnknown_08338550:: @ 8338550 - .incbin "baserom.gba", 0x338550, 0x7c8 - -gUnknown_08338D18:: @ 8338D18 - .incbin "baserom.gba", 0x338d18, 0x8 - -gUnknown_08338D20:: @ 8338D20 - .incbin "baserom.gba", 0x338d20, 0x8 - -gUnknown_08338D28:: @ 8338D28 - .incbin "baserom.gba", 0x338d28, 0x48 - -gUnknown_08338D70:: @ 8338D70 - .incbin "baserom.gba", 0x338d70, 0x8 - -gUnknown_08338D78:: @ 8338D78 - .incbin "baserom.gba", 0x338d78, 0x8 - -gUnknown_08338D80:: @ 8338D80 - .incbin "baserom.gba", 0x338d80, 0x8 - -gUnknown_08338D88:: @ 8338D88 - .incbin "baserom.gba", 0x338d88, 0x38 - -gUnknown_08338DC0:: @ 8338DC0 - .incbin "baserom.gba", 0x338dc0, 0x8 - -gUnknown_08338DC8:: @ 8338DC8 - .incbin "baserom.gba", 0x338dc8, 0x2c - -gUnknown_08338DF4:: @ 8338DF4 - .incbin "baserom.gba", 0x338df4, 0x8 - -gUnknown_08338DFC:: @ 8338DFC - .incbin "baserom.gba", 0x338dfc, 0x70 - -gUnknown_08338E6C:: @ 8338E6C - .incbin "baserom.gba", 0x338e6c, 0x8 - -gUnknown_08338E74:: @ 8338E74 - .incbin "baserom.gba", 0x338e74, 0x18 - -gUnknown_08338E8C:: @ 8338E8C - .incbin "baserom.gba", 0x338e8c, 0x18 - -gUnknown_08338EA4:: @ 8338EA4 - .incbin "baserom.gba", 0x338ea4, 0x28 - -gUnknown_08338ECC:: @ 8338ECC - .incbin "baserom.gba", 0x338ecc, 0x4 - -gUnknown_08338ED0:: @ 8338ED0 - .incbin "baserom.gba", 0x338ed0, 0xf0 - -gUnknown_08338FC0:: @ 8338FC0 - .incbin "baserom.gba", 0x338fc0, 0x3c - -gUnknown_08338FFC:: @ 8338FFC - .incbin "baserom.gba", 0x338ffc, 0x10 - -gUnknown_0833900C:: @ 833900C - .incbin "baserom.gba", 0x33900c, 0x8 - -gUnknown_08339014:: @ 8339014 - .incbin "baserom.gba", 0x339014, 0x10 - -gUnknown_08339024:: @ 8339024 - .incbin "baserom.gba", 0x339024, 0x6c - -gUnknown_08339090:: @ 8339090 - .incbin "baserom.gba", 0x339090, 0x44 - -gUnknown_083390D4:: @ 83390D4 - .incbin "baserom.gba", 0x3390d4, 0x20 - -gUnknown_083390F4:: @ 83390F4 - .incbin "baserom.gba", 0x3390f4, 0x400 - -gUnknown_083394F4:: @ 83394F4 - .incbin "baserom.gba", 0x3394f4, 0x246 - -gUnknown_0833973A:: @ 833973A - .incbin "baserom.gba", 0x33973a, 0x61 - -gUnknown_0833979B:: @ 833979B - .incbin "baserom.gba", 0x33979b, 0x2 - -gUnknown_0833979D:: @ 833979D - .incbin "baserom.gba", 0x33979d, 0x33 - -gUnknown_083397D0:: @ 83397D0 - .incbin "baserom.gba", 0x3397d0, 0x4a - -gUnknown_0833981A:: @ 833981A - .incbin "baserom.gba", 0x33981a, 0x17 - -gUnknown_08339831:: @ 8339831 - .incbin "baserom.gba", 0x339831, 0x27 - -gUnknown_08339858:: @ 8339858 - .incbin "baserom.gba", 0x339858, 0x3e - -gUnknown_08339896:: @ 8339896 - .incbin "baserom.gba", 0x339896, 0x1a - -gUnknown_083398B0:: @ 83398B0 - .incbin "baserom.gba", 0x3398b0, 0x2d - -gUnknown_083398DD:: @ 83398DD - .incbin "baserom.gba", 0x3398dd, 0x18 - -gUnknown_083398F5:: @ 83398F5 - .incbin "baserom.gba", 0x3398f5, 0x1f - -gUnknown_08339914:: @ 8339914 - .incbin "baserom.gba", 0x339914, 0x7 - -gUnknown_0833991B:: @ 833991B - .incbin "baserom.gba", 0x33991b, 0x6 - -gUnknown_08339921:: @ 8339921 - .incbin "baserom.gba", 0x339921, 0x7 - -gUnknown_08339928:: @ 8339928 - .incbin "baserom.gba", 0x339928, 0x6 - -gUnknown_0833992E:: @ 833992E - .incbin "baserom.gba", 0x33992e, 0xe - -gUnknown_0833993C:: @ 833993C - .incbin "baserom.gba", 0x33993c, 0x5 - -gUnknown_08339941:: @ 8339941 - .incbin "baserom.gba", 0x339941, 0x2 - -gUnknown_08339943:: @ 8339943 - .incbin "baserom.gba", 0x339943, 0x4 - -gUnknown_08339947:: @ 8339947 - .incbin "baserom.gba", 0x339947, 0x8 - -gUnknown_0833994F:: @ 833994F - .incbin "baserom.gba", 0x33994f, 0xe - -gUnknown_0833995D:: @ 833995D - .incbin "baserom.gba", 0x33995d, 0x13 - -gUnknown_08339970:: @ 8339970 - .incbin "baserom.gba", 0x339970, 0x4 - -gUnknown_08339974:: @ 8339974 - .incbin "baserom.gba", 0x339974, 0xc - -gUnknown_08339980:: @ 8339980 - .incbin "baserom.gba", 0x339980, 0x38 - -gUnknown_083399B8:: @ 83399B8 - .incbin "baserom.gba", 0x3399b8, 0x8 - -gUnknown_083399C0:: @ 83399C0 - .incbin "baserom.gba", 0x3399c0, 0x8 - -gUnknown_083399C8:: @ 83399C8 - .incbin "baserom.gba", 0x3399c8, 0x8 - -gUnknown_083399D0:: @ 83399D0 - .incbin "baserom.gba", 0x3399d0, 0xc - -gUnknown_083399DC:: @ 83399DC - .incbin "baserom.gba", 0x3399dc, 0x8 - -gUnknown_083399E4:: @ 83399E4 - .incbin "baserom.gba", 0x3399e4, 0x3 - -gUnknown_083399E7:: @ 83399E7 - .incbin "baserom.gba", 0x3399e7, 0x5 - -gUnknown_083399EC:: @ 83399EC - .incbin "baserom.gba", 0x3399ec, 0xd4 - -gUnknown_08339AC0:: @ 8339AC0 - .incbin "baserom.gba", 0x339ac0, 0x8 - -gUnknown_08339AC8:: @ 8339AC8 - .incbin "baserom.gba", 0x339ac8, 0x8 - -gUnknown_08339AD0:: @ 8339AD0 - .incbin "baserom.gba", 0x339ad0, 0x8 - -gUnknown_08339AD8:: @ 8339AD8 - .incbin "baserom.gba", 0x339ad8, 0x60 - -gUnknown_08339B38:: @ 8339B38 - .incbin "baserom.gba", 0x339b38, 0x8 - -gUnknown_08339B40:: @ 8339B40 - .incbin "baserom.gba", 0x339b40, 0x98 - -gUnknown_08339BD8:: @ 8339BD8 - .incbin "baserom.gba", 0x339bd8, 0x8 - -gUnknown_08339BE0:: @ 8339BE0 - .incbin "baserom.gba", 0x339be0, 0x44 - -gUnknown_08339C24:: @ 8339C24 - .incbin "baserom.gba", 0x339c24, 0x8 - -gUnknown_08339C2C:: @ 8339C2C - .incbin "baserom.gba", 0x339c2c, 0x2c - -gUnknown_08339C58:: @ 8339C58 - .incbin "baserom.gba", 0x339c58, 0x8 - -gUnknown_08339C60:: @ 8339C60 - .incbin "baserom.gba", 0x339c60, 0x18 - -gUnknown_08339C78:: @ 8339C78 - .incbin "baserom.gba", 0x339c78, 0x28 - -gUnknown_08339CA0:: @ 8339CA0 - .incbin "baserom.gba", 0x339ca0, 0x1e - -gUnknown_08339CBE:: @ 8339CBE - .incbin "baserom.gba", 0x339cbe, 0x5 - -gUnknown_08339CC3:: @ 8339CC3 - .incbin "baserom.gba", 0x339cc3, 0x5 - -gUnknown_08339CC8:: @ 8339CC8 - .incbin "baserom.gba", 0x339cc8, 0x4c - -gUnknown_08339D14:: @ 8339D14 - .incbin "baserom.gba", 0x339d14, 0x8 - -gContestWinnerPicDummy:: @ 8339D1C - .incbin "baserom.gba", 0x339d1c, 0x20 - -gUnknown_08339D3C:: @ 8339D3C - .incbin "baserom.gba", 0x339d3c, 0x28 - -gUnknown_08339D64:: @ 8339D64 - .incbin "baserom.gba", 0x339d64, 0x48 - -gUnknown_08339DAC:: @ 8339DAC - .incbin "baserom.gba", 0x339dac, 0x10 - -gUnknown_08339DBC:: @ 8339DBC - .incbin "baserom.gba", 0x339dbc, 0xc - -gUnknown_08339DC8:: @ 8339DC8 - .incbin "baserom.gba", 0x339dc8, 0xc - -gUnknown_08339DD4:: @ 8339DD4 - .incbin "baserom.gba", 0x339dd4, 0x2c - -gUnknown_08339E00:: @ 8339E00 - .incbin "baserom.gba", 0x339e00, 0x8 - -@ 8339E08 - .include "data/tilesets/tileset_graphics.inc" - -@ 83960F0 - .include "data/tilesets/metatiles.inc" - -@ 83DF704 - .include "data/tilesets/tilesets.inc" - -@ 83DFE14 - .incbin "baserom.gba", 0x3dfe14, 0xa1fc0 - -gUnknown_08481DD4:: @ 8481DD4 - .incbin "baserom.gba", 0x481dd4, 0x47a4 - -gUnknown_08486578:: @ 8486578 - .incbin "baserom.gba", 0x486578, 0x980 - -gUnknown_08486EF8:: @ 8486EF8 - .incbin "baserom.gba", 0x486ef8, 0x4 - -gUnknown_08486EFC:: @ 8486EFC - .incbin "baserom.gba", 0x486efc, 0x10090 - -gUnknown_08496F8C:: @ 8496F8C - .incbin "baserom.gba", 0x496f8c, 0x14 - -gUnknown_08496FA0:: @ 8496FA0 - .incbin "baserom.gba", 0x496fa0, 0x14 - -gUnknown_08496FB4:: @ 8496FB4 - .incbin "baserom.gba", 0x496fb4, 0x1c0 - -gUnknown_08497174:: @ 8497174 - .incbin "baserom.gba", 0x497174, 0x288 - -gUnknown_084973FC:: @ 84973FC - .incbin "baserom.gba", 0x4973fc, 0x48 - -gUnknown_08497444:: @ 8497444 - .incbin "baserom.gba", 0x497444, 0x4c - -gUnknown_08497490:: @ 8497490 - .incbin "baserom.gba", 0x497490, 0xc - -gUnknown_0849749C:: @ 849749C - .incbin "baserom.gba", 0x49749c, 0x14 - -gUnknown_084974B0:: @ 84974B0 - .incbin "baserom.gba", 0x4974b0, 0x8 - -gUnknown_084974B8:: @ 84974B8 - .incbin "baserom.gba", 0x4974b8, 0x20 - -gUnknown_084974D8:: @ 84974D8 - .incbin "baserom.gba", 0x4974d8, 0x10 - -gUnknown_084974E8:: @ 84974E8 - .incbin "baserom.gba", 0x4974e8, 0x10 - -gUnknown_084974F8:: @ 84974F8 - .incbin "baserom.gba", 0x4974f8, 0x10 - -gUnknown_08497508:: @ 8497508 - .incbin "baserom.gba", 0x497508, 0x2 - -gUnknown_0849750A:: @ 849750A - .incbin "baserom.gba", 0x49750a, 0x2 - -gUnknown_0849750C:: @ 849750C - .incbin "baserom.gba", 0x49750c, 0x14 - -gUnknown_08497520:: @ 8497520 - .incbin "baserom.gba", 0x497520, 0x10 - -gUnknown_08497530:: @ 8497530 - .incbin "baserom.gba", 0x497530, 0xc - -gUnknown_0849753C:: @ 849753C - .incbin "baserom.gba", 0x49753c, 0x4 - -gUnknown_08497540:: @ 8497540 - .incbin "baserom.gba", 0x497540, 0x10 - -gUnknown_08497550:: @ 8497550 - .incbin "baserom.gba", 0x497550, 0x4 - -gUnknown_08497554:: @ 8497554 - .incbin "baserom.gba", 0x497554, 0x8 - -gUnknown_0849755C:: @ 849755C - .incbin "baserom.gba", 0x49755c, 0x40 - -gUnknown_0849759C:: @ 849759C - .incbin "baserom.gba", 0x49759c, 0x6 - -gUnknown_084975A2:: @ 84975A2 - .incbin "baserom.gba", 0x4975a2, 0x6 - -gUnknown_084975A8:: @ 84975A8 - .incbin "baserom.gba", 0x4975a8, 0x2 - -gUnknown_084975AA:: @ 84975AA - .incbin "baserom.gba", 0x4975aa, 0x6 - -gUnknown_084975B0:: @ 84975B0 - .incbin "baserom.gba", 0x4975b0, 0xc - -gUnknown_084975BC:: @ 84975BC - .incbin "baserom.gba", 0x4975bc, 0x8 diff --git a/data/field_door.s b/data/field_door.s new file mode 100644 index 000000000..69a7c6534 --- /dev/null +++ b/data/field_door.s @@ -0,0 +1,17 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_08496F8C:: @ 8496F8C + .incbin "baserom.gba", 0x496f8c, 0x14 + +gUnknown_08496FA0:: @ 8496FA0 + .incbin "baserom.gba", 0x496fa0, 0x14 + +gUnknown_08496FB4:: @ 8496FB4 + .incbin "baserom.gba", 0x496fb4, 0x1c0 + +gUnknown_08497174:: @ 8497174 + .incbin "baserom.gba", 0x497174, 0x288 diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s new file mode 100644 index 000000000..952485463 --- /dev/null +++ b/data/field_player_avatar.s @@ -0,0 +1,83 @@ +@ the third big chunk of data + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + + +gUnknown_084973FC:: @ 84973FC + .incbin "baserom.gba", 0x4973fc, 0x48 + +gUnknown_08497444:: @ 8497444 + .incbin "baserom.gba", 0x497444, 0x4c + +gUnknown_08497490:: @ 8497490 + .incbin "baserom.gba", 0x497490, 0xc + +gUnknown_0849749C:: @ 849749C + .incbin "baserom.gba", 0x49749c, 0x14 + +gUnknown_084974B0:: @ 84974B0 + .incbin "baserom.gba", 0x4974b0, 0x8 + +gUnknown_084974B8:: @ 84974B8 + .incbin "baserom.gba", 0x4974b8, 0x20 + +gUnknown_084974D8:: @ 84974D8 + .incbin "baserom.gba", 0x4974d8, 0x10 + +gUnknown_084974E8:: @ 84974E8 + .incbin "baserom.gba", 0x4974e8, 0x10 + +gUnknown_084974F8:: @ 84974F8 + .incbin "baserom.gba", 0x4974f8, 0x10 + +gUnknown_08497508:: @ 8497508 + .incbin "baserom.gba", 0x497508, 0x2 + +gUnknown_0849750A:: @ 849750A + .incbin "baserom.gba", 0x49750a, 0x2 + +gUnknown_0849750C:: @ 849750C + .incbin "baserom.gba", 0x49750c, 0x14 + +gUnknown_08497520:: @ 8497520 + .incbin "baserom.gba", 0x497520, 0x10 + +gUnknown_08497530:: @ 8497530 + .incbin "baserom.gba", 0x497530, 0xc + +gUnknown_0849753C:: @ 849753C + .incbin "baserom.gba", 0x49753c, 0x4 + +gUnknown_08497540:: @ 8497540 + .incbin "baserom.gba", 0x497540, 0x10 + +gUnknown_08497550:: @ 8497550 + .incbin "baserom.gba", 0x497550, 0x4 + +gUnknown_08497554:: @ 8497554 + .incbin "baserom.gba", 0x497554, 0x8 + +gUnknown_0849755C:: @ 849755C + .incbin "baserom.gba", 0x49755c, 0x40 + +gUnknown_0849759C:: @ 849759C + .incbin "baserom.gba", 0x49759c, 0x6 + +gUnknown_084975A2:: @ 84975A2 + .incbin "baserom.gba", 0x4975a2, 0x6 + +gUnknown_084975A8:: @ 84975A8 + .incbin "baserom.gba", 0x4975a8, 0x2 + +gUnknown_084975AA:: @ 84975AA + .incbin "baserom.gba", 0x4975aa, 0x6 + +gUnknown_084975B0:: @ 84975B0 + .incbin "baserom.gba", 0x4975b0, 0xc + +gUnknown_084975BC:: @ 84975BC + .incbin "baserom.gba", 0x4975bc, 0x8 diff --git a/data/fieldmap.s b/data/fieldmap.s new file mode 100644 index 000000000..e2cc537da --- /dev/null +++ b/data/fieldmap.s @@ -0,0 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_08486EF8:: @ 8486EF8 + .incbin "baserom.gba", 0x486ef8, 0x4 diff --git a/data/metatile_behavior.s b/data/metatile_behavior.s new file mode 100644 index 000000000..ea19a3031 --- /dev/null +++ b/data/metatile_behavior.s @@ -0,0 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_08486EFC:: @ 8486EFC + .incbin "baserom.gba", 0x486efc, 0x10090 diff --git a/data/pokeball.s b/data/pokeball.s new file mode 100644 index 000000000..4e7b4315a --- /dev/null +++ b/data/pokeball.s @@ -0,0 +1,14 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_0832C400:: @ 832C400 + .incbin "baserom.gba", 0x32c400, 0x60 + +gUnknown_0832C460:: @ 832C460 + .incbin "baserom.gba", 0x32c460, 0x128 + +gUnknown_0832C588:: @ 832C588 + .incbin "baserom.gba", 0x32c588, 0x138 diff --git a/data/rom4.s b/data/rom4.s new file mode 100644 index 000000000..aa57174d9 --- /dev/null +++ b/data/rom4.s @@ -0,0 +1,43 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 +gUnknown_08339D3C:: @ 8339D3C + .incbin "baserom.gba", 0x339d3c, 0x28 + +gUnknown_08339D64:: @ 8339D64 + .incbin "baserom.gba", 0x339d64, 0x48 + +gUnknown_08339DAC:: @ 8339DAC + .incbin "baserom.gba", 0x339dac, 0x10 + +gUnknown_08339DBC:: @ 8339DBC + .incbin "baserom.gba", 0x339dbc, 0xc + +gUnknown_08339DC8:: @ 8339DC8 + .incbin "baserom.gba", 0x339dc8, 0xc + +gUnknown_08339DD4:: @ 8339DD4 + .incbin "baserom.gba", 0x339dd4, 0x2c + +gUnknown_08339E00:: @ 8339E00 + .incbin "baserom.gba", 0x339e00, 0x8 + +@ 8339E08 + .include "data/tilesets/tileset_graphics.inc" + +@ 83960F0 + .include "data/tilesets/metatiles.inc" + +@ 83DF704 + .include "data/tilesets/tilesets.inc" + +@ 83DFE14 + .incbin "baserom.gba", 0x3dfe14, 0xa1fc0 + +gUnknown_08481DD4:: @ 8481DD4 + .incbin "baserom.gba", 0x481dd4, 0x47a4 + +gUnknown_08486578:: @ 8486578 + .incbin "baserom.gba", 0x486578, 0x980 diff --git a/data/trade.s b/data/trade.s new file mode 100644 index 000000000..601b597ed --- /dev/null +++ b/data/trade.s @@ -0,0 +1,200 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2, 0 + +gUnknown_0832C6C0:: @ 832C6C0 + .incbin "baserom.gba", 0x32c6c0, 0x1fe + +gUnknown_0832C8BE:: @ 832C8BE + .incbin "baserom.gba", 0x32c8be, 0x1fe + +gUnknown_0832CABC:: @ 832CABC + .incbin "baserom.gba", 0x32cabc, 0x800 + +gUnknown_0832D2BC:: @ 832D2BC + .incbin "baserom.gba", 0x32d2bc, 0x800 + +gUnknown_0832DABC:: @ 832DABC + .incbin "baserom.gba", 0x32dabc, 0xb + +gUnknown_0832DAC7:: @ 832DAC7 + .incbin "baserom.gba", 0x32dac7, 0x2 + +gUnknown_0832DAC9:: @ 832DAC9 + .incbin "baserom.gba", 0x32dac9, 0x2 + +gUnknown_0832DACB:: @ 832DACB + .incbin "baserom.gba", 0x32dacb, 0x7 + +gUnknown_0832DAD2:: @ 832DAD2 + .incbin "baserom.gba", 0x32dad2, 0xd + +gUnknown_0832DADF:: @ 832DADF + .incbin "baserom.gba", 0x32dadf, 0x6 + +gUnknown_0832DAE5:: @ 832DAE5 + .incbin "baserom.gba", 0x32dae5, 0x157 + +gUnknown_0832DC3C:: @ 832DC3C + .incbin "baserom.gba", 0x32dc3c, 0x8 + +gUnknown_0832DC44:: @ 832DC44 + .incbin "baserom.gba", 0x32dc44, 0x50 + +gUnknown_0832DC94:: @ 832DC94 + .incbin "baserom.gba", 0x32dc94, 0x18 + +gUnknown_0832DCAC:: @ 832DCAC + .incbin "baserom.gba", 0x32dcac, 0x38 + +gUnknown_0832DCE4:: @ 832DCE4 + .incbin "baserom.gba", 0x32dce4, 0x8 + +gUnknown_0832DCEC:: @ 832DCEC + .incbin "baserom.gba", 0x32dcec, 0x138 + +gUnknown_0832DE24:: @ 832DE24 + .incbin "baserom.gba", 0x32de24, 0x1a + +gUnknown_0832DE3E:: @ 832DE3E + .incbin "baserom.gba", 0x32de3e, 0x18 + +gUnknown_0832DE56:: @ 832DE56 + .incbin "baserom.gba", 0x32de56, 0x3e + +gUnknown_0832DE94:: @ 832DE94 + .incbin "baserom.gba", 0x32de94, 0x18 + +gUnknown_0832DEAC:: @ 832DEAC + .incbin "baserom.gba", 0x32deac, 0x10 + +gUnknown_0832DEBC:: @ 832DEBC + .incbin "baserom.gba", 0x32debc, 0x24 + +gUnknown_0832DEE0:: @ 832DEE0 + .incbin "baserom.gba", 0x32dee0, 0x4 + +gUnknown_0832DEE4:: @ 832DEE4 + .incbin "baserom.gba", 0x32dee4, 0x10 + +gUnknown_0832DEF4:: @ 832DEF4 + .incbin "baserom.gba", 0x32def4, 0x98 + +gUnknown_0832DF8C:: @ 832DF8C + .incbin "baserom.gba", 0x32df8c, 0x8 + +gUnknown_0832DF94:: @ 832DF94 + .incbin "baserom.gba", 0x32df94, 0x5 + +gUnknown_0832DF99:: @ 832DF99 + .incbin "baserom.gba", 0x32df99, 0x2027 + +gUnknown_0832FFC0:: @ 832FFC0 + .incbin "baserom.gba", 0x32ffc0, 0x1fa0 + +gUnknown_08331F60:: @ 8331F60 + .incbin "baserom.gba", 0x331f60, 0x1000 + +gUnknown_08332F60:: @ 8332F60 + .incbin "baserom.gba", 0x332f60, 0x2840 + +gUnknown_083357A0:: @ 83357A0 + .incbin "baserom.gba", 0x3357a0, 0x100 + +gUnknown_083358A0:: @ 83358A0 + .incbin "baserom.gba", 0x3358a0, 0x100 + +gUnknown_083359A0:: @ 83359A0 + .incbin "baserom.gba", 0x3359a0, 0x1000 + +gUnknown_083369A0:: @ 83369A0 + .incbin "baserom.gba", 0x3369a0, 0x1000 + +gUnknown_083379A0:: @ 83379A0 + .incbin "baserom.gba", 0x3379a0, 0x100 + +gUnknown_08337AA0:: @ 8337AA0 + .incbin "baserom.gba", 0x337aa0, 0x200 + +gUnknown_08337CA0:: @ 8337CA0 + .incbin "baserom.gba", 0x337ca0, 0x200 + +gUnknown_08337EA0:: @ 8337EA0 + .incbin "baserom.gba", 0x337ea0, 0x20 + +gUnknown_08337EC0:: @ 8337EC0 + .incbin "baserom.gba", 0x337ec0, 0x690 + +gUnknown_08338550:: @ 8338550 + .incbin "baserom.gba", 0x338550, 0x7c8 + +gUnknown_08338D18:: @ 8338D18 + .incbin "baserom.gba", 0x338d18, 0x8 + +gUnknown_08338D20:: @ 8338D20 + .incbin "baserom.gba", 0x338d20, 0x8 + +gUnknown_08338D28:: @ 8338D28 + .incbin "baserom.gba", 0x338d28, 0x48 + +gUnknown_08338D70:: @ 8338D70 + .incbin "baserom.gba", 0x338d70, 0x8 + +gUnknown_08338D78:: @ 8338D78 + .incbin "baserom.gba", 0x338d78, 0x8 + +gUnknown_08338D80:: @ 8338D80 + .incbin "baserom.gba", 0x338d80, 0x8 + +gUnknown_08338D88:: @ 8338D88 + .incbin "baserom.gba", 0x338d88, 0x38 + +gUnknown_08338DC0:: @ 8338DC0 + .incbin "baserom.gba", 0x338dc0, 0x8 + +gUnknown_08338DC8:: @ 8338DC8 + .incbin "baserom.gba", 0x338dc8, 0x2c + +gUnknown_08338DF4:: @ 8338DF4 + .incbin "baserom.gba", 0x338df4, 0x8 + +gUnknown_08338DFC:: @ 8338DFC + .incbin "baserom.gba", 0x338dfc, 0x70 + +gUnknown_08338E6C:: @ 8338E6C + .incbin "baserom.gba", 0x338e6c, 0x8 + +gUnknown_08338E74:: @ 8338E74 + .incbin "baserom.gba", 0x338e74, 0x18 + +gUnknown_08338E8C:: @ 8338E8C + .incbin "baserom.gba", 0x338e8c, 0x18 + +gUnknown_08338EA4:: @ 8338EA4 + .incbin "baserom.gba", 0x338ea4, 0x28 + +gUnknown_08338ECC:: @ 8338ECC + .incbin "baserom.gba", 0x338ecc, 0x4 + +gUnknown_08338ED0:: @ 8338ED0 + .incbin "baserom.gba", 0x338ed0, 0xf0 + +gUnknown_08338FC0:: @ 8338FC0 + .incbin "baserom.gba", 0x338fc0, 0x3c + +gUnknown_08338FFC:: @ 8338FFC + .incbin "baserom.gba", 0x338ffc, 0x10 + +gUnknown_0833900C:: @ 833900C + .incbin "baserom.gba", 0x33900c, 0x8 + +gUnknown_08339014:: @ 8339014 + .incbin "baserom.gba", 0x339014, 0x10 + +gUnknown_08339024:: @ 8339024 + .incbin "baserom.gba", 0x339024, 0x6c + +gUnknown_08339090:: @ 8339090 + .incbin "baserom.gba", 0x339090, 0x44 diff --git a/ld_script.txt b/ld_script.txt index 754f18730..d65d29e4b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -341,7 +341,17 @@ SECTIONS { src/util.o(.rodata); data/data3.o(.rodata); src/egg_hatch.o(.rodata); - data/data3_a0_A.o(.rodata); + data/battle_7.o(.rodata); + data/battle_interface.o(.rodata); + data/pokeball.o(.rodata); + data/trade.o(.rodata); + data/berry_blender.o(.rodata); + src/new_game.o(.rodata); + data/rom4.o(.rodata); + data/fieldmap.o(.rodata); + data/metatile_behavior.o(.rodata); + data/field_door.o(.rodata); + data/field_player_avatar.o(.rodata); data/field_map_obj.o(.rodata); data/data3_a0_B.o(.rodata); src/berry.o(.rodata); diff --git a/src/new_game.c b/src/new_game.c index 2bf774c69..5a482c593 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -18,6 +18,7 @@ #include "event_data.h" #include "money.h" #include "coins.h" +#include "text.h" extern u8 gPlayerPartyCount; extern u8 gDifferentSaveFile; @@ -104,7 +105,10 @@ void ClearPokedexFlags(void) memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); } -extern const struct ContestWinner gContestWinnerPicDummy; +const struct ContestWinner gContestWinnerPicDummy = { + .monName = _(""), + .trainerName = _("") +}; void ClearAllContestWinnerPics(void) { |