Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-03-21 17:46:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move ground map conversion table to C

Browse Source
This commit is contained in:
DizzyEggg 2025-06-16 16:29:20 +02:00
parent 7d4711af82
commit 95babdeda5
18 changed files with 2618 additions and 2358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/ground_map_1.s
View File

@ -76,7 +76,7 @@ _080A4E4C:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080A4E6C: .4byte gGroundConversion_811BAF4
_080A4E6C: .4byte gGroundMapConversionTable
_080A4E70: .4byte _080A4E74
.align 2, 0
_080A4E74:
@ -441,7 +441,7 @@ _080A5160:
adds r2, r5, 0
bl FatalError
.align 2, 0
_080A5180: .4byte gGroundConversion_811BAF4
_080A5180: .4byte gGroundMapConversionTable
_080A5184: .4byte gUnknown_8117734
_080A5188: .4byte gUnknown_8117740
_080A518C:
@ -1278,7 +1278,7 @@ sub_80A5738:
bx lr
.align 2, 0
_080A5750: .4byte gGroundMapAction
_080A5754: .4byte gGroundConversion_811BAF4
_080A5754: .4byte gGroundMapConversionTable
thumb_func_end sub_80A5738
thumb_func_start sub_80A5758
@ -1407,7 +1407,7 @@ _080A5832:
.align 2, 0
_080A5838: .4byte gGroundMapDungeon_3001B70
_080A583C: .4byte gGroundMapAction
_080A5840: .4byte gGroundConversion_811BAF4
_080A5840: .4byte gGroundMapConversionTable
_080A5844: .4byte 0xffff8800
_080A5848: .4byte 0xffffb000
_080A584C: .4byte 0xffff7000

2251
data/data_8115F5C_3.s
View File

File diff suppressed because it is too large Load Diff

618
data/data_8115F5C_3_.s Normal file
View File

