Merge pull request #100 from PikalaxALT/heal_location

Heal location and Field Region Map
This commit is contained in:
Diegoisawesome
2017-11-15 23:24:45 -06:00
committed by GitHub
50 changed files with 3224 additions and 5968 deletions

View File

@@ -86,6 +86,7 @@ include graphics_file_rules.mk
%.4bpp: %.png ; $(GFX) $< $@
%.8bpp: %.png ; $(GFX) $< $@
%.gbapal: %.pal ; $(GFX) $< $@
%.gbapal: %.png ; $(GFX) $< $@
%.lz: % ; $(GFX) $< $@
%.rl: % ; $(GFX) $< $@

View File

@@ -1,325 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_817018C
sub_817018C: @ 817018C
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0
bl SetVBlankCallback
ldr r4, =gUnknown_0203BCD0
movs r0, 0x89
lsls r0, 4
bl Alloc
str r0, [r4]
ldr r1, =0x0000088c
adds r2, r0, r1
movs r1, 0
strh r1, [r2]
str r5, [r0]
ldr r0, =sub_81701C4
bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_817018C
thumb_func_start sub_81701C4
sub_81701C4: @ 81701C4
push {lr}
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0x10
movs r1, 0
bl SetGpuReg
movs r0, 0x12
movs r1, 0
bl SetGpuReg
movs r0, 0x14
movs r1, 0
bl SetGpuReg
movs r0, 0x16
movs r1, 0
bl SetGpuReg
movs r0, 0x18
movs r1, 0
bl SetGpuReg
movs r0, 0x1A
movs r1, 0
bl SetGpuReg
movs r0, 0x1C
movs r1, 0
bl SetGpuReg
movs r0, 0x1E
movs r1, 0
bl SetGpuReg
bl ResetSpriteData
bl FreeAllSpritePalettes
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085E5068
movs r0, 0x1
movs r2, 0x2
bl InitBgsFromTemplates
ldr r0, =gUnknown_085E5070
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x27
movs r2, 0xD0
bl sub_809882C
bl clear_scheduled_bg_copies_to_vram
ldr r0, =sub_8170274
bl SetMainCallback2
ldr r0, =sub_8170260
bl SetVBlankCallback
pop {r0}
bx r0
.pool
thumb_func_end sub_81701C4
thumb_func_start sub_8170260
sub_8170260: @ 8170260
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8170260
thumb_func_start sub_8170274
sub_8170274: @ 8170274
push {lr}
bl sub_8170290
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
thumb_func_end sub_8170274
thumb_func_start sub_8170290
sub_8170290: @ 8170290
push {r4,r5,lr}
sub sp, 0xC
ldr r1, =gUnknown_0203BCD0
ldr r0, [r1]
ldr r2, =0x0000088c
adds r0, r2
ldrh r0, [r0]
adds r4, r1, 0
cmp r0, 0x6
bls _081702A6
b _08170416
_081702A6:
lsls r0, 2
ldr r1, =_081702BC
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081702BC:
.4byte _081702D8
.4byte _08170300
.4byte _08170358
.4byte _08170380
.4byte _08170394
.4byte _081703C0
.4byte _081703E8
_081702D8:
ldr r0, [r4]
adds r0, 0x8
movs r1, 0
bl sub_8122CDC
movs r0, 0
movs r1, 0
bl sub_8124288
movs r0, 0x1
movs r1, 0x1
bl sub_81240D4
ldr r1, [r4]
ldr r0, =0x0000088c
adds r1, r0
b _081703D8
.pool
_08170300:
movs r0, 0x1
movs r1, 0
movs r2, 0x27
movs r3, 0xD
bl SetWindowBorderStyle
ldr r5, =gText_Hoenn
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
bl GetStringCenterAlignXOffset
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
movs r0, 0x1
str r0, [sp]
movs r4, 0
str r4, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
movs r1, 0
movs r2, 0x27
movs r3, 0xD
bl SetWindowBorderStyle
bl sub_8170428
movs r0, 0x1
negs r0, r0
str r4, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
b _081703CC
.pool
_08170358:
movs r1, 0x82
lsls r1, 5
movs r0, 0
bl SetGpuRegBits
movs r0, 0
bl ShowBg
movs r0, 0x2
bl ShowBg
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
ldr r0, =0x0000088c
adds r1, r0
b _081703D8
.pool
_08170380:
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08170416
ldr r1, [r4]
b _081703D4
.pool
_08170394:
bl sub_81230AC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _081703A6
bl sub_8170428
b _08170416
_081703A6:
cmp r0, 0x3
blt _08170416
cmp r0, 0x5
bgt _08170416
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
ldr r0, =0x0000088c
adds r1, r0
b _081703D8
.pool
_081703C0:
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
_081703CC:
bl BeginNormalPaletteFade
ldr r0, =gUnknown_0203BCD0
ldr r1, [r0]
_081703D4:
ldr r2, =0x0000088c
adds r1, r2
_081703D8:
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
b _08170416
.pool
_081703E8:
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
bne _08170416
bl sub_812305C
ldr r4, =gUnknown_0203BCD0
ldr r0, [r4]
ldr r0, [r0]
bl SetMainCallback2
ldr r0, [r4]
cmp r0, 0
beq _08170412
bl Free
str r5, [r4]
_08170412:
bl FreeAllWindowBuffers
_08170416:
add sp, 0xC
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8170290
thumb_func_start sub_8170428
sub_8170428: @ 8170428
push {r4,lr}
sub sp, 0xC
ldr r4, =gUnknown_0203BCD0
ldr r0, [r4]
ldrb r0, [r0, 0xA]
cmp r0, 0
beq _08170460
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, [r4]
adds r2, 0xC
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
b _08170470
.pool
_08170460:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl CopyWindowToVram
_08170470:
add sp, 0xC
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8170428
.align 2, 0 @ Don't pad with nop.

View File

@@ -1,83 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8122C5C
sub_8122C5C: @ 8122C5C
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
lsls r1, 16
lsrs r1, 16
movs r3, 0
ldr r2, =gUnknown_0859F53C
_08122C6A:
movs r0, 0
ldrsb r0, [r2, r0]
cmp r0, r4
bne _08122C84
movs r0, 0x1
ldrsb r0, [r2, r0]
cmp r0, r1
bne _08122C84
adds r0, r3, 0x1
b _08122C8E
.pool
_08122C84:
adds r2, 0x8
adds r3, 0x1
cmp r3, 0x15
bls _08122C6A
movs r0, 0
_08122C8E:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8122C5C
thumb_func_start sub_8122C94
sub_8122C94: @ 8122C94
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
bl sub_8122C5C
cmp r0, 0
beq _08122CB4
lsls r0, 3
ldr r1, =gUnknown_0859F534
adds r0, r1
b _08122CB6
.pool
_08122CB4:
movs r0, 0
_08122CB6:
pop {r1}
bx r1
thumb_func_end sub_8122C94
thumb_func_start sub_8122CBC
@ warpdata *sub_8122CBC(int a1)
sub_8122CBC: @ 8122CBC
push {lr}
cmp r0, 0
beq _08122CD4
cmp r0, 0x16
bhi _08122CD4
lsls r0, 3
ldr r1, =gUnknown_0859F534
adds r0, r1
b _08122CD6
.pool
_08122CD4:
movs r0, 0
_08122CD6:
pop {r1}
bx r1
thumb_func_end sub_8122CBC
.align 2, 0 @ Don't pad with nop.

View File

@@ -9892,7 +9892,7 @@ _081B55E8:
.pool
_081B5614:
ldr r1, =gUnknown_0203CEC8
ldr r0, =sub_8124690
ldr r0, =MCB2_FlyMap
b _081B5628
.pool
_081B5624:

View File

@@ -362,7 +362,7 @@ sub_813CD04: @ 813CD04
adds r1, r3, 0
bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
bl sub_8123F9C
bl CorrectSpecialMapSecId
ldr r2, [r4]
movs r1, 0x88
lsls r1, 1
@@ -653,7 +653,7 @@ _0813CF5A:
adds r0, r4, 0
adds r1, r6, 0
str r3, [sp]
bl sub_8123E9C
bl GetRegionMapSectionIdAt
ldr r3, [sp]
ldr r2, [r3]
mov r7, r9
@@ -1338,11 +1338,11 @@ _0813D4F8:
bl sub_8122D88
movs r0, 0x1
movs r1, 0x1
bl sub_8124288
bl CreateRegionMapPlayerIcon
movs r1, 0x8
negs r1, r1
movs r0, 0
bl sub_8123824
bl PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs
b _0813D584
.pool
_0813D520:

View File

@@ -10864,7 +10864,7 @@ sub_81CC670: @ 81CC670
movs r0, 0x4
bl sub_81C763C
adds r4, r0, 0
bl sub_812305C
bl FreeRegionMapIconResources
bl sub_81CC9EC
ldrb r0, [r4, 0x8]
bl RemoveWindow
@@ -10886,7 +10886,7 @@ sub_81CC6A4: @ 81CC6A4
bl TransferPlttBuffer
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_81237B4
bl UpdateRegionMapVideoRegs
pop {r0}
bx r0
thumb_func_end sub_81CC6A4
@@ -10991,10 +10991,10 @@ _081CC784:
bne _081CC7AC
movs r0, 0x4
movs r1, 0x9
bl sub_8124288
bl CreateRegionMapPlayerIcon
movs r0, 0x5
movs r1, 0xA
bl sub_81240D4
bl CreateRegionMapCursor
bl sub_812454C
b _081CC77C
_081CC7AC:

File diff suppressed because it is too large Load Diff

View File

@@ -841,7 +841,7 @@ sub_8084CCC: @ 8084CCC
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
bl sub_8122CBC
bl GetHealLocationPointer
adds r4, r0, 0
cmp r4, 0
beq _08084CFA
@@ -885,7 +885,7 @@ Overworld_SetHealLocationWarp: @ 8084D1C
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
bl sub_8122CBC
bl GetHealLocationPointer
adds r5, r0, 0
cmp r5, 0
beq _08084D50
@@ -1187,7 +1187,7 @@ sub_8084F6C: @ 8084F6C
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
bl sub_8122CBC
bl GetHealLocationPointer
adds r5, r0, 0
cmp r5, 0
beq _08084FA0

View File

@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085E5068:: @ 85E5068 struct BgTemplate
.4byte 0x000001f0, 0x00002dca
.align 2
gUnknown_085E5070:: @ 85E5070
window_template 0x00, 0x11, 0x11, 0x0c, 0x02, 0x0f, 0x0001
window_template 0x00, 0x16, 0x01, 0x07, 0x02, 0x0f, 0x0019
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000

View File

@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0859F534:: @ 859F534
.incbin "baserom.gba", 0x59f534, 0x8
gUnknown_0859F53C:: @ 859F53C
.incbin "baserom.gba", 0x59f53c, 0xd0

View File

@@ -11,4 +11,4 @@ gUnknown_0859F51C:: @ 859F51C
.incbin "baserom.gba", 0x59f51c, 0x8
gUnknown_0859F524:: @ 859F524
.incbin "baserom.gba", 0x59f524, 0x10
.incbin "baserom.gba", 0x59f524, 0x18

View File

@@ -1,101 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0859F60C:: @ 859F60C
.incbin "baserom.gba", 0x59f60c, 0x44
gUnknown_0859F650:: @ 859F650
.incbin "baserom.gba", 0x59f650, 0xec
gUnknown_0859F73C:: @ 859F73C
.incbin "baserom.gba", 0x59f73c, 0x40
gUnknown_0859F77C:: @ 859F77C
.incbin "baserom.gba", 0x59f77c, 0xd64
gUnknown_085A04E0:: @ 85A04E0
.incbin "baserom.gba", 0x5a04e0, 0x34c
gUnknown_085A082C:: @ 85A082C
.incbin "baserom.gba", 0x5a082c, 0x20
gUnknown_085A084C:: @ 85A084C
.incbin "baserom.gba", 0x5a084c, 0x80
gUnknown_085A08CC:: @ 85A08CC
.incbin "baserom.gba", 0x5a08cc, 0x20
gUnknown_085A08EC:: @ 85A08EC
.incbin "baserom.gba", 0x5a08ec, 0x80
gUnknown_085A096C:: @ 85A096C
.incbin "baserom.gba", 0x5a096c, 0x1a4
@ 85A0B10
.include "data/region_map_entries.inc"
gUnknown_085A1B24:: @ 85A1B24
.incbin "baserom.gba", 0x5a1b24, 0x60
gUnknown_085A1B84:: @ 85A1B84
.incbin "baserom.gba", 0x5a1b84, 0x6
gUnknown_085A1B8A:: @ 85A1B8A
.incbin "baserom.gba", 0x5a1b8a, 0x22
gUnknown_085A1BAC:: @ 85A1BAC
.incbin "baserom.gba", 0x5a1bac, 0x20
gUnknown_085A1BCC:: @ 85A1BCC
.incbin "baserom.gba", 0x5a1bcc, 0x34
gUnknown_085A1C00:: @ 85A1C00
.incbin "baserom.gba", 0x5a1c00, 0x8
gUnknown_085A1C08:: @ 85A1C08
.incbin "baserom.gba", 0x5a1c08, 0x18
gUnknown_085A1C20:: @ 85A1C20
.incbin "baserom.gba", 0x5a1c20, 0x10
gUnknown_085A1C30:: @ 85A1C30
.incbin "baserom.gba", 0x5a1c30, 0x4
gUnknown_085A1C34:: @ 85A1C34
.incbin "baserom.gba", 0x5a1c34, 0x4
gUnknown_085A1C38:: @ 85A1C38
.incbin "baserom.gba", 0x5a1c38, 0x20
gUnknown_085A1C58:: @ 85A1C58
.incbin "baserom.gba", 0x5a1c58, 0x38
gUnknown_085A1C90:: @ 85A1C90
.incbin "baserom.gba", 0x5a1c90, 0xd8
gUnknown_085A1D68:: @ 85A1D68
.incbin "baserom.gba", 0x5a1d68, 0xd4
gUnknown_085A1E3C:: @ 85A1E3C
.incbin "baserom.gba", 0x5a1e3c, 0xa0
gUnknown_085A1EDC:: @ 85A1EDC
.incbin "baserom.gba", 0x5a1edc, 0x8
gUnknown_085A1EE4:: @ 85A1EE4
.incbin "baserom.gba", 0x5a1ee4, 0xc
gUnknown_085A1EF0:: @ 85A1EF0
.incbin "baserom.gba", 0x5a1ef0, 0x20
gUnknown_085A1F10:: @ 85A1F10
.incbin "baserom.gba", 0x5a1f10, 0x8
gUnknown_085A1F18:: @ 85A1F18
.incbin "baserom.gba", 0x5a1f18, 0x64
gUnknown_085A1F7C:: @ 85A1F7C
.incbin "baserom.gba", 0x5a1f7c, 0x18

View File

@@ -1,809 +0,0 @@
gMapName_LittlerootTown:: @ 85A0B10
.string "LITTLEROOT TOWN$"
gMapName_OldaleTown:: @ 85A0B20
.string "OLDALE TOWN$"
gMapName_DewfordTown:: @ 85A0B2C
.string "DEWFORD TOWN$"
gMapName_LavaridgeTown:: @ 85A0B39
.string "LAVARIDGE TOWN$"
gMapName_FallarborTown:: @ 85A0B48
.string "FALLARBOR TOWN$"
gMapName_VerdanturfTown:: @ 85A0B57
.string "VERDANTURF TOWN$"
gMapName_PacifidlogTown:: @ 85A0B67
.string "PACIFIDLOG TOWN$"
gMapName_PetalburgCity:: @ 85A0B77
.string "PETALBURG CITY$"
gMapName_SlateportCity:: @ 85A0B86
.string "SLATEPORT CITY$"
gMapName_MauvilleCity:: @ 85A0B95
.string "MAUVILLE CITY$"
gMapName_RustboroCity:: @ 85A0BA3
.string "RUSTBORO CITY$"
gMapName_FortreeCity:: @ 85A0BB1
.string "FORTREE CITY$"
gMapName_LilycoveCity:: @ 85A0BBE
.string "LILYCOVE CITY$"
gMapName_MossdeepCity:: @ 85A0BCC
.string "MOSSDEEP CITY$"
gMapName_SootopolisCity:: @ 85A0BDA
.string "SOOTOPOLIS CITY$"
gMapName_EverGrandeCity:: @ 85A0BEA
.string "EVER GRANDE CITY$"
gMapName_Route101:: @ 85A0BFB
.string "ROUTE 101$"
gMapName_Route102:: @ 85A0C05
.string "ROUTE 102$"
gMapName_Route103:: @ 85A0C0F
.string "ROUTE 103$"
gMapName_Route104:: @ 85A0C19
.string "ROUTE 104$"
gMapName_Route105:: @ 85A0C23
.string "ROUTE 105$"
gMapName_Route106:: @ 85A0C2D
.string "ROUTE 106$"
gMapName_Route107:: @ 85A0C37
.string "ROUTE 107$"
gMapName_Route108:: @ 85A0C41
.string "ROUTE 108$"
gMapName_Route109:: @ 85A0C4B
.string "ROUTE 109$"
gMapName_Route110:: @ 85A0C55
.string "ROUTE 110$"
gMapName_Route111:: @ 85A0C5F
.string "ROUTE 111$"
gMapName_Route112:: @ 85A0C69
.string "ROUTE 112$"
gMapName_Route113:: @ 85A0C73
.string "ROUTE 113$"
gMapName_Route114:: @ 85A0C7D
.string "ROUTE 114$"
gMapName_Route115:: @ 85A0C87
.string "ROUTE 115$"
gMapName_Route116:: @ 85A0C91
.string "ROUTE 116$"
gMapName_Route117:: @ 85A0C9B
.string "ROUTE 117$"
gMapName_Route118:: @ 85A0CA5
.string "ROUTE 118$"
gMapName_Route119:: @ 85A0CAF
.string "ROUTE 119$"
gMapName_Route120:: @ 85A0CB9
.string "ROUTE 120$"
gMapName_Route121:: @ 85A0CC3
.string "ROUTE 121$"
gMapName_Route122:: @ 85A0CCD
.string "ROUTE 122$"
gMapName_Route123:: @ 85A0CD7
.string "ROUTE 123$"
gMapName_Route124:: @ 85A0CE1
.string "ROUTE 124$"
gMapName_Route125:: @ 85A0CEB
.string "ROUTE 125$"
gMapName_Route126:: @ 85A0CF5
.string "ROUTE 126$"
gMapName_Route127:: @ 85A0CFF
.string "ROUTE 127$"
gMapName_Route128:: @ 85A0D09
.string "ROUTE 128$"
gMapName_Route129:: @ 85A0D13
.string "ROUTE 129$"
gMapName_Route130:: @ 85A0D1D
.string "ROUTE 130$"
gMapName_Route131:: @ 85A0D27
.string "ROUTE 131$"
gMapName_Route132:: @ 85A0D31
.string "ROUTE 132$"
gMapName_Route133:: @ 85A0D3B
.string "ROUTE 133$"
gMapName_Route134:: @ 85A0D45
.string "ROUTE 134$"
gMapName_Underwater:: @ 85A0D4F
.string "UNDERWATER$"
gMapName_GraniteCave:: @ 85A0D5A
.string "GRANITE CAVE$"
gMapName_MtChimney:: @ 85A0D67
.string "MT. CHIMNEY$"
gMapName_SafariZone:: @ 85A0D73
.string "SAFARI ZONE$"
gMapName_BattleFrontier:: @ 85A0D7F
.string "BATTLE FRONTIER$"
gMapName_PetalburgWoods:: @ 85A0D8F
.string "PETALBURG WOODS$"
gMapName_RusturfTunnel:: @ 85A0D9F
.string "RUSTURF TUNNEL$"
gMapName_AbandonedShip:: @ 85A0DAE
.string "ABANDONED SHIP$"
gMapName_NewMauville:: @ 85A0DBD
.string "NEW MAUVILLE$"
gMapName_MeteorFalls:: @ 85A0DCA
.string "METEOR FALLS$"
gMapName_MtPyre:: @ 85A0DD7
.string "MT. PYRE$"
@ This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
@ hideout in Emerald with their own new region map entries, and this name
@ doesn't seem to be used anymore.
gMapName_AquaHideoutOld:: @ 85A0DE0
.string "{AQUA} HIDEOUT$"
gMapName_ShoalCave:: @ 85A0DEB
.string "SHOAL CAVE$"
gMapName_SeafloorCavern:: @ 85A0DF6
.string "SEAFLOOR CAVERN$"
gMapName_VictoryRoad:: @ 85A0E06
.string "VICTORY ROAD$"
gMapName_MirageIsland:: @ 85A0E13
.string "MIRAGE ISLAND$"
gMapName_CaveOfOrigin:: @ 85A0E21
.string "CAVE OF ORIGIN$"
gMapName_SouthernIsland:: @ 85A0E30
.string "SOUTHERN ISLAND$"
gMapName_FieryPath:: @ 85A0E40
.string "FIERY PATH$"
gMapName_JaggedPass:: @ 85A0E4B
.string "JAGGED PASS$"
gMapName_SealedChamber:: @ 85A0E57
.string "SEALED CHAMBER$"
gMapName_ScorchedSlab:: @ 85A0E66
.string "SCORCHED SLAB$"
gMapName_IslandCave:: @ 85A0E74
.string "ISLAND CAVE$"
gMapName_DesertRuins:: @ 85A0E80
.string "DESERT RUINS$"
gMapName_AncientTomb:: @ 85A0E8D
.string "ANCIENT TOMB$"
gMapName_InsideOfTruck:: @ 85A0E9A
.string "INSIDE OF TRUCK$"
gMapName_SkyPillar:: @ 85A0EAA
.string "SKY PILLAR$"
gMapName_SecretBase:: @ 85A0EB5
.string "SECRET BASE$"
gMapName_None:: @ 85A0EC1
.string "$"
gMapName_PalletTown:: @ 85A0EC2
.string "PALLET TOWN$"
gMapName_ViridianCity:: @ 85A0ECE
.string "VIRIDIAN CITY$"
gMapName_PewterCity:: @ 85A0EDC
.string "PEWTER CITY$"
gMapName_CeruleanCity:: @ 85A0EE8
.string "CERULEAN CITY$"
gMapName_LavenderTown:: @ 85A0EF6
.string "LAVENDER TOWN$"
gMapName_VermilionCity:: @ 85A0F04
.string "VERMILION CITY$"
gMapName_CeladonCity:: @ 85A0F13
.string "CELADON CITY$"
gMapName_FuchsiaCity:: @ 85A0F20
.string "FUCHSIA CITY$"
gMapName_CinnabarIsland:: @ 85A0F2D
.string "CINNABAR ISLAND$"
gMapName_IndigoPlateau:: @ 85A0F3D
.string "INDIGO PLATEAU$"
gMapName_SaffronCity:: @ 85A0F4C
.string "SAFFRON CITY$"
gMapName_Route4:: @ 85A0F59
.string "ROUTE 4$"
gMapName_Route10:: @ 85A0F61
.string "ROUTE 10$"
gMapName_Route1:: @ 85A0F6A
.string "ROUTE 1$"
gMapName_Route2:: @ 85A0F72
.string "ROUTE 2$"
gMapName_Route3:: @ 85A0F7A
.string "ROUTE 3$"
gMapName_Route4_2:: @ 85A0F82
.string "ROUTE 4$"
gMapName_Route5:: @ 85A0F8A
.string "ROUTE 5$"
gMapName_Route6:: @ 85A0F92
.string "ROUTE 6$"
gMapName_Route7:: @ 85A0F9A
.string "ROUTE 7$"
gMapName_Route8:: @ 85A0FA2
.string "ROUTE 8$"
gMapName_Route9:: @ 85A0FAA
.string "ROUTE 9$"
gMapName_Route10_2:: @ 85A0FB2
.string "ROUTE 10$"
gMapName_Route11:: @ 85A0FBB
.string "ROUTE 11$"
gMapName_Route12:: @ 85A0FC4
.string "ROUTE 12$"
gMapName_Route13:: @ 85A0FCD
.string "ROUTE 13$"
gMapName_Route14:: @ 85A0FD6
.string "ROUTE 14$"
gMapName_Route15:: @ 85A0FDF
.string "ROUTE 15$"
gMapName_Route16:: @ 85A0FE8
.string "ROUTE 16$"
gMapName_Route17:: @ 85A0FF1
.string "ROUTE 17$"
gMapName_Route18:: @ 85A0FFA
.string "ROUTE 18$"
gMapName_Route19:: @ 85A1003
.string "ROUTE 19$"
gMapName_Route20:: @ 85A100C
.string "ROUTE 20$"
gMapName_Route21:: @ 85A1015
.string "ROUTE 21$"
gMapName_Route22:: @ 85A101E
.string "ROUTE 22$"
gMapName_Route23:: @ 85A1027
.string "ROUTE 23$"
gMapName_Route24:: @ 85A1030
.string "ROUTE 24$"
gMapName_Route25:: @ 85A1039
.string "ROUTE 25$"
gMapName_ViridianForest:: @ 85A1042
.string "VIRIDIAN FOREST$"
gMapName_MtMoon:: @ 85A1052
.string "MT. MOON$"
gMapName_SSAnne:: @ 85A105B
.string "S.S. ANNE$"
gMapName_UndergroundPath:: @ 85A1065
.string "UNDERGROUND PATH$"
gMapName_UndergroundPath2:: @ 85A1076
.string "UNDERGROUND PATH$"
gMapName_DiglettsCave:: @ 85A1087
.string "DIGLETTS CAVE$"
gMapName_KantoVictoryRoad:: @ 85A1096
.string "VICTORY ROAD$"
gMapName_RocketHideout:: @ 85A10A3
.string "ROCKET HIDEOUT$"
gMapName_SilphCo:: @ 85A10B2
.string "SILPH CO.$"
gMapName_PokemonMansion:: @ 85A10BC
.string "POKéMON MANSION$"
gMapName_KantoSafariZone:: @ 85A10CC
.string "SAFARI ZONE$"
gMapName_PokemonLeague:: @ 85A10D8
.string "POKéMON LEAGUE$"
gMapName_RockTunnel:: @ 85A10E7
.string "ROCK TUNNEL$"
gMapName_SeafoamIslands:: @ 85A10F3
.string "SEAFOAM ISLANDS$"
gMapName_PokemonTower:: @ 85A1103
.string "POKéMON TOWER$"
gMapName_CeruleanCave:: @ 85A1111
.string "CERULEAN CAVE$"
gMapName_PowerPlant:: @ 85A111F
.string "POWER PLANT$"
gMapName_OneIsland:: @ 85A112B
.string "ONE ISLAND$"
gMapName_TwoIsland:: @ 85A1136
.string "TWO ISLAND$"
gMapName_ThreeIsland:: @ 85A1141
.string "THREE ISLAND$"
gMapName_FourIsland:: @ 85A114E
.string "FOUR ISLAND$"
gMapName_FiveIsland:: @ 85A115A
.string "FIVE ISLAND$"
gMapName_SevenIsland:: @ 85A1166
.string "SEVEN ISLAND$"
gMapName_SixIsland:: @ 85A1173
.string "SIX ISLAND$"
gMapName_KindleRoad:: @ 85A117E
.string "KINDLE ROAD$"
gMapName_TreasureBeach:: @ 85A118A
.string "TREASURE BEACH$"
gMapName_CapeBrink:: @ 85A1199
.string "CAPE BRINK$"
gMapName_BondBridge:: @ 85A11A4
.string "BOND BRIDGE$"
gMapName_ThreeIslePort:: @ 85A11B0
.string "THREE ISLE PORT$"
gMapName_SeviiIsle6:: @ 85A11C0
.string "SEVII ISLE 6$"
gMapName_SeviiIsle7:: @ 85A11CD
.string "SEVII ISLE 7$"
gMapName_SeviiIsle8:: @ 85A11DA
.string "SEVII ISLE 8$"
gMapName_SeviiIsle9:: @ 85A11E7
.string "SEVII ISLE 9$"
gMapName_ResortGorgeous:: @ 85A11F4
.string "RESORT GORGEOUS$"
gMapName_WaterLabyrinth:: @ 85A1204
.string "WATER LABYRINTH$"
gMapName_FiveIsleMeadow:: @ 85A1214
.string "FIVE ISLE MEADOW$"
gMapName_MemorialPillar:: @ 85A1225
.string "MEMORIAL PILLAR$"
gMapName_OutcastIsland:: @ 85A1235
.string "OUTCAST ISLAND$"
gMapName_GreenPath:: @ 85A1244
.string "GREEN PATH$"
gMapName_WaterPath:: @ 85A124F
.string "WATER PATH$"
gMapName_RuinValley:: @ 85A125A
.string "RUIN VALLEY$"
gMapName_TrainerTower:: @ 85A1266
.string "TRAINER TOWER$"
gMapName_CanyonEntrance:: @ 85A1274
.string "CANYON ENTRANCE$"
gMapName_SevaultCanyon:: @ 85A1284
.string "SEVAULT CANYON$"
gMapName_TanobyRuins:: @ 85A1293
.string "TANOBY RUINS$"
gMapName_SeviiIsle22:: @ 85A12A0
.string "SEVII ISLE 22$"
gMapName_SeviiIsle23:: @ 85A12AE
.string "SEVII ISLE 23$"
gMapName_SeviiIsle24:: @ 85A12BC
.string "SEVII ISLE 24$"
gMapName_NavelRock:: @ 85A12CA
.string "NAVEL ROCK$"
gMapName_MtEmber:: @ 85A12D5
.string "MT. EMBER$"
gMapName_BerryForest:: @ 85A12DF
.string "BERRY FOREST$"
gMapName_IcefallCave:: @ 85A12EC
.string "ICEFALL CAVE$"
gMapName_RocketWarehouse:: @ 85A12F9
.string "ROCKET WAREHOUSE$"
gMapName_TrainerTower2:: @ 85A130A
.string "TRAINER TOWER$"
gMapName_DottedHole:: @ 85A1318
.string "DOTTED HOLE$"
gMapName_LostCave:: @ 85A1324
.string "LOST CAVE$"
gMapName_PatternBush:: @ 85A132E
.string "PATTERN BUSH$"
gMapName_AlteringCave:: @ 85A133B
.string "ALTERING CAVE$"
gMapName_TanobyChambers:: @ 85A1349
.string "TANOBY CHAMBERS$"
gMapName_ThreeIslePath:: @ 85A1359
.string "THREE ISLE PATH$"
gMapName_TanobyKey:: @ 85A1369
.string "TANOBY KEY$"
gMapName_BirthIsland:: @ 85A1374
.string "BIRTH ISLAND$"
gMapName_MoneanChamber:: @ 85A1381
.string "MONEAN CHAMBER$"
gMapName_LiptooChamber:: @ 85A1390
.string "LIPTOO CHAMBER$"
gMapName_WeepthChamber:: @ 85A139F
.string "WEEPTH CHAMBER$"
gMapName_DilfordChamber:: @ 85A13AE
.string "DILFORD CHAMBER$"
gMapName_ScufibChamber:: @ 85A13BE
.string "SCUFIB CHAMBER$"
gMapName_RixyChamber:: @ 85A13CD
.string "RIXY CHAMBER$"
gMapName_ViapoisChamber:: @ 85A13DA
.string "VIAPOIS CHAMBER$"
gMapName_EmberSpa:: @ 85A13EA
.string "EMBER SPA$"
gMapName_SpecialArea:: @ 85A13F4
.string "SPECIAL AREA$"
gMapName_AquaHideout:: @ 85A1401
.string "AQUA HIDEOUT$"
gMapName_MagmaHideout:: @ 85A140E
.string "MAGMA HIDEOUT$"
gMapName_MirageTower:: @ 85A141C
.string "MIRAGE TOWER$"
gMapName_FarawayIsland:: @ 85A1429
.string "FARAWAY ISLAND$"
gMapName_ArtisanCave:: @ 85A1438
.string "ARTISAN CAVE$"
gMapName_MarineCave:: @ 85A1445
.string "MARINE CAVE$"
gMapName_TerraCave:: @ 85A1451
.string "TERRA CAVE$"
gMapName_DesertUnderpass:: @ 85A145C
.string "DESERT UNDERPASS$"
gMapName_TrainerHill:: @ 85A146D
.string "TRAINER HILL$"
.align 2
gRegionMapEntries:: @ 85A147C
region_map_entry 4, 11, 1, 1, LittlerootTown
region_map_entry 4, 9, 1, 1, OldaleTown
region_map_entry 2, 14, 1, 1, DewfordTown
region_map_entry 5, 3, 1, 1, LavaridgeTown
region_map_entry 3, 0, 1, 1, FallarborTown
region_map_entry 4, 6, 1, 1, VerdanturfTown
region_map_entry 17, 10, 1, 1, PacifidlogTown
region_map_entry 1, 9, 1, 1, PetalburgCity
region_map_entry 8, 10, 1, 2, SlateportCity
region_map_entry 8, 6, 2, 1, MauvilleCity
region_map_entry 0, 5, 1, 2, RustboroCity
region_map_entry 12, 0, 1, 1, FortreeCity
region_map_entry 18, 3, 2, 1, LilycoveCity
region_map_entry 24, 5, 2, 1, MossdeepCity
region_map_entry 21, 7, 1, 1, SootopolisCity
region_map_entry 27, 8, 1, 2, EverGrandeCity
region_map_entry 4, 10, 1, 1, Route101
region_map_entry 2, 9, 2, 1, Route102
region_map_entry 4, 8, 4, 1, Route103
region_map_entry 0, 7, 1, 3, Route104
region_map_entry 0, 10, 1, 3, Route105
region_map_entry 0, 13, 2, 1, Route106
region_map_entry 3, 14, 3, 1, Route107
region_map_entry 6, 14, 2, 1, Route108
region_map_entry 8, 12, 1, 3, Route109
region_map_entry 8, 7, 1, 3, Route110
region_map_entry 8, 0, 1, 6, Route111
region_map_entry 6, 3, 2, 1, Route112
region_map_entry 4, 0, 4, 1, Route113
region_map_entry 1, 0, 2, 3, Route114
region_map_entry 0, 2, 1, 3, Route115
region_map_entry 1, 5, 4, 1, Route116
region_map_entry 5, 6, 3, 1, Route117
region_map_entry 10, 6, 2, 1, Route118
region_map_entry 11, 0, 1, 6, Route119
region_map_entry 13, 0, 1, 4, Route120
region_map_entry 14, 3, 4, 1, Route121
region_map_entry 16, 4, 1, 2, Route122
region_map_entry 12, 6, 5, 1, Route123
region_map_entry 20, 3, 4, 3, Route124
region_map_entry 24, 3, 2, 2, Route125
region_map_entry 20, 6, 3, 3, Route126
region_map_entry 23, 6, 3, 3, Route127
region_map_entry 23, 9, 4, 1, Route128
region_map_entry 24, 10, 2, 1, Route129
region_map_entry 21, 10, 3, 1, Route130
region_map_entry 18, 10, 3, 1, Route131
region_map_entry 15, 10, 2, 1, Route132
region_map_entry 12, 10, 3, 1, Route133
region_map_entry 9, 10, 3, 1, Route134
region_map_entry 20, 3, 4, 3, Underwater
region_map_entry 20, 6, 3, 3, Underwater
region_map_entry 23, 6, 3, 3, Underwater
region_map_entry 23, 9, 4, 1, Underwater
region_map_entry 21, 7, 1, 1, Underwater
region_map_entry 1, 13, 1, 1, GraniteCave
region_map_entry 6, 2, 1, 1, MtChimney
region_map_entry 16, 2, 1, 1, SafariZone
region_map_entry 22, 12, 1, 1, BattleFrontier
region_map_entry 0, 8, 1, 1, PetalburgWoods
region_map_entry 2, 5, 1, 1, RusturfTunnel
region_map_entry 6, 14, 1, 1, AbandonedShip
region_map_entry 8, 7, 1, 1, NewMauville
region_map_entry 0, 3, 1, 1, MeteorFalls
region_map_entry 1, 2, 1, 1, MeteorFalls
region_map_entry 16, 4, 1, 1, MtPyre
region_map_entry 19, 3, 1, 1, AquaHideoutOld
region_map_entry 24, 4, 1, 1, ShoalCave
region_map_entry 24, 9, 1, 1, SeafloorCavern
region_map_entry 24, 9, 1, 1, Underwater
region_map_entry 27, 9, 1, 1, VictoryRoad
region_map_entry 17, 10, 1, 1, MirageIsland
region_map_entry 21, 7, 1, 1, CaveOfOrigin
region_map_entry 12, 14, 1, 1, SouthernIsland
region_map_entry 6, 3, 1, 1, FieryPath
region_map_entry 7, 3, 1, 1, FieryPath
region_map_entry 6, 3, 1, 1, JaggedPass
region_map_entry 7, 2, 1, 1, JaggedPass
region_map_entry 11, 10, 1, 1, SealedChamber
region_map_entry 11, 10, 1, 1, Underwater
region_map_entry 13, 0, 1, 1, ScorchedSlab
region_map_entry 0, 10, 1, 1, IslandCave
region_map_entry 8, 3, 1, 1, DesertRuins
region_map_entry 13, 2, 1, 1, AncientTomb
region_map_entry 0, 0, 1, 1, InsideOfTruck
region_map_entry 19, 10, 1, 1, SkyPillar
region_map_entry 0, 0, 1, 1, SecretBase
region_map_entry 0, 0, 1, 1, None
region_map_entry 0, 0, 1, 1, PalletTown
region_map_entry 0, 0, 1, 1, ViridianCity
region_map_entry 0, 0, 1, 1, PewterCity
region_map_entry 0, 0, 1, 1, CeruleanCity
region_map_entry 0, 0, 1, 1, LavenderTown
region_map_entry 0, 0, 1, 1, VermilionCity
region_map_entry 0, 0, 1, 1, CeladonCity
region_map_entry 0, 0, 1, 1, FuchsiaCity
region_map_entry 0, 0, 1, 1, CinnabarIsland
region_map_entry 0, 0, 1, 1, IndigoPlateau
region_map_entry 0, 0, 1, 1, SaffronCity
region_map_entry 0, 0, 1, 1, Route4
region_map_entry 0, 0, 1, 1, Route10
region_map_entry 0, 0, 1, 1, Route1
region_map_entry 0, 0, 1, 1, Route2
region_map_entry 0, 0, 1, 1, Route3
region_map_entry 0, 0, 1, 1, Route4_2
region_map_entry 0, 0, 1, 1, Route5
region_map_entry 0, 0, 1, 1, Route6
region_map_entry 0, 0, 1, 1, Route7
region_map_entry 0, 0, 1, 1, Route8
region_map_entry 0, 0, 1, 1, Route9
region_map_entry 0, 0, 1, 1, Route10_2
region_map_entry 0, 0, 1, 1, Route11
region_map_entry 0, 0, 1, 1, Route12
region_map_entry 0, 0, 1, 1, Route13
region_map_entry 0, 0, 1, 1, Route14
region_map_entry 0, 0, 1, 1, Route15
region_map_entry 0, 0, 1, 1, Route16
region_map_entry 0, 0, 1, 1, Route17
region_map_entry 0, 0, 1, 1, Route18
region_map_entry 0, 0, 1, 1, Route19
region_map_entry 0, 0, 1, 1, Route20
region_map_entry 0, 0, 1, 1, Route21
region_map_entry 0, 0, 1, 1, Route22
region_map_entry 0, 0, 1, 1, Route23
region_map_entry 0, 0, 1, 1, Route24
region_map_entry 0, 0, 1, 1, Route25
region_map_entry 0, 0, 1, 1, ViridianForest
region_map_entry 0, 0, 1, 1, MtMoon
region_map_entry 0, 0, 1, 1, SSAnne
region_map_entry 0, 0, 1, 1, UndergroundPath
region_map_entry 0, 0, 1, 1, UndergroundPath2
region_map_entry 0, 0, 1, 1, DiglettsCave
region_map_entry 0, 0, 1, 1, KantoVictoryRoad
region_map_entry 0, 0, 1, 1, RocketHideout
region_map_entry 0, 0, 1, 1, SilphCo
region_map_entry 0, 0, 1, 1, PokemonMansion
region_map_entry 0, 0, 1, 1, KantoSafariZone
region_map_entry 0, 0, 1, 1, PokemonLeague
region_map_entry 0, 0, 1, 1, RockTunnel
region_map_entry 0, 0, 1, 1, SeafoamIslands
region_map_entry 0, 0, 1, 1, PokemonTower
region_map_entry 0, 0, 1, 1, CeruleanCave
region_map_entry 0, 0, 1, 1, PowerPlant
region_map_entry 0, 0, 1, 1, OneIsland
region_map_entry 0, 0, 1, 1, TwoIsland
region_map_entry 0, 0, 1, 1, ThreeIsland
region_map_entry 0, 0, 1, 1, FourIsland
region_map_entry 0, 0, 1, 1, FiveIsland
region_map_entry 0, 0, 1, 1, SevenIsland
region_map_entry 0, 0, 1, 1, SixIsland
region_map_entry 0, 0, 1, 1, KindleRoad
region_map_entry 0, 0, 1, 1, TreasureBeach
region_map_entry 0, 0, 1, 1, CapeBrink
region_map_entry 0, 0, 1, 1, BondBridge
region_map_entry 0, 0, 1, 1, ThreeIslePort
region_map_entry 0, 0, 1, 1, SeviiIsle6
region_map_entry 0, 0, 1, 1, SeviiIsle7
region_map_entry 0, 0, 1, 1, SeviiIsle8
region_map_entry 0, 0, 1, 1, SeviiIsle9
region_map_entry 0, 0, 1, 1, ResortGorgeous
region_map_entry 0, 0, 1, 1, WaterLabyrinth
region_map_entry 0, 0, 1, 1, FiveIsleMeadow
region_map_entry 0, 0, 1, 1, MemorialPillar
region_map_entry 0, 0, 1, 1, OutcastIsland
region_map_entry 0, 0, 1, 1, GreenPath
region_map_entry 0, 0, 1, 1, WaterPath
region_map_entry 0, 0, 1, 1, RuinValley
region_map_entry 0, 0, 1, 1, TrainerTower
region_map_entry 0, 0, 1, 1, CanyonEntrance
region_map_entry 0, 0, 1, 1, SevaultCanyon
region_map_entry 0, 0, 1, 1, TanobyRuins
region_map_entry 0, 0, 1, 1, SeviiIsle22
region_map_entry 0, 0, 1, 1, SeviiIsle23
region_map_entry 0, 0, 1, 1, SeviiIsle24
region_map_entry 0, 0, 1, 1, NavelRock
region_map_entry 0, 0, 1, 1, MtEmber
region_map_entry 0, 0, 1, 1, BerryForest
region_map_entry 0, 0, 1, 1, IcefallCave
region_map_entry 0, 0, 1, 1, RocketWarehouse
region_map_entry 0, 0, 1, 1, TrainerTower2
region_map_entry 0, 0, 1, 1, DottedHole
region_map_entry 0, 0, 1, 1, LostCave
region_map_entry 0, 0, 1, 1, PatternBush
region_map_entry 0, 0, 1, 1, AlteringCave
region_map_entry 0, 0, 1, 1, TanobyChambers
region_map_entry 0, 0, 1, 1, ThreeIslePath
region_map_entry 0, 0, 1, 1, TanobyKey
region_map_entry 0, 0, 1, 1, BirthIsland
region_map_entry 0, 0, 1, 1, MoneanChamber
region_map_entry 0, 0, 1, 1, LiptooChamber
region_map_entry 0, 0, 1, 1, WeepthChamber
region_map_entry 0, 0, 1, 1, DilfordChamber
region_map_entry 0, 0, 1, 1, ScufibChamber
region_map_entry 0, 0, 1, 1, RixyChamber
region_map_entry 0, 0, 1, 1, ViapoisChamber
region_map_entry 0, 0, 1, 1, EmberSpa
region_map_entry 0, 0, 1, 1, SpecialArea
region_map_entry 19, 3, 1, 1, AquaHideout
region_map_entry 6, 3, 1, 1, MagmaHideout
region_map_entry 8, 2, 1, 1, MirageTower
region_map_entry 0, 0, 1, 1, BirthIsland
region_map_entry 0, 0, 1, 1, FarawayIsland
region_map_entry 22, 12, 1, 1, ArtisanCave
region_map_entry 0, 0, 1, 1, MarineCave
region_map_entry 0, 0, 1, 1, Underwater
region_map_entry 0, 0, 1, 1, TerraCave
region_map_entry 0, 10, 1, 3, Underwater
region_map_entry 24, 3, 2, 2, Underwater
region_map_entry 24, 10, 2, 1, Underwater
region_map_entry 2, 0, 1, 1, DesertUnderpass
region_map_entry 6, 8, 1, 1, AlteringCave
region_map_entry 0, 0, 1, 1, NavelRock
region_map_entry 8, 4, 1, 1, TrainerHill