@ -0,0 +1,618 @@
.section .rodata
.align 2,0
.string "pksdir0\0"
.align 2,0
@ Script Data
.global gMapScriptTable
gMapScriptTable: @ 811E258
@ replacing .incbin "baserom.gba", 0x11E258, 0x39C
.4byte gGroundScript_gs0
.4byte gGroundScript_gs1
.4byte gGroundScript_gs2
.4byte gGroundScript_gs2
.4byte gGroundScript_gs4
.4byte gGroundScript_gs5
.4byte gGroundScript_gs6
.4byte gGroundScript_gs7
.4byte gGroundScript_gs8
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs9
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs12
.4byte gGroundScript_gs105
.4byte gGroundScript_gs106
.4byte gGroundScript_gs107
.4byte gGroundScript_gs108
.4byte gGroundScript_gs109
.4byte gGroundScript_gs110
.4byte gGroundScript_gs111
.4byte gGroundScript_gs112
.4byte gGroundScript_gs113
.4byte gGroundScript_gs114
.4byte gGroundScript_gs115
.4byte gGroundScript_gs116
.4byte gGroundScript_gs117
.4byte gGroundScript_gs118
.4byte gGroundScript_gs119
.4byte gGroundScript_gs120
.4byte gGroundScript_gs121
.4byte gGroundScript_gs122
.4byte gGroundScript_gs123
.4byte gGroundScript_gs124
.4byte gGroundScript_gs125
.4byte gGroundScript_gs126
.4byte gGroundScript_gs127
.4byte gGroundScript_gs128
.4byte gGroundScript_gs129
.4byte gGroundScript_gs130
.4byte gGroundScript_gs131
.4byte gGroundScript_gs132
.4byte gGroundScript_gs133
.4byte gGroundScript_gs134
.4byte gGroundScript_gs135
.4byte gGroundScript_gs136
.4byte gGroundScript_gs137
.4byte gGroundScript_gs138
.4byte gGroundScript_gs139
.4byte gGroundScript_gs140
.4byte gGroundScript_gs141
.4byte gGroundScript_gs142
.4byte gGroundScript_gs143
.4byte gGroundScript_gs144
.4byte gGroundScript_gs145
.4byte gGroundScript_gs146
.4byte gGroundScript_gs147
.4byte gGroundScript_gs148
.4byte gGroundScript_gs149
.4byte gGroundScript_gs150
.4byte gGroundScript_gs151
.4byte gGroundScript_gs152
.4byte gGroundScript_gs153
.4byte gGroundScript_gs154
.4byte gGroundScript_gs155
.4byte gGroundScript_gs156
.4byte gGroundScript_gs157
.4byte gGroundScript_gs158
.4byte gGroundScript_gs159
.4byte gGroundScript_gs160
.4byte gGroundScript_gs161
.4byte gGroundScript_gs162
.4byte gGroundScript_gs163
.4byte gGroundScript_gs164
.4byte gGroundScript_gs165
.4byte gGroundScript_gs166
.4byte gGroundScript_gs167
.4byte gGroundScript_gs168
.4byte gGroundScript_gs169
.4byte gGroundScript_gs170
.4byte gGroundScript_gs171
.4byte gGroundScript_gs172
.4byte gGroundScript_gs173
.4byte gGroundScript_gs174
.4byte gGroundScript_gs175
.4byte gGroundScript_gs176
.4byte gGroundScript_gs177
.4byte gGroundScript_gs178
.4byte gGroundScript_gs179
.4byte gGroundScript_gs180
.4byte gGroundScript_gs181
.4byte gGroundScript_gs182
.4byte gGroundScript_gs183
.4byte gGroundScript_gs184
.4byte gGroundScript_gs185
.4byte gGroundScript_gs186
.4byte gGroundScript_gs187
.4byte gGroundScript_gs188
.4byte gGroundScript_gs189
.4byte gGroundScript_gs190
.4byte gGroundScript_gs191
.4byte gGroundScript_gs192
.4byte gGroundScript_gs193
.4byte gGroundScript_gs194
.4byte gGroundScript_gs195
.4byte gGroundScript_gs196
.4byte gGroundScript_gs197
.4byte gGroundScript_gs198
.4byte gGroundScript_gs199
.4byte gGroundScript_gs200
.4byte gGroundScript_gs201
.4byte gGroundScript_gs202
.4byte gGroundScript_gs203
.4byte gGroundScript_gs204
.4byte gGroundScript_gs205
.4byte gGroundScript_gs206
.4byte gGroundScript_gs207
.4byte gGroundScript_gs208
.4byte gGroundScript_gs209
.4byte gGroundScript_gs210
.4byte gGroundScript_gs211
.4byte gGroundScript_gs212
.4byte gGroundScript_gs213
.4byte gGroundScript_gs214
.4byte gGroundScript_gs215
.4byte gGroundScript_gs216
.4byte gGroundScript_gs217
.4byte gGroundScript_gs218
.4byte gGroundScript_gs219
.4byte gGroundScript_gs220
.4byte gGroundScript_gs221
.4byte gGroundScript_gs222
.4byte gGroundScript_gs223
.4byte gGroundScript_gs224
.4byte gGroundScript_gs225
.4byte gGroundScript_gs226
.4byte gGroundScript_gs227
.4byte gGroundScript_gs228
.string "pksdir0\0"
.align 2, 0
.global gUnknown_811E5F4
gUnknown_811E5F4: @ 811E5F4
@ replacing .incbin "baserom.gba", 0x11E5F4, 0x48
.byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00, 0x71, 0x00
.byte 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x97, 0x00, 0x00, 0x00, 0x9a, 0x00
.byte 0x00, 0x00, 0xa9, 0x00, 0x01, 0x00, 0xee, 0x00, 0x01, 0x00, 0xef, 0x00, 0x01, 0x00, 0xf0, 0x00
.byte 0x01, 0x00, 0xf1, 0x00, 0x01, 0x00, 0xf2, 0x00, 0x01, 0x00, 0xf3, 0x00, 0x01, 0x00, 0xf4, 0x00
.byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.global gGroundLivesTypeData_811E63C
gGroundLivesTypeData_811E63C: @ 811E63C
@ replacing .incbin "baserom.gba", 0x11E63C, 0x6E4
.byte 0x01, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x02, 0x00, 0x5e, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x08, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x09, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x34, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x6c, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x9d, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x61, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xa4, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x0b, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x9d, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x28, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xb8, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x0a, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x30, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x51, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x51, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x51, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x52, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x51, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x51, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x33, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x33, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x32, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xfc, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x7c, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x7c, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x35, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x28, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x55, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x73, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x55, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x28, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xbd, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x45, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0xea, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xeb, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x33, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x83, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x41, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x2c, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x2b, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x2b, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x41, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x06, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x11, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x5e, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x17, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x4d, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x0b, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xbd, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x91, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0xb2, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x6d, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x26, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0xa5, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x92, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x90, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x9b, 0x01
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x09, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0xf9, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x4c, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x09, 0x00
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0xa7, 0x01
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x84, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xe3, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x38, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x38, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x38, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x38, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x60, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x0d, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x0c, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x0e, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x13, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x96, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x99, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x98, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x9d, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x04, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xa4, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x97, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x95, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x96, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x97, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x9a, 0x01
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x12, 0x01
.4byte gUnknown_811ED14
.byte 0x03, 0x01, 0x00, 0x00, 0x05, 0x00, 0x9e, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x1a, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x2a, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x70, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x7a, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x7b, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0x7f, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x9a, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xbe, 0x00
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.byte 0x05, 0x00, 0xa6, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00, 0x05, 0x00, 0xa6, 0x01
.4byte gUnknown_811ED14
.byte 0x02, 0x01, 0x00, 0x00
.global gUnknown_811ED14
gUnknown_811ED14: @ 811ED14
.byte 0x2d, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64
.byte 0x69, 0x72, 0x30, 0x00
.global gGroundObjectTypes
gGroundObjectTypes: @ 811ED20
@ replacing .incbin "baserom.gba", 0x11ED20, 0x118
.byte 0x01, 0x00, 0x01, 0x01, 0x0e, 0x00, 0x01, 0x01, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x01, 0x04, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x03, 0x01, 0x08, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00, 0x03, 0x03, 0x02, 0x00, 0x03, 0x04
.byte 0x02, 0x00, 0x06, 0x04, 0x0b, 0x00, 0x03, 0x01, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03
.byte 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0b, 0x00, 0x04, 0x03, 0x0e, 0x00, 0x02, 0x01
.byte 0x0e, 0x00, 0x02, 0x01, 0x0a, 0x00, 0x02, 0x01, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x02, 0x02
.byte 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x02, 0x02, 0x0a, 0x00, 0x02, 0x02, 0x0e, 0x00, 0x02, 0x02
.byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.global gGroundEffectTypes
gGroundEffectTypes: @ 811EE38
@ replacing .incbin "baserom.gba", 0x11EE38, 0x103B8
.byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x01, 0x01

236
include/constants/ground_map.h Normal file
View File