View File

@@ -3149,10 +3149,10 @@ gText_SelectTheAnswer:: @ 85EC752
gText_LyricsCantBeDeleted:: @ 85EC765
.string "The lyrics cant be deleted.$"
gUnknown_085EC782:: @ 85EC782
gText_PokemonLeague:: @ 85EC782
.string "POKéMON LEAGUE$"
gUnknown_085EC791:: @ 85EC791
gText_PokemonCenter:: @ 85EC791
.string "POKéMON CENTER$"
gText_GetsAPokeBlockQuestion:: @ 85EC7A0

View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
115 205 115
74 148 82
255 98 90
197 65 65
255 255 255
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 156 0
255 255 255
255 255 255
230 230 246
205 205 230
180 180 222
156 156 205
131 131 197
98 98 180
74 74 164
49 49 156
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 0 0
0 0 0
0 0 0
205 205 205
0 0 0
0 0 0
255 213 222
255 164 197
197 98 115
131 131 123
98 90 90
49 49 65
0 0 0
0 0 0
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 B

View File

@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
222 164 148
205 131 115
123 90 82
98 98 115
41 57 65
164 106 82
74 49 57
205 205 222
106 213 65
65 172 32
255 98 90
197 65 65
255 255 255
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

View File

@@ -0,0 +1,35 @@
JASC-PAL
0100
32
0 0 0
156 213 255
164 180 255
123 180 213
74 156 230
41 131 230
65 106 205
0 115 172
32 74 197
0 57 139
213 255 123
172 238 49
98 213 0
57 172 8
0 115 0
205 205 148
0 0 0
255 255 255
238 230 172
238 230 115
238 189 57
246 213 82
230 164 0
255 172 16
255 57 16
246 0 0
148 0 0
205 205 205
98 98 98
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Binary file not shown.

View File