@ -0,0 +1,236 @@
#ifndef GUARD_CONSTANTS_GROUND_MAP_H
#define GUARD_CONSTANTS_GROUND_MAP_H
enum {
MAP_SQUARE,
MAP_POKEMON_SQUARE,
MAP_WHISCASH_POND,
MAP_WHISCASH_POND_OPEN,
MAP_PELIPPER_POST_OFFICE,
MAP_PELIPPER_POST_OFFICE_INSIDE,
MAP_MAKUHITA_DOJO,
MAP_MAKUHITA_DOJO_INSIDE,
MAP_LUMINOUS_CAVE,
MAP_TEAM_BASE_PIKACHU_BASIC,
MAP_TEAM_BASE_PIKACHU_CONSTRUCTION,
MAP_TEAM_BASE_PIKACHU_FINAL,
MAP_TEAM_BASE_INSIDE_PIKACHU_BASIC,
MAP_TEAM_BASE_INSIDE_PIKACHU_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_PIKACHU_FINAL,
MAP_TEAM_BASE_MEOWTH_BASIC,
MAP_TEAM_BASE_MEOWTH_CONSTRUCTION,
MAP_TEAM_BASE_MEOWTH_FINAL,
MAP_TEAM_BASE_INSIDE_MEOWTH_BASIC,
MAP_TEAM_BASE_INSIDE_MEOWTH_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_MEOWTH_FINAL,
MAP_TEAM_BASE_EEVEE_BASIC,
MAP_TEAM_BASE_EEVEE_CONSTRUCTION,
MAP_TEAM_BASE_EEVEE_FINAL,
MAP_TEAM_BASE_INSIDE_EEVEE_BASIC,
MAP_TEAM_BASE_INSIDE_EEVEE_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_EEVEE_FINAL,
MAP_TEAM_BASE_SKITTY_BASIC,
MAP_TEAM_BASE_SKITTY_CONSTRUCTION,
MAP_TEAM_BASE_SKITTY_FINAL,
MAP_TEAM_BASE_INSIDE_SKITTY_BASIC,
MAP_TEAM_BASE_INSIDE_SKITTY_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_SKITTY_FINAL,
MAP_TEAM_BASE_SQUIRTLE_BASIC,
MAP_TEAM_BASE_SQUIRTLE_CONSTRUCTION,
MAP_TEAM_BASE_SQUIRTLE_FINAL,
MAP_TEAM_BASE_INSIDE_SQUIRTLE_BASIC,
MAP_TEAM_BASE_INSIDE_SQUIRTLE_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_SQUIRTLE_FINAL,
MAP_TEAM_BASE_TOTODILE_BASIC,
MAP_TEAM_BASE_TOTODILE_CONSTRUCTION,
MAP_TEAM_BASE_TOTODILE_FINAL,
MAP_TEAM_BASE_INSIDE_TOTODILE_BASIC,
MAP_TEAM_BASE_INSIDE_TOTODILE_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_TOTODILE_FINAL,
MAP_TEAM_BASE_MUDKIP_BASIC,
MAP_TEAM_BASE_MUDKIP_CONSTRUCTION,
MAP_TEAM_BASE_MUDKIP_FINAL,
MAP_TEAM_BASE_INSIDE_MUDKIP_BASIC,
MAP_TEAM_BASE_INSIDE_MUDKIP_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_MUDKIP_FINAL,
MAP_TEAM_BASE_PSYDUCK_BASIC,
MAP_TEAM_BASE_PSYDUCK_CONSTRUCTION,
MAP_TEAM_BASE_PSYDUCK_FINAL,
MAP_TEAM_BASE_INSIDE_PSYDUCK_BASIC,
MAP_TEAM_BASE_INSIDE_PSYDUCK_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_PSYDUCK_FINAL,
MAP_TEAM_BASE_CHARMANDER_BASIC,
MAP_TEAM_BASE_CHARMANDER_CONSTRUCTION,
MAP_TEAM_BASE_CHARMANDER_FINAL,
MAP_TEAM_BASE_INSIDE_CHARMANDER_BASIC,
MAP_TEAM_BASE_INSIDE_CHARMANDER_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_CHARMANDER_FINAL,
MAP_TEAM_BASE_TORCHIC_BASIC,
MAP_TEAM_BASE_TORCHIC_CONSTRUCTION,
MAP_TEAM_BASE_TORCHIC_FINAL,
MAP_TEAM_BASE_INSIDE_TORCHIC_BASIC,
MAP_TEAM_BASE_INSIDE_TORCHIC_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_TORCHIC_FINAL,
MAP_TEAM_BASE_CYNDAQUIL_BASIC,
MAP_TEAM_BASE_CYNDAQUIL_CONSTRUCTION,
MAP_TEAM_BASE_CYNDAQUIL_FINAL,
MAP_TEAM_BASE_INSIDE_CYNDAQUIL_BASIC,
MAP_TEAM_BASE_INSIDE_CYNDAQUIL_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_CYNDAQUIL_FINAL,
MAP_TEAM_BASE_CUBONE_BASIC,
MAP_TEAM_BASE_CUBONE_CONSTRUCTION,
MAP_TEAM_BASE_CUBONE_FINAL,
MAP_TEAM_BASE_INSIDE_CUBONE_BASIC,
MAP_TEAM_BASE_INSIDE_CUBONE_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_CUBONE_FINAL,
MAP_TEAM_BASE_MACHOP_BASIC,
MAP_TEAM_BASE_MACHOP_CONSTRUCTION,
MAP_TEAM_BASE_MACHOP_FINAL,
MAP_TEAM_BASE_INSIDE_MACHOP_BASIC,
MAP_TEAM_BASE_INSIDE_MACHOP_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_MACHOP_FINAL,
MAP_TEAM_BASE_BULBASAUR_BASIC,
MAP_TEAM_BASE_BULBASAUR_CONSTRUCTION,
MAP_TEAM_BASE_BULBASAUR_FINAL,
MAP_TEAM_BASE_INSIDE_BULBASAUR_BASIC,
MAP_TEAM_BASE_INSIDE_BULBASAUR_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_BULBASAUR_FINAL,
MAP_TEAM_BASE_CHIKORITA_BASIC,
MAP_TEAM_BASE_CHIKORITA_CONSTRUCTION,
MAP_TEAM_BASE_CHIKORITA_FINAL,
MAP_TEAM_BASE_INSIDE_CHIKORITA_BASIC,
MAP_TEAM_BASE_INSIDE_CHIKORITA_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_CHIKORITA_FINAL,
MAP_TEAM_BASE_TREECKO_BASIC,
MAP_TEAM_BASE_TREECKO_CONSTRUCTION,
MAP_TEAM_BASE_TREECKO_FINAL,
MAP_TEAM_BASE_INSIDE_TREECKO_BASIC,
MAP_TEAM_BASE_INSIDE_TREECKO_CONSTRUCTION,
MAP_TEAM_BASE_INSIDE_TREECKO_FINAL,
MAP_FRIEND_AREA_BOUNTIFUL_SEA,
MAP_FRIEND_AREA_TREASURE_SEA,
MAP_FRIEND_AREA_SERENE_SEA,
MAP_FRIEND_AREA_DEEP_SEA_FLOOR,
MAP_FRIEND_AREA_DEEP_SEA_CURRENT,
MAP_FRIEND_AREA_SEAFLOOR_CAVE,
MAP_FRIEND_AREA_SHALLOW_BEACH,
MAP_FRIEND_AREA_MT_DEEPGREEN,
MAP_FRIEND_AREA_MT_CLEFT,
MAP_FRIEND_AREA_MT_MOONVIEW,
MAP_FRIEND_AREA_RAINBOW_PEAK,
MAP_FRIEND_AREA_WILD_PLAINS,
MAP_FRIEND_AREA_BEAU_PLAINS,
MAP_FRIEND_AREA_SKY_BLUE_PLAINS,
MAP_FRIEND_AREA_SAFARI,
MAP_FRIEND_AREA_SCORCHED_PLAINS,
MAP_FRIEND_AREA_SACRED_FIELD,
MAP_FRIEND_AREA_MIST_RISE_FOREST,
MAP_FRIEND_AREA_FLYAWAY_FOREST,
MAP_FRIEND_AREA_OVERGROWN_FOREST,
MAP_FRIEND_AREA_ENERGETIC_FOREST,
MAP_FRIEND_AREA_MUSHROOM_FOREST,
MAP_FRIEND_AREA_HEALING_FOREST,
MAP_FRIEND_AREA_TRANSFORM_FOREST,
MAP_FRIEND_AREA_SECRETIVE_FOREST,
MAP_FRIEND_AREA_RUB_A_DUB_RIVER,
MAP_FRIEND_AREA_TADPOLE_POND,
MAP_FRIEND_AREA_TURTLESHELL_POND,
MAP_FRIEND_AREA_MYSTIC_LAKE,
MAP_FRIEND_AREA_WATERFALL_LAKE,
MAP_FRIEND_AREA_PEANUT_SWAMP,
MAP_FRIEND_AREA_POISON_SWAMP,
MAP_FRIEND_AREA_ECHO_CAVE,
MAP_FRIEND_AREA_CRYPTIC_CAVE,
MAP_FRIEND_AREA_DRAGON_CAVE,
MAP_FRIEND_AREA_BOULDER_CAVE,
MAP_FRIEND_AREA_JUNGLE,
MAP_FRIEND_AREA_DECREPIT_LAB,
MAP_FRIEND_AREA_MT_DISCIPLINE,
MAP_FRIEND_AREA_THUNDER_MEADOW,
MAP_FRIEND_AREA_POWER_PLANT,
MAP_FRIEND_AREA_CRATER,
MAP_FRIEND_AREA_FURNACE_DESERT,
MAP_FRIEND_AREA_AGED_CHAMBER_AN,
MAP_FRIEND_AREA_AGED_CHAMBER_O_EXCLAIM,
MAP_FRIEND_AREA_ANCIENT_RELIC,
MAP_FRIEND_AREA_DARKNESS_RIDGE,
MAP_FRIEND_AREA_FRIGID_CAVERN,
MAP_FRIEND_AREA_ICE_FLOE_BEACH,
MAP_FRIEND_AREA_VOLCANIC_PIT,
MAP_FRIEND_AREA_STRATOS_LOOKOUT,
MAP_FRIEND_AREA_RAVAGED_FIELD,
MAP_FRIEND_AREA_MAGNETIC_QUARRY,
MAP_FRIEND_AREA_LEGENDARY_ISLAND,
MAP_FRIEND_AREA_SOUTHERN_ISLAND,
MAP_FRIEND_AREA_ENCLOSED_ISLAND,
MAP_FRIEND_AREA_FINAL_ISLAND,
MAP_PERSONALITY_TEST_CYAN,
MAP_PERSONALITY_TEST_PURPLE,
MAP_FUGITIVES_FISSURE,
MAP_FUGITIVES_FIRE,
MAP_FUGITIVES_LAPIS_CAVE,
MAP_FUGITIVES_VOLCANO,
MAP_FUGITIVES_SNOW_ROAD,
MAP_FUGITIVES_SNOW_FOREST,
MAP_FUGITIVES_BLIZZARD_ROAD,
MAP_SUMMIT_SUNSET,
MAP_SKY_TOWER,
MAP_COMET,
MAP_NIGHTMARE,
MAP_NIGHT_SKY_1,
MAP_NIGHT_SKY_2,
MAP_THE_END,
MAP_TINY_WOODS_ENTRY,
MAP_TINY_WOODS_END,
MAP_THUNDERWAVE_CAVE_ENTRY,
MAP_THUNDERWAVE_CAVE_END,
MAP_MT_STEEL_ENTRY,
MAP_MT_STEEL_END,
MAP_SINISTER_WOODS_ENTRY,
MAP_SINISTER_WOODS_END,
MAP_SILENT_CHASM_ENTRY,
MAP_SILENT_CHASM_END,
MAP_MT_THUNDER_ENTRY,
MAP_MT_THUNDER_MID,
MAP_MT_THUNDER_END,
MAP_GREAT_CANYON_ENTRY,
MAP_HILL_OF_THE_ANCIENTS,
MAP_LAPIS_CAVE_ENTRY,
MAP_LAPIS_CAVE_END,
MAP_MT_BLAZE_ENTRY,
MAP_MT_BLAZE_MID,
MAP_MT_BLAZE_END,
MAP_FROSTY_FOREST_ENTRY,
MAP_FROSTY_FOREST_MID,
MAP_FROSTY_FOREST_END,
MAP_MT_FREEZE_ENTRY,
MAP_MT_FREEZE_MID,
MAP_MT_FREEZE_END,
MAP_MAGMA_CAVERN_ENTRY,
MAP_MAGMA_CAVERN_MID,
MAP_MAGMA_CAVERN_END,
MAP_SKY_TOWER_ENTRY,
MAP_SKY_TOWER_MID,
MAP_SKY_TOWER_END,
MAP_D14,
MAP_D15,
MAP_D16,
MAP_D17,
MAP_D18,
MAP_D19,
MAP_D20,
MAP_D21,
MAP_D22,
MAP_D23,
MAP_D24,
MAP_D25,
MAP_PERSONALITY_TEST_MULTICOLOR,
MAP_TITLE_SCREEN,
MAP_INTRO,
MAP_LOGO_POKEMON_COMPANY,
MAP_LOGO_WARNING,
MAP_TEAM_BASE_WALL_MAP,
MAP_COUNT,
};
#endif // GUARD_CONSTANTS_GROUND_MAP_H