@@ -4,6 +4,8 @@ monfrontdir := graphics/pokemon/anim_front_pics
monpaldir := graphics/pokemon/palettes
INTROGFXDIR := graphics/intro
interfacedir := graphics/interface
PKNAVGFXDIR := graphics/pokenav
MISCGFXDIR := graphics/misc
$(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \
$(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \
@@ -291,5 +293,7 @@ $(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png
$(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png
$(GFX) $< $@ -num_tiles 63
graphics/misc/japanese_hof.4bpp: graphics/misc/japanese_hof.png
$(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png
$(GFX) $< $@ -num_tiles 233
$(MISCGFXDIR)/japanese_hof.4bpp: $(MISCGFXDIR)/japanese_hof.png
$(GFX) $< $@ -num_tiles 29

View File

@@ -0,0 +1,421 @@
#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
static const u8 gMapName_LittlerootTown[] = _("LITTLEROOT TOWN");
static const u8 gMapName_OldaleTown[] = _("OLDALE TOWN");
static const u8 gMapName_DewfordTown[] = _("DEWFORD TOWN");
static const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE TOWN");
static const u8 gMapName_FallarborTown[] = _("FALLARBOR TOWN");
static const u8 gMapName_VerdanturfTown[] = _("VERDANTURF TOWN");
static const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN");
static const u8 gMapName_PetalburgCity[] = _("PETALBURG CITY");
static const u8 gMapName_SlateportCity[] = _("SLATEPORT CITY");
static const u8 gMapName_MauvilleCity[] = _("MAUVILLE CITY");
static const u8 gMapName_RustboroCity[] = _("RUSTBORO CITY");
static const u8 gMapName_FortreeCity[] = _("FORTREE CITY");
static const u8 gMapName_LilycoveCity[] = _("LILYCOVE CITY");
static const u8 gMapName_MossdeepCity[] = _("MOSSDEEP CITY");
static const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS CITY");
static const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE CITY");
static const u8 gMapName_Route101[] = _("ROUTE 101");
static const u8 gMapName_Route102[] = _("ROUTE 102");
static const u8 gMapName_Route103[] = _("ROUTE 103");
static const u8 gMapName_Route104[] = _("ROUTE 104");
static const u8 gMapName_Route105[] = _("ROUTE 105");
static const u8 gMapName_Route106[] = _("ROUTE 106");
static const u8 gMapName_Route107[] = _("ROUTE 107");
static const u8 gMapName_Route108[] = _("ROUTE 108");
static const u8 gMapName_Route109[] = _("ROUTE 109");
static const u8 gMapName_Route110[] = _("ROUTE 110");
static const u8 gMapName_Route111[] = _("ROUTE 111");
static const u8 gMapName_Route112[] = _("ROUTE 112");
static const u8 gMapName_Route113[] = _("ROUTE 113");
static const u8 gMapName_Route114[] = _("ROUTE 114");
static const u8 gMapName_Route115[] = _("ROUTE 115");
static const u8 gMapName_Route116[] = _("ROUTE 116");
static const u8 gMapName_Route117[] = _("ROUTE 117");
static const u8 gMapName_Route118[] = _("ROUTE 118");
static const u8 gMapName_Route119[] = _("ROUTE 119");
static const u8 gMapName_Route120[] = _("ROUTE 120");
static const u8 gMapName_Route121[] = _("ROUTE 121");
static const u8 gMapName_Route122[] = _("ROUTE 122");
static const u8 gMapName_Route123[] = _("ROUTE 123");
static const u8 gMapName_Route124[] = _("ROUTE 124");
static const u8 gMapName_Route125[] = _("ROUTE 125");
static const u8 gMapName_Route126[] = _("ROUTE 126");
static const u8 gMapName_Route127[] = _("ROUTE 127");
static const u8 gMapName_Route128[] = _("ROUTE 128");
static const u8 gMapName_Route129[] = _("ROUTE 129");
static const u8 gMapName_Route130[] = _("ROUTE 130");
static const u8 gMapName_Route131[] = _("ROUTE 131");
static const u8 gMapName_Route132[] = _("ROUTE 132");
static const u8 gMapName_Route133[] = _("ROUTE 133");
static const u8 gMapName_Route134[] = _("ROUTE 134");
static const u8 gMapName_Underwater[] = _("UNDERWATER");
static const u8 gMapName_GraniteCave[] = _("GRANITE CAVE");
static const u8 gMapName_MtChimney[] = _("MT. CHIMNEY");
static const u8 gMapName_SafariZone[] = _("SAFARI ZONE");
static const u8 gMapName_BattleFrontier[] = _("BATTLE FRONTIER");
static const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS");
static const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
static const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP");
static const u8 gMapName_NewMauville[] = _("NEW MAUVILLE");
static const u8 gMapName_MeteorFalls[] = _("METEOR FALLS");
static const u8 gMapName_MtPyre[] = _("MT. PYRE");
// This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a
// hideout in Emerald with their own new region map entries, and this name
// doesn't seem to be used anymore.
static const u8 gMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT");
static const u8 gMapName_ShoalCave[] = _("SHOAL CAVE");
static const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
static const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD");
static const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND");
static const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
static const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
static const u8 gMapName_FieryPath[] = _("FIERY PATH");
static const u8 gMapName_JaggedPass[] = _("JAGGED PASS");
static const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER");
static const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB");
static const u8 gMapName_IslandCave[] = _("ISLAND CAVE");
static const u8 gMapName_DesertRuins[] = _("DESERT RUINS");
static const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB");
static const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
static const u8 gMapName_SkyPillar[] = _("SKY PILLAR");
static const u8 gMapName_SecretBase[] = _("SECRET BASE");
static const u8 gMapName_None[] = _("");
static const u8 gMapName_PalletTown[] = _("PALLET TOWN");
static const u8 gMapName_ViridianCity[] = _("VIRIDIAN CITY");
static const u8 gMapName_PewterCity[] = _("PEWTER CITY");
static const u8 gMapName_CeruleanCity[] = _("CERULEAN CITY");
static const u8 gMapName_LavenderTown[] = _("LAVENDER TOWN");
static const u8 gMapName_VermilionCity[] = _("VERMILION CITY");
static const u8 gMapName_CeladonCity[] = _("CELADON CITY");
static const u8 gMapName_FuchsiaCity[] = _("FUCHSIA CITY");
static const u8 gMapName_CinnabarIsland[] = _("CINNABAR ISLAND");
static const u8 gMapName_IndigoPlateau[] = _("INDIGO PLATEAU");
static const u8 gMapName_SaffronCity[] = _("SAFFRON CITY");
static const u8 gMapName_Route4[] = _("ROUTE 4");
static const u8 gMapName_Route10[] = _("ROUTE 10");
static const u8 gMapName_Route1[] = _("ROUTE 1");
static const u8 gMapName_Route2[] = _("ROUTE 2");
static const u8 gMapName_Route3[] = _("ROUTE 3");
static const u8 gMapName_Route4_2[] = _("ROUTE 4");
static const u8 gMapName_Route5[] = _("ROUTE 5");
static const u8 gMapName_Route6[] = _("ROUTE 6");
static const u8 gMapName_Route7[] = _("ROUTE 7");
static const u8 gMapName_Route8[] = _("ROUTE 8");
static const u8 gMapName_Route9[] = _("ROUTE 9");
static const u8 gMapName_Route10_2[] = _("ROUTE 10");
static const u8 gMapName_Route11[] = _("ROUTE 11");
static const u8 gMapName_Route12[] = _("ROUTE 12");
static const u8 gMapName_Route13[] = _("ROUTE 13");
static const u8 gMapName_Route14[] = _("ROUTE 14");
static const u8 gMapName_Route15[] = _("ROUTE 15");
static const u8 gMapName_Route16[] = _("ROUTE 16");
static const u8 gMapName_Route17[] = _("ROUTE 17");
static const u8 gMapName_Route18[] = _("ROUTE 18");
static const u8 gMapName_Route19[] = _("ROUTE 19");
static const u8 gMapName_Route20[] = _("ROUTE 20");
static const u8 gMapName_Route21[] = _("ROUTE 21");
static const u8 gMapName_Route22[] = _("ROUTE 22");
static const u8 gMapName_Route23[] = _("ROUTE 23");
static const u8 gMapName_Route24[] = _("ROUTE 24");
static const u8 gMapName_Route25[] = _("ROUTE 25");
static const u8 gMapName_ViridianForest[] = _("VIRIDIAN FOREST");
static const u8 gMapName_MtMoon[] = _("MT. MOON");
static const u8 gMapName_SSAnne[] = _("S.S. ANNE");
static const u8 gMapName_UndergroundPath[] = _("UNDERGROUND PATH");
static const u8 gMapName_UndergroundPath2[] = _("UNDERGROUND PATH");
static const u8 gMapName_DiglettsCave[] = _("DIGLETTS CAVE");
static const u8 gMapName_KantoVictoryRoad[] = _("VICTORY ROAD");
static const u8 gMapName_RocketHideout[] = _("ROCKET HIDEOUT");
static const u8 gMapName_SilphCo[] = _("SILPH CO.");
static const u8 gMapName_PokemonMansion[] = _("POKéMON MANSION");
static const u8 gMapName_KantoSafariZone[] = _("SAFARI ZONE");
static const u8 gMapName_PokemonLeague[] = _("POKéMON LEAGUE");
static const u8 gMapName_RockTunnel[] = _("ROCK TUNNEL");
static const u8 gMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS");
static const u8 gMapName_PokemonTower[] = _("POKéMON TOWER");
static const u8 gMapName_CeruleanCave[] = _("CERULEAN CAVE");
static const u8 gMapName_PowerPlant[] = _("POWER PLANT");
static const u8 gMapName_OneIsland[] = _("ONE ISLAND");
static const u8 gMapName_TwoIsland[] = _("TWO ISLAND");
static const u8 gMapName_ThreeIsland[] = _("THREE ISLAND");
static const u8 gMapName_FourIsland[] = _("FOUR ISLAND");
static const u8 gMapName_FiveIsland[] = _("FIVE ISLAND");
static const u8 gMapName_SevenIsland[] = _("SEVEN ISLAND");
static const u8 gMapName_SixIsland[] = _("SIX ISLAND");
static const u8 gMapName_KindleRoad[] = _("KINDLE ROAD");
static const u8 gMapName_TreasureBeach[] = _("TREASURE BEACH");
static const u8 gMapName_CapeBrink[] = _("CAPE BRINK");
static const u8 gMapName_BondBridge[] = _("BOND BRIDGE");
static const u8 gMapName_ThreeIslePort[] = _("THREE ISLE PORT");
static const u8 gMapName_SeviiIsle6[] = _("SEVII ISLE 6");
static const u8 gMapName_SeviiIsle7[] = _("SEVII ISLE 7");
static const u8 gMapName_SeviiIsle8[] = _("SEVII ISLE 8");
static const u8 gMapName_SeviiIsle9[] = _("SEVII ISLE 9");
static const u8 gMapName_ResortGorgeous[] = _("RESORT GORGEOUS");
static const u8 gMapName_WaterLabyrinth[] = _("WATER LABYRINTH");
static const u8 gMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW");
static const u8 gMapName_MemorialPillar[] = _("MEMORIAL PILLAR");
static const u8 gMapName_OutcastIsland[] = _("OUTCAST ISLAND");
static const u8 gMapName_GreenPath[] = _("GREEN PATH");
static const u8 gMapName_WaterPath[] = _("WATER PATH");
static const u8 gMapName_RuinValley[] = _("RUIN VALLEY");
static const u8 gMapName_TrainerTower[] = _("TRAINER TOWER");
static const u8 gMapName_CanyonEntrance[] = _("CANYON ENTRANCE");
static const u8 gMapName_SevaultCanyon[] = _("SEVAULT CANYON");
static const u8 gMapName_TanobyRuins[] = _("TANOBY RUINS");
static const u8 gMapName_SeviiIsle22[] = _("SEVII ISLE 22");
static const u8 gMapName_SeviiIsle23[] = _("SEVII ISLE 23");
static const u8 gMapName_SeviiIsle24[] = _("SEVII ISLE 24");
static const u8 gMapName_NavelRock[] = _("NAVEL ROCK");
static const u8 gMapName_MtEmber[] = _("MT. EMBER");
static const u8 gMapName_BerryForest[] = _("BERRY FOREST");
static const u8 gMapName_IcefallCave[] = _("ICEFALL CAVE");
static const u8 gMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE");
static const u8 gMapName_TrainerTower2[] = _("TRAINER TOWER");
static const u8 gMapName_DottedHole[] = _("DOTTED HOLE");
static const u8 gMapName_LostCave[] = _("LOST CAVE");
static const u8 gMapName_PatternBush[] = _("PATTERN BUSH");
static const u8 gMapName_AlteringCave[] = _("ALTERING CAVE");
static const u8 gMapName_TanobyChambers[] = _("TANOBY CHAMBERS");
static const u8 gMapName_ThreeIslePath[] = _("THREE ISLE PATH");
static const u8 gMapName_TanobyKey[] = _("TANOBY KEY");
static const u8 gMapName_BirthIsland[] = _("BIRTH ISLAND");
static const u8 gMapName_MoneanChamber[] = _("MONEAN CHAMBER");
static const u8 gMapName_LiptooChamber[] = _("LIPTOO CHAMBER");
static const u8 gMapName_WeepthChamber[] = _("WEEPTH CHAMBER");
static const u8 gMapName_DilfordChamber[] = _("DILFORD CHAMBER");
static const u8 gMapName_ScufibChamber[] = _("SCUFIB CHAMBER");
static const u8 gMapName_RixyChamber[] = _("RIXY CHAMBER");
static const u8 gMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER");
static const u8 gMapName_EmberSpa[] = _("EMBER SPA");
static const u8 gMapName_SpecialArea[] = _("SPECIAL AREA");
static const u8 gMapName_AquaHideout[] = _("AQUA HIDEOUT");
static const u8 gMapName_MagmaHideout[] = _("MAGMA HIDEOUT");
static const u8 gMapName_MirageTower[] = _("MIRAGE TOWER");
static const u8 gMapName_FarawayIsland[] = _("FARAWAY ISLAND");
static const u8 gMapName_ArtisanCave[] = _("ARTISAN CAVE");
static const u8 gMapName_MarineCave[] = _("MARINE CAVE");
static const u8 gMapName_TerraCave[] = _("TERRA CAVE");
static const u8 gMapName_DesertUnderpass[] = _("DESERT UNDERPASS");
static const u8 gMapName_TrainerHill[] = _("TRAINER HILL");
const struct RegionMapLocation gRegionMapEntries[] = {
{ 4, 11, 1, 1, gMapName_LittlerootTown},
{ 4, 9, 1, 1, gMapName_OldaleTown},
{ 2, 14, 1, 1, gMapName_DewfordTown},
{ 5, 3, 1, 1, gMapName_LavaridgeTown},
{ 3, 0, 1, 1, gMapName_FallarborTown},
{ 4, 6, 1, 1, gMapName_VerdanturfTown},
{17, 10, 1, 1, gMapName_PacifidlogTown},
{ 1, 9, 1, 1, gMapName_PetalburgCity},
{ 8, 10, 1, 2, gMapName_SlateportCity},
{ 8, 6, 2, 1, gMapName_MauvilleCity},
{ 0, 5, 1, 2, gMapName_RustboroCity},
{12, 0, 1, 1, gMapName_FortreeCity},
{18, 3, 2, 1, gMapName_LilycoveCity},
{24, 5, 2, 1, gMapName_MossdeepCity},
{21, 7, 1, 1, gMapName_SootopolisCity},
{27, 8, 1, 2, gMapName_EverGrandeCity},
{ 4, 10, 1, 1, gMapName_Route101},
{ 2, 9, 2, 1, gMapName_Route102},
{ 4, 8, 4, 1, gMapName_Route103},
{ 0, 7, 1, 3, gMapName_Route104},
{ 0, 10, 1, 3, gMapName_Route105},
{ 0, 13, 2, 1, gMapName_Route106},
{ 3, 14, 3, 1, gMapName_Route107},
{ 6, 14, 2, 1, gMapName_Route108},
{ 8, 12, 1, 3, gMapName_Route109},
{ 8, 7, 1, 3, gMapName_Route110},
{ 8, 0, 1, 6, gMapName_Route111},
{ 6, 3, 2, 1, gMapName_Route112},
{ 4, 0, 4, 1, gMapName_Route113},
{ 1, 0, 2, 3, gMapName_Route114},
{ 0, 2, 1, 3, gMapName_Route115},
{ 1, 5, 4, 1, gMapName_Route116},
{ 5, 6, 3, 1, gMapName_Route117},
{10, 6, 2, 1, gMapName_Route118},
{11, 0, 1, 6, gMapName_Route119},
{13, 0, 1, 4, gMapName_Route120},
{14, 3, 4, 1, gMapName_Route121},
{16, 4, 1, 2, gMapName_Route122},
{12, 6, 5, 1, gMapName_Route123},
{20, 3, 4, 3, gMapName_Route124},
{24, 3, 2, 2, gMapName_Route125},
{20, 6, 3, 3, gMapName_Route126},
{23, 6, 3, 3, gMapName_Route127},
{23, 9, 4, 1, gMapName_Route128},
{24, 10, 2, 1, gMapName_Route129},
{21, 10, 3, 1, gMapName_Route130},
{18, 10, 3, 1, gMapName_Route131},
{15, 10, 2, 1, gMapName_Route132},
{12, 10, 3, 1, gMapName_Route133},
{ 9, 10, 3, 1, gMapName_Route134},
{20, 3, 4, 3, gMapName_Underwater},
{20, 6, 3, 3, gMapName_Underwater},
{23, 6, 3, 3, gMapName_Underwater},
{23, 9, 4, 1, gMapName_Underwater},
{21, 7, 1, 1, gMapName_Underwater},
{ 1, 13, 1, 1, gMapName_GraniteCave},
{ 6, 2, 1, 1, gMapName_MtChimney},
{16, 2, 1, 1, gMapName_SafariZone},
{22, 12, 1, 1, gMapName_BattleFrontier},
{ 0, 8, 1, 1, gMapName_PetalburgWoods},
{ 2, 5, 1, 1, gMapName_RusturfTunnel},
{ 6, 14, 1, 1, gMapName_AbandonedShip},
{ 8, 7, 1, 1, gMapName_NewMauville},
{ 0, 3, 1, 1, gMapName_MeteorFalls},
{ 1, 2, 1, 1, gMapName_MeteorFalls},
{16, 4, 1, 1, gMapName_MtPyre},
{19, 3, 1, 1, gMapName_AquaHideoutOld},
{24, 4, 1, 1, gMapName_ShoalCave},
{24, 9, 1, 1, gMapName_SeafloorCavern},
{24, 9, 1, 1, gMapName_Underwater},
{27, 9, 1, 1, gMapName_VictoryRoad},
{17, 10, 1, 1, gMapName_MirageIsland},
{21, 7, 1, 1, gMapName_CaveOfOrigin},
{12, 14, 1, 1, gMapName_SouthernIsland},
{ 6, 3, 1, 1, gMapName_FieryPath},
{ 7, 3, 1, 1, gMapName_FieryPath},
{ 6, 3, 1, 1, gMapName_JaggedPass},
{ 7, 2, 1, 1, gMapName_JaggedPass},
{11, 10, 1, 1, gMapName_SealedChamber},
{11, 10, 1, 1, gMapName_Underwater},
{13, 0, 1, 1, gMapName_ScorchedSlab},
{ 0, 10, 1, 1, gMapName_IslandCave},
{ 8, 3, 1, 1, gMapName_DesertRuins},
{13, 2, 1, 1, gMapName_AncientTomb},
{ 0, 0, 1, 1, gMapName_InsideOfTruck},
{19, 10, 1, 1, gMapName_SkyPillar},
{ 0, 0, 1, 1, gMapName_SecretBase},
{ 0, 0, 1, 1, gMapName_None},
{ 0, 0, 1, 1, gMapName_PalletTown},
{ 0, 0, 1, 1, gMapName_ViridianCity},
{ 0, 0, 1, 1, gMapName_PewterCity},
{ 0, 0, 1, 1, gMapName_CeruleanCity},
{ 0, 0, 1, 1, gMapName_LavenderTown},
{ 0, 0, 1, 1, gMapName_VermilionCity},
{ 0, 0, 1, 1, gMapName_CeladonCity},
{ 0, 0, 1, 1, gMapName_FuchsiaCity},
{ 0, 0, 1, 1, gMapName_CinnabarIsland},
{ 0, 0, 1, 1, gMapName_IndigoPlateau},
{ 0, 0, 1, 1, gMapName_SaffronCity},
{ 0, 0, 1, 1, gMapName_Route4},
{ 0, 0, 1, 1, gMapName_Route10},
{ 0, 0, 1, 1, gMapName_Route1},
{ 0, 0, 1, 1, gMapName_Route2},
{ 0, 0, 1, 1, gMapName_Route3},
{ 0, 0, 1, 1, gMapName_Route4_2},
{ 0, 0, 1, 1, gMapName_Route5},
{ 0, 0, 1, 1, gMapName_Route6},
{ 0, 0, 1, 1, gMapName_Route7},
{ 0, 0, 1, 1, gMapName_Route8},
{ 0, 0, 1, 1, gMapName_Route9},
{ 0, 0, 1, 1, gMapName_Route10_2},
{ 0, 0, 1, 1, gMapName_Route11},
{ 0, 0, 1, 1, gMapName_Route12},
{ 0, 0, 1, 1, gMapName_Route13},
{ 0, 0, 1, 1, gMapName_Route14},
{ 0, 0, 1, 1, gMapName_Route15},
{ 0, 0, 1, 1, gMapName_Route16},
{ 0, 0, 1, 1, gMapName_Route17},
{ 0, 0, 1, 1, gMapName_Route18},
{ 0, 0, 1, 1, gMapName_Route19},
{ 0, 0, 1, 1, gMapName_Route20},
{ 0, 0, 1, 1, gMapName_Route21},
{ 0, 0, 1, 1, gMapName_Route22},
{ 0, 0, 1, 1, gMapName_Route23},
{ 0, 0, 1, 1, gMapName_Route24},
{ 0, 0, 1, 1, gMapName_Route25},
{ 0, 0, 1, 1, gMapName_ViridianForest},
{ 0, 0, 1, 1, gMapName_MtMoon},
{ 0, 0, 1, 1, gMapName_SSAnne},
{ 0, 0, 1, 1, gMapName_UndergroundPath},
{ 0, 0, 1, 1, gMapName_UndergroundPath2},
{ 0, 0, 1, 1, gMapName_DiglettsCave},
{ 0, 0, 1, 1, gMapName_KantoVictoryRoad},
{ 0, 0, 1, 1, gMapName_RocketHideout},
{ 0, 0, 1, 1, gMapName_SilphCo},
{ 0, 0, 1, 1, gMapName_PokemonMansion},
{ 0, 0, 1, 1, gMapName_KantoSafariZone},
{ 0, 0, 1, 1, gMapName_PokemonLeague},
{ 0, 0, 1, 1, gMapName_RockTunnel},
{ 0, 0, 1, 1, gMapName_SeafoamIslands},
{ 0, 0, 1, 1, gMapName_PokemonTower},
{ 0, 0, 1, 1, gMapName_CeruleanCave},
{ 0, 0, 1, 1, gMapName_PowerPlant},
{ 0, 0, 1, 1, gMapName_OneIsland},
{ 0, 0, 1, 1, gMapName_TwoIsland},
{ 0, 0, 1, 1, gMapName_ThreeIsland},
{ 0, 0, 1, 1, gMapName_FourIsland},
{ 0, 0, 1, 1, gMapName_FiveIsland},
{ 0, 0, 1, 1, gMapName_SevenIsland},
{ 0, 0, 1, 1, gMapName_SixIsland},
{ 0, 0, 1, 1, gMapName_KindleRoad},
{ 0, 0, 1, 1, gMapName_TreasureBeach},
{ 0, 0, 1, 1, gMapName_CapeBrink},
{ 0, 0, 1, 1, gMapName_BondBridge},
{ 0, 0, 1, 1, gMapName_ThreeIslePort},
{ 0, 0, 1, 1, gMapName_SeviiIsle6},
{ 0, 0, 1, 1, gMapName_SeviiIsle7},
{ 0, 0, 1, 1, gMapName_SeviiIsle8},
{ 0, 0, 1, 1, gMapName_SeviiIsle9},
{ 0, 0, 1, 1, gMapName_ResortGorgeous},
{ 0, 0, 1, 1, gMapName_WaterLabyrinth},
{ 0, 0, 1, 1, gMapName_FiveIsleMeadow},
{ 0, 0, 1, 1, gMapName_MemorialPillar},
{ 0, 0, 1, 1, gMapName_OutcastIsland},
{ 0, 0, 1, 1, gMapName_GreenPath},
{ 0, 0, 1, 1, gMapName_WaterPath},
{ 0, 0, 1, 1, gMapName_RuinValley},
{ 0, 0, 1, 1, gMapName_TrainerTower},
{ 0, 0, 1, 1, gMapName_CanyonEntrance},
{ 0, 0, 1, 1, gMapName_SevaultCanyon},
{ 0, 0, 1, 1, gMapName_TanobyRuins},
{ 0, 0, 1, 1, gMapName_SeviiIsle22},
{ 0, 0, 1, 1, gMapName_SeviiIsle23},
{ 0, 0, 1, 1, gMapName_SeviiIsle24},
{ 0, 0, 1, 1, gMapName_NavelRock},
{ 0, 0, 1, 1, gMapName_MtEmber},
{ 0, 0, 1, 1, gMapName_BerryForest},
{ 0, 0, 1, 1, gMapName_IcefallCave},
{ 0, 0, 1, 1, gMapName_RocketWarehouse},
{ 0, 0, 1, 1, gMapName_TrainerTower2},
{ 0, 0, 1, 1, gMapName_DottedHole},
{ 0, 0, 1, 1, gMapName_LostCave},
{ 0, 0, 1, 1, gMapName_PatternBush},
{ 0, 0, 1, 1, gMapName_AlteringCave},
{ 0, 0, 1, 1, gMapName_TanobyChambers},
{ 0, 0, 1, 1, gMapName_ThreeIslePath},
{ 0, 0, 1, 1, gMapName_TanobyKey},
{ 0, 0, 1, 1, gMapName_BirthIsland},
{ 0, 0, 1, 1, gMapName_MoneanChamber},
{ 0, 0, 1, 1, gMapName_LiptooChamber},
{ 0, 0, 1, 1, gMapName_WeepthChamber},
{ 0, 0, 1, 1, gMapName_DilfordChamber},
{ 0, 0, 1, 1, gMapName_ScufibChamber},
{ 0, 0, 1, 1, gMapName_RixyChamber},
{ 0, 0, 1, 1, gMapName_ViapoisChamber},
{ 0, 0, 1, 1, gMapName_EmberSpa},
{ 0, 0, 1, 1, gMapName_SpecialArea},
{19, 3, 1, 1, gMapName_AquaHideout},
{ 6, 3, 1, 1, gMapName_MagmaHideout},
{ 8, 2, 1, 1, gMapName_MirageTower},
{ 0, 0, 1, 1, gMapName_BirthIsland},
{ 0, 0, 1, 1, gMapName_FarawayIsland},
{22, 12, 1, 1, gMapName_ArtisanCave},
{ 0, 0, 1, 1, gMapName_MarineCave},
{ 0, 0, 1, 1, gMapName_Underwater},
{ 0, 0, 1, 1, gMapName_TerraCave},
{ 0, 10, 1, 3, gMapName_Underwater},
{24, 3, 2, 2, gMapName_Underwater},
{24, 10, 2, 1, gMapName_Underwater},
{ 2, 0, 1, 1, gMapName_DesertUnderpass},
{ 6, 8, 1, 1, gMapName_AlteringCave},
{ 0, 0, 1, 1, gMapName_NavelRock},
{ 8, 4, 1, 1, gMapName_TrainerHill}
};
#endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H

View File

@@ -69,9 +69,10 @@ enum FieldEffectScriptIdx
FLDEFF_USE_TELEPORT
};
u8 FieldEffectStart(u8);
bool8 FieldEffectActiveListContains(u8 id);
extern u32 gFieldEffectArguments[8];
u8 FieldEffectStart(u8);
bool8 FieldEffectActiveListContains(u8 id);
void sub_80B69DC(void);
#endif //GUARD_FIELD_EFFECTS_H

View File

@@ -7,102 +7,105 @@
// SYSTEM FLAGS
#define FLAG_SYS_POKEMON_GET CODE_FLAGS + 0
#define FLAG_SYS_POKEDEX_GET CODE_FLAGS + 1
#define FLAG_SYS_POKENAV_GET CODE_FLAGS + 2
#define FLAG_SYS_POKEMON_GET (CODE_FLAGS + 0)
#define FLAG_SYS_POKEDEX_GET (CODE_FLAGS + 1)
#define FLAG_SYS_POKENAV_GET (CODE_FLAGS + 2)
// third one appears unused
#define FLAG_SYS_GAME_CLEAR CODE_FLAGS + 4
#define FLAG_SYS_CHAT_USED CODE_FLAGS + 5
#define FLAG_SYS_HIPSTER_MEET CODE_FLAGS + 6
#define FLAG_SYS_GAME_CLEAR (CODE_FLAGS + 4)
#define FLAG_SYS_CHAT_USED (CODE_FLAGS + 5)
#define FLAG_SYS_HIPSTER_MEET (CODE_FLAGS + 6)
// badges
#define FLAG_BADGE01_GET CODE_FLAGS + 7
#define FLAG_BADGE02_GET CODE_FLAGS + 8
#define FLAG_BADGE03_GET CODE_FLAGS + 9
#define FLAG_BADGE04_GET CODE_FLAGS + 0xA
#define FLAG_BADGE05_GET CODE_FLAGS + 0xB
#define FLAG_BADGE06_GET CODE_FLAGS + 0xC
#define FLAG_BADGE07_GET CODE_FLAGS + 0xD
#define FLAG_BADGE08_GET CODE_FLAGS + 0xE
#define FLAG_BADGE01_GET (CODE_FLAGS + 7)
#define FLAG_BADGE02_GET (CODE_FLAGS + 8)
#define FLAG_BADGE03_GET (CODE_FLAGS + 9)
#define FLAG_BADGE04_GET (CODE_FLAGS + 0xA)
#define FLAG_BADGE05_GET (CODE_FLAGS + 0xB)
#define FLAG_BADGE06_GET (CODE_FLAGS + 0xC)
#define FLAG_BADGE07_GET (CODE_FLAGS + 0xD)
#define FLAG_BADGE08_GET (CODE_FLAGS + 0xE)
// cities and towns
#define FLAG_VISITED_LITTLEROOT_TOWN CODE_FLAGS + 0xF
#define FLAG_VISITED_OLDALE_TOWN CODE_FLAGS + 0x10
#define FLAG_VISITED_DEWFORD_TOWN CODE_FLAGS + 0x11
#define FLAG_VISITED_LAVARIDGE_TOWN CODE_FLAGS + 0x12
#define FLAG_VISITED_FALLARBOR_TOWN CODE_FLAGS + 0x13
#define FLAG_VISITED_VERDANTURF_TOWN CODE_FLAGS + 0x14
#define FLAG_VISITED_PACIFIDLOG_TOWN CODE_FLAGS + 0x15
#define FLAG_VISITED_PETALBURG_CITY CODE_FLAGS + 0x16
#define FLAG_VISITED_SLATEPORT_CITY CODE_FLAGS + 0x17
#define FLAG_VISITED_MAUVILLE_CITY CODE_FLAGS + 0x18
#define FLAG_VISITED_RUSTBORO_CITY CODE_FLAGS + 0x19
#define FLAG_VISITED_FORTREE_CITY CODE_FLAGS + 0x1A
#define FLAG_VISITED_LILYCOVE_CITY CODE_FLAGS + 0x1B
#define FLAG_VISITED_MOSSDEEP_CITY CODE_FLAGS + 0x1C
#define FLAG_VISITED_SOOTOPOLIS_CITY CODE_FLAGS + 0x1D
#define FLAG_VISITED_EVER_GRANDE_CITY CODE_FLAGS + 0x1E
#define FLAG_VISITED_LITTLEROOT_TOWN (CODE_FLAGS + 0xF)
#define FLAG_VISITED_OLDALE_TOWN (CODE_FLAGS + 0x10)
#define FLAG_VISITED_DEWFORD_TOWN (CODE_FLAGS + 0x11)
#define FLAG_VISITED_LAVARIDGE_TOWN (CODE_FLAGS + 0x12)
#define FLAG_VISITED_FALLARBOR_TOWN (CODE_FLAGS + 0x13)
#define FLAG_VISITED_VERDANTURF_TOWN (CODE_FLAGS + 0x14)
#define FLAG_VISITED_PACIFIDLOG_TOWN (CODE_FLAGS + 0x15)
#define FLAG_VISITED_PETALBURG_CITY (CODE_FLAGS + 0x16)
#define FLAG_VISITED_SLATEPORT_CITY (CODE_FLAGS + 0x17)
#define FLAG_VISITED_MAUVILLE_CITY (CODE_FLAGS + 0x18)
#define FLAG_VISITED_RUSTBORO_CITY (CODE_FLAGS + 0x19)
#define FLAG_VISITED_FORTREE_CITY (CODE_FLAGS + 0x1A)
#define FLAG_VISITED_LILYCOVE_CITY (CODE_FLAGS + 0x1B)
#define FLAG_VISITED_MOSSDEEP_CITY (CODE_FLAGS + 0x1C)
#define FLAG_VISITED_SOOTOPOLIS_CITY (CODE_FLAGS + 0x1D)
#define FLAG_VISITED_EVER_GRANDE_CITY (CODE_FLAGS + 0x1E)
#define FLAG_SYS_UNKNOWN_880 CODE_FLAGS + 0x20
#define FLAG_SYS_UNKNOWN_880 (CODE_FLAGS + 0x20)
#define FLAG_SYS_USE_FLASH CODE_FLAGS + 0x28
#define FLAG_SYS_USE_STRENGTH CODE_FLAGS + 0x29
#define FLAG_SYS_WEATHER_CTRL CODE_FLAGS + 0x2A
#define FLAG_SYS_CYCLING_ROAD CODE_FLAGS + 0x2B
#define FLAG_SYS_SAFARI_MODE CODE_FLAGS + 0x2C
#define FLAG_SYS_CRUISE_MODE CODE_FLAGS + 0x2D
#define FLAG_SYS_USE_FLASH (CODE_FLAGS + 0x28)
#define FLAG_SYS_USE_STRENGTH (CODE_FLAGS + 0x29)
#define FLAG_SYS_WEATHER_CTRL (CODE_FLAGS + 0x2A)
#define FLAG_SYS_CYCLING_ROAD (CODE_FLAGS + 0x2B)
#define FLAG_SYS_SAFARI_MODE (CODE_FLAGS + 0x2C)
#define FLAG_SYS_CRUISE_MODE (CODE_FLAGS + 0x2D)
#define FLAG_SYS_TV_HOME CODE_FLAGS + 0x30
#define FLAG_SYS_TV_WATCH CODE_FLAGS + 0x31
#define FLAG_SYS_TV_START CODE_FLAGS + 0x32
#define FLAG_SYS_POPWORD_INPUT CODE_FLAGS + 0x33
#define FLAG_SYS_MIX_RECORD CODE_FLAGS + 0x34
#define FLAG_SYS_CLOCK_SET CODE_FLAGS + 0x35
#define FLAG_SYS_NATIONAL_DEX CODE_FLAGS + 0x36
#define FLAG_SYS_CAVE_SHIP CODE_FLAGS + 0x37
#define FLAG_SYS_CAVE_WONDER CODE_FLAGS + 0x38
#define FLAG_SYS_CAVE_BATTLE CODE_FLAGS + 0x39
#define FLAG_SYS_SHOAL_TIDE CODE_FLAGS + 0x3A
#define FLAG_SYS_RIBBON_GET CODE_FLAGS + 0x3B
#define FLAG_SYS_TV_HOME (CODE_FLAGS + 0x30)
#define FLAG_SYS_TV_WATCH (CODE_FLAGS + 0x31)
#define FLAG_SYS_TV_START (CODE_FLAGS + 0x32)
#define FLAG_SYS_POPWORD_INPUT (CODE_FLAGS + 0x33)
#define FLAG_SYS_MIX_RECORD (CODE_FLAGS + 0x34)
#define FLAG_SYS_CLOCK_SET (CODE_FLAGS + 0x35)
#define FLAG_SYS_NATIONAL_DEX (CODE_FLAGS + 0x36)
#define FLAG_SYS_CAVE_SHIP (CODE_FLAGS + 0x37)
#define FLAG_SYS_CAVE_WONDER (CODE_FLAGS + 0x38)
#define FLAG_SYS_CAVE_BATTLE (CODE_FLAGS + 0x39)
#define FLAG_SYS_SHOAL_TIDE (CODE_FLAGS + 0x3A)
#define FLAG_SYS_RIBBON_GET (CODE_FLAGS + 0x3B)
#define FLAG_SYS_PC_LANETTE CODE_FLAGS + 0x4B
#define FLAG_SYS_MYSTERY_EVENT_ENABLE CODE_FLAGS + 0x4C
#define FLAG_SYS_ENC_UP_ITEM CODE_FLAGS + 0x4D
#define FLAG_SYS_ENC_DOWN_ITEM CODE_FLAGS + 0x4E
#define FLAG_SYS_BRAILLE_DIG CODE_FLAGS + 0x4F
#define FLAG_SYS_BRAILLE_STRENGTH CODE_FLAGS + 0x50
#define FLAG_SYS_BRAILLE_WAIT CODE_FLAGS + 0x51
#define FLAG_SYS_BRAILLE_FLY CODE_FLAGS + 0x52
#define FLAG_SYS_HAS_EON_TICKET CODE_FLAGS + 0x53
#define FLAG_UNLOCK_BATTLE_FRONTIER (CODE_FLAGS + 0x48)
#define FLAG_UNLOCK_SOUTHERN_ISLAND (CODE_FLAGS + 0x49)
#define FLAG_SYS_POKEMON_LEAGUE_FLY CODE_FLAGS + 0x54
#define FLAG_SYS_PC_LANETTE (CODE_FLAGS + 0x4B)
#define FLAG_SYS_MYSTERY_EVENT_ENABLE (CODE_FLAGS + 0x4C)
#define FLAG_SYS_ENC_UP_ITEM (CODE_FLAGS + 0x4D)
#define FLAG_SYS_ENC_DOWN_ITEM (CODE_FLAGS + 0x4E)
#define FLAG_SYS_BRAILLE_DIG (CODE_FLAGS + 0x4F)
#define FLAG_SYS_BRAILLE_STRENGTH (CODE_FLAGS + 0x50)
#define FLAG_SYS_BRAILLE_WAIT (CODE_FLAGS + 0x51)
#define FLAG_SYS_BRAILLE_FLY (CODE_FLAGS + 0x52)
#define FLAG_SYS_HAS_EON_TICKET (CODE_FLAGS + 0x53)
#define FLAG_SYS_TV_LATI CODE_FLAGS + 0x5D
#define FLAG_SYS_POKEMON_LEAGUE_FLY (CODE_FLAGS + 0x54)
#define FLAG_SYS_SHOAL_ITEM CODE_FLAGS + 0x5F
#define FLAG_SYS_B_DASH CODE_FLAGS + 0x60 // got Running Shoes
#define FLAG_SYS_CTRL_OBJ_DELETE CODE_FLAGS + 0x61
#define FLAG_SYS_RESET_RTC_ENABLE CODE_FLAGS + 0x62
#define FLAG_SYS_TV_LATI (CODE_FLAGS + 0x5D)
#define FLAG_SYS_TOWER_SILVER CODE_FLAGS + 0x64
#define FLAG_SYS_TOWER_GOLD CODE_FLAGS + 0x65
#define FLAG_SYS_DOME_SILVER CODE_FLAGS + 0x66
#define FLAG_SYS_DOME_GOLD CODE_FLAGS + 0x67
#define FLAG_SYS_PALACE_SILVER CODE_FLAGS + 0x68
#define FLAG_SYS_PALACE_GOLD CODE_FLAGS + 0x69
#define FLAG_SYS_ARENA_SILVER CODE_FLAGS + 0x6A
#define FLAG_SYS_ARENA_GOLD CODE_FLAGS + 0x6B
#define FLAG_SYS_FACTORY_SILVER CODE_FLAGS + 0x6C
#define FLAG_SYS_FACTORY_GOLD CODE_FLAGS + 0x6D
#define FLAG_SYS_PIKE_SILVER CODE_FLAGS + 0x6E
#define FLAG_SYS_PIKE_GOLD CODE_FLAGS + 0x6F
#define FLAG_SYS_PYRAMID_SILVER CODE_FLAGS + 0x70
#define FLAG_SYS_PYRAMID_GOLD CODE_FLAGS + 0x71
#define FLAG_SYS_FRONTIER_PASS CODE_FLAGS + 0x72
#define FLAG_SYS_SHOAL_ITEM (CODE_FLAGS + 0x5F)
#define FLAG_SYS_B_DASH (CODE_FLAGS + 0x60) // got Running Shoes
#define FLAG_SYS_CTRL_OBJ_DELETE (CODE_FLAGS + 0x61)
#define FLAG_SYS_RESET_RTC_ENABLE (CODE_FLAGS + 0x62)
#define FLAG_SYS_STORAGE_UNKNOWN_FLAG CODE_FLAGS + 0x77
#define FLAG_SYS_TOWER_SILVER (CODE_FLAGS + 0x64)
#define FLAG_SYS_TOWER_GOLD (CODE_FLAGS + 0x65)
#define FLAG_SYS_DOME_SILVER (CODE_FLAGS + 0x66)
#define FLAG_SYS_DOME_GOLD (CODE_FLAGS + 0x67)
#define FLAG_SYS_PALACE_SILVER (CODE_FLAGS + 0x68)
#define FLAG_SYS_PALACE_GOLD (CODE_FLAGS + 0x69)
#define FLAG_SYS_ARENA_SILVER (CODE_FLAGS + 0x6A)
#define FLAG_SYS_ARENA_GOLD (CODE_FLAGS + 0x6B)
#define FLAG_SYS_FACTORY_SILVER (CODE_FLAGS + 0x6C)
#define FLAG_SYS_FACTORY_GOLD (CODE_FLAGS + 0x6D)
#define FLAG_SYS_PIKE_SILVER (CODE_FLAGS + 0x6E)
#define FLAG_SYS_PIKE_GOLD (CODE_FLAGS + 0x6F)
#define FLAG_SYS_PYRAMID_SILVER (CODE_FLAGS + 0x70)
#define FLAG_SYS_PYRAMID_GOLD (CODE_FLAGS + 0x71)
#define FLAG_SYS_FRONTIER_PASS (CODE_FLAGS + 0x72)
#define FLAG_SYS_MYSTERY_GIFT_ENABLE CODE_FLAGS + 0x7B
#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (CODE_FLAGS + 0x77)
#define FLAG_SYS_MYSTERY_GIFT_ENABLE (CODE_FLAGS + 0x7B)
// SPECIAL FLAGS (unknown purpose)

25
include/heal_location.h Normal file
View File

@@ -0,0 +1,25 @@
#ifndef GUARD_HEAL_LOCATION_H
#define GUARD_HEAL_LOCATION_H
// Exported type declarations
struct UnkStruct_0859F534 {
const union AffineAnimCmd *const *const affineAnims;
void (* callback)(struct Sprite *sprite);
};
struct HealLocation
{
s8 group;
s8 map;
u16 x;
u16 y;
};
// Exported RAM declarations
// Exported ROM declarations
const struct HealLocation *GetHealLocationPointer(u32 loc);
#endif //GUARD_HEAL_LOCATION_H

View File

@@ -29,5 +29,7 @@ bool8 free_temp_tile_data_buffers_if_possible(void);
u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
s8 sub_8198C58(void);
void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);
#endif // GUARD_MENU_H

View File

@@ -53,13 +53,16 @@ void Overworld_ChangeMusicTo(u16);
bool32 is_c1_link_related_active(void);
void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
void c2_exit_to_overworld_2_switch(void);
bool32 sub_8087598(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
void warp_in(void);
u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
void sub_8086194(void);
void sub_8084CCC(u8 spawn);
void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum);
void c2_load_new_map(void);
void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);

View File

@@ -2,6 +2,7 @@
#define GUARD_PARTY_MENU_H
bool8 pokemon_has_move(struct Pokemon *, u16);
void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void);
#endif // GUARD_PARTY_MENU_H

View File

@@ -1,227 +1,314 @@
#ifndef GUARD_REGION_MAP_H
#define GUARD_REGION_MAP_H
#include "bg.h"
// Exported type declarations
enum {
REGION_MAP_LITTLEROOT_TOWN,
REGION_MAP_OLDALE_TOWN,
REGION_MAP_DEWFORD_TOWN,
REGION_MAP_LAVARIDGE_TOWN,
REGION_MAP_FALLARBOR_TOWN,
REGION_MAP_VERDANTURF_TOWN,
REGION_MAP_PACIFIDLOG_TOWN,
REGION_MAP_PETALBURG_CITY,
REGION_MAP_SLATEPORT_CITY,
REGION_MAP_MAUVILLE_CITY,
REGION_MAP_RUSTBORO_CITY,
REGION_MAP_FORTREE_CITY,
REGION_MAP_LILYCOVE_CITY,
REGION_MAP_MOSSDEEP_CITY,
REGION_MAP_SOOTOPOLIS_CITY,
REGION_MAP_EVER_GRANDE_CITY,
REGION_MAP_ROUTE_101,
REGION_MAP_ROUTE_102,
REGION_MAP_ROUTE_103,
REGION_MAP_ROUTE_104,
REGION_MAP_ROUTE_105,
REGION_MAP_ROUTE_106,
REGION_MAP_ROUTE_107,
REGION_MAP_ROUTE_108,
REGION_MAP_ROUTE_109,
REGION_MAP_ROUTE_110,
REGION_MAP_ROUTE_111,
REGION_MAP_ROUTE_112,
REGION_MAP_ROUTE_113,
REGION_MAP_ROUTE_114,
REGION_MAP_ROUTE_115,
REGION_MAP_ROUTE_116,
REGION_MAP_ROUTE_117,
REGION_MAP_ROUTE_118,
REGION_MAP_ROUTE_119,
REGION_MAP_ROUTE_120,
REGION_MAP_ROUTE_121,
REGION_MAP_ROUTE_122,
REGION_MAP_ROUTE_123,
REGION_MAP_ROUTE_124,
REGION_MAP_ROUTE_125,
REGION_MAP_ROUTE_126,
REGION_MAP_ROUTE_127,
REGION_MAP_ROUTE_128,
REGION_MAP_ROUTE_129,
REGION_MAP_ROUTE_130,
REGION_MAP_ROUTE_131,
REGION_MAP_ROUTE_132,
REGION_MAP_ROUTE_133,
REGION_MAP_ROUTE_134,
REGION_MAP_UNDERWATER_124,
REGION_MAP_UNDERWATER_125,
REGION_MAP_UNDERWATER_126,
REGION_MAP_UNDERWATER_127,
REGION_MAP_UNDERWATER_128,
REGION_MAP_GRANITE_CAVE,
REGION_MAP_MT_CHIMNEY,
REGION_MAP_SAFARI_ZONE,
REGION_MAP_BATTLE_FRONTIER,
REGION_MAP_PETALBURG_WOODS,
REGION_MAP_RUSTURF_TUNNEL,
REGION_MAP_ABANDONED_SHIP,
REGION_MAP_NEW_MAUVILLE,
REGION_MAP_METEOR_FALLS,
REGION_MAP_METEOR_FALLS2,
REGION_MAP_MT_PYRE,
REGION_MAP_AQUA_HIDEOUT_OLD,
REGION_MAP_SHOAL_CAVE,
REGION_MAP_SEAFLOOR_CAVERN,
REGION_MAP_UNDERWATER,
REGION_MAP_VICTORY_ROAD,
REGION_MAP_MIRAGE_ISLAND,
REGION_MAP_CAVE_OF_ORIGIN,
REGION_MAP_SOUTHERN_ISLAND,
REGION_MAP_FIERY_PATH,
REGION_MAP_FIERY_PATH2,
REGION_MAP_JAGGED_PASS,
REGION_MAP_JAGGED_PASS2,
REGION_MAP_SEALED_CHAMBER,
REGION_MAP_UNDERWATER_SEALED_CHAMBER,
REGION_MAP_SCORCHED_SLAB,
REGION_MAP_ISLAND_CAVE,
REGION_MAP_DESERT_RUINS,
REGION_MAP_ANCIENT_TOMB,
REGION_MAP_INSIDE_OF_TRUCK,
REGION_MAP_SKY_PILLAR,
REGION_MAP_SECRET_BASE,
REGION_MAP_NONE,
REGION_MAP_PALLET_TOWN,
REGION_MAP_VIRIDIAN_CITY,
REGION_MAP_PEWTER_CITY,
REGION_MAP_CERULEAN_CITY,
REGION_MAP_LAVENDER_TOWN,
REGION_MAP_VERMILION_CITY,
REGION_MAP_CELADON_CITY,
REGION_MAP_FUCHSIA_CITY,
REGION_MAP_CINNABAR_ISLAND,
REGION_MAP_INDIGO_PLATEAU,
REGION_MAP_SAFFRON_CITY,
REGION_MAP_ROUTE_4,
REGION_MAP_ROUTE_10,
REGION_MAP_ROUTE_1,
REGION_MAP_ROUTE_2,
REGION_MAP_ROUTE_3,
REGION_MAP_ROUTE_4_2,
REGION_MAP_ROUTE_5,
REGION_MAP_ROUTE_6,
REGION_MAP_ROUTE_7,
REGION_MAP_ROUTE_8,
REGION_MAP_ROUTE_9,
REGION_MAP_ROUTE_10_2,
REGION_MAP_ROUTE_11,
REGION_MAP_ROUTE_12,
REGION_MAP_ROUTE_13,
REGION_MAP_ROUTE_14,
REGION_MAP_ROUTE_15,
REGION_MAP_ROUTE_16,
REGION_MAP_ROUTE_17,
REGION_MAP_ROUTE_18,
REGION_MAP_ROUTE_19,
REGION_MAP_ROUTE_20,
REGION_MAP_ROUTE_21,
REGION_MAP_ROUTE_22,
REGION_MAP_ROUTE_23,
REGION_MAP_ROUTE_24,
REGION_MAP_ROUTE_25,
REGION_MAP_VIRIDIAN_FOREST,
REGION_MAP_MT_MOON,
REGION_MAP_S_S_ANNE,
REGION_MAP_UNDERGROUND_PATH,
REGION_MAP_UNDERGROUND_PATH_2,
REGION_MAP_DIGLETTS_CAVE,
REGION_MAP_KANTO_VICTORY_ROAD,
REGION_MAP_ROCKET_HIDEOUT,
REGION_MAP_SILPH_CO,
REGION_MAP_POKEMON_MANSION,
REGION_MAP_KANTO_SAFARI_ZONE,
REGION_MAP_POKEMON_LEAGUE,
REGION_MAP_ROCK_TUNNEL,
REGION_MAP_SEAFOAM_ISLANDS,
REGION_MAP_POKEMON_TOWER,
REGION_MAP_CERULEAN_CAVE,
REGION_MAP_POWER_PLANT,
REGION_MAP_ONE_ISLAND,
REGION_MAP_TWO_ISLAND,
REGION_MAP_THREE_ISLAND,
REGION_MAP_FOUR_ISLAND,
REGION_MAP_FIVE_ISLAND,
REGION_MAP_SEVEN_ISLAND,
REGION_MAP_SIX_ISLAND,
REGION_MAP_KINDLE_ROAD,
REGION_MAP_TREASURE_BEACH,
REGION_MAP_CAPE_BRINK,
REGION_MAP_BOND_BRIDGE,
REGION_MAP_THREE_ISLE_PORT,
REGION_MAP_SEVII_ISLE_6,
REGION_MAP_SEVII_ISLE_7,
REGION_MAP_SEVII_ISLE_8,
REGION_MAP_SEVII_ISLE_9,
REGION_MAP_RESORT_GORGEOUS,
REGION_MAP_WATER_LABYRINTH,
REGION_MAP_FIVE_ISLE_MEADOW,
REGION_MAP_MEMORIAL_PILLAR,
REGION_MAP_OUTCAST_ISLAND,
REGION_MAP_GREEN_PATH,
REGION_MAP_WATER_PATH,
REGION_MAP_RUIN_VALLEY,
REGION_MAP_TRAINER_TOWER,
REGION_MAP_CANYON_ENTRANCE,
REGION_MAP_SEVAULT_CANYON,
REGION_MAP_TANOBY_RUINS,
REGION_MAP_SEVII_ISLE_22,
REGION_MAP_SEVII_ISLE_23,
REGION_MAP_SEVII_ISLE_24,
REGION_MAP_NAVEL_ROCK,
REGION_MAP_MT_EMBER,
REGION_MAP_BERRY_FOREST,
REGION_MAP_ICEFALL_CAVE,
REGION_MAP_ROCKET_WAREHOUSE,
REGION_MAP_TRAINER_TOWER_2,
REGION_MAP_DOTTED_HOLE,
REGION_MAP_LOST_CAVE,
REGION_MAP_PATTERN_BUSH,
REGION_MAP_ALTERING_CAVE,
REGION_MAP_TANOBY_CHAMBERS,
REGION_MAP_THREE_ISLE_PATH,
REGION_MAP_TANOBY_KEY,
REGION_MAP_BIRTH_ISLAND,
REGION_MAP_MONEAN_CHAMBER,
REGION_MAP_LIPTOO_CHAMBER,
REGION_MAP_WEEPTH_CHAMBER,
REGION_MAP_DILFORD_CHAMBER,
REGION_MAP_SCUFIB_CHAMBER,
REGION_MAP_RIXY_CHAMBER,
REGION_MAP_VIAPOIS_CHAMBER,
REGION_MAP_EMBER_SPA,
REGION_MAP_SPECIAL_AREA,
REGION_MAP_AQUA_HIDEOUT,
REGION_MAP_MAGMA_HIDEOUT,
REGION_MAP_MIRAGE_TOWER,
REGION_MAP_BIRTH_ISLAND_2,
REGION_MAP_FARAWAY_ISLAND,
REGION_MAP_ARTISAN_CAVE,
REGION_MAP_MARINE_CAVE,
REGION_MAP_UNDERWATER_MARINE_CAVE,
REGION_MAP_TERRA_CAVE,
REGION_MAP_UNDERWATER_TERRA_CAVE,
REGION_MAP_UNDERWATER_UNK1,
REGION_MAP_UNDERWATER_UNK2,
REGION_MAP_DESERT_UNDERPASS,
REGION_MAP_ALTERING_CAVE_2,
REGION_MAP_NAVEL_ROCK2,
REGION_MAP_TRAINER_HILL
MAPSEC_LITTLEROOT_TOWN,
MAPSEC_OLDALE_TOWN,
MAPSEC_DEWFORD_TOWN,
MAPSEC_LAVARIDGE_TOWN,
MAPSEC_FALLARBOR_TOWN,
MAPSEC_VERDANTURF_TOWN,
MAPSEC_PACIFIDLOG_TOWN,
MAPSEC_PETALBURG_CITY,
MAPSEC_SLATEPORT_CITY,
MAPSEC_MAUVILLE_CITY,
MAPSEC_RUSTBORO_CITY,
MAPSEC_FORTREE_CITY,
MAPSEC_LILYCOVE_CITY,
MAPSEC_MOSSDEEP_CITY,
MAPSEC_SOOTOPOLIS_CITY,
MAPSEC_EVER_GRANDE_CITY,
MAPSEC_ROUTE_101,
MAPSEC_ROUTE_102,
MAPSEC_ROUTE_103,
MAPSEC_ROUTE_104,
MAPSEC_ROUTE_105,
MAPSEC_ROUTE_106,
MAPSEC_ROUTE_107,
MAPSEC_ROUTE_108,
MAPSEC_ROUTE_109,
MAPSEC_ROUTE_110,
MAPSEC_ROUTE_111,
MAPSEC_ROUTE_112,
MAPSEC_ROUTE_113,
MAPSEC_ROUTE_114,
MAPSEC_ROUTE_115,
MAPSEC_ROUTE_116,
MAPSEC_ROUTE_117,
MAPSEC_ROUTE_118,
MAPSEC_ROUTE_119,
MAPSEC_ROUTE_120,
MAPSEC_ROUTE_121,
MAPSEC_ROUTE_122,
MAPSEC_ROUTE_123,
MAPSEC_ROUTE_124,
MAPSEC_ROUTE_125,
MAPSEC_ROUTE_126,
MAPSEC_ROUTE_127,
MAPSEC_ROUTE_128,
MAPSEC_ROUTE_129,
MAPSEC_ROUTE_130,
MAPSEC_ROUTE_131,
MAPSEC_ROUTE_132,
MAPSEC_ROUTE_133,
MAPSEC_ROUTE_134,
MAPSEC_UNDERWATER_124,
MAPSEC_UNDERWATER_125,
MAPSEC_UNDERWATER_126,
MAPSEC_UNDERWATER_127,
MAPSEC_UNDERWATER_SOOTOPOLIS,
MAPSEC_GRANITE_CAVE,
MAPSEC_MT_CHIMNEY,
MAPSEC_SAFARI_ZONE,
MAPSEC_BATTLE_FRONTIER,
MAPSEC_PETALBURG_WOODS,
MAPSEC_RUSTURF_TUNNEL,
MAPSEC_ABANDONED_SHIP,
MAPSEC_NEW_MAUVILLE,
MAPSEC_METEOR_FALLS,
MAPSEC_METEOR_FALLS2,
MAPSEC_MT_PYRE,
MAPSEC_AQUA_HIDEOUT_OLD,
MAPSEC_SHOAL_CAVE,
MAPSEC_SEAFLOOR_CAVERN,
MAPSEC_UNDERWATER_128,
MAPSEC_VICTORY_ROAD,
MAPSEC_MIRAGE_ISLAND,
MAPSEC_CAVE_OF_ORIGIN,
MAPSEC_SOUTHERN_ISLAND,
MAPSEC_FIERY_PATH,
MAPSEC_FIERY_PATH2,
MAPSEC_JAGGED_PASS,
MAPSEC_JAGGED_PASS2,
MAPSEC_SEALED_CHAMBER,
MAPSEC_UNDERWATER_SEALED_CHAMBER,
MAPSEC_SCORCHED_SLAB,
MAPSEC_ISLAND_CAVE,
MAPSEC_DESERT_RUINS,
MAPSEC_ANCIENT_TOMB,
MAPSEC_INSIDE_OF_TRUCK,
MAPSEC_SKY_PILLAR,
MAPSEC_SECRET_BASE,
MAPSEC_DYNAMIC,
MAPSEC_PALLET_TOWN,
MAPSEC_VIRIDIAN_CITY,
MAPSEC_PEWTER_CITY,
MAPSEC_CERULEAN_CITY,
MAPSEC_LAVENDER_TOWN,
MAPSEC_VERMILION_CITY,
MAPSEC_CELADON_CITY,
MAPSEC_FUCHSIA_CITY,
MAPSEC_CINNABAR_ISLAND,
MAPSEC_INDIGO_PLATEAU,
MAPSEC_SAFFRON_CITY,
MAPSEC_ROUTE_4,
MAPSEC_ROUTE_10,
MAPSEC_ROUTE_1,
MAPSEC_ROUTE_2,
MAPSEC_ROUTE_3,
MAPSEC_ROUTE_4_2,
MAPSEC_ROUTE_5,
MAPSEC_ROUTE_6,
MAPSEC_ROUTE_7,
MAPSEC_ROUTE_8,
MAPSEC_ROUTE_9,
MAPSEC_ROUTE_10_2,
MAPSEC_ROUTE_11,
MAPSEC_ROUTE_12,
MAPSEC_ROUTE_13,
MAPSEC_ROUTE_14,
MAPSEC_ROUTE_15,
MAPSEC_ROUTE_16,
MAPSEC_ROUTE_17,
MAPSEC_ROUTE_18,
MAPSEC_ROUTE_19,
MAPSEC_ROUTE_20,
MAPSEC_ROUTE_21,
MAPSEC_ROUTE_22,
MAPSEC_ROUTE_23,
MAPSEC_ROUTE_24,
MAPSEC_ROUTE_25,
MAPSEC_VIRIDIAN_FOREST,
MAPSEC_MT_MOON,
MAPSEC_S_S_ANNE,
MAPSEC_UNDERGROUND_PATH,
MAPSEC_UNDERGROUND_PATH_2,
MAPSEC_DIGLETTS_CAVE,
MAPSEC_KANTO_VICTORY_ROAD,
MAPSEC_ROCKET_HIDEOUT,
MAPSEC_SILPH_CO,
MAPSEC_POKEMON_MANSION,
MAPSEC_KANTO_SAFARI_ZONE,
MAPSEC_POKEMON_LEAGUE,
MAPSEC_ROCK_TUNNEL,
MAPSEC_SEAFOAM_ISLANDS,
MAPSEC_POKEMON_TOWER,
MAPSEC_CERULEAN_CAVE,
MAPSEC_POWER_PLANT,
MAPSEC_ONE_ISLAND,
MAPSEC_TWO_ISLAND,
MAPSEC_THREE_ISLAND,
MAPSEC_FOUR_ISLAND,
MAPSEC_FIVE_ISLAND,
MAPSEC_SEVEN_ISLAND,
MAPSEC_SIX_ISLAND,
MAPSEC_KINDLE_ROAD,
MAPSEC_TREASURE_BEACH,
MAPSEC_CAPE_BRINK,
MAPSEC_BOND_BRIDGE,
MAPSEC_THREE_ISLE_PORT,
MAPSEC_SEVII_ISLE_6,
MAPSEC_SEVII_ISLE_7,
MAPSEC_SEVII_ISLE_8,
MAPSEC_SEVII_ISLE_9,
MAPSEC_RESORT_GORGEOUS,
MAPSEC_WATER_LABYRINTH,
MAPSEC_FIVE_ISLE_MEADOW,
MAPSEC_MEMORIAL_PILLAR,
MAPSEC_OUTCAST_ISLAND,
MAPSEC_GREEN_PATH,
MAPSEC_WATER_PATH,
MAPSEC_RUIN_VALLEY,
MAPSEC_TRAINER_TOWER,
MAPSEC_CANYON_ENTRANCE,
MAPSEC_SEVAULT_CANYON,
MAPSEC_TANOBY_RUINS,
MAPSEC_SEVII_ISLE_22,
MAPSEC_SEVII_ISLE_23,
MAPSEC_SEVII_ISLE_24,
MAPSEC_NAVEL_ROCK,
MAPSEC_MT_EMBER,
MAPSEC_BERRY_FOREST,
MAPSEC_ICEFALL_CAVE,
MAPSEC_ROCKET_WAREHOUSE,
MAPSEC_TRAINER_TOWER_2,
MAPSEC_DOTTED_HOLE,
MAPSEC_LOST_CAVE,
MAPSEC_PATTERN_BUSH,
MAPSEC_ALTERING_CAVE,
MAPSEC_TANOBY_CHAMBERS,
MAPSEC_THREE_ISLE_PATH,
MAPSEC_TANOBY_KEY,
MAPSEC_BIRTH_ISLAND,
MAPSEC_MONEAN_CHAMBER,
MAPSEC_LIPTOO_CHAMBER,
MAPSEC_WEEPTH_CHAMBER,
MAPSEC_DILFORD_CHAMBER,
MAPSEC_SCUFIB_CHAMBER,
MAPSEC_RIXY_CHAMBER,
MAPSEC_VIAPOIS_CHAMBER,
MAPSEC_EMBER_SPA,
MAPSEC_SPECIAL_AREA,
MAPSEC_AQUA_HIDEOUT,
MAPSEC_MAGMA_HIDEOUT,
MAPSEC_MIRAGE_TOWER,
MAPSEC_BIRTH_ISLAND_2,
MAPSEC_FARAWAY_ISLAND,
MAPSEC_ARTISAN_CAVE,
MAPSEC_MARINE_CAVE,
MAPSEC_UNDERWATER_MARINE_CAVE,
MAPSEC_TERRA_CAVE,
MAPSEC_UNDERWATER_TERRA_CAVE,
MAPSEC_UNDERWATER_UNK1,
MAPSEC_UNDERWATER_129,
MAPSEC_DESERT_UNDERPASS,
MAPSEC_ALTERING_CAVE_2,
MAPSEC_NAVEL_ROCK2,
MAPSEC_TRAINER_HILL,
MAPSEC_NONE
};
enum
{
INPUT_EVENT_NONE,
INPUT_EVENT_MOVE_START,
INPUT_EVENT_MOVE_CONT,
INPUT_EVENT_MOVE_END,
INPUT_EVENT_A_BUTTON,
INPUT_EVENT_B_BUTTON,
};
enum {
MAPSECTYPE_NONE,
MAPSECTYPE_PLAIN,
MAPSECTYPE_CITY_CANFLY,
MAPSECTYPE_CITY_CANTFLY,
MAPSECTYPE_BATTLE_FRONTIER
};
struct RegionMap {
/*0x000*/ u16 mapSecId;
/*0x002*/ u8 iconDrawType;
/*0x003*/ u8 posWithinMapSec;
/*0x004*/ u8 mapSecName[0x14];
/*0x018*/ u8 (*inputCallback)(void);
/*0x01c*/ struct Sprite *cursorSprite;
/*0x020*/ struct Sprite *playerIconSprite;
/*0x024*/ s32 bg2x;
/*0x028*/ s32 bg2y;
/*0x02c*/ u32 bg2pa;
/*0x034*/ u32 bg2pc;
/*0x030*/ u32 bg2pb;
/*0x038*/ u32 bg2pd;
/*0x03c*/ s32 unk_03c;
/*0x040*/ s32 unk_040;
/*0x044*/ s32 unk_044;
/*0x048*/ s32 unk_048;
/*0x04c*/ s32 unk_04c;
/*0x050*/ s32 unk_050;
/*0x054*/ u16 cursorPosX;
/*0x056*/ u16 cursorPosY;
/*0x058*/ u16 cursorTileTag;
/*0x05a*/ u16 cursorPaletteTag;
/*0x05c*/ s16 scrollX;
/*0x05e*/ s16 scrollY;
/*0x060*/ s16 unk_060;
/*0x062*/ s16 unk_062;
/*0x064*/ u16 zoomedCursorPosX;
/*0x066*/ u16 zoomedCursorPosY;
/*0x068*/ s16 zoomedCursorDeltaY;
/*0x06a*/ s16 zoomedCursorDeltaX;
/*0x06c*/ u16 zoomedCursorMovementFrameCounter;
/*0x06e*/ u16 unk_06e;
/*0x070*/ u16 playerIconTileTag;
/*0x072*/ u16 playerIconPaletteTag;
/*0x074*/ u16 playerIconSpritePosX;
/*0x076*/ u16 playerIconSpritePosY;
/*0x078*/ bool8 zoomed;
/*0x079*/ u8 initStep;
/*0x07a*/ s8 cursorMovementFrameCounter;
/*0x07b*/ s8 cursorDeltaX;
/*0x07c*/ s8 cursorDeltaY;
/*0x07d*/ bool8 needUpdateVideoRegs;
/*0x07e*/ bool8 blinkPlayerIcon;
/*0x07f*/ bool8 playerIsInCave;
/*0x080*/ u8 bgNum;
/*0x081*/ u8 charBaseIdx;
/*0x082*/ u8 mapBaseIdx;
/*0x083*/ bool8 bgManaged;
/*0x084*/ u8 filler_084[0x100];
/*0x184*/ u8 cursorSmallImage[0x100];
/*0x284*/ u8 cursorLargeImage[0x600];
}; // size = 0x884
// Exported RAM declarations
// Exported ROM declarations
void GetMapName(u8 *, u16, u16);
void sub_8122CF8(struct RegionMap *regionMap, struct BgTemplate *template, bool8 zoomed);
bool8 sub_8122DB0(void);
void UpdateRegionMapVideoRegs(void);
void InitRegionMap(struct RegionMap *regionMap, u8 argument);
u8 sub_81230AC(void);
bool8 sub_8123514(void);
void FreeRegionMapIconResources(void);
u16 GetRegionMapSectionIdAt(u16 x, u16 y);
void CreateRegionMapPlayerIcon(u16 x, u16 y);
void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
u8 *GetMapName(u8 *, u16, u16);
bool32 sub_8124668(u8 mapSecId);
#endif //GUARD_REGION_MAP_H

View File

@@ -3,6 +3,7 @@
void sub_81357FC(u8, void(void));
u8 GetLeadMonIndex(void);
u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
void sub_813BADC(bool8);
#endif //GUARD_ROM6_H

View File

@@ -8,5 +8,6 @@
// Exported ROM declarations
void sub_80E9578(void);
void sub_80E980C(void);
u8 *GetSecretBaseMapName(u8 *dest);
#endif //GUARD_SECRET_BASE_H

View File

@@ -70,6 +70,13 @@ extern const u8 gText_Cushion[];
extern const u8 gText_Decorate[];
extern const u8 gText_PutAway[];
extern const u8 gText_Toss2[];
extern const u8 gText_Hoenn[];
extern const u8 gText_Ferry[];
extern const u8 gText_SecretBase[];
extern const u8 gText_Hideout[];
extern const u8 gText_FlyToWhere[];
extern const u8 gText_PokemonLeague[];
extern const u8 gText_PokemonCenter[];
extern const u8 gText_ApostropheSBase[];
extern const u8 gText_NoRegistry[];
extern const u8 gText_OkayToDeleteFromRegistry[];

View File

@@ -29,13 +29,14 @@
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
#define VAR_0x4037 0x4037
#define VAR_DAYS 0x4040
#define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_STORAGE_UNKNOWN 0x4036
#define VAR_POKELOT_PRIZE 0x4045
#define VAR_NATIONAL_DEX 0x4046
#define VAR_SEEDOT_SIZE_RECORD 0x4047
#define VAR_SEEDOT_SIZE_RECORD 0x4047
#define VAR_ASH_GATHER_COUNT 0x4048
#define VAR_BIRCH_STATE 0x4049
#define VAR_CRUISE_STEP_COUNT 0x404A

View File

@@ -169,8 +169,8 @@ SECTIONS {
src/mail.o(.text);
asm/menu_helpers.o(.text);
asm/dewford_trend.o(.text);
asm/heal_location.o(.text);
asm/region_map.o(.text);
src/heal_location.o(.text);
src/region_map.o(.text);
asm/cute_sketch.o(.text);
src/decoration.o(.text);
asm/slot_machine.o(.text);
@@ -214,7 +214,7 @@ SECTIONS {
asm/player_pc.o(.text);
asm/intro.o(.text);
src/reset_save_heap.o(.text);
asm/field_region_map.o(.text);
src/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text);
src/hall_of_fame.o(.text);
asm/credits.o(.text);
@@ -416,8 +416,8 @@ SECTIONS {
data/mauville_old_man.o(.rodata);
src/mail.o(.rodata);
data/menu_helpers.o(.rodata);
data/heal_location.o(.rodata);
data/region_map.o(.rodata);
src/heal_location.o(.rodata);
src/region_map.o(.rodata);
data/cute_sketch.o(.rodata);
src/decoration.o(.rodata);
data/slot_machine.o(.rodata);
@@ -441,7 +441,7 @@ SECTIONS {
src/battle_controller_wally.o(.rodata);
data/player_pc.o(.rodata);
data/intro.o(.rodata);
data/field_region_map.o(.rodata);
src/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata);
src/hall_of_fame.o(.rodata);
data/credits.o(.rodata);

View File

@@ -1603,7 +1603,7 @@ void sub_81289F0(u8 taskId)
ScriptContext1_SetupScript(EventScript_275D1F);
}
gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
{
TV_PutSecretBaseVisitOnTheAir();
}
@@ -2222,7 +2222,7 @@ void sub_81298EC(u8 taskId)
{
StringExpandPlaceholders(gStringVar4, gText_DecorationReturnedToPC);
DisplayItemMessageOnField(taskId, gStringVar4, sub_8129D64);
if (gMapHeader.regionMapSectionId == REGION_MAP_SECRET_BASE)
if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
{
TV_PutSecretBaseVisitOnTheAir();
}

193
src/field_region_map.c Normal file
View File

@@ -0,0 +1,193 @@
// Includes
#include "global.h"
#include "main.h"
#include "malloc.h"
#include "gpu_regs.h"
#include "bg.h"
#include "text.h"
#include "window.h"
#include "text_window.h"
#include "palette.h"
#include "menu.h"
#include "strings.h"
#include "international_string_util.h"
#include "region_map.h"
// Static type declarations
// Static RAM declarations
static EWRAM_DATA struct {
MainCallback callback;
u32 filler_004;
struct RegionMap regionMap;
u16 state;
} *sFieldRegionMapHandler = NULL;
// Static ROM declarations
static void MCB2_InitRegionMapRegisters(void);
static void VBCB_FieldUpdateRegionMap(void);
static void MCB2_FieldUpdateRegionMap(void);
static void FieldUpdateRegionMap(void);
static void PrintRegionMapSecName(void);
// .rodata
static const struct BgTemplate gUnknown_085E5068[] = {
{
.bg = 0,
.charBaseIndex = 0,
.mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
}, {
.bg = 2,
.charBaseIndex = 2,
.mapBaseIndex = 28,
.screenSize = 2,
.paletteMode = 1,
.priority = 2,
.baseTile = 0
}
};
static const struct WindowTemplate gUnknown_085E5070[] = {
{ 0, 17, 17, 12, 2, 15, 0x0001 },
{ 0, 22, 1, 7, 2, 15, 0x0019 },
DUMMY_WIN_TEMPLATE
};
// .text
void sub_817018C(MainCallback callback)
{
SetVBlankCallback(NULL);
sFieldRegionMapHandler = malloc(sizeof(*sFieldRegionMapHandler));
sFieldRegionMapHandler->state = 0;
sFieldRegionMapHandler->callback = callback;
SetMainCallback2(MCB2_InitRegionMapRegisters);
}
static void MCB2_InitRegionMapRegisters(void)
{
SetGpuReg(REG_OFFSET_DISPCNT, 0);
SetGpuReg(REG_OFFSET_BG0HOFS, 0);
SetGpuReg(REG_OFFSET_BG0VOFS, 0);
SetGpuReg(REG_OFFSET_BG1HOFS, 0);
SetGpuReg(REG_OFFSET_BG1VOFS, 0);
SetGpuReg(REG_OFFSET_BG2HOFS, 0);
SetGpuReg(REG_OFFSET_BG2VOFS, 0);
SetGpuReg(REG_OFFSET_BG3HOFS, 0);
SetGpuReg(REG_OFFSET_BG3VOFS, 0);
ResetSpriteData();
FreeAllSpritePalettes();
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(1, gUnknown_085E5068, 2);
InitWindows(gUnknown_085E5070);
DeactivateAllTextPrinters();
sub_809882C(0, 0x27, 0xd0);
clear_scheduled_bg_copies_to_vram();
SetMainCallback2(MCB2_FieldUpdateRegionMap);
SetVBlankCallback(VBCB_FieldUpdateRegionMap);
}
static void VBCB_FieldUpdateRegionMap(void)
{
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
}
static void MCB2_FieldUpdateRegionMap(void)
{
FieldUpdateRegionMap();
AnimateSprites();
BuildOamBuffer();
UpdatePaletteFade();
do_scheduled_bg_tilemap_copies_to_vram();
}
static void FieldUpdateRegionMap(void)
{
u8 offset;
switch (sFieldRegionMapHandler->state)
{
case 0:
InitRegionMap(&sFieldRegionMapHandler->regionMap, 0);
CreateRegionMapPlayerIcon(0, 0);
CreateRegionMapCursor(1, 1);
sFieldRegionMapHandler->state++;
break;
case 1:
SetWindowBorderStyle(1, 0, 0x27, 0xd);
offset = GetStringCenterAlignXOffset(1, gText_Hoenn, 0x38);
PrintTextOnWindow(1, 1, gText_Hoenn, offset, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
SetWindowBorderStyle(0, 0, 0x27, 0xd);
PrintRegionMapSecName();
BeginNormalPaletteFade(-1, 0, 16, 0, 0);
sFieldRegionMapHandler->state++;
break;
case 2:
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
ShowBg(0);
ShowBg(2);
sFieldRegionMapHandler->state++;
break;
case 3:
if (!gPaletteFade.active)
{
sFieldRegionMapHandler->state++;
}
break;
case 4:
switch (sub_81230AC())
{
case INPUT_EVENT_MOVE_END:
PrintRegionMapSecName();
break;
case INPUT_EVENT_A_BUTTON:
case INPUT_EVENT_B_BUTTON:
sFieldRegionMapHandler->state++;
break;
}
break;
case 5:
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
sFieldRegionMapHandler->state++;
break;
case 6:
if (!gPaletteFade.active)
{
FreeRegionMapIconResources();
SetMainCallback2(sFieldRegionMapHandler->callback);
if (sFieldRegionMapHandler != NULL)
{
free(sFieldRegionMapHandler);
sFieldRegionMapHandler = NULL;
}
FreeAllWindowBuffers();
}
break;
}
}
static void PrintRegionMapSecName(void)
{
if (sFieldRegionMapHandler->regionMap.iconDrawType != MAPSECTYPE_NONE)
{
FillWindowPixelBuffer(0, 0x11);
PrintTextOnWindow(0, 1, sFieldRegionMapHandler->regionMap.mapSecName, 0, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
}
else
{
FillWindowPixelBuffer(0, 0x11);
CopyWindowToVram(0, 3);
}
}

83
src/heal_location.c Normal file
View File

@@ -0,0 +1,83 @@
// Includes
#include "global.h"
#include "map_constants.h"
#include "heal_location.h"
#define HEAL_LOCATION(map, x, y) {MAP_GROUP_##map, MAP_ID_##map, x, y}
// Static type declarations
// Static RAM declarations
// Static ROM declarations
// .rodata
static const struct HealLocation sHealLocations[] = {
HEAL_LOCATION(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2),
HEAL_LOCATION(LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2),
HEAL_LOCATION(PETALBURG_CITY, 20, 17),
HEAL_LOCATION(SLATEPORT_CITY, 19, 20),
HEAL_LOCATION(MAUVILLE_CITY, 22, 6),
HEAL_LOCATION(RUSTBORO_CITY, 16, 39),
HEAL_LOCATION(FORTREE_CITY, 5, 7),
HEAL_LOCATION(LILYCOVE_CITY, 24, 15),
HEAL_LOCATION(MOSSDEEP_CITY, 28, 17),
HEAL_LOCATION(SOOTOPOLIS_CITY, 43, 32),
HEAL_LOCATION(EVER_GRANDE_CITY, 27, 49),
HEAL_LOCATION(LITTLEROOT_TOWN, 5, 9),
HEAL_LOCATION(LITTLEROOT_TOWN, 14, 9),
HEAL_LOCATION(OLDALE_TOWN, 6, 17),
HEAL_LOCATION(DEWFORD_TOWN, 2, 11),
HEAL_LOCATION(LAVARIDGE_TOWN, 9, 7),
HEAL_LOCATION(FALLARBOR_TOWN, 14, 8),
HEAL_LOCATION(VERDANTURF_TOWN, 16, 4),
HEAL_LOCATION(PACIFIDLOG_TOWN, 8, 16),
HEAL_LOCATION(EVER_GRANDE_CITY, 18, 6),
HEAL_LOCATION(SOUTHERN_ISLAND_EXTERIOR, 15, 20),
HEAL_LOCATION(BATTLE_FRONTIER_OUTSIDE_EAST, 3, 52)
};
#define NUM_HEAL_LOCATIONS (ARRAY_COUNT(sHealLocations))
// .text
static u32 GetHealLocationIndexFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
{
u32 i;
for (i = 0; i < NUM_HEAL_LOCATIONS; i++)
{
if (sHealLocations[i].group == mapGroup && sHealLocations[i].map == mapNum)
{
return i + 1;
}
}
return 0;
}
const struct HealLocation *GetHealLocationPointerFromMapGroupAndNum(u16 mapGroup, u16 mapNum)
{
u32 loc;
loc = GetHealLocationIndexFromMapGroupAndNum(mapGroup, mapNum);
if (loc == 0)
{
return NULL;
}
return &sHealLocations[loc - 1];
}
const struct HealLocation *GetHealLocationPointer(u32 loc)
{
if (loc == 0)
{
return NULL;
}
if (loc > NUM_HEAL_LOCATIONS)
{
return NULL;
}
return &sHealLocations[loc - 1];
}

1949
src/region_map.c Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -6432,10 +6432,10 @@ void DoTVShowTodaysRivalTrainer(void)
default:
sTVShowState = 7;
break;
case REGION_MAP_SECRET_BASE:
case MAPSEC_SECRET_BASE:
sTVShowState = 8;
break;
case REGION_MAP_NONE:
case MAPSEC_DYNAMIC:
switch (show->rivalTrainer.mapDataId)
{
case 0x115 ... 0x117:
@@ -6633,7 +6633,7 @@ void DoTVShowHoennTreasureInvestigators(void)
{
case 0:
StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
if (show->treasureInvestigators.location == REGION_MAP_NONE)
if (show->treasureInvestigators.location == MAPSEC_DYNAMIC)
{
switch (show->treasureInvestigators.mapDataId)
{

View File

@@ -34,8 +34,7 @@ gUnknown_03001178: @ 3001178
gUnknown_0300117C: @ 300117C
.space 0x4
gUnknown_03001180: @ 3001180
.space 0x8
.include "src/region_map.o"
gUnknown_03001188: @ 3001188
.space 0x68

View File

@@ -1105,12 +1105,7 @@ gUnknown_0203A138: @ 203A138
gUnknown_0203A140: @ 203A140
.space 0x4
gUnknown_0203A144: @ 203A144
.space 0x4
gUnknown_0203A148: @ 203A148
.space 0x4
.include "src/region_map.o"
.include "src/decoration.o"
.align 2
@@ -1398,8 +1393,7 @@ gUnknown_0203BCC8: @ 203BCC8
gUnknown_0203BCCC: @ 203BCCC
.space 0x4
gUnknown_0203BCD0: @ 203BCD0
.space 0x4
.include "src/field_region_map.o"
gUnknown_0203BCD4: @ 203BCD4
.space 0x4