8
include/global.h
View File

@ -40,14 +40,14 @@ static inline s16 Self_s16(s16 a)
}
// Needed to match a couple of functions.
static inline void InlineStrcpy(u8 *dst, const u8 *src)
static inline u8 *InlineStrcpy(u8 *dst, const u8 *src)
{
strcpy(dst, src);
return strcpy(dst, src);
}
static inline void InlineStrncpy(u8 *dst, const u8 *src, s32 n)
static inline u8 *InlineStrncpy(u8 *dst, const u8 *src, s32 n)
{
strncpy(dst, src, n);
return strncpy(dst, src, n);
}
static inline bool8 AreStringsDifferent(const u8 *str1, const u8 *str2)

12
include/ground_main.h
View File

@ -4,16 +4,6 @@
#include "structs/str_pokemon.h"
#include "structs/str_wonder_mail.h"
// size: 0xC
typedef struct GroundConversionStruct
{
s16 unk0;
s16 unk2;
s16 unk4;
s16 unk6;
/* 0x8 */ u8 *text;
} GroundConversionStruct;
bool8 sub_8098F88(void);
const char *GetCurrentGroundPlaceName(void);
@ -25,6 +15,4 @@ bool8 sub_8098D80(u32 speed);
bool8 sub_80992E0(s16 *param_1, s16 *param_2);
bool8 sub_8099328(u8 *);
extern GroundConversionStruct gGroundConversion_811BAF4[10];
#endif // GUARD_GROUND_MAIN_H

18
include/ground_map_conversion_table.h Normal file
View File

@ -0,0 +1,18 @@
#ifndef GUARD_GROUND_MAP_CONVERSION_TABLE_H
#define GUARD_GROUND_MAP_CONVERSION_TABLE_H
#include "constants/ground_map.h"
// size: 0xC
typedef struct GroundConversionStruct
{
s16 unk0;
s16 groundPlaceId;
s16 mapFileTableId;
s16 unk6;
/* 0x8 */ const u8 *text;
} GroundConversionStruct;
extern const GroundConversionStruct gGroundMapConversionTable[MAP_COUNT + 1];
#endif // GUARD_GROUND_MAP_CONVERSION_TABLE_H

43
include/ground_place.h
View File

@ -1,6 +1,49 @@
#ifndef GUARD_GROUND_PLACE_H
#define GUARD_GROUND_PLACE_H
// Duplicate entries are most likely outdoors vs indoors. To verify which are which
enum GroundPlace {
GROUND_PLACE_SQUARE,
GROUND_PLACE_SQUARE_2,
GROUND_PLACE_POKEMON_SQUARE,
GROUND_PLACE_WHISCASH_POND,
GROUND_PLACE_PELIPPER_POST_OFFICE,
GROUND_PLACE_PELIPPER_POST_OFFICE_INSIDE,
GROUND_PLACE_MAKUHITA_DOJO,
GROUND_PLACE_MAKUHITA_DOJO_INSIDE, // unused
GROUND_PLACE_LUMINOUS_CAVE,
GROUND_PLACE_FRIEND_AREAS,
GROUND_PLACE_TEAM_BASE,
GROUND_PLACE_TEAM_BASE_INSIDE,
GROUND_PLACE_DUNGEON,
GROUND_PLACE_TINY_WOODS,
GROUND_PLACE_THUNDERWAVE_CAVE,
GROUND_PLACE_MT_STEEL,
GROUND_PLACE_SINISTER_WOODS,
GROUND_PLACE_SILENT_CHASM,
GROUND_PLACE_MT_THUNDER,
GROUND_PLACE_MT_THUNDER_MID,
GROUND_PLACE_GREAT_CANYON,
GROUND_PLACE_HILL_OF_THE_ANCIENTS,
GROUND_PLACE_LAPIS_CAVE,
GROUND_PLACE_LAPIS_CAVE_EXIT,
GROUND_PLACE_MT_BLAZE,
GROUND_PLACE_MT_BLAZE_MID,
GROUND_PLACE_FROSTY_FOREST,
GROUND_PLACE_FROSTY_CLEARING,
GROUND_PLACE_MT_FREEZE,
GROUND_PLACE_MT_FREEZE_MID,
GROUND_PLACE_MAGMA_CAVERN,
GROUND_PLACE_MAGMA_CAVERN_MID,
GROUND_PLACE_SKY_TOWER,
GROUND_PLACE_SKY_TOWER_MID,
GROUND_PLACE_WESTERN_CAVE,
GROUND_PLACE_DIRECTION, // Similarly to GROUND_PLACE_SCENE, used in the conversion table for bgs which are not maps.
GROUND_PLACE_NEW_GAME,
GROUND_PLACE_SCENE, // For all maps that aren't really maps, for example warning screen, personality test background, etc.
GROUND_PLACE_INVALIDITY, // Probably marks the last entry, not used in-game.
};
const u8 *GetGroundPlaceName(s16 id);
#endif // GUARD_GROUND_PLACE_H

13
include/structs/str_81188F0.h
View File

@ -4,12 +4,13 @@
// size: 0x1C
struct unkStruct_81188F0
{
/* 0x0 */ const u8 *text1;
/* 0x4 */ const u8 *text2;
/* 0x8 */ const u8 *text3;
/* 0xC */ const u8 *text4[2];
/* 0x14 */ u32 unk2;
/* 0x18 */ u32 unk3;
/* 0x0 */ const u8 *fileName1;
/* 0x4 */ const u8 *fileName2;
/* 0x8 */ const u8 *fileName3;
/* 0xC */ const u8 *fileName4[2];
// Unused, always NULL
/* 0x14 */ const u8 *unusedFileName5;
/* 0x18 */ const u8 *unusedFileName6;
};
extern const struct unkStruct_81188F0 gUnknown_81188F0[];

2
ld_script.ld
View File

@ -737,6 +737,8 @@ SECTIONS {
src/ground_event.o(.rodata);
src/unk_dungeon_load_maybe.o(.rodata);
data/data_8115F5C_3.o(.rodata);
src/ground_map_conversion_table.o(.rodata);
data/data_8115F5C_3_.o(.rodata);
src/ground_event_data.o(.rodata);
src/friend_area_dialogue.o(.rodata);
src/ground_data_t00p01_station.o(.rodata);

24
src/debug_field_map_window.c
View File

@ -10,6 +10,7 @@
#include "menu_input.h"
#include "text_1.h"
#include "text_2.h"
#include "ground_map_conversion_table.h"
#include "structs/str_81188F0.h"
EWRAM_INIT static struct MenuHeaderWindow *sDebugWindow = {NULL};
@ -114,11 +115,8 @@ static void ShowWindowsWithHeader(void)
static void PrintCurrentPageText(void)
{
GroundConversionStruct *temp;
const struct unkStruct_81188F0 *temp2;
s32 x, y, pageNum;
s16 index;
int counter;
s32 i;
CallPrepareTextbox_8008C54(sDebugWindow->m.menuWinId);
sub_80073B8(sDebugWindow->m.menuWinId);
@ -129,18 +127,18 @@ static void PrintCurrentPageText(void)
PrintNumOnWindow(x, 0, pageNum, 2, 7, sDebugWindow->m.menuWinId);
// This line has no real effect. It's a magic 'fakematch' to fool agb into generating the same asm. It can be removed if you don't care about matching.
if (x) { counter = 0; }
if (x) { i = 0; }
for (counter = 0; counter < sDebugWindow->m.input.currPageEntries; counter++) {
index = (sDebugWindow->m.input.currPage * sDebugWindow->m.input.entriesPerPage) + counter;
temp = &gGroundConversion_811BAF4[index];
temp2 = &gUnknown_81188F0[temp->unk4];
for (i = 0; i < sDebugWindow->m.input.currPageEntries; i++) {
s16 index = (sDebugWindow->m.input.currPage * sDebugWindow->m.input.entriesPerPage) + i;
const GroundConversionStruct *mapConversionPtr = &gGroundMapConversionTable[index];
const struct unkStruct_81188F0 *mapFilesPtr = &gUnknown_81188F0[mapConversionPtr->mapFileTableId];
y = GetMenuEntryYCoord(&sDebugWindow->m.input, counter);
PrintStringOnWindow(8, y, temp2->text1, sDebugWindow->m.menuWinId, 0);
y = GetMenuEntryYCoord(&sDebugWindow->m.input, i);
PrintStringOnWindow(8, y, mapFilesPtr->fileName1, sDebugWindow->m.menuWinId, 0);
y = GetMenuEntryYCoord(&sDebugWindow->m.input, counter);
PrintStringOnWindow(62, y, temp->text, sDebugWindow->m.menuWinId, 0);
y = GetMenuEntryYCoord(&sDebugWindow->m.input, i);
PrintStringOnWindow(62, y, mapConversionPtr->text, sDebugWindow->m.menuWinId, 0);
}
sub_80073E0(sDebugWindow->m.menuWinId);

20
src/ground_bg.c
View File

@ -245,9 +245,9 @@ void sub_80A2FBC(GroundBg *groundBg, s32 a1_)
CloseOpenedFiles(groundBg);
groundBg->unk444 = a1;
dataPtr = &gUnknown_81188F0[a1];
groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive);
groundBg->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive);
groundBg->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive);
groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->fileName1, &gGroundFileArchive);
groundBg->unk434 = OpenFileAndGetFileDataPtr(dataPtr->fileName2, &gGroundFileArchive);
groundBg->unk438 = OpenFileAndGetFileDataPtr(dataPtr->fileName3, &gGroundFileArchive);
file_430 = groundBg->unk430->data;
file_434 = groundBg->unk434->data;
file_438 = groundBg->unk438->data;
@ -344,11 +344,11 @@ void sub_80A2FBC(GroundBg *groundBg, s32 a1_)
vramPtr = (void *)(VRAM + 0x8000 + (groundBg->unk52C.unk4 + mapPtr_454->unk4) * 32);
for (id = 0; id < 2; id++) {
SubStruct_3E0 *sub3E0 = &groundBg->unk3E0[id];
if (dataPtr->text4[id] != NULL) {
if (dataPtr->fileName4[id] != NULL) {
const struct UnkFileStruct *fileStr;
const void *r1, *r0;
sub3E0->unk8 = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive);
sub3E0->unk8 = OpenFileAndGetFileDataPtr(dataPtr->fileName4[id], &gGroundFileArchive);
sub3E0->unk0 = 1;
sub3E0->unk1 = 1;
fileStr = sub3E0->unk8->data;
@ -380,9 +380,9 @@ void sub_80A2FBC(GroundBg *groundBg, s32 a1_)
}
}
for (; id < 4; id++) {
if (dataPtr->text4[id] != NULL) {
if (dataPtr->fileName4[id] != NULL) {
s32 n;
OpenedFile *file = OpenFileAndGetFileDataPtr(dataPtr->text4[id], &gGroundFileArchive);
OpenedFile *file = OpenFileAndGetFileDataPtr(dataPtr->fileName4[id], &gGroundFileArchive);
const struct UnkFileStruct *fileStr = file->data;
u16 *r1 = (void *) fileStr->unk4;
r1 += fileStr->unk2 * 2;
@ -426,9 +426,9 @@ void sub_80A3440(GroundBg *groundBg, s32 a1_, DungeonLocation *dungLoc, s32 a3)
CloseOpenedFiles(groundBg);
groundBg->unk444 = a1;
dataPtr = &gUnknown_81188F0[a1];
groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->text1, &gGroundFileArchive);
groundBg->unk434 = OpenFileAndGetFileDataPtr(dataPtr->text2, &gGroundFileArchive);
groundBg->unk438 = OpenFileAndGetFileDataPtr(dataPtr->text3, &gGroundFileArchive);
groundBg->unk430 = OpenFileAndGetFileDataPtr(dataPtr->fileName1, &gGroundFileArchive);
groundBg->unk434 = OpenFileAndGetFileDataPtr(dataPtr->fileName2, &gGroundFileArchive);
groundBg->unk438 = OpenFileAndGetFileDataPtr(dataPtr->fileName3, &gGroundFileArchive);
file_430 = groundBg->unk430->data;
file_434 = groundBg->unk434->data;
file_438 = groundBg->unk438->data;

3
src/ground_main.c
View File

@ -17,6 +17,7 @@
#include "play_time.h"
#include "pokemon.h"
#include "text_util.h"
#include "ground_map_conversion_table.h"
EWRAM_DATA u32 gUnknown_20398A8 = {0};
EWRAM_DATA s32 gUnknown_20398AC = {0};
@ -740,7 +741,7 @@ UNUSED static const char *sub_80990B8(void)
{
s16 index = sub_8098FCC(0xB);
if (index != -1) {
return GetGroundPlaceName(gGroundConversion_811BAF4[index].unk2);
return GetGroundPlaceName(gGroundMapConversionTable[index].groundPlaceId);
}
else {
return GetCurrentGroundPlaceName();

5
src/ground_map.c
View File

@ -7,6 +7,7 @@
#include "ground_map_2.h"
#include "ground_script.h"
#include "memory.h"
#include "ground_map_conversion_table.h"
IWRAM_INIT GroundMapAction *gGroundMapAction = {NULL};
IWRAM_INIT GroundBg *gGroundMapDungeon_3001B70 = {NULL};
@ -178,8 +179,8 @@ bool8 GroundMapNotifyAll(s16 param_1)
bool8 sub_80A4D48(s16 index)
{
if (index == -1) return TRUE;
if (gGroundConversion_811BAF4[index].unk0 == 5) return FALSE;
if (gGroundConversion_811BAF4[index].unk0 != 8) return TRUE;
if (gGroundMapConversionTable[index].unk0 == 5) return FALSE;
if (gGroundMapConversionTable[index].unk0 != 8) return TRUE;
return FALSE;
}

1611
src/ground_map_conversion_table.c Normal file
View File

File diff suppressed because it is too large Load Diff

78
src/ground_place.c
View File

@ -4,45 +4,45 @@
#include "event_flag.h"
static const u8 *const sGroundPlaceNames[] = {
[0] = _("Square"),
[1] = _("Square"),
[2] = _("Pokémon Square"),
[3] = _("Whiscash Pond"),
[4] = _("Pelipper Post Office"),
[5] = _("Pelipper Post Office"),
[6] = _("Makuhita Dojo"),
[7] = _("Makuhita Dojo"),
[8] = _("Luminous Cave"),
[9] = _("Friend Areas"),
[10] = _("$t Team Base"),
[11] = _("$t Team Base"),
[12] = _("Dungeon"),
[13] = _("Tiny Woods"),
[14] = _("Thunderwave Cave"),
[15] = _("Mt. Steel"),
[16] = _("Sinister Woods"),
[17] = _("Silent Chasm"),
[18] = _("Mt. Thunder"),
[19] = _("Mt. Thunder Mid"),
[20] = _("Great Canyon"),
[21] = _("Hill of the Ancients"),
[22] = _("Lapis Cave"),
[23] = _("Lapis Cave Exit"),
[24] = _("Mt. Blaze"),
[25] = _("Mt. Blaze Mid"),
[26] = _("Frosty Forest"),
[27] = _("Frosty Clearing"),
[28] = _("Mt. Freeze"),
[29] = _("Mt. Freeze Mid"),
[30] = _("Magma Cavern"),
[31] = _("Magma Cavern Mid"),
[32] = _("Sky Tower"),
[33] = _("Sky Tower Mid"),
[34] = _("Western Cave"),
[35] = _("{COLOR YELLOW_C}direction{RESET}"),
[36] = _("New Game"),
[37] = _("{COLOR YELLOW_C}scene{RESET}"),
[38] = _("{COLOR RED_W}invalidity{RESET}"),
[GROUND_PLACE_SQUARE] = _("Square"),
[GROUND_PLACE_SQUARE_2] = _("Square"),
[GROUND_PLACE_POKEMON_SQUARE] = _("Pokémon Square"),
[GROUND_PLACE_WHISCASH_POND] = _("Whiscash Pond"),
[GROUND_PLACE_PELIPPER_POST_OFFICE] = _("Pelipper Post Office"),
[GROUND_PLACE_PELIPPER_POST_OFFICE_INSIDE] =_("Pelipper Post Office"),
[GROUND_PLACE_MAKUHITA_DOJO] = _("Makuhita Dojo"),
[GROUND_PLACE_MAKUHITA_DOJO_INSIDE] = _("Makuhita Dojo"),
[GROUND_PLACE_LUMINOUS_CAVE] = _("Luminous Cave"),
[GROUND_PLACE_FRIEND_AREAS] = _("Friend Areas"),
[GROUND_PLACE_TEAM_BASE] = _("$t Team Base"),
[GROUND_PLACE_TEAM_BASE_INSIDE] = _("$t Team Base"),
[GROUND_PLACE_DUNGEON] = _("Dungeon"),
[GROUND_PLACE_TINY_WOODS] = _("Tiny Woods"),
[GROUND_PLACE_THUNDERWAVE_CAVE] = _("Thunderwave Cave"),
[GROUND_PLACE_MT_STEEL] = _("Mt. Steel"),
[GROUND_PLACE_SINISTER_WOODS] = _("Sinister Woods"),
[GROUND_PLACE_SILENT_CHASM] = _("Silent Chasm"),
[GROUND_PLACE_MT_THUNDER] = _("Mt. Thunder"),
[GROUND_PLACE_MT_THUNDER_MID] = _("Mt. Thunder Mid"),
[GROUND_PLACE_GREAT_CANYON] = _("Great Canyon"),
[GROUND_PLACE_HILL_OF_THE_ANCIENTS] = _("Hill of the Ancients"),
[GROUND_PLACE_LAPIS_CAVE] = _("Lapis Cave"),
[GROUND_PLACE_LAPIS_CAVE_EXIT] = _("Lapis Cave Exit"),
[GROUND_PLACE_MT_BLAZE] = _("Mt. Blaze"),
[GROUND_PLACE_MT_BLAZE_MID] = _("Mt. Blaze Mid"),
[GROUND_PLACE_FROSTY_FOREST] = _("Frosty Forest"),
[GROUND_PLACE_FROSTY_CLEARING] = _("Frosty Clearing"),
[GROUND_PLACE_MT_FREEZE] = _("Mt. Freeze"),
[GROUND_PLACE_MT_FREEZE_MID] = _("Mt. Freeze Mid"),
[GROUND_PLACE_MAGMA_CAVERN] = _("Magma Cavern"),
[GROUND_PLACE_MAGMA_CAVERN_MID] = _("Magma Cavern Mid"),
[GROUND_PLACE_SKY_TOWER] = _("Sky Tower"),
[GROUND_PLACE_SKY_TOWER_MID] = _("Sky Tower Mid"),
[GROUND_PLACE_WESTERN_CAVE] = _("Western Cave"),
[GROUND_PLACE_DIRECTION] = _("{COLOR YELLOW_C}direction{RESET}"),
[GROUND_PLACE_NEW_GAME] = _("New Game"),
[GROUND_PLACE_SCENE] = _("{COLOR YELLOW_C}scene{RESET}"),
[GROUND_PLACE_INVALIDITY] = _("{COLOR RED_W}invalidity{RESET}"),
};
// Returns Location string for the pause menu

14
src/ground_script.c
View File

@ -45,7 +45,7 @@
#include "pokemon_3.h"
#include "friend_area_dialogue.h"
#include "structs/str_dungeon_setup.h"
#include "ground_map_conversion_table.h"
void GroundMap_Select(s16);
void GroundMap_SelectDungeon(s32, DungeonLocation*, u32);
@ -1401,7 +1401,7 @@ s32 ExecuteScriptCommand(Action *action)
u32 argCopy = arg;
u32 byte = (u8)curCmd.argByte;
if (ScriptLoggingEnabled(TRUE)) {
Log(1, " ground select %3d[%s] %3d", arg, gGroundConversion_811BAF4[arg].text, byte);
Log(1, " ground select %3d[%s] %3d", arg, gGroundMapConversionTable[arg].text, byte);
}
GroundMainGroundRequest(argCopy, byte, curCmd.argShort);
break;
@ -1490,25 +1490,25 @@ s32 ExecuteScriptCommand(Action *action)
gUnknown_2039A34 = gUnknown_2039A32;
if (ScriptLoggingEnabled(TRUE)) {
Log(1," map select %3d %3d[%s]",gCurrentMap,gUnknown_2039A32,
gGroundConversion_811BAF4[gCurrentMap].text);
gGroundMapConversionTable[gCurrentMap].text);
}
} else {
gUnknown_2039A32 = gCurrentMap = curCmd.arg1;
gUnknown_2039A34 = curCmd.arg1;
if (ScriptLoggingEnabled(TRUE)) {
Log(1," ground select %3d %3d[%s]",gCurrentMap,gUnknown_2039A32,
gGroundConversion_811BAF4[gCurrentMap].text);
gGroundMapConversionTable[gCurrentMap].text);
}
}
SetScriptVarValue(NULL,GROUND_MAP,gCurrentMap);
SetScriptVarValue(NULL,GROUND_PLACE,gGroundConversion_811BAF4[gCurrentMap].unk2);
SetScriptVarValue(NULL,GROUND_PLACE,gGroundMapConversionTable[gCurrentMap].groundPlaceId);
GroundSprite_Reset(gUnknown_2039A32);
sub_809D0BC();
DeleteGroundEvents();
DeleteGroundLives();
DeleteGroundObjects();
DeleteGroundEffects();
sub_809C770(gCurrentMap, gGroundConversion_811BAF4[gCurrentMap].unk2);
sub_809C770(gCurrentMap, gGroundMapConversionTable[gCurrentMap].groundPlaceId);
GroundMap_Select(gUnknown_2039A32);
GroundLink_Select(gUnknown_2039A32);
GroundLives_Select(gUnknown_2039A32,0,0);
@ -1522,7 +1522,7 @@ s32 ExecuteScriptCommand(Action *action)
gUnknown_2039A34 = gUnknown_2039A32 = gCurrentMap = (s16)curCmd.arg2;
if (ScriptLoggingEnabled(TRUE)) {
Log(1, " dungeon select %3d %3d[%s]", gCurrentMap,gUnknown_2039A32,
gGroundConversion_811BAF4[gCurrentMap].text);
gGroundMapConversionTable[gCurrentMap].text);
}
GroundSprite_Reset(gUnknown_2039A32);
sub_809D0BC();

12
src/load_screen.c
View File

@ -253,11 +253,6 @@ u32 UpdateLoadScreenMenu(void)
return nextMenu;
}
static inline u8 *DrawLoadScreenTextSub(u8 *teamNameBuffer) {
strcpy(teamNameBuffer,gNoTeamNamePlaceholder);
return teamNameBuffer;
}
void DrawLoadScreenText(void)
{
int iVar2;
@ -272,7 +267,6 @@ void DrawLoadScreenText(void)
u32 seconds;
Pokemon *playerInfo;
unkStruct_203B484 *temp2;
u8 *r2;
iVar2 = sub_8011FA8();
CallPrepareTextbox_8008C54(0);
@ -287,14 +281,12 @@ void DrawLoadScreenText(void)
// Draw Team Name
if (sub_80023E4(0)) {
sub_80920D8(teamNameBuffer);
r2 = teamNameBuffer;
}
else {
// NOTE: static inline was needed here to match -jiang
r2 = DrawLoadScreenTextSub(teamNameBuffer);
InlineStrcpy(teamNameBuffer,gNoTeamNamePlaceholder);
}
sprintfStatic(gLoadScreen->formattedTeamName,gUnknown_80E7804,r2);
sprintfStatic(gLoadScreen->formattedTeamName,gUnknown_80E7804,teamNameBuffer);
PrintStringOnWindow(64,0,gLoadScreen->formattedTeamName,0,0);
// Draw Player Name