dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #101 from Diegoisawesome/dump_maps

Browse Source 
Dump maps
This commit is contained in:
Diegoisawesome
2017-11-15 01:01:06 -06:00
committed by GitHub
parent 3fb2a488f9 ce0e5cbfe4
commit 055a419830
2796 changed files with 149558 additions and 2478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_1.s
+25 -25
View File
@@ -136,7 +136,7 @@ _0818EAC8:
.4byte _0818ECD0
.4byte _0818ECF4
_0818EAF0:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
lsls r1, r5, 1
@@ -150,7 +150,7 @@ _0818EAF0:
b _0818ED10
.pool
_0818EB14:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r3, =0x00000cdc
@@ -170,7 +170,7 @@ _0818EB14:
b _0818ED10
.pool
_0818EB48:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -180,7 +180,7 @@ _0818EB48:
b _0818ECBE
.pool
_0818EB64:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -190,7 +190,7 @@ _0818EB64:
b _0818ECBE
.pool
_0818EB80:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -198,7 +198,7 @@ _0818EB80:
b _0818ECBA
.pool
_0818EB98:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -216,7 +216,7 @@ _0818EBB4:
bne _0818EC04
cmp r5, 0
beq _0818EBE8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -226,7 +226,7 @@ _0818EBB4:
b _0818ECBE
.pool
_0818EBE8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -238,7 +238,7 @@ _0818EBE8:
_0818EC04:
cmp r5, 0
beq _0818EC24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -248,7 +248,7 @@ _0818EC04:
b _0818ECBE
.pool
_0818EC24:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -266,7 +266,7 @@ _0818EC40:
bne _0818EC90
cmp r5, 0
beq _0818EC74
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -277,7 +277,7 @@ _0818EC40:
b _0818ED10
.pool
_0818EC74:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -289,7 +289,7 @@ _0818EC74:
_0818EC90:
cmp r5, 0
beq _0818ECB0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000d08
@@ -299,7 +299,7 @@ _0818EC90:
b _0818ECBE
.pool
_0818ECB0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r3, =0x00000d08
@@ -328,7 +328,7 @@ _0818ECD0:
b _0818ED10
.pool
_0818ECF4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r3, =0x00000d0a
@@ -11707,12 +11707,12 @@ sub_8194EC0: @ 8194EC0
bl sub_8195358
cmp r4, r0
ble _08194EE8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _08194EEC
.pool
_08194EE8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_08194EEC:
strh r0, [r1]
@@ -13130,7 +13130,7 @@ _08195A74:
beq _08195AB0
b _08195AD0
_08195A7A:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r5]
ldr r2, =0x00000dc6
adds r1, r2
@@ -13139,7 +13139,7 @@ _08195A7A:
b _08195AD0
.pool
_08195A90:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r5]
lsls r1, r7, 1
lsls r2, r6, 2
@@ -13152,7 +13152,7 @@ _08195A90:
b _08195AD0
.pool
_08195AB0:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
@@ -13285,7 +13285,7 @@ sub_8195BB0: @ 8195BB0
ldrh r0, [r2]
cmp r0, 0x31
bhi _08195C00
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl Random
lsls r0, 16
lsrs r0, 16
@@ -13297,12 +13297,12 @@ sub_8195BB0: @ 8195BB0
_08195C00:
cmp r0, 0x62
bhi _08195C10
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _08195C14
.pool
_08195C10:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
_08195C14:
strh r0, [r1]
@@ -13517,12 +13517,12 @@ sub_8195DB8: @ 8195DB8
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _08195E06
.pool
_08195E00:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_08195E06:
asm/battle_frontier_2.s
+87 -87
View File
@@ -4361,14 +4361,14 @@ _0819CA4E:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0819CAFE
.pool
_0819CA68:
movs r0, 0x2
strh r0, [r4, 0x8]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _0819CAFE
@@ -11730,13 +11730,13 @@ _081A0734:
bne _081A0778
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _081A0768
.pool
_081A0764:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_081A0768:
ldrb r0, [r4, 0xC]
@@ -11982,12 +11982,12 @@ sub_81A093C: @ 81A093C
lsrs r1, r0, 24
cmp r1, 0
bne _081A0954
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _081A095A
.pool
_081A0954:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081A095A:
@@ -12046,7 +12046,7 @@ sub_81A0990: @ 81A0990
thumb_func_start sub_81A09B4
sub_81A09B4: @ 81A09B4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r0, 0xB1
@@ -12070,13 +12070,13 @@ sub_81A09D0: @ 81A09D0
subs r1, r0, 0x3
cmp r1, 0
bge _081A09F4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _081A0A1C
.pool
_081A09F4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
cmp r1, 0x8
ble _081A09FE
movs r0, 0x1
@@ -12403,7 +12403,7 @@ sub_81A0CC0: @ 81A0CC0
lsrs r0, r1, 28
cmp r0, 0x2
bhi _081A0CE4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _081A0D34
.pool
@@ -12431,22 +12431,22 @@ _081A0D08:
beq _081A0D24
b _081A0D30
_081A0D0E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
b _081A0D34
.pool
_081A0D18:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _081A0D34
.pool
_081A0D24:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A0D34
.pool
_081A0D30:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
_081A0D34:
strh r0, [r1]
@@ -13078,7 +13078,7 @@ _081A1242:
lsls r0, 30
ldr r1, =gSpecialVar_0x8005
mov r12, r1
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
mov r8, r1
cmp r0, 0
beq _081A127C
@@ -13855,7 +13855,7 @@ _081A186C:
.4byte _081A1918
.4byte _081A1938
_081A188C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca8
@@ -13865,7 +13865,7 @@ _081A188C:
b _081A1956
.pool
_081A18A8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13877,7 +13877,7 @@ _081A18A8:
b _081A1956
.pool
_081A18C8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000cb2
@@ -13887,7 +13887,7 @@ _081A18C8:
b _081A1956
.pool
_081A18E4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13897,7 +13897,7 @@ _081A18E4:
b _081A1926
.pool
_081A1900:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gBattleOutcome
ldrb r0, [r1]
strh r0, [r2]
@@ -13906,7 +13906,7 @@ _081A1900:
b _081A1956
.pool
_081A1918:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ca9
@@ -13919,7 +13919,7 @@ _081A1926:
b _081A1956
.pool
_081A1938:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
movs r0, 0xD0
@@ -17183,7 +17183,7 @@ sub_81A35EC: @ 81A35EC
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_81A3610
lsls r0, 24
lsrs r0, 24
@@ -17755,12 +17755,12 @@ sub_81A3B00: @ 81A3B00
ldr r0, =0x000003fe
cmp r1, r0
bne _081A3B20
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A3B24
.pool
_081A3B20:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_081A3B24:
strh r0, [r1]
@@ -17988,7 +17988,7 @@ sub_81A3D30: @ 81A3D30
push {r4,lr}
ldr r0, =0x000040cf
bl VarGet
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
lsls r0, 24
lsrs r0, 24
bl sub_81A3B30
@@ -18044,13 +18044,13 @@ sub_81A3DA0: @ 81A3DA0
ands r2, r1
cmp r2, 0
beq _081A3DC4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081A3DC8
.pool
_081A3DC4:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
_081A3DC8:
pop {r0}
@@ -18390,7 +18390,7 @@ _081A404E:
bne _081A40C8
cmp r7, 0
bne _081A40E4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18406,7 +18406,7 @@ _081A404E:
b _081A40E4
.pool
_081A40C8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrb r3, [r0]
str r6, [sp]
add r1, sp, 0x10
@@ -18529,7 +18529,7 @@ _081A41E0:
strh r0, [r1]
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrb r0, [r0]
ldr r1, =0x00000ca9
adds r2, r1
@@ -18767,7 +18767,7 @@ _081A43EE:
thumb_func_start sub_81A4410
sub_81A4410: @ 81A4410
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl MoveRecordedBattleToSaveData
strh r0, [r4]
ldr r0, =gSaveBlock2Ptr
@@ -21309,7 +21309,7 @@ _081A5994:
beq _081A59C8
b _081A59EE
_081A599A:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r2, =0x00000dd8
adds r1, r3, r2
ldrh r1, [r1]
@@ -21317,7 +21317,7 @@ _081A599A:
b _081A59EE
.pool
_081A59B0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
lsls r1, 1
ldr r4, =0x00000dda
adds r0, r3, r4
@@ -21328,7 +21328,7 @@ _081A59B0:
_081A59C8:
cmp r1, 0
beq _081A59E0
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =0x00000cdc
adds r0, r3, r1
ldr r0, [r0]
@@ -21336,7 +21336,7 @@ _081A59C8:
b _081A59EA
.pool
_081A59E0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r4, =0x00000cdc
adds r0, r3, r4
ldr r0, [r0]
@@ -21550,12 +21550,12 @@ sub_81A5B88: @ 81A5B88
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081A5BD6
.pool
_081A5BD0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081A5BD6:
@@ -22026,7 +22026,7 @@ _081A5FE4:
beq _081A6030
b _081A6044
_081A5FEA:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -22035,7 +22035,7 @@ _081A5FEA:
b _081A603C
.pool
_081A6000:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r7]
ldr r0, =0x00000cdc
adds r2, r0
@@ -22054,7 +22054,7 @@ _081A6000:
b _081A6044
.pool
_081A6030:
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
ldr r0, [r7]
lsls r1, r6, 1
lsls r2, r5, 2
@@ -23248,7 +23248,7 @@ sub_81A6A08: @ 81A6A08
str r0, [r1]
movs r4, 0
add r5, sp, 0x14
ldr r7, =gScriptResult
ldr r7, =gSpecialVar_Result
movs r1, 0
_081A6A1E:
mov r2, sp
@@ -23407,7 +23407,7 @@ _081A6B18:
lsrs r4, r0, 24
cmp r4, 0x2
bls _081A6B0E
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0x1
@@ -24180,7 +24180,7 @@ _081A7174:
.4byte _081A71E8
.4byte _081A720C
_081A7188:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e02
adds r1, r3
@@ -24189,7 +24189,7 @@ _081A7188:
b _081A723A
.pool
_081A71A0:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24203,7 +24203,7 @@ _081A71A0:
b _081A7238
.pool
_081A71C4:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24217,7 +24217,7 @@ _081A71C4:
b _081A7238
.pool
_081A71E8:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000ca9
adds r0, r1, r3
@@ -24233,7 +24233,7 @@ _081A71E8:
_081A720C:
cmp r2, 0
beq _081A7228
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -24243,7 +24243,7 @@ _081A720C:
b _081A7236
.pool
_081A7228:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -24424,12 +24424,12 @@ sub_81A73B8: @ 81A73B8
ldrh r0, [r0]
cmp r0, 0xE
bls _081A73DC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A73E0
.pool
_081A73DC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_081A73E0:
strh r0, [r1]
@@ -24440,7 +24440,7 @@ _081A73E0:
thumb_func_start sub_81A73EC
sub_81A73EC: @ 81A73EC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, =gUnknown_0300128C
ldrb r1, [r1]
strh r1, [r0]
@@ -24528,27 +24528,27 @@ _081A7484:
beq _081A74A4
b _081A74C2
_081A748E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081A74C0
.pool
_081A7498:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081A74C0
.pool
_081A74A4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _081A74C0
.pool
_081A74B0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _081A74C0
.pool
_081A74BC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
_081A74C0:
strh r0, [r1]
@@ -24560,7 +24560,7 @@ _081A74C2:
thumb_func_start sub_81A74CC
sub_81A74CC: @ 81A74CC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, =gUnknown_0300128D
ldrb r1, [r1]
strh r1, [r0]
@@ -24580,7 +24580,7 @@ sub_81A74E0: @ 81A74E0
adds r4, 0x1
adds r0, r4, 0
bl sub_81A7F38
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -26066,7 +26066,7 @@ _081A807A:
thumb_func_start sub_81A8090
sub_81A8090: @ 81A8090
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl InBattlePike
lsls r0, 24
lsrs r0, 24
@@ -26110,7 +26110,7 @@ sub_81A80DC: @ 81A80DC
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
movs r0, 0
strh r0, [r4]
movs r0, 0x1
@@ -26295,7 +26295,7 @@ _081A824C:
thumb_func_start sub_81A825C
sub_81A825C: @ 81A825C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
movs r2, 0xE1
@@ -26311,7 +26311,7 @@ sub_81A825C: @ 81A825C
thumb_func_start sub_81A827C
sub_81A827C: @ 81A827C
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gUnknown_0861266C
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -26754,7 +26754,7 @@ _081A8634:
thumb_func_start sub_81A863C
sub_81A863C: @ 81A863C
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
movs r0, 0
bl sub_81A8590
lsls r0, 24
@@ -26787,7 +26787,7 @@ sub_81A8658: @ 81A8658
ldrb r4, [r0]
adds r0, r4, 0
bl sub_81A7F38
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -26821,7 +26821,7 @@ sub_81A86C0: @ 81A86C0
mov r6, r9
mov r5, r8
push {r5-r7}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
movs r0, 0
@@ -26895,7 +26895,7 @@ _081A8766:
mov r0, r9
cmp r0, 0x1
bne _081A8778
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _081A8786
@@ -27919,13 +27919,13 @@ _081A8F70:
.4byte _081A9010
.4byte _081A9028
_081A8F8C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e18
b _081A8FFE
.pool
_081A8F9C:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
lsls r1, r4, 1
ldr r3, =0x00000e1a
@@ -27937,14 +27937,14 @@ _081A8F9C:
_081A8FB4:
cmp r4, 0
beq _081A8FCC
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
b _081A9030
.pool
_081A8FCC:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -27954,14 +27954,14 @@ _081A8FCC:
b _081A9036
.pool
_081A8FE4:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r2, =0x00000e1a
adds r1, r2
b _081A9000
.pool
_081A8FF8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r1, [r3]
ldr r3, =0x00000e1c
_081A8FFE:
@@ -27972,7 +27972,7 @@ _081A9000:
b _081A903A
.pool
_081A9010:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r1, =0x00000cdc
adds r0, r1
@@ -27982,7 +27982,7 @@ _081A9010:
b _081A9036
.pool
_081A9028:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, [r3]
ldr r3, =0x00000cdc
adds r0, r3
@@ -28211,12 +28211,12 @@ sub_81A91FC: @ 81A91FC
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081A924A
.pool
_081A9244:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081A924A:
@@ -28296,7 +28296,7 @@ CalculateBattlePyramidItemBallItemId: @ 81A9290
_081A92DE:
bl sub_81AA9E4
lsls r0, 24
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
ldrh r4, [r1]
ldr r1, =gUnknown_08613650
lsrs r0, 20
@@ -28401,7 +28401,7 @@ sub_81A93C8: @ 81A93C8
lsls r1, 4
adds r3, r0, r1
movs r2, 0
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
b _081A93F4
.pool
_081A93E4:
@@ -28712,7 +28712,7 @@ _081A9650:
thumb_func_start sub_81A966C
sub_81A966C: @ 81A966C
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl InBattlePyramid
lsls r0, 24
lsrs r0, 24
@@ -28745,7 +28745,7 @@ _081A9698:
b _081A9754
.pool
_081A96B4:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0x1
beq _081A9710
@@ -28775,7 +28775,7 @@ _081A96F4:
ldrh r0, [r0]
bl PlaySE
_081A96FC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
@@ -29352,7 +29352,7 @@ _081A9B86:
strb r3, [r0, 0x6]
mov r7, r10
ldr r2, [r7]
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r1, [r0]
subs r1, 0x1
lsls r0, r1, 1
@@ -29815,7 +29815,7 @@ _081A9F7A:
thumb_func_start sub_81A9F80
sub_81A9F80: @ 81A9F80
push {lr}
ldr r0, =gUnknown_08252C88
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -29962,7 +29962,7 @@ _081AA0A6:
ldr r2, =0x00000169
adds r0, r2
lsls r0, 2
ldr r1, =gUnknown_08481DD4
ldr r1, =gMapAttributes
adds r0, r1
ldr r6, [r0]
ldr r2, [r6, 0xC]
@@ -30241,8 +30241,8 @@ sub_81AA2F8: @ 81AA2F8
push {r4,r5,lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r5, =gUnknown_08252C4F
ldr r4, =gUnknown_08252C6A
ldr r5, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F
ldr r4, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A
movs r2, 0xC8
lsls r2, 4
adds r1, r0, r2
asm/battle_setup.s
+21 -21
View File
@@ -1344,7 +1344,7 @@ sub_80B1158: @ 80B1158
sub sp, 0x8
ldr r0, =0x00004023
bl GetVarPointer
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldrh r1, [r2]
strh r1, [r0]
ldrh r0, [r2]
@@ -1669,7 +1669,7 @@ battle_80801F0: @ 80B13F8
ldrh r1, [r0]
cmp r1, 0
beq _080B141A
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
strh r1, [r0]
lsls r0, r1, 24
lsrs r0, 24
@@ -1728,7 +1728,7 @@ _080B1494:
ldr r0, =gUnknown_0854FF84
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gUnknown_082713C2
ldr r0, =EventScript_2713C2
b _080B161E
.pool
_080B14A8:
@@ -1757,7 +1757,7 @@ _080B14D6:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gUnknown_0827138A
ldr r0, =EventScript_27138A
b _080B161E
.pool
_080B14EC:
@@ -1769,7 +1769,7 @@ _080B14EC:
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
ldr r0, =gUnknown_082713F8
ldr r0, =EventScript_2713F8
b _080B161E
.pool
_080B1514:
@@ -1781,7 +1781,7 @@ _080B1514:
ldrh r0, [r4]
bl sub_80B2234
strh r0, [r4]
ldr r0, =gUnknown_082713D1
ldr r0, =EventScript_2713D1
b _080B161E
.pool
_080B153C:
@@ -1793,7 +1793,7 @@ _080B153C:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl sub_81A9AA8
ldr r1, =gTrainerBattleOpponent_A
@@ -1803,7 +1803,7 @@ _080B156C:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl sub_81A9AA8
_080B157C:
@@ -1833,7 +1833,7 @@ _080B15A8:
adds r1, r5, 0
bl TrainerBattleLoadArgs
bl battle_80801F0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl battle_init
ldr r1, =gTrainerBattleOpponent_A
@@ -1843,7 +1843,7 @@ _080B15D8:
ldr r0, =gUnknown_08550014
adds r1, r5, 0
bl TrainerBattleLoadArgs
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl battle_init
b _080B157C
@@ -1866,7 +1866,7 @@ _080B1616:
adds r1, r5, 0
bl TrainerBattleLoadArgs
_080B161C:
ldr r0, =gUnknown_08271362
ldr r0, =EventScript_271362
_080B161E:
pop {r4,r5}
pop {r1}
@@ -1882,7 +1882,7 @@ SingleTrainerWantsBattle: @ 80B162C
lsrs r0, 24
ldr r2, =gSelectedMapObject
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -1893,7 +1893,7 @@ SingleTrainerWantsBattle: @ 80B162C
adds r1, 0x1
adds r0, r1, 0
bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gUnknown_08271354
ldr r0, =EventScript_271354
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
pop {r4}
@@ -1910,7 +1910,7 @@ TwoTrainersWantBattle: @ 80B1670
lsrs r0, 24
ldr r2, =gSelectedMapObject
strb r0, [r2]
ldr r4, =gScriptLastTalked
ldr r4, =gSpecialVar_LastTalked
ldr r3, =gMapObjects
lsls r2, r0, 3
adds r2, r0
@@ -1931,7 +1931,7 @@ TwoTrainersWantBattle: @ 80B1670
@ void TwoTrainersWantBattleExecuteScript()
TwoTrainersWantBattleExecuteScript: @ 80B16A4
push {lr}
ldr r0, =gUnknown_08271354
ldr r0, =EventScript_271354
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
pop {r0}
@@ -2332,7 +2332,7 @@ sub_80B1A14: @ 80B1A14
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1A44
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl sub_81A9AA8
lsls r0, 16
@@ -2370,7 +2370,7 @@ _080B1A7C:
ldrb r0, [r0]
cmp r0, 0x1
bhi _080B1AAC
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl battle_init
adds r1, r0, 0
@@ -2420,7 +2420,7 @@ BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8
ldr r0, [r0]
cmp r0, 0
bne _080B1B04
ldr r0, =gUnknown_082C8436
ldr r0, =EventScript_2C8436
_080B1B04:
pop {r1}
bx r1
@@ -2457,7 +2457,7 @@ _080B1B3C:
b _080B1B56
.pool
_080B1B54:
ldr r0, =gUnknown_082742E6
ldr r0, =LavaridgeTown_Gym_1F_EventScript_2742E6
_080B1B56:
pop {r1}
bx r1
@@ -3484,7 +3484,7 @@ CheckIfMultipleTrainersWantBattle: @ 80B22D8
ldr r1, =gUnknown_02038BF8
movs r0, 0x1
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _080B230A
.pool
@@ -3492,7 +3492,7 @@ _080B2300:
ldr r1, =gUnknown_02038BF8
movs r0, 0
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_080B230A:
strh r0, [r1]
asm/battle_tent.s
+9 -9
View File
@@ -57,7 +57,7 @@ sub_81B99D4: @ 81B99D4
thumb_func_start sub_81B9A28
sub_81B9A28: @ 81B9A28
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6a
@@ -196,12 +196,12 @@ sub_81B9B28: @ 81B9B28
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9B76
.pool
_081B9B70:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9B76:
@@ -263,7 +263,7 @@ sub_81B9BA0: @ 81B9BA0
thumb_func_start sub_81B9BF4
sub_81B9BF4: @ 81B9BF4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6c
@@ -357,12 +357,12 @@ sub_81B9C98: @ 81B9C98
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9CE6
.pool
_081B9CE0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9CE6:
@@ -436,7 +436,7 @@ sub_81B9D28: @ 81B9D28
thumb_func_start sub_81B9D7C
sub_81B9D7C: @ 81B9D7C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6e
@@ -530,12 +530,12 @@ sub_81B9E20: @ 81B9E20
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9E6E
.pool
_081B9E68:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9E6E:
asm/battle_tower.s
+17 -17
View File
@@ -132,12 +132,12 @@ _08162094:
lsls r1, 24
lsrs r1, 24
bl sub_8164FCC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
strh r0, [r1]
b _081620E8
.pool
_081620A8:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldr r2, [r5]
ldr r0, =0x00000cdc
adds r2, r0
@@ -294,7 +294,7 @@ _081621EE:
adds r0, 0x1
strh r0, [r1]
bl sub_8163E90
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, [r5]
adds r0, r4
ldrh r0, [r0]
@@ -3547,11 +3547,11 @@ _08163E2C:
ldr r4, =gUnknown_02038BFC
movs r0, 0
strb r0, [r4]
ldr r0, =gUnknown_08224158
ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
bl BattleSetup_ConfigureTrainerBattle
movs r0, 0x1
strb r0, [r4]
ldr r0, =gUnknown_08224167
ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1
bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gPartnerTrainerId
strh r5, [r0]
@@ -4714,7 +4714,7 @@ sub_8164828: @ 8164828
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r0, [r0]
subs r5, r0, 0x2
ldr r0, =gSaveBlock2Ptr
@@ -5076,7 +5076,7 @@ sub_8164B74: @ 8164B74
adds r0, r2
ldrh r6, [r0]
bl GetMultiplayerId
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x6
bls _08164BAC
@@ -5126,7 +5126,7 @@ _08164C18:
mov r1, sp
movs r2, 0x4
bl SendBlock
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _08164DB4
.pool
@@ -5204,7 +5204,7 @@ _08164CB0:
mov r4, r8
cmp r4, 0xD
ble _08164C68
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _08164DB4
.pool
@@ -5222,7 +5222,7 @@ _08164CE0:
adds r1, r3
movs r2, 0x28
bl SendBlock
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _08164DB4
.pool
@@ -5268,13 +5268,13 @@ _08164D14:
ldrb r0, [r0]
cmp r0, 0
bne _08164DB0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
b _08164DB4
.pool
_08164D98:
bl sub_800AC34
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
b _08164DB4
.pool
@@ -5284,7 +5284,7 @@ _08164DA8:
cmp r0, 0
bne _08164DB6
_08164DB0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x6
_08164DB4:
strh r0, [r1]
@@ -5625,7 +5625,7 @@ sub_816502C: @ 816502C
movs r0, 0x45
mov r10, r0
_0816506A:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
mov r9, r1
movs r0, 0
strh r0, [r1]
@@ -5681,7 +5681,7 @@ _081650D4:
cmp r6, r8
blt _0816508C
_081650DC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
beq _08165132
@@ -5901,7 +5901,7 @@ _08165294:
thumb_func_start sub_81652B4
sub_81652B4: @ 81652B4
push {r4-r6,lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
movs r0, 0
strh r0, [r2]
ldr r1, =gSaveBlock2Ptr
@@ -5943,7 +5943,7 @@ _081652F2:
ldr r3, =0x00000bec
adds r0, r1, r3
bl sub_816534C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_08165316:
asm/berry_blender.s
+3 -3
View File
@@ -1190,7 +1190,7 @@ _080801F8:
movs r5, 0xAC
lsls r5, 1
adds r0, r5
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
bl sub_807FE14
ldr r0, =gUnknown_020228C4
@@ -2043,7 +2043,7 @@ _080808F8:
_08080950:
bl sub_800B4C0
bl sub_8080588
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r1, [r4]
movs r0, 0
bl sub_8082FDC
@@ -7619,7 +7619,7 @@ _080837EA:
movs r1, 0x6
bl CreateTask
bl sub_80EECEC
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
asm/berry_tag_screen.s
+1 -1
View File
@@ -12,7 +12,7 @@ sub_8177C14: @ 8177C14
ldr r0, =0x0000180c
bl AllocZeroed
str r0, [r4]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemIdToBerryType
ldr r1, [r4]
asm/cable_club.s
+14 -14
View File
@@ -433,7 +433,7 @@ sub_80B2688: @ 80B2688
bne _080B26EC
movs r0, 0x15
bl PlaySE
ldr r0, =gUnknown_082780B3
ldr r0, =OldaleTown_PokemonCenter_2F_Text_2780B3
bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B270C
b _080B26FA
@@ -441,7 +441,7 @@ sub_80B2688: @ 80B2688
_080B26EC:
movs r0, 0x16
bl PlaySE
ldr r0, =gUnknown_08278131
ldr r0, =OldaleTown_PokemonCenter_2F_Text_278131
bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B2918
_080B26FA:
@@ -544,7 +544,7 @@ sub_80B275C: @ 80B275C
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_082780F2
ldr r0, =OldaleTown_PokemonCenter_2F_Text_2780F2
bl ShowFieldAutoScrollMessage
mov r0, r9
subs r0, 0x8
@@ -597,7 +597,7 @@ sub_80B2804: @ 80B2804
cmp r0, 0
beq _080B2878
_080B2852:
ldr r0, =gUnknown_082780B3
ldr r0, =OldaleTown_PokemonCenter_2F_Text_2780B3
bl ShowFieldAutoScrollMessage
ldr r1, =gTasks
lsls r0, r5, 2
@@ -663,7 +663,7 @@ sub_80B28A8: @ 80B28A8
b _080B2908
.pool
_080B28F4:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
adds r0, r7, 0
adds r1, r6, 0
bl sub_80B2478
@@ -703,7 +703,7 @@ sub_80B2918: @ 80B2918
bl sub_80B24F8
cmp r0, 0x1
beq _080B29E6
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
adds r0, r6, 0
adds r1, r5, 0
bl sub_80B2478
@@ -791,7 +791,7 @@ sub_80B2A08: @ 80B2A08
bl sub_80B24F8
cmp r0, 0x1
beq _080B2ACE
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bne _080B2A38
@@ -1067,7 +1067,7 @@ _080B2C7E:
movs r0, 0
bl sub_800B330
bl ResetBlockReceivedFlags
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
adds r1, r5, 0
bl task_map_chg_seq_0807EC34
_080B2C9C:
@@ -1111,7 +1111,7 @@ sub_80B2CEC: @ 80B2CEC
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
ldr r0, =gTasks
@@ -1139,7 +1139,7 @@ sub_80B2D2C: @ 80B2D2C
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x6
strh r0, [r1]
ldr r0, =gTasks
@@ -1284,7 +1284,7 @@ sub_80B2E4C: @ 80B2E4C
thumb_func_start sub_80B2E74
sub_80B2E74: @ 80B2E74
push {lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_020229C6
@@ -1353,7 +1353,7 @@ sub_80B2EE4: @ 80B2EE4
b _080B2FC6
.pool
_080B2F0C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
bne _080B2FA8
@@ -1415,7 +1415,7 @@ _080B2F74:
_080B2F82:
cmp r7, 0
beq _080B2FA8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xC
strh r0, [r1]
bl sub_800AD10
@@ -2296,7 +2296,7 @@ _080B3750:
beq _080B37B8
b _080B37CC
_080B375A:
ldr r0, =gUnknown_08278091
ldr r0, =OldaleTown_PokemonCenter_2F_Text_278091
bl ShowFieldMessage
movs r0, 0x1
strh r0, [r5, 0x8]
asm/contest.s
+8 -8
View File
@@ -6313,7 +6313,7 @@ _080DAE1E:
movs r0, 0x4
b _080DAE9A
_080DAE2E:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DAE82
@@ -6358,7 +6358,7 @@ _080DAE82:
movs r0, 0
b _080DAE9A
_080DAE86:
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
adds r2, r1, 0
ldrh r1, [r0]
movs r0, 0x2
@@ -8456,7 +8456,7 @@ sub_80DBED4: @ 80DBED4
adds r0, r1
ldrb r1, [r0]
lsls r1, 1
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
lsls r0, 3
adds r1, r0
@@ -11805,7 +11805,7 @@ sub_80DD9F0: @ 80DD9F0
ldrb r1, [r0, 0x1]
lsls r1, 29
lsrs r1, 29
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r2, [r0]
lsls r0, r2, 2
adds r0, r2
@@ -14260,7 +14260,7 @@ _080DEDE6:
b _080DEF90
.pool
_080DEE00:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DEE4C
@@ -14369,7 +14369,7 @@ _080DEEF4:
mov r2, r10
ldr r0, [r2]
adds r0, r7
ldr r1, =gUnknown_02039F2E
ldr r1, =gSpecialVar_ContestRank
ldrh r1, [r1]
ldr r3, =0x00002eae
adds r0, r3
@@ -14383,7 +14383,7 @@ _080DEF02:
mov r2, r9
lsls r1, r2, 5
adds r0, r1
ldr r1, =gScriptContestCategory
ldr r1, =gSpecialVar_ContestCategory
ldrh r1, [r1]
ldr r3, =0x00002e9a
adds r0, r3
@@ -14485,7 +14485,7 @@ _080DEFE6:
b _080DF03A
.pool
_080DEFF8:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DF038
asm/contest_ai.s
+1 -1
View File
@@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4
ldr r0, =gContestResources
ldr r0, [r0]
ldr r1, [r0, 0xC]
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
strh r0, [r1, 0x18]
ldr r1, =gAIScriptPtr
asm/contest_effect.s
+1 -1
View File
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
adds r0, r3
ldrb r0, [r0, 0x1]
lsls r0, 29
ldr r1, =gScriptContestCategory
ldr r1, =gSpecialVar_ContestCategory
lsrs r0, 29
ldrh r1, [r1]
cmp r0, r1
asm/contest_link_80F57C4.s
+17 -17
View File
@@ -548,7 +548,7 @@ _080F5D2A:
movs r0, 0x8
strh r0, [r1]
bl InterviewBefore
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
beq _080F5D58
@@ -556,7 +556,7 @@ _080F5D2A:
_080F5D58:
movs r0, 0x2
bl sub_813BADC
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrb r0, [r0]
bl sub_80DEDA8
movs r0, 0xFE
@@ -673,7 +673,7 @@ _080F5E78:
movs r0, 0x25
bl IncrementGameStat
_080F5E92:
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrb r0, [r0]
bl sub_80DEDA8
movs r0, 0xFE
@@ -2972,7 +2972,7 @@ sub_80F71C8: @ 80F71C8
b _080F7240
.pool
_080F71F8:
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r2, [r0]
cmp r2, 0
bne _080F720C
@@ -3008,7 +3008,7 @@ _080F7236:
bl CopyToBgTilemapBufferRect
movs r5, 0xF
_080F7240:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0
bne _080F725C
@@ -4640,15 +4640,15 @@ sub_80F7F30: @ 80F7F30
adds r5, r0, 0
cmp r5, 0
beq _080F7F5E
ldr r4, =gScriptContestCategory
ldr r4, =gSpecialVar_ContestCategory
ldrb r0, [r4]
ldr r1, =gUnknown_02039F2E
ldr r1, =gSpecialVar_ContestRank
ldrb r1, [r1]
bl sub_80DAB8C
ldrb r0, [r4]
bl sub_80DB09C
_080F7F5E:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
pop {r4,r5}
pop {r0}
@@ -4666,7 +4666,7 @@ sub_80F7F7C: @ 80F7F7C
muls r1, r0
ldr r0, =gPlayerParty
adds r2, r1, r0
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080F7FEE
@@ -4704,7 +4704,7 @@ _080F7FDC:
movs r1, 0x36
_080F7FE0:
bl GetMonData
ldr r1, =gUnknown_02039F2E
ldr r1, =gSpecialVar_ContestRank
ldrh r1, [r1]
cmp r0, r1
bls _080F7FEE
@@ -4730,7 +4730,7 @@ sub_80F7FFC: @ 80F7FFC
beq _080F8010
b _080F8250
_080F8010:
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bls _080F801A
@@ -4762,7 +4762,7 @@ _080F8048:
lsrs r1, r0, 24
mov r0, sp
strb r1, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r1, r0
bls _080F806C
@@ -4812,7 +4812,7 @@ _080F80B8:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bls _080F80DC
@@ -4861,7 +4861,7 @@ _080F8124:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bls _080F8148
@@ -4908,7 +4908,7 @@ _080F8190:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bhi _080F8250
@@ -4951,7 +4951,7 @@ _080F81F8:
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r2, r0
bhi _080F8250
@@ -5488,7 +5488,7 @@ _080F8678:
bl sub_80F86E0
ldr r1, =gUnknown_02039F2B
strb r0, [r1]
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
asm/contest_link_81D9DE4.s
+1 -1
View File
@@ -370,7 +370,7 @@ sub_81DA10C: @ 81DA10C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
asm/daycare.s
+3 -3
View File
@@ -3075,12 +3075,12 @@ c3_080469FC: @ 8071204
b _0807124E
.pool
_0807123C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0807124E
.pool
_08071248:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
strh r0, [r1]
_0807124E:
@@ -3109,7 +3109,7 @@ _08071284:
ands r0, r2
cmp r0, 0
beq _080712B4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
ldrb r0, [r4, 0x8]
movs r1, 0
asm/dewford_trend.s
+2 -2
View File
@@ -667,7 +667,7 @@ sub_81229C8: @ 81229C8
negs r0, r0
lsrs r4, r0, 31
_08122A0C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4}
pop {r0}
@@ -677,7 +677,7 @@ _08122A0C:
thumb_func_start sub_8122A30
sub_8122A30: @ 8122A30
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r3, =0x00002e6c
asm/easy_chat.s
+3 -3
View File
@@ -1659,7 +1659,7 @@ _0811AFAC:
b _0811AFE6
.pool
_0811AFC0:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
ldr r0, =gUnknown_0203A118
ldr r0, [r0]
@@ -1709,7 +1709,7 @@ _0811B00C:
.pool
_0811B020:
bl sub_811BE9C
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
@@ -1860,7 +1860,7 @@ _0811B118:
b _0811B14A
.pool
_0811B134:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_811B4EC
strh r0, [r4]
bl sub_811B3E4
asm/field_control_avatar.s
+45 -45
View File
@@ -184,7 +184,7 @@ sub_809C014: @ 809C014
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
movs r1, 0
strh r1, [r0]
ldr r0, =gSelectedMapObject
@@ -443,13 +443,13 @@ _0809C214:
ldr r0, =gUnknown_0823B589
cmp r4, r0
beq _0809C244
ldr r0, =gUnknown_082766A2
ldr r0, =EventScript_2766A2
cmp r4, r0
beq _0809C244
ldr r0, =gUnknown_082766A6
ldr r0, =EventScript_2766A6
cmp r4, r0
beq _0809C244
ldr r0, =gUnknown_08271D92
ldr r0, =EventScript_271D92
cmp r4, r0
beq _0809C244
movs r0, 0x5
@@ -582,13 +582,13 @@ _0809C34C:
ble _0809C340
ldr r0, =gSelectedMapObject
strb r3, [r0]
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r3
lsls r0, 2
adds r0, r5
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
@@ -668,13 +668,13 @@ _0809C400:
_0809C40C:
ldr r0, =gSelectedMapObject
strb r4, [r0]
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r4
lsls r0, 2
adds r0, r3
ldrb r0, [r0, 0x8]
strh r0, [r1]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_Facing
strh r7, [r0]
bl InTrainerHill
cmp r0, 0x1
@@ -687,7 +687,7 @@ _0809C43C:
bl GetFieldObjectScriptPointerByFieldObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrb r0, [r0]
bl GetRamScript
adds r1, r0, 0
@@ -721,7 +721,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
ldr r2, [r0, 0x8]
cmp r2, 0
bne _0809C490
ldr r0, =gUnknown_082C8436
ldr r0, =EventScript_2C8436
b _0809C532
.pool
_0809C490:
@@ -778,7 +778,7 @@ _0809C4E2:
lsrs r0, 24
cmp r0, 0x1
beq _0809C4CC
ldr r0, =gUnknown_08271CB7
ldr r0, =EventScript_271CB7
b _0809C532
.pool
_0809C510:
@@ -790,7 +790,7 @@ _0809C510:
lsls r0, 24
cmp r0, 0
beq _0809C4CC
ldr r0, =gUnknown_082759F1
ldr r0, =EventScript_2759F1
b _0809C532
.pool
_0809C530:
@@ -816,7 +816,7 @@ TryGetMetatileBehaviorScript: @ 809C538
lsrs r0, 24
cmp r0, 0x1
bne _0809C55C
ldr r0, =gUnknown_0827EE0B
ldr r0, =EventScript_27EE0B
b _0809C7E4
.pool
_0809C55C:
@@ -826,7 +826,7 @@ _0809C55C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C574
ldr r0, =gUnknown_08271D92
ldr r0, =EventScript_271D92
b _0809C7E4
.pool
_0809C574:
@@ -836,7 +836,7 @@ _0809C574:
lsrs r0, 24
cmp r0, 0x1
bne _0809C58C
ldr r0, =gUnknown_081E615D
ldr r0, =SootopolisCity_EventScript_1E615D
b _0809C7E4
.pool
_0809C58C:
@@ -846,7 +846,7 @@ _0809C58C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5A4
ldr r0, =gUnknown_082393F9
ldr r0, =SkyPillar_Outside_EventScript_2393F9
b _0809C7E4
.pool
_0809C5A4:
@@ -864,7 +864,7 @@ _0809C5B4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5CC
ldr r0, =gUnknown_082A4BAC
ldr r0, =EventScript_2A4BAC
b _0809C7E4
.pool
_0809C5CC:
@@ -874,7 +874,7 @@ _0809C5CC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5E4
ldr r0, =gUnknown_0826A22A
ldr r0, =Route110_TrickHouseEntrance_EventScript_26A22A
b _0809C7E4
.pool
_0809C5E4:
@@ -884,7 +884,7 @@ _0809C5E4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C5FC
ldr r0, =gUnknown_0827208F
ldr r0, =EventScript_27208F
b _0809C7E4
.pool
_0809C5FC:
@@ -894,7 +894,7 @@ _0809C5FC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C614
ldr r0, =gUnknown_08292DE5
ldr r0, =EventScript_292DE5
b _0809C7E4
.pool
_0809C614:
@@ -904,7 +904,7 @@ _0809C614:
lsrs r0, 24
cmp r0, 0x1
bne _0809C62C
ldr r0, =gUnknown_082725CE
ldr r0, =EventScript_2725CE
b _0809C7E4
.pool
_0809C62C:
@@ -914,7 +914,7 @@ _0809C62C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C644
ldr r0, =gUnknown_082725D7
ldr r0, =EventScript_2725D7
b _0809C7E4
.pool
_0809C644:
@@ -924,7 +924,7 @@ _0809C644:
lsrs r0, 24
cmp r0, 0x1
bne _0809C65C
ldr r0, =gUnknown_082725E0
ldr r0, =EventScript_2725E0
b _0809C7E4
.pool
_0809C65C:
@@ -934,7 +934,7 @@ _0809C65C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C674
ldr r0, =gUnknown_082725E9
ldr r0, =EventScript_2725E9
b _0809C7E4
.pool
_0809C674:
@@ -944,7 +944,7 @@ _0809C674:
lsrs r0, 24
cmp r0, 0x1
bne _0809C68C
ldr r0, =gUnknown_082725F2
ldr r0, =EventScript_2725F2
b _0809C7E4
.pool
_0809C68C:
@@ -954,7 +954,7 @@ _0809C68C:
lsrs r0, 24
cmp r0, 0x1
bne _0809C6A4
ldr r0, =gUnknown_082725FB
ldr r0, =EventScript_2725FB
b _0809C7E4
.pool
_0809C6A4:
@@ -964,7 +964,7 @@ _0809C6A4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C6BC
ldr r0, =gUnknown_08272604
ldr r0, =EventScript_272604
b _0809C7E4
.pool
_0809C6BC:
@@ -975,7 +975,7 @@ _0809C6BC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C6D4
ldr r0, =gUnknown_08277B8A
ldr r0, =OldaleTown_PokemonCenter_2F_EventScript_277B8A
b _0809C7E4
.pool
_0809C6D4:
@@ -997,7 +997,7 @@ _0809C6EC:
lsrs r0, 24
cmp r0, 0x1
bne _0809C704
ldr r0, =gUnknown_0827381B
ldr r0, =EventScript_27381B
b _0809C7E4
.pool
_0809C704:
@@ -1007,7 +1007,7 @@ _0809C704:
lsrs r0, 24
cmp r0, 0x1
bne _0809C71C
ldr r0, =gUnknown_082C8393
ldr r0, =TrainerHill_1F_EventScript_2C8393
b _0809C7E4
.pool
_0809C71C:
@@ -1125,7 +1125,7 @@ TryGetFieldMoveScript: @ 809C7EC
lsrs r0, 24
cmp r0, 0x1
bne _0809C824
ldr r0, =gUnknown_08271EA0
ldr r0, =EventScript_271EA0
b _0809C862
.pool
_0809C824:
@@ -1146,11 +1146,11 @@ _0809C824:
lsrs r0, 24
cmp r0, 0x1
bne _0809C858
ldr r0, =gUnknown_08290A49
ldr r0, =EventScript_290A49
b _0809C862
.pool
_0809C858:
ldr r0, =gUnknown_08290A83
ldr r0, =EventScript_290A83
b _0809C862
.pool
_0809C860:
@@ -1174,7 +1174,7 @@ sub_809C868: @ 809C868
lsrs r0, 24
cmp r0, 0x2
bne _0809C894
ldr r0, =gUnknown_08290B0F
ldr r0, =EventScript_290B0F
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C896
@@ -1203,7 +1203,7 @@ sub_809C89C: @ 809C89C
lsrs r0, 24
cmp r0, 0x1
bne _0809C8D4
ldr r0, =gUnknown_08290B5A
ldr r0, =EventScript_290B5A
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C8D6
@@ -1310,7 +1310,7 @@ _0809C988:
lsls r0, 24
cmp r0, 0
beq _0809C9A4
ldr r0, =gUnknown_08252BE8
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8
_0809C996:
bl ScriptContext1_SetupScript
movs r0, 0x1
@@ -1385,7 +1385,7 @@ _0809CA04:
lsrs r0, 24
cmp r0, 0x1
bne _0809CA48
ldr r0, =gUnknown_082736BC
ldr r0, =EventScript_2736BC
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1396,7 +1396,7 @@ _0809CA48:
beq _0809CA64
movs r0, 0xD
bl IncrementGameStat
ldr r0, =gUnknown_08291FC0
ldr r0, =Route117_PokemonDayCare_EventScript_291FC0
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1416,7 +1416,7 @@ _0809CA7C:
lsrs r0, 24
cmp r0, 0x1
bne _0809CA94
ldr r0, =gUnknown_08238EAF
ldr r0, =IslandCave_EventScript_238EAF
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1424,7 +1424,7 @@ _0809CA94:
bl is_tile_that_overrides_player_control
cmp r0, 0x1
bne _0809CAA8
ldr r0, =gUnknown_081DF7BA
ldr r0, =MauvilleCity_EventScript_1DF7BA
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1432,7 +1432,7 @@ _0809CAA8:
bl sub_8138120
cmp r0, 0x1
bne _0809CABC
ldr r0, =gUnknown_081F49EC
ldr r0, =Route119_EventScript_1F49EC
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1440,7 +1440,7 @@ _0809CABC:
bl sub_8138168
cmp r0, 0x1
bne _0809CAD0
ldr r0, =gUnknown_081FA4D6
ldr r0, =LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1448,7 +1448,7 @@ _0809CAD0:
bl sub_81381B0
cmp r0, 0x1
bne _0809CAE4
ldr r0, =gUnknown_0821307B
ldr r0, =RustboroCity_Gym_EventScript_21307B
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1456,7 +1456,7 @@ _0809CAE4:
bl sub_81381F8
cmp r0, 0x1
bne _0809CAF8
ldr r0, =gUnknown_08224175
ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224175
bl ScriptContext1_SetupScript
b _0809CB28
.pool
@@ -1470,7 +1470,7 @@ _0809CAF8:
bl CountSSTidalStep
cmp r0, 0x1
bne _0809CB1C
ldr r0, =gUnknown_0823C050
ldr r0, =SSTidalCorridor_EventScript_23C050
bl ScriptContext1_SetupScript
b _0809CB28
.pool
asm/field_poison.s
+3 -3
View File
@@ -203,12 +203,12 @@ _080F96C0:
cmp r0, 0
beq _080F96F0
_080F96E6:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _080F9718
.pool
_080F96F0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _080F9718
@@ -224,7 +224,7 @@ _080F96FC:
b _080F9722
.pool
_080F9714:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080F9718:
bl EnableBothScriptContexts
asm/field_screen.s
+1 -1
View File
@@ -10424,7 +10424,7 @@ sub_80B0534: @ 80B0534
lsls r1, 3
ldr r0, =gTasks + 0x8
adds r1, r0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
bne _080B0568
asm/fldeff_80F9BCC.s
+9 -9
View File
@@ -563,7 +563,7 @@ _080F9FFE:
sub_80FA004: @ 80FA004
push {r4,lr}
bl sub_80E8BC8
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
@@ -647,7 +647,7 @@ sub_80FA0DC: @ 80FA0DC
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275A86
ldr r0, =EventScript_275A86
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -782,7 +782,7 @@ sub_80FA1E8: @ 80FA1E8
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275ADF
ldr r0, =EventScript_275ADF
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -955,7 +955,7 @@ sub_80FA34C: @ 80FA34C
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275B38
ldr r0, =EventScript_275B38
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -2063,7 +2063,7 @@ _080FACC2:
ldr r0, =gStringVar2
ldr r1, =gText_Gold
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2087,7 +2087,7 @@ _080FAD14:
ldr r0, =gStringVar2
ldr r1, =gText_Silver
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =0x00004054
@@ -2103,12 +2103,12 @@ _080FAD14:
b _080FAD8A
.pool
_080FAD60:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _080FAD70
.pool
_080FAD6C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_080FAD70:
strh r0, [r1]
@@ -2131,7 +2131,7 @@ _080FAD8A:
b _080FADCE
.pool
_080FADA4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
strh r0, [r1]
ldr r0, =0x00004054
asm/fldeff_cut.s
+2 -2
View File
@@ -425,7 +425,7 @@ sub_80D3A9C: @ 80D3A9C
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08290705
ldr r0, =Route103_EventScript_290705
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -1323,7 +1323,7 @@ _080D41D4:
lsrs r0, 24
cmp r0, 0x1
bne _080D422A
ldr r0, =gUnknown_08267EDB
ldr r0, =FarawayIsland_Interior_EventScript_267EDB
bl ScriptContext1_SetupScript
_080D422A:
pop {r4-r6}
asm/fldeff_strength.s
+2 -2
View File
@@ -17,7 +17,7 @@ hm_prepare_rocksmash: @ 8145DC4
movs r0, 0
b _08145DF2
_08145DD8:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -44,7 +44,7 @@ sub_8145E0C: @ 8145E0C
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082908FD
ldr r0, =FieryPath_EventScript_2908FD
bl ScriptContext1_SetupScript
pop {r0}
bx r0
asm/fldeff_sweetscent.s
+1 -1
View File
@@ -205,7 +205,7 @@ sub_815A090: @ 815A090
lsls r2, 1
bl CpuFastSet
bl sub_80AC3E4
ldr r0, =gUnknown_08290CAE
ldr r0, =EventScript_290CAE
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
asm/item_menu.s
+42 -42
View File
@@ -121,7 +121,7 @@ sub_81AAC28: @ 81AAC28
ldr r0, =gSpecialVar_0x8005
movs r1, 0
strh r1, [r0]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
pop {r0}
bx r0
@@ -135,7 +135,7 @@ sub_81AAC50: @ 81AAC50
movs r0, 0x7
movs r1, 0x5
bl GoToBagMenu
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
pop {r0}
@@ -150,7 +150,7 @@ sub_81AAC70: @ 81AAC70
movs r0, 0x8
movs r1, 0x5
bl GoToBagMenu
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
pop {r0}
@@ -2181,7 +2181,7 @@ _081ABE32:
_081ABE40:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
mov r1, r10
strh r1, [r0]
ldr r0, =gTasks + 0x8
@@ -2215,7 +2215,7 @@ _081ABE68:
lsrs r0, 24
adds r1, r4, 0
bl BagGetItemIdByPocketPosition
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
strh r0, [r1]
ldr r1, =gUnknown_08614054
ldrb r0, [r5, 0x4]
@@ -3125,7 +3125,7 @@ _081AC668:
.4byte _081AC70C
.4byte _081AC690
_081AC690:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetBattleUsage
lsls r0, 24
@@ -3170,7 +3170,7 @@ _081AC6E8:
b _081ACA10
.pool
_081AC70C:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -3205,7 +3205,7 @@ _081AC748:
b _081ACA10
.pool
_081AC76C:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -3240,7 +3240,7 @@ _081AC7A8:
b _081ACA10
.pool
_081AC7CC:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -3288,7 +3288,7 @@ _081AC840:
ldrb r0, [r0, 0x5]
cmp r0, 0x4
beq _081AC856
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl sub_8122148
lsls r0, 24
@@ -3358,7 +3358,7 @@ _081AC8D4:
ldr r1, =gUnknown_0861402C
movs r2, 0x4
bl memcpy
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_is_mail
lsls r0, 24
@@ -3396,7 +3396,7 @@ _081AC92C:
ldr r0, [r0]
ldr r1, =0x00000496
adds r0, r1
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r2]
cmp r0, r1
@@ -3472,7 +3472,7 @@ _081ACA12:
bne _081ACA50
movs r0, 0x1
bl ClearWindowTilemap
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl PrintTMHMMoveData
movs r0, 0x3
@@ -3484,7 +3484,7 @@ _081ACA12:
b _081ACA86
.pool
_081ACA50:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -3985,7 +3985,7 @@ ItemMenu_UseOutOfBattle: @ 81ACE7C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl ItemId_GetFieldFunc
cmp r0, 0
@@ -4015,7 +4015,7 @@ _081ACEB8:
ldrb r0, [r0, 0x5]
cmp r0, 0x3
beq _081ACEE8
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@@ -4055,7 +4055,7 @@ ItemMenu_Toss: @ 81ACEF4
b _081ACF6A
.pool
_081ACF24:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4105,7 +4105,7 @@ BagMenuConfirmToss: @ 81ACF88
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4242,7 +4242,7 @@ BagMenuActuallyToss: @ 81AD0CC
lsls r4, 3
ldr r5, =gTasks + 0x8
adds r6, r4, r5
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4312,7 +4312,7 @@ Task_ActuallyToss: @ 81AD150
beq _081AD1CE
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r5, 0x10]
bl RemoveBagItem
@@ -4369,7 +4369,7 @@ ItemMenu_Register: @ 81AD1EC
ldr r0, [r0]
ldr r2, =0x00000496
adds r1, r0, r2
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r2, [r0]
ldrh r0, [r1]
cmp r0, r2
@@ -4412,7 +4412,7 @@ ItemMenu_Give: @ 81AD278
lsrs r4, r0, 24
adds r6, r4, 0
bl bag_menu_remove_some_window
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4476,7 +4476,7 @@ bag_menu_print_cant_be_held_msg: @ 81AD30C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4567,7 +4567,7 @@ ItemMenu_UseInBattle: @ 81AD3DC
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetBattleFunc
cmp r0, 0
@@ -4601,7 +4601,7 @@ item_menu_type_2: @ 81AD41C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4662,7 +4662,7 @@ item_menu_type_b: @ 81AD4B4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_is_mail
lsls r0, 24
@@ -4751,7 +4751,7 @@ _081AD550:
bl player_bitmagic
bl sub_808B864
bl sub_808BCF4
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
ldr r0, [r4]
adds r0, r5
ldrh r1, [r0]
@@ -4775,7 +4775,7 @@ _081AD5C4:
adds r0, r5
strh r7, [r0]
_081AD5CA:
ldr r0, =gUnknown_082736B3
ldr r0, =EventScript_2736B3
bl ScriptContext1_SetupScript
_081AD5D0:
movs r0, 0x1
@@ -4798,7 +4798,7 @@ display_sell_item_ask_str: @ 81AD5DC
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r4, r0, r1
ldr r6, =gScriptItemId
ldr r6, =gSpecialVar_ItemId
ldrh r0, [r6]
bl itemid_get_market_price
lsls r0, 16
@@ -4861,7 +4861,7 @@ sub_81AD680: @ 81AD680
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r6, =gStringVar1
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_get_market_price
lsls r0, 16
@@ -4944,7 +4944,7 @@ sub_81AD730: @ 81AD730
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_get_market_price
lsls r0, 16
@@ -4996,7 +4996,7 @@ sub_81AD794: @ 81AD794
ldrb r4, [r0]
movs r2, 0x10
ldrsh r5, [r6, r2]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl itemid_get_market_price
lsls r0, 16
@@ -5061,7 +5061,7 @@ sub_81AD84C: @ 81AD84C
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r6, =gScriptItemId
ldr r6, =gSpecialVar_ItemId
ldrh r0, [r6]
ldr r1, =gStringVar2
bl CopyItemName
@@ -5122,7 +5122,7 @@ sub_81AD8C8: @ 81AD8C8
adds r5, r0
movs r0, 0x5F
bl PlaySE
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
mov r8, r2
ldrh r0, [r2]
mov r3, r10
@@ -5241,7 +5241,7 @@ display_deposit_item_ask_str: @ 81AD9EC
b _081ADA5E
.pool
_081ADA18:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -5366,7 +5366,7 @@ sub_81ADB14: @ 81ADB14
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl itemid_is_unique
lsls r0, 24
@@ -5690,7 +5690,7 @@ _081ADDEC:
ldrb r0, [r4]
movs r1, 0x2
bl bag_menu_print_cursor_
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
movs r0, 0x4
strh r0, [r1]
adds r0, r5, 0
@@ -5726,10 +5726,10 @@ unknown_ItemMenu_Show: @ 81ADE38
lsls r4, 24
lsrs r4, 24
ldr r1, =gSpecialVar_0x8005
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
@@ -5760,11 +5760,11 @@ unknown_ItemMenu_Give2: @ 81ADE8C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
@@ -5795,7 +5795,7 @@ unknown_ItemMenu_Confirm2: @ 81ADEDC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl bag_menu_remove_some_window
asm/item_use.s
+19 -19
View File
@@ -11,7 +11,7 @@ SetUpItemUseCallback: @ 80FD060
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r0, [r1]
cmp r0, 0xAF
bne _080FD084
@@ -260,7 +260,7 @@ sub_80FD254: @ 80FD254
push {lr}
sub sp, 0x24
mov r1, sp
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0x20]
ldr r1, =bag_menu_mail_related
@@ -381,7 +381,7 @@ ItemUseOnFieldCB_Bike: @ 80FD358
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetSecondaryId
lsls r0, 24
@@ -515,7 +515,7 @@ ItemUseOnFieldCB_Rod: @ 80FD468
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetSecondaryId
lsls r0, 24
@@ -1642,7 +1642,7 @@ sub_80FDD10: @ 80FDD10
b _080FDD68
.pool
_080FDD58:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetFieldFunc
adds r1, r0, 0
@@ -1661,12 +1661,12 @@ sub_80FDD74: @ 80FDD74
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
bl ScriptContext2_Enable
ldr r0, =gUnknown_08274482
ldr r0, =Route102_EventScript_274482
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
@@ -1728,7 +1728,7 @@ sub_80FDE08: @ 80FDE08
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
ldr r0, =gUnknown_082744C0
ldr r0, =Route102_EventScript_2744C0
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
@@ -1787,7 +1787,7 @@ sub_80FDE7C: @ 80FDE7C
lsls r4, 24
lsrs r4, 24
bl ScriptContext2_Enable
ldr r0, =gUnknown_08242CFC
ldr r0, =BattleFrontier_OutsideEast_EventScript_242CFC
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
@@ -1886,7 +1886,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
movs r0, 0xA9
lsls r0, 1
@@ -1945,7 +1945,7 @@ task08_0809AD8C: @ 80FDFBC
cmp r0, 0
beq _080FE000
ldr r4, =gStringVar1
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemIdToBattleMoveId
lsls r0, 16
@@ -2002,7 +2002,7 @@ sub_80FE03C: @ 80FE03C
thumb_func_start sub_80FE058
sub_80FE058: @ 80FE058
push {r4,lr}
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
movs r1, 0x1
bl RemoveBagItem
@@ -2125,7 +2125,7 @@ sub_80FE164: @ 80FE164
cmp r0, 0
bne _080FE1C2
ldr r4, =0x00004021
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetHoldEffectParam
adds r1, r0, 0
@@ -2205,7 +2205,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
ldr r1, =gStringVar2
bl CopyItemName
@@ -2361,7 +2361,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
lsls r0, 24
cmp r0, 0
bne _080FE3D0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -2450,7 +2450,7 @@ sub_80FE440: @ 80FE440
ble _080FE4AC
movs r0, 0x1
bl PlaySE
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
movs r1, 0x1
bl RemoveBagItem
@@ -2496,7 +2496,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
muls r0, r2
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r2, 24
lsrs r2, 24
@@ -2664,7 +2664,7 @@ ItemUseOutOfBattle_EnigmaBerry: @ 80FE650
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
@@ -2785,7 +2785,7 @@ ItemUseInBattle_EnigmaBerry: @ 80FE77C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl GetItemEffectType
lsls r0, 24
asm/link.s
+30 -30
View File
@@ -1232,7 +1232,7 @@ _08009E8C:
_08009EA8:
ldr r0, =gUnknown_03003110
strh r2, [r0]
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
b _08009F04
.pool
@@ -18044,7 +18044,7 @@ BerryBlenderLinkBecomeLeader: @ 801273C
movs r0, 0
strb r0, [r1, 0xC]
strb r0, [r1, 0xD]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@@ -18891,7 +18891,7 @@ _08012EE6:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08012F50
@@ -18900,7 +18900,7 @@ _08012EFC:
bl EnableBothScriptContexts
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x8
strh r0, [r1]
b _08012F50
@@ -19569,7 +19569,7 @@ BerryBlenderLinkJoinGroup: @ 80134A4
movs r0, 0
strb r0, [r1, 0x8]
strb r0, [r1, 0x9]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
strh r0, [r1]
pop {r0}
bx r0
@@ -20194,13 +20194,13 @@ _08013AE4:
lsls r0, 24
cmp r0, 0
beq _08013B82
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0x6
b _08013B58
.pool
_08013B14:
bl sub_800E084
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0x5
b _08013B58
.pool
@@ -20226,7 +20226,7 @@ _08013B4A:
lsls r0, 24
cmp r0, 0
beq _08013B82
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0x8
_08013B58:
strh r1, [r0]
@@ -21544,7 +21544,7 @@ _0801474C:
_08014764:
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_02022C2C
@@ -21600,7 +21600,7 @@ _080147CC:
.4byte _08014992
.4byte _0801499C
_080147F0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_02022C2C
@@ -21744,7 +21744,7 @@ _0801494A:
bl sub_80B2AF4
cmp r0, 0
beq _08014980
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0xB
strh r1, [r0]
movs r0, 0x7
@@ -21835,7 +21835,7 @@ sub_8014A00: @ 8014A00
strb r2, [r1, 0xC]
strb r2, [r1, 0xD]
strb r4, [r1, 0x18]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -22295,7 +22295,7 @@ _08014E4E:
beq _08014EF2
adds r0, r4, 0
bl DestroyTask
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08014EF2
@@ -22384,7 +22384,7 @@ sub_8014EFC: @ 8014EFC
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -22725,7 +22725,7 @@ _0801526A:
adds r0, r6, 0
bl DestroyTask
bl sub_800EDD4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _080152A0
@@ -22773,7 +22773,7 @@ sub_80152A8: @ 80152A8
strb r2, [r1, 0x9]
subs r4, 0x15
strb r4, [r1, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
pop {r4}
pop {r0}
@@ -23097,7 +23097,7 @@ _080155C2:
adds r0, r4, 0
bl DestroyTask
bl sub_800EDD4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x5
strh r0, [r1]
b _08015604
@@ -23141,7 +23141,7 @@ UnionRoomSpecial: @ 801560C
strb r1, [r0, 0x16]
strh r1, [r0, 0x10]
strh r1, [r0, 0x12]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
movs r0, 0xD0
movs r1, 0x1
@@ -23384,7 +23384,7 @@ _08015878:
ldr r0, [r6, 0xC]
movs r1, 0x4
bl sub_80175EC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r0, 0x3
@@ -23486,7 +23486,7 @@ _080159A0:
movs r0, 0x4
bl _08016876
_080159A6:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
ldrh r0, [r4]
cmp r0, 0
beq _08015A0A
@@ -25069,7 +25069,7 @@ var_800D_set_xB: @ 8016884
bl InUnionRoom
cmp r0, 0x1
bne _08016894
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xB
strh r0, [r1]
_08016894:
@@ -30491,7 +30491,7 @@ _0801940C:
b _08019922
.pool
_0801942C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _08019436
@@ -30992,7 +30992,7 @@ _080197F8:
b _08019922
.pool
_08019810:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x5
beq _0801981A
@@ -39452,7 +39452,7 @@ _0801DC10:
thumb_func_start sub_801DC20
sub_801DC20: @ 801DC20
push {r4-r6,lr}
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_Result
bl sub_801B044
adds r4, r0, 0
bl IsMysteryEventEnabled
@@ -45605,7 +45605,7 @@ _08020D74:
sub_8020D8C: @ 8020D8C
push {r4,lr}
sub sp, 0xC
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r0, [r1]
subs r0, 0x85
lsls r0, 16
@@ -45626,7 +45626,7 @@ _08020DB0:
ldrb r0, [r2, 0x8]
lsls r0, 5
adds r0, r2, r0
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
subs r1, 0x85
adds r0, 0xA4
@@ -59190,7 +59190,7 @@ sub_8027A48: @ 8027A48
sub_8027A5C: @ 8027A5C
push {r4-r6,lr}
movs r5, 0
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_Result
_08027A62:
movs r0, 0x64
adds r1, r5, 0
@@ -59215,7 +59215,7 @@ _08027A94:
adds r5, 0x1
cmp r5, 0x5
ble _08027A62
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_08027AA0:
@@ -68862,7 +68862,7 @@ _0802C924:
bl sub_802C908
cmp r0, 0
beq _0802C95C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _0802C966
.pool
@@ -68870,7 +68870,7 @@ _0802C95C:
adds r5, 0x1
cmp r5, 0x5
ble _0802C924
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_0802C966:
strh r0, [r1]
asm/macros.inc
+1
View File
@@ -1,5 +1,6 @@
.include "asm/macros/asm.inc"
.include "asm/macros/function.inc"
.include "asm/macros/movement.inc"
.include "asm/macros/window.inc"
.include "asm/macros/pokemon_data.inc"
.include "asm/macros/ec.inc"
asm/macros/event.s → asm/macros/event.inc
+534 -422
View File
File diff suppressed because it is too large Load Diff
asm/macros/map.inc
+102 -2
View File
@@ -1,15 +1,115 @@
.macro new_map_group
.set cur_map_group, cur_map_group + 1
inc cur_map_group
.set cur_map_num, 0
.endm
.macro map_group map_name
.set GROUP_\map_name, cur_map_group
.set MAP_\map_name, cur_map_num
.set cur_map_num, cur_map_num + 1
inc cur_map_num
.endm
.macro map map_name
.byte GROUP_\map_name
.byte MAP_\map_name
.endm
.macro warp_map map_name
.byte MAP_\map_name
.byte GROUP_\map_name
.endm
.macro heal_location map_name, x, y
.byte GROUP_\map_name
.byte MAP_\map_name
.2byte \x
.2byte \y
.space 2
.endm
.equiv GROUP_NONE, 0x7f
.equiv MAP_NONE, 0x7f
.equiv GROUP_UNDEFINED, 0xff
.equiv MAP_UNDEFINED, 0xff
.macro map_script type, address
.byte \type
.4byte \address
.endm
.macro map_script_2 word1, word2, address
.2byte \word1
.2byte \word2
.4byte \address
.endm
.macro object_event index, gfx, replacement, filler1, x, y, elevation, movement_type, radius, filler2, trainer_type, sight_radius_tree_etc, script, event_flag, filler3, filler4
.byte \index, \gfx, \replacement, \filler1
.2byte \x
.2byte \y
.byte \elevation, \movement_type, \radius, \filler2
.2byte \trainer_type, \sight_radius_tree_etc
.4byte \script
.2byte \event_flag
.byte \filler3, \filler4
inc _num_npcs
.endm
.macro warp_def x, y, byte, warp, map
.2byte \x, \y
.byte \byte, \warp
warp_map \map
inc _num_warps
.endm
.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
.2byte \x, \y
.byte \byte1, \byte2
.2byte \word1, \word2, \word3
.4byte \script
inc _num_traps
.endm
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
.2byte \x, \y
.byte \byte, \kind
.2byte \word
.if \kind < 5
.4byte \arg6
.else
.2byte \arg6
.byte \arg7, \arg8
.endif
inc _num_signs
.endm
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs
reset_map_events
.endm
.macro reset_map_events
.set _num_npcs, 0
.set _num_warps, 0
.set _num_traps, 0
.set _num_signs, 0
.endm
reset_map_events
.equiv connection_down, 1
.equiv connection_up, 2
.equiv connection_left, 3
.equiv connection_right, 4
.equiv connection_dive, 5
.equiv connection_emerge, 6
.macro connection direction, offset, map, filler
.4byte connection_\direction
.4byte \offset
map \map
.space 2
.endm
asm/macros/movement.inc
+123
View File
@@ -0,0 +1,123 @@
.macro create_movement name
enum _\name
.macro \name
.byte _\name
.endm
.endm
enum_start
create_movement step_00
create_movement step_01
create_movement step_02
create_movement step_03
create_movement slow_step_down
create_movement slow_step_up
create_movement slow_step_left
create_movement slow_step_right
create_movement step_down
create_movement step_up
create_movement step_left
create_movement step_right
create_movement fast_step_down
create_movement fast_step_up
create_movement fast_step_left
create_movement fast_step_right
create_movement step_10
create_movement step_11
create_movement step_12
create_movement step_13
create_movement step_14
create_movement step_15
create_movement step_16
create_movement step_17
create_movement step_18
create_movement step_19
create_movement step_1a
create_movement step_1b
create_movement step_1c
create_movement step_1d
create_movement step_1e
create_movement step_1f
create_movement step_20
create_movement step_21
create_movement step_22
create_movement step_23
create_movement step_24
create_movement step_25
create_movement step_26
create_movement step_27
create_movement step_28
create_movement step_29
create_movement step_2a
create_movement step_2b
create_movement step_2c
create_movement step_2d
create_movement step_2e
create_movement step_2f
create_movement step_30
create_movement step_31
create_movement step_32
create_movement step_33
create_movement step_34
create_movement step_35
create_movement step_36
create_movement step_37
create_movement step_38
create_movement step_39
create_movement step_3a
create_movement step_3b
create_movement step_3c
create_movement step_3d
create_movement step_3e
create_movement step_3f
create_movement step_40
create_movement step_41
create_movement step_42
create_movement step_43
create_movement step_44
create_movement step_45
create_movement step_46
create_movement step_47
create_movement step_48
create_movement step_49
create_movement step_4a
create_movement step_4b
create_movement step_4c
create_movement step_4d
create_movement step_4e
create_movement step_4f
create_movement step_50
create_movement step_51
create_movement step_52
create_movement step_53
create_movement step_54
create_movement step_55
create_movement step_56
create_movement step_57
create_movement step_58
create_movement step_59
create_movement step_5a
create_movement step_5b
create_movement step_5c
create_movement step_5d
create_movement step_5e
create_movement step_5f
create_movement step_60
create_movement step_61
create_movement step_62
create_movement step_63
enum_start 0x91
create_movement step_91
create_movement step_92
create_movement step_93
create_movement step_94
create_movement step_95
create_movement step_96
create_movement step_97
create_movement step_98
create_movement step_99
create_movement step_9A
enum_start 0xfe
create_movement step_end
asm/map_obj_lock.s
+1 -1
View File
@@ -256,7 +256,7 @@ sub_8098574: @ 8098574
lsls r0, 2
ldr r1, =gMapObjects
adds r0, r1
ldr r1, =gScriptFacing
ldr r1, =gSpecialVar_Facing
ldrb r1, [r1]
bl FieldObjectFaceOppositeDirection
pop {r0}
asm/mauville_old_man.s
+10 -10
View File
@@ -157,7 +157,7 @@ sub_81201C8: @ 81201C8
thumb_func_start sub_81201DC
sub_81201DC: @ 81201DC
push {r4,lr}
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl sub_81201C8
lsls r0, 24
lsrs r0, 24
@@ -170,7 +170,7 @@ sub_81201DC: @ 81201DC
thumb_func_start sub_81201F4
sub_81201F4: @ 81201F4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e51
@@ -347,7 +347,7 @@ sub_8120340: @ 8120340
thumb_func_start sub_8120358
sub_8120358: @ 8120358
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r2, =0x00002e28
@@ -379,14 +379,14 @@ sub_812038C: @ 812038C
ldr r0, =0x0000ffff
cmp r1, r0
bne _081203AC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081203B6
.pool
_081203AC:
ldr r0, =gStringVar1
bl CopyEasyChatWord
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_081203B6:
strh r0, [r1]
@@ -405,14 +405,14 @@ sub_81203C4: @ 81203C4
ldrb r0, [r2, 0x1]
cmp r0, 0xA
bne _081203EC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
strb r0, [r2, 0x1]
b _081203F2
.pool
_081203EC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081203F2:
@@ -503,7 +503,7 @@ _081204C4:
adds r0, 0x1
_081204C8:
strb r0, [r5, 0x1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
pop {r4-r6}
@@ -2382,13 +2382,13 @@ _0812132C:
cmp r4, r0
bne _0812135C
_0812134E:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _08121364
.pool
_0812135C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
ldr r0, =gUnknown_03001178
strb r4, [r0]
asm/party_menu.s
+30 -30
View File
@@ -1213,13 +1213,13 @@ sub_81B0BFC: @ 81B0BFC
muls r1, r0
ldr r0, =gPlayerParty
adds r6, r1, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r0, =gUnknown_0203CEC8
ldrb r0, [r0, 0xB]
cmp r0, 0xC
bne _081B0C40
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =gSpecialVar_0x8005
@@ -7739,7 +7739,7 @@ c2_8123744: @ 81B41F0
mov r7, r8
push {r7}
sub sp, 0xC
ldr r6, =gScriptItemId
ldr r6, =gSpecialVar_ItemId
ldrh r0, [r6]
cmp r0, 0
bne _081B4224
@@ -7845,7 +7845,7 @@ sub_81B42D0: @ 81B42D0
ands r0, r1
cmp r0, 0
bne _081B432C
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r0, =gUnknown_0203CEC8
mov r8, r0
@@ -7969,7 +7969,7 @@ _081B43FC:
beq _081B44DE
b _081B44EC
_081B4402:
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
movs r1, 0x1
bl RemoveBagItem
@@ -8135,7 +8135,7 @@ sub_81B4578: @ 81B4578
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r7, [r0]
cmp r7, 0
bne _081B45F8
@@ -8212,7 +8212,7 @@ sub_81B4624: @ 81B4624
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
movs r2, 0
movs r3, 0
@@ -8220,7 +8220,7 @@ sub_81B4624: @ 81B4624
b _081B467C
.pool
_081B4670:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r1]
movs r2, 0
@@ -11359,7 +11359,7 @@ _081B61BC:
movs r7, 0
movs r6, 0
_081B61C0:
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl GetItemEffectType
lsls r0, 24
@@ -11787,7 +11787,7 @@ ItemUseCB_Medicine: @ 81B6588
muls r1, r0
ldr r0, =gPlayerParty
adds r5, r1, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
@@ -12032,7 +12032,7 @@ sub_81B67C8: @ 81B67C8
muls r1, r0
ldr r0, =gPlayerParty
adds r5, r1, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r6, [r0]
adds r0, r6, 0
bl GetItemEffectType
@@ -12391,7 +12391,7 @@ dp05_ether: @ 81B6AFC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0xAF
bne _081B6B20
@@ -12500,7 +12500,7 @@ ether_effect_related: @ 81B6BEC
lsrs r6, r0, 24
movs r4, 0
ldr r7, =gUnknown_0203CED6
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r5, [r0]
movs r0, 0xE
negs r0, r0
@@ -12729,7 +12729,7 @@ sub_81B6DC4: @ 81B6DC4
movs r0, 0xE
adds r0, r7
mov r8, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
ldr r1, =gStringVar1
adds r0, r5, 0
@@ -12818,7 +12818,7 @@ sub_81B6EB4: @ 81B6EB4
adds r5, r1, r0
adds r6, r2, 0
adds r6, 0xE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r4, [r0]
movs r1, 0x2
ldrsh r0, [r6, r1]
@@ -12928,7 +12928,7 @@ _081B6FC0:
_081B6FDC:
cmp r0, 0x2
bne _081B6FE4
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r2, [r0]
_081B6FE4:
adds r0, r5, 0
@@ -13324,7 +13324,7 @@ _081B7306:
_081B7368:
cmp r0, 0x2
bne _081B7370
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
_081B7370:
ldr r0, =gTasks
@@ -13409,7 +13409,7 @@ dp05_rare_candy: @ 81B7404
movs r1, 0x86
lsls r1, 2
adds r4, r6, r1
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
mov r8, r2
adds r0, r5, 0
movs r1, 0x38
@@ -13467,7 +13467,7 @@ _081B74B4:
ldrb r0, [r0, 0x9]
adds r1, r5, 0
bl sub_81B754C
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -14084,7 +14084,7 @@ sub_81B7A28: @ 81B7A28
lsls r0, 16
lsrs r7, r0, 16
ldrb r0, [r6, 0x9]
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -14236,7 +14236,7 @@ _081B7BC8:
ldr r1, =gUnknown_0203CEE8
movs r0, 0x1
strb r0, [r1]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
movs r1, 0x1
bl RemoveBagItem
@@ -14312,7 +14312,7 @@ sub_81B7C74: @ 81B7C74
ldr r0, [r1]
str r0, [r2]
ldrb r0, [r1, 0x9]
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r1, [r4]
movs r2, 0
bl ExecuteTableBasedItemEffect__
@@ -14685,7 +14685,7 @@ _081B7F72:
movs r3, 0
bl sub_81B0038
ldr r1, =gUnknown_0203CEC8
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
strh r0, [r1, 0xC]
add sp, 0xC
@@ -14933,7 +14933,7 @@ sub_81B81A8: @ 81B81A8
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
bne _081B8208
@@ -17381,7 +17381,7 @@ _081B95BA:
thumb_func_start sub_81B95E0
sub_81B95E0: @ 81B95E0
push {r4,r5,lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0
@@ -17490,7 +17490,7 @@ sub_81B968C: @ 81B968C
thumb_func_start sub_81B96D0
sub_81B96D0: @ 81B96D0
push {r4,r5,lr}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
movs r4, 0
@@ -17741,13 +17741,13 @@ sub_81B98DC: @ 81B98DC
adds r1, r0, 0
cmp r1, 0
beq _081B990C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081B9910
.pool
_081B990C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_081B9910:
pop {r0}
@@ -17760,7 +17760,7 @@ sub_81B9918: @ 81B9918
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
ldr r0, =gSpecialVar_0x8004
@@ -17813,7 +17813,7 @@ _081B9980:
bl sub_80D23A8
cmp r0, 0x1
beq _081B999C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081B999C:
asm/player_pc.s
+2 -2
View File
@@ -379,12 +379,12 @@ sub_816B148: @ 816B148
ldrb r0, [r0, 0x8]
cmp r0, 0
bne _0816B174
ldr r0, =gUnknown_081F863F
ldr r0, =LittlerootTown_BrendansHouse_2F_EventScript_1F863F
bl ScriptContext1_SetupScript
b _0816B184
.pool
_0816B174:
ldr r0, =gUnknown_081F958F
ldr r0, =LittlerootTown_MaysHouse_2F_EventScript_1F958F
bl ScriptContext1_SetupScript
b _0816B184
.pool
asm/pokeblock_feed.s
+2 -2
View File
@@ -380,7 +380,7 @@ _08179EEC:
b _08179F5E
.pool
_08179F00:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8179FEC
ldr r0, =gUnknown_0203BD1C
@@ -692,7 +692,7 @@ sub_817A1C4: @ 817A1C4
ldr r0, =gPlayerParty
adds r5, r0
ldr r1, =gSaveBlock1Ptr
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
lsls r0, 3
ldr r2, =0x00000848
asm/pokemon_storage_system.s
+2 -2
View File
@@ -2252,7 +2252,7 @@ _080C8230:
ldrb r0, [r0]
cmp r0, 0x2
bne _080C825C
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
cmp r0, 0
beq _080C825C
@@ -5458,7 +5458,7 @@ _080C9F56:
sub_80C9F6C: @ 80C9F6C
push {lr}
sub sp, 0x4
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
mov r0, sp
strh r1, [r0]
asm/pokemon_summary_screen.s
+15 -15
View File
@@ -3585,7 +3585,7 @@ _081C5C5C:
_081C5C88:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
strh r4, [r0]
adds r0, r5, 0
bl sub_81C5B14
@@ -3594,7 +3594,7 @@ _081C5C88:
_081C5CA0:
movs r0, 0x5
bl PlaySE
ldr r2, =gScriptItemId
ldr r2, =gSpecialVar_ItemId
mov r12, r2
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
@@ -3681,7 +3681,7 @@ sub_81C5D20: @ 81C5D20
b _081C5DD8
.pool
_081C5D74:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
bl ItemId_GetBattleUsage
lsls r0, 24
@@ -3722,7 +3722,7 @@ _081C5DCE:
_081C5DD8:
strb r0, [r1]
_081C5DDA:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4195,7 +4195,7 @@ sub_81C61E0: @ 81C61E0
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetPocket
lsls r0, 24
@@ -4315,7 +4315,7 @@ sub_81C62C4: @ 81C62C4
b _081C6334
.pool
_081C62F4:
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4362,7 +4362,7 @@ sub_81C6350: @ 81C6350
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4577,7 +4577,7 @@ sub_81C654C: @ 81C654C
lsls r4, 3
ldr r5, =gTasks + 0x8
adds r6, r4, r5
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4635,7 +4635,7 @@ sub_81C65CC: @ 81C65CC
beq _081C662E
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldrh r1, [r4, 0x10]
bl RemovePyramidBagItem
@@ -4671,7 +4671,7 @@ sub_81C6648: @ 81C6648
lsrs r4, r0, 24
adds r6, r4, 0
bl sub_81C61A8
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_is_mail
lsls r0, 24
@@ -4713,7 +4713,7 @@ sub_81C66AC: @ 81C66AC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
@@ -4785,7 +4785,7 @@ sub_81C674C: @ 81C674C
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r0, [r5]
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4820,7 +4820,7 @@ sub_81C679C: @ 81C679C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gScriptItemId
ldr r4, =gSpecialVar_ItemId
ldrh r0, [r4]
bl ItemId_GetBattleFunc
cmp r0, 0
@@ -5238,7 +5238,7 @@ _081C6AF8:
bl Free
adds r0, r5, 0
bl Free
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
b _081C6BC6
@@ -5266,7 +5266,7 @@ _081C6B9C:
lsrs r6, r0, 24
cmp r6, 0x2
bls _081C6B9C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
adds r0, r7, 0
asm/pokenav.s
+23 -23
View File
@@ -27683,7 +27683,7 @@ _081D4AF8:
movs r2, 0x80
orrs r1, r2
strb r1, [r0]
ldr r0, =gScriptFacing
ldr r0, =gSpecialVar_Facing
ldrh r0, [r0]
cmp r0, 0x2
beq _081D4B3A
@@ -29323,7 +29323,7 @@ _081D5854:
sub_81D58D8: @ 81D58D8
push {lr}
bl sub_80008E8
ldr r3, =gScriptResult
ldr r3, =gSpecialVar_Result
movs r0, 0
strh r0, [r3]
ldr r0, =gSaveBlock1Ptr
@@ -29381,7 +29381,7 @@ sub_81D5924: @ 81D5924
cmp r4, 0
beq _081D596C
_081D5952:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
strh r0, [r1]
b _081D59C0
@@ -29413,12 +29413,12 @@ _081D596C:
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
b _081D59C0
.pool
_081D59BC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r6, [r0]
_081D59C0:
pop {r3}
@@ -29444,7 +29444,7 @@ sub_81D59D0: @ 81D59D0
lsrs r5, r0, 24
cmp r5, 0
beq _081D59FC
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r3, [r0]
b _081D5A4E
.pool
@@ -29473,12 +29473,12 @@ _081D59FC:
adds r2, r0
ldr r0, [r2]
str r0, [r1]
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081D5A4E
.pool
_081D5A48:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081D5A4E:
@@ -29556,7 +29556,7 @@ sub_81D5AD0: @ 81D5AD0
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081D5B20
.pool
@@ -29569,12 +29569,12 @@ _081D5B00:
negs r0, r0
ands r0, r1
strb r0, [r2]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _081D5B20
.pool
_081D5B1C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_081D5B20:
strh r0, [r1]
@@ -29653,12 +29653,12 @@ sub_81D5BBC: @ 81D5BBC
movs r2, 0
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081D5BF0
.pool
_081D5BEC:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_081D5BF0:
strh r0, [r1]
@@ -29672,7 +29672,7 @@ _081D5BF0:
sub_81D5C00: @ 81D5C00
push {lr}
bl sub_81D56B0
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
bl sub_81D5710
@@ -29721,12 +29721,12 @@ sub_81D5C5C: @ 81D5C5C
lsrs r1, r0, 24
cmp r1, 0
bne _081D5C74
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _081D5C7A
.pool
_081D5C74:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_081D5C7A:
@@ -30022,7 +30022,7 @@ _081D5E64:
movs r1, 0xF
ands r0, r1
strh r0, [r5, 0xE]
ldr r0, =gUnknown_082C83F0
ldr r0, =EventScript_2C83F0
str r0, [r5, 0x10]
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
@@ -30487,7 +30487,7 @@ _081D62A2:
thumb_func_start sub_81D62AC
sub_81D62AC: @ 81D62AC
ldr r0, =gUnknown_082C83F0
ldr r0, =EventScript_2C83F0
bx lr
.pool
thumb_func_end sub_81D62AC
@@ -30495,7 +30495,7 @@ sub_81D62AC: @ 81D62AC
thumb_func_start sub_81D62B4
sub_81D62B4: @ 81D62B4
push {lr}
ldr r0, =gScriptLastTalked
ldr r0, =gSpecialVar_LastTalked
ldrh r1, [r0]
movs r0, 0x5
bl sub_81D572C
@@ -30772,7 +30772,7 @@ _081D64D4:
thumb_func_start sub_81D64DC
sub_81D64DC: @ 81D64DC
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000ef9
@@ -30825,7 +30825,7 @@ sub_81D6534: @ 81D6534
cmp r0, 0x6
beq _081D6560
bl sub_81D5C00
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0
beq _081D6560
@@ -30851,12 +30851,12 @@ sub_81D6568: @ 81D6568
ands r0, r1
cmp r0, 0
beq _081D6590
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _081D6594
.pool
_081D6590:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_081D6594:
strh r0, [r1]
asm/recorded_battle.s
+1 -1
View File
@@ -334,7 +334,7 @@ RecordedBattle_ReadBankAction: @ 8185054
cmp r0, 0xFF
bne _081850BC
_0818507A:
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldr r1, =gBattleOutcome
movs r0, 0x5
strb r0, [r1]
asm/rom4.s
+4 -4
View File
@@ -8,7 +8,7 @@
thumb_func_start sub_8084620
sub_8084620: @ 8084620
push {r4,lr}
ldr r0, =gUnknown_08271857
ldr r0, =EverGrandeCity_HallOfFame_EventScript_271857
bl ScriptContext2_RunNewScript
ldr r0, =gSaveBlock1Ptr
ldr r4, [r0]
@@ -64,7 +64,7 @@ sub_808469C: @ 808469C
bl FlagClear
ldr r0, =0x00000888
bl FlagClear
ldr r0, =gUnknown_08271862
ldr r0, =EverGrandeCity_HallOfFame_EventScript_271862
bl ScriptContext2_RunNewScript
pop {r0}
bx r0
@@ -419,7 +419,7 @@ get_mapdata_header: @ 80849A8
b _080849C6
.pool
_080849BC:
ldr r0, =gUnknown_08481DD4
ldr r0, =gMapAttributes
subs r1, 0x1
lsls r1, 2
adds r1, r0
@@ -535,7 +535,7 @@ _08084A8A:
get_mapheader_by_bank_and_number: @ 8084A90
lsls r0, 16
lsls r1, 16
ldr r2, =gUnknown_08486578
ldr r2, =gMapGroups
lsrs r0, 14
adds r0, r2
ldr r0, [r0]
asm/rom6.s
+39 -39
View File
@@ -31,7 +31,7 @@ npc_before_player_of_type: @ 8135424
ldrb r0, [r2, 0x5]
cmp r0, r5
bne _08135470
ldr r1, =gScriptLastTalked
ldr r1, =gSpecialVar_LastTalked
ldrb r0, [r2, 0x8]
strh r0, [r1]
movs r0, 0x1
@@ -262,7 +262,7 @@ sub_8135654: @ 8135654
lsls r0, 24
cmp r0, 0
beq _0813568C
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -307,7 +307,7 @@ sub_81356C4: @ 81356C4
lsls r0, 24
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082907F0
ldr r0, =Route111_EventScript_2907F0
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -2136,11 +2136,11 @@ _081366B6:
_081366D0:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldr r2, =0x0000ffff
adds r1, r2, 0
strh r1, [r0]
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
mov r1, r9
strh r1, [r0]
adds r0, r7, 0
@@ -2150,7 +2150,7 @@ _081366D0:
_081366F8:
movs r0, 0x5
bl PlaySE
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
strh r4, [r0]
adds r0, r7, 0
bl sub_8136938
@@ -2541,7 +2541,7 @@ sub_8136A50: @ 8136A50
sub_8136A74: @ 8136A74
push {lr}
ldr r2, =gSaveBlock1Ptr
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
lsls r1, 3
ldr r0, =0x00000848
@@ -2586,7 +2586,7 @@ sub_8136AB4: @ 8136AB4
ldr r3, =gPokeblockNames
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, =gScriptItemId
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r1, 3
adds r2, r1
@@ -2689,7 +2689,7 @@ sub_8136BC0: @ 8136BC0
ands r0, r1
cmp r0, 0
beq _08136C36
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8136F68
movs r0, 0x5
@@ -2772,7 +2772,7 @@ sub_8136C8C: @ 8136C8C
lsls r0, 24
lsrs r0, 24
ldr r5, =gSaveBlock1Ptr
ldr r7, =gScriptItemId
ldr r7, =gSpecialVar_ItemId
ldrh r2, [r7]
lsls r2, 3
ldr r6, =0x00000848
@@ -2836,7 +2836,7 @@ sub_8136D2C: @ 8136D2C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrb r0, [r5]
bl SafariZoneActivatePokeblockFeeder
ldr r0, =gStringVar1
@@ -2853,7 +2853,7 @@ sub_8136D2C: @ 8136D2C
adds r1, r3
ldr r1, [r1]
bl StringCopy
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
@@ -2877,7 +2877,7 @@ sub_8136D90: @ 8136D90
lsrs r4, 24
ldr r6, =gSpecialVar_0x8004
ldr r0, =gSaveBlock1Ptr
ldr r5, =gScriptItemId
ldr r5, =gSpecialVar_ItemId
ldrh r1, [r5]
lsls r1, 3
ldr r2, =0x00000848
@@ -2888,7 +2888,7 @@ sub_8136D90: @ 8136D90
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
@@ -3333,7 +3333,7 @@ sub_81370FC: @ 81370FC
lsls r0, 24
cmp r0, 0
beq _08137134
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl brm_get_pokemon_selection
lsls r0, 24
lsrs r0, 24
@@ -3407,7 +3407,7 @@ sub_81371B4: @ 81371B4
bl PlaySE
ldr r0, =0x00000888
bl FlagSet
ldr r0, =gUnknown_082926F8
ldr r0, =EventScript_2926F8
bl ScriptContext1_SetupScript
pop {r0}
bx r0
@@ -4899,7 +4899,7 @@ _08137E58:
lsls r0, 24
lsrs r4, r0, 24
_08137E5C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
pop {r4-r7}
pop {r0}
@@ -7214,7 +7214,7 @@ _081390E6:
cmp r0, 0xC
bne _0813913C
_08139128:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
b _0813914A
.pool
@@ -7224,7 +7224,7 @@ _0813913C:
lsrs r5, r0, 24
cmp r5, 0x5
bls _081390E6
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_0813914A:
strh r0, [r1]
@@ -8044,7 +8044,7 @@ _081397BE:
thumb_func_start sub_81397C4
sub_81397C4: @ 81397C4
push {r4,r5,lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldrh r1, [r2]
ldr r0, =0x0000270f
cmp r1, r0
@@ -8123,7 +8123,7 @@ _08139862:
thumb_func_start sub_813986C
sub_813986C: @ 813986C
push {lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x4
bhi _081398B8
@@ -9381,7 +9381,7 @@ _0813A2BE:
strh r4, [r3, 0x26]
b _0813A2D2
_0813A2C6:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
adds r0, r4, 0
@@ -9649,7 +9649,7 @@ sub_813A4EC: @ 813A4EC
b _0813A566
.pool
_0813A51C:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
@@ -9657,7 +9657,7 @@ _0813A51C:
b _0813A54C
.pool
_0813A530:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
movs r0, 0x5
bl PlaySE
@@ -10930,7 +10930,7 @@ task_deoxys_sound: @ 813AFDC
lsrs r0, 24
cmp r0, 0x1
bne _0813B004
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _0813B06A
.pool
@@ -10961,7 +10961,7 @@ _0813B004:
mov r0, r8
movs r1, 0
bl VarSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _0813B070
@@ -10971,7 +10971,7 @@ _0813B05C:
bne _0813B080
ldr r0, =0x000008d4
bl FlagSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
_0813B06A:
strh r0, [r1]
@@ -10991,7 +10991,7 @@ _0813B080:
ldr r0, =0x00004035
adds r1, r5, 0
bl VarSet
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
@@ -11684,7 +11684,7 @@ _0813B62E:
ldrh r1, [r5]
cmp r1, 0x1
bne _0813B668
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _0813B790
.pool
@@ -11698,7 +11698,7 @@ _0813B668:
ldrh r0, [r0]
cmp r0, 0x1
bne _0813B68C
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x2
b _0813B6AC
.pool
@@ -11710,12 +11710,12 @@ _0813B68C:
ldrh r0, [r0]
cmp r0, 0
bne _0813B6A8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x3
b _0813B6AC
.pool
_0813B6A8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
_0813B6AC:
strh r0, [r1]
@@ -11736,7 +11736,7 @@ _0813B6C2:
bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r2, 0x2
bl SendBlock
b _0813B708
@@ -11751,7 +11751,7 @@ _0813B6E4:
lsls r0, 24
cmp r0, 0
beq _0813B790
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r0, =gBlockRecvBuffer
ldrh r0, [r0]
strh r0, [r1]
@@ -11773,20 +11773,20 @@ _0813B728:
lsls r0, 24
cmp r0, 0
bne _0813B74C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x2
bne _0813B790
ldr r0, =gUnknown_0824979B
ldr r0, =gText_YourPartnerHasRetired
bl ShowFieldAutoScrollMessage
b _0813B790
.pool
_0813B74C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0x3
bne _0813B790
ldr r0, =gUnknown_0824979B
ldr r0, =gText_YourPartnerHasRetired
bl ShowFieldAutoScrollMessage
b _0813B790
.pool
@@ -12041,7 +12041,7 @@ _0813B94E:
thumb_func_start sub_813B968
sub_813B968: @ 813B968
push {r4,r5,lr}
ldr r5, =gScriptResult
ldr r5, =gSpecialVar_Result
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
movs r1, 0x7
asm/script_menu.s
+15 -15
View File
@@ -24,7 +24,7 @@ ScriptMenu_Multichoice: @ 80E1E08
lsrs r0, 24
cmp r0, 0x1
beq _080E1E4C
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0xFF
strh r1, [r0]
movs r0, 0
@@ -70,7 +70,7 @@ ScriptMenu_MultichoiceWithDefault: @ 80E1E58
lsrs r0, 24
cmp r0, 0x1
beq _080E1EA8
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
str r4, [sp]
@@ -358,13 +358,13 @@ _080E20B8:
bne _080E20FC
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _080E20EC
.pool
_080E20E8:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080E20EC:
ldrb r0, [r5, 0xC]
@@ -389,7 +389,7 @@ ScriptMenu_YesNo: @ 80E2108
lsrs r0, 24
cmp r0, 0x1
beq _080E2138
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl sub_8197930
@@ -410,7 +410,7 @@ _080E213A:
thumb_func_start sub_80E2140
sub_80E2140: @ 80E2140
push {lr}
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
ldrh r0, [r0]
cmp r0, 0xFF
beq _080E2154
@@ -465,12 +465,12 @@ _080E219C:
_080E21A4:
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
b _080E21B8
.pool
_080E21B4:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
_080E21B8:
strh r0, [r1]
@@ -517,7 +517,7 @@ ScriptMenu_MultichoiceGrid: @ 80E21D0
b _080E22E8
.pool
_080E2210:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
movs r1, 0xFF
strh r1, [r0]
movs r2, 0
@@ -655,13 +655,13 @@ sub_80E2308: @ 80E2308
bne _080E2360
movs r0, 0x5
bl PlaySE
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x7F
strh r0, [r1]
b _080E2350
.pool
_080E234C:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080E2350:
ldrb r0, [r5, 0xC]
@@ -686,7 +686,7 @@ sp109_CreatePCMenu: @ 80E236C
lsrs r0, 24
cmp r0, 0x1
beq _080E2394
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl CreatePCMenu
@@ -893,7 +893,7 @@ sub_80E2548: @ 80E2548
lsrs r0, 24
cmp r0, 0x1
beq _080E2570
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl sub_80E2578
@@ -1266,7 +1266,7 @@ _080E2860:
thumb_func_start sub_80E2878
sub_80E2878: @ 80E2878
push {lr}
ldr r2, =gScriptResult
ldr r2, =gSpecialVar_Result
ldrh r0, [r2]
cmp r0, 0x7F
beq _080E288C
@@ -1648,7 +1648,7 @@ sp106_CreateStartMenu: @ 80E2B7C
lsrs r0, 24
cmp r0, 0x1
beq _080E2BA4
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0xFF
strh r0, [r1]
bl CreateStartMenu
asm/script_pokemon_util_80F87D8.s
+12 -12
View File
@@ -83,7 +83,7 @@ sub_80F8850: @ 80F8850
thumb_func_start sub_80F8864
sub_80F8864: @ 80F8864
push {lr}
ldr r0, =gScriptContestCategory
ldr r0, =gSpecialVar_ContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080F88A4
@@ -157,7 +157,7 @@ sub_80F88E8: @ 80F88E8
ldrb r0, [r0]
cmp r0, 0
bne _080F8930
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r0, 0x3
bne _080F8930
@@ -601,7 +601,7 @@ sub_80F8C7C: @ 80F8C7C
ldrb r0, [r0]
cmp r0, 0
bne _080F8D18
ldr r0, =gUnknown_02039F2E
ldr r0, =gSpecialVar_ContestRank
ldrh r0, [r0]
cmp r0, 0x3
bne _080F8D18
@@ -952,7 +952,7 @@ sub_80F8FA0: @ 80F8FA0
ands r0, r1
cmp r0, 0
bne _080F8FD8
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@@ -960,7 +960,7 @@ sub_80F8FA0: @ 80F8FA0
b _080F8FDE
.pool
_080F8FD8:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x4
strh r0, [r1]
_080F8FDE:
@@ -987,11 +987,11 @@ sub_80F8FE8: @ 80F8FE8
adds r0, r1
str r0, [r2]
lsrs r0, 16
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
b _080F902A
.pool
_080F9020:
ldr r4, =gScriptResult
ldr r4, =gSpecialVar_Result
bl Random
lsls r0, 16
lsrs r0, 16
@@ -1376,7 +1376,7 @@ _080F9310:
cmp r1, 0x2
bne _080F9318
_080F9314:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080F9318:
pop {r0}
@@ -1550,12 +1550,12 @@ sub_80F9460: @ 80F9460
ldrb r1, [r0]
cmp r1, 0
bne _080F9478
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _080F947E
.pool
_080F9478:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080F947E:
@@ -1590,12 +1590,12 @@ sub_80F94B8: @ 80F94B8
ldrb r1, [r0]
cmp r1, 0
bne _080F94D0
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
b _080F94D6
.pool
_080F94D0:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_080F94D6:
asm/start_menu.s
+5 -5
View File
@@ -868,7 +868,7 @@ _0809FF00:
bl sub_8197DF8
bl sub_80984F4
bl ScriptContext2_Disable
ldr r0, =gUnknown_08252C88
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809FF22
@@ -974,13 +974,13 @@ task50_save_game: @ 809FFD0
_0809FFEC:
cmp r1, 0x3
bgt _080A0000
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
b _080A0000
.pool
_0809FFFC:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r1, [r0]
_080A0000:
adds r0, r4, 0
@@ -1089,7 +1089,7 @@ sub_80A00A0: @ 80A00A0
lsls r0, 24
cmp r0, 0
beq _080A00D4
ldr r0, =gUnknown_08252CA7
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CA7
ldr r1, =sub_80A00EC
bl sub_809FF98
b _080A00DC
@@ -1415,7 +1415,7 @@ sub_80A035C: @ 80A035C
movs r1, 0
bl sub_819746C
bl remove_start_menu_window_maybe
ldr r0, =gUnknown_08252CFB
ldr r0, =BattleFrontier_BattlePyramidEmptySquare_Text_252CFB
ldr r1, =sub_80A0388
bl sub_809FF98
movs r0, 0
asm/trader.s
+4 -4
View File
@@ -335,7 +335,7 @@ _08133CCA:
sub_8133CD8: @ 8133CD8
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
ldr r2, =0x00002e59
adds r0, r2
ldrb r0, [r0]
@@ -348,7 +348,7 @@ sub_8133CD8: @ 8133CD8
sub_8133CF4: @ 8133CF4
push {r4,r5,lr}
movs r4, 0
ldr r5, =gScriptResult
ldr r5, =gSpecialVar_Result
_08133CFA:
adds r0, r4, 0
bl CountDecorationCategoryN
@@ -365,7 +365,7 @@ _08133D10:
lsrs r4, r0, 24
cmp r4, 0x7
bls _08133CFA
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
_08133D20:
@@ -378,7 +378,7 @@ _08133D20:
thumb_func_start sub_8133D2C
sub_8133D2C: @ 8133D2C
push {r4-r6,lr}
ldr r6, =gScriptResult
ldr r6, =gSpecialVar_Result
movs r0, 0
strh r0, [r6]
ldr r4, =gDecorations
asm/trainer_see.s
+2 -2
View File
@@ -1300,7 +1300,7 @@ sub_80B45D0: @ 80B45D0
bne _080B460C
adds r0, 0x1
strb r0, [r1]
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0x1
strh r0, [r1]
bl UnfreezeMapObjects
@@ -1313,7 +1313,7 @@ _080B460C:
movs r0, 0
strb r0, [r1]
_080B4610:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_080B4616:
asm/use_pokeblock.s
+1 -1
View File
@@ -1016,7 +1016,7 @@ _08166BB6:
lsls r0, 24
cmp r0, 0
bne _08166BDA
ldr r0, =gScriptItemId
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8136F68
ldr r0, =sub_8166BEC
asm/wild_encounter.s
+3 -3
View File
@@ -1628,12 +1628,12 @@ rock_smash_wild_pokemon_encounter: @ 80B550C
bne _080B5568
bl sub_80B0698
_080B5554:
ldr r0, =gScriptResult
ldr r0, =gSpecialVar_Result
strh r4, [r0]
b _080B556E
.pool
_080B5568:
ldr r1, =gScriptResult
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_080B556E:
@@ -2026,7 +2026,7 @@ sub_80B5870: @ 80B5870
bl VarSet
cmp r4, 0
bne _080B58C4
ldr r0, =gUnknown_082A4B2A
ldr r0, =EventScript_RepelWoreOff
bl ScriptContext1_SetupScript
movs r0, 0x1
b _080B58C6
constants/constants.inc
+1
View File
@@ -17,3 +17,4 @@
.include "constants/berry_constants.inc"
.include "constants/field_object_constants.inc"
.include "constants/contest_move_effects.inc"
.include "constants/songs.inc"
constants/flags.inc
+1574
View File
File diff suppressed because it is too large Load Diff
constants/map_object_constants.inc
+40 -12
View File
@@ -39,7 +39,7 @@
.set MAP_OBJ_GFX_SCHOOL_KID_M, 38
.set MAP_OBJ_GFX_MANIAC, 39
.set MAP_OBJ_GFX_HEX_MANIAC, 40
.set MAP_OBJ_GFX_RAYQUAZA, 41
.set MAP_OBJ_GFX_RAYQUAZA_1, 41
.set MAP_OBJ_GFX_SWIMMER_M, 42
.set MAP_OBJ_GFX_SWIMMER_F, 43
.set MAP_OBJ_GFX_BLACK_BELT, 44
@@ -68,12 +68,12 @@
.set MAP_OBJ_GFX_REPORTER_M, 67
.set MAP_OBJ_GFX_REPORTER_F, 68
.set MAP_OBJ_GFX_BARD, 69
.set MAP_OBJ_GFX_HIPSTER, 70
.set MAP_OBJ_GFX_TRADER, 71
.set MAP_OBJ_GFX_STORYTELLER, 72
.set MAP_OBJ_GFX_GIDDY, 73
.set MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1, 74
.set MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2, 75
.set MAP_OBJ_GFX_ANABEL, 70
.set MAP_OBJ_GFX_TUCKER, 71
.set MAP_OBJ_GFX_GRETA, 72
.set MAP_OBJ_GFX_SPENSER, 73
.set MAP_OBJ_GFX_NOLAND, 74
.set MAP_OBJ_GFX_LUCY, 75
.set MAP_OBJ_GFX_UNUSED_NATU_DOLL, 76
.set MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL, 77
.set MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL, 78
@@ -93,10 +93,10 @@
.set MAP_OBJ_GFX_MAY_SURFING, 92
.set MAP_OBJ_GFX_MAY_FIELD_MOVE, 93
.set MAP_OBJ_GFX_TRUCK, 94
.set MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 95
.set MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 96
.set MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 95
.set MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 96
.set MAP_OBJ_GFX_BIRCHS_BAG, 97
.set MAP_OBJ_GFX_ZIGZAGOON, 98
.set MAP_OBJ_GFX_ZIGZAGOON_1, 98
.set MAP_OBJ_GFX_ARTIST, 99
.set MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 100
.set MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, 101
@@ -205,8 +205,8 @@
.set MAP_OBJ_GFX_KECLEON_1, 204
.set MAP_OBJ_GFX_KYOGRE_2, 205
.set MAP_OBJ_GFX_GROUDON_2, 206
.set MAP_OBJ_GFX_RAYQUAZA_2, 207
.set MAP_OBJ_GFX_ZIGZAGOON_2, 208
.set MAP_OBJ_GFX_RAYQUAZA_2, 207
.set MAP_OBJ_GFX_ZIGZAGOON_2, 208
.set MAP_OBJ_GFX_PIKACHU, 209
.set MAP_OBJ_GFX_AZUMARILL, 210
.set MAP_OBJ_GFX_WINGULL, 211
@@ -216,6 +216,34 @@
.set MAP_OBJ_GFX_MOM, 215
.set MAP_OBJ_GFX_LINK_BRENDAN, 216
.set MAP_OBJ_GFX_LINK_MAY, 217
.set MAP_OBJ_GFX_JUAN, 218
.set MAP_OBJ_GFX_SCOTT, 219
.set MAP_OBJ_GFX_POOCHYENA, 220
.set MAP_OBJ_GFX_KYOGRE_3, 221
.set MAP_OBJ_GFX_GROUDON_3, 222
.set MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 223
.set MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 224
.set MAP_OBJ_GFX_KIRLIA, 225
.set MAP_OBJ_GFX_DUSCLOPS, 226
.set MAP_OBJ_GFX_UNION_ROOM_NURSE, 227
.set MAP_OBJ_GFX_SUDOWOODO, 228
.set MAP_OBJ_GFX_MEW, 229
.set MAP_OBJ_GFX_RED, 230
.set MAP_OBJ_GFX_LEAF, 231
.set MAP_OBJ_GFX_DEOXYS, 232
.set MAP_OBJ_GFX_DEOXYS_TRIANGLE, 233
.set MAP_OBJ_GFX_BRANDON, 234
.set MAP_OBJ_GFX_LINK_RS_BRENDAN, 235
.set MAP_OBJ_GFX_LINK_RS_MAY, 236
.set MAP_OBJ_GFX_LUGIA, 237
.set MAP_OBJ_GFX_HOOH, 238
.set MAP_OBJ_GFX_BARD_2, 239
.set MAP_OBJ_GFX_HIPSTER, 240
.set MAP_OBJ_GFX_TRADER, 241
.set MAP_OBJ_GFX_STORYTELLER, 242
.set MAP_OBJ_GFX_GIDDY, 243
.set MAP_OBJ_GFX_PLACEHOLDER_1, 244
.set MAP_OBJ_GFX_PLACEHOLDER_2, 245
.set SHADOW_SIZE_S, 0
.set SHADOW_SIZE_M, 1
constants/songs.inc
+461
View File
@@ -0,0 +1,461 @@
.equiv SE_STOP, 0
.equiv SE_KAIFUKU, 1
.equiv SE_PC_LOGON, 2
.equiv SE_PC_OFF, 3
.equiv SE_PC_ON, 4
.equiv SE_SELECT, 5
.equiv SE_WIN_OPEN, 6
.equiv SE_WALL_HIT, 7
.equiv SE_DOOR, 8
.equiv SE_KAIDAN, 9
.equiv SE_DANSA, 10
.equiv SE_JITENSYA, 11
.equiv SE_KOUKA_L, 12
.equiv SE_KOUKA_M, 13
.equiv SE_KOUKA_H, 14
.equiv SE_BOWA2, 15
.equiv SE_POKE_DEAD, 16
.equiv SE_NIGERU, 17
.equiv SE_JIDO_DOA, 18
.equiv SE_NAMINORI, 19
.equiv SE_BAN, 20
.equiv SE_PIN, 21
.equiv SE_BOO, 22
.equiv SE_BOWA, 23
.equiv SE_JYUNI, 24
.equiv SE_A, 25
.equiv SE_I, 26
.equiv SE_U, 27
.equiv SE_E, 28
.equiv SE_O, 29
.equiv SE_N, 30
.equiv SE_SEIKAI, 31
.equiv SE_HAZURE, 32
.equiv SE_EXP, 33
.equiv SE_JITE_PYOKO, 34
.equiv SE_MU_PACHI, 35
.equiv SE_TK_KASYA, 36
.equiv SE_FU_ZAKU, 37
.equiv SE_FU_ZAKU2, 38
.equiv SE_FU_ZUZUZU, 39
.equiv SE_RU_GASHIN, 40
.equiv SE_RU_GASYAN, 41
.equiv SE_RU_BARI, 42
.equiv SE_RU_HYUU, 43
.equiv SE_KI_GASYAN, 44
.equiv SE_TK_WARPIN, 45
.equiv SE_TK_WARPOUT, 46
.equiv SE_TU_SAA, 47
.equiv SE_HI_TURUN, 48
.equiv SE_TRACK_MOVE, 49
.equiv SE_TRACK_STOP, 50
.equiv SE_TRACK_HAIK, 51
.equiv SE_TRACK_DOOR, 52
.equiv SE_MOTER, 53
.equiv SE_CARD, 54
.equiv SE_SAVE, 55
.equiv SE_KON, 56
.equiv SE_KON2, 57
.equiv SE_KON3, 58
.equiv SE_KON4, 59
.equiv SE_SUIKOMU, 60
.equiv SE_NAGERU, 61
.equiv SE_TOY_C, 62
.equiv SE_TOY_D, 63
.equiv SE_TOY_E, 64
.equiv SE_TOY_F, 65
.equiv SE_TOY_G, 66
.equiv SE_TOY_A, 67
.equiv SE_TOY_B, 68
.equiv SE_TOY_C1, 69
.equiv SE_MIZU, 70
.equiv SE_HASHI, 71
.equiv SE_DAUGI, 72
.equiv SE_PINPON, 73
.equiv SE_FUUSEN1, 74
.equiv SE_FUUSEN2, 75
.equiv SE_FUUSEN3, 76
.equiv SE_TOY_KABE, 77
.equiv SE_TOY_DANGO, 78
.equiv SE_DOKU, 79
.equiv SE_ESUKA, 80
.equiv SE_T_AME, 81
.equiv SE_T_AME_E, 82
.equiv SE_T_OOAME, 83
.equiv SE_T_OOAME_E, 84
.equiv SE_T_KOAME, 85
.equiv SE_T_KOAME_E, 86
.equiv SE_T_KAMI, 87
.equiv SE_T_KAMI2, 88
.equiv SE_ELEBETA, 89
.equiv SE_HINSI, 90
.equiv SE_EXPMAX, 91
.equiv SE_TAMAKORO, 92
.equiv SE_TAMAKORO_E, 93
.equiv SE_BASABASA, 94
.equiv SE_REGI, 95
.equiv SE_C_GAJI, 96
.equiv SE_C_MAKU_U, 97
.equiv SE_C_MAKU_D, 98
.equiv SE_C_PASI, 99
.equiv SE_C_SYU, 100
.equiv SE_C_PIKON, 101
.equiv SE_REAPOKE, 102
.equiv SE_OP_BASYU, 103
.equiv SE_BT_START, 104
.equiv SE_DENDOU, 105
.equiv SE_JIHANKI, 106
.equiv SE_TAMA, 107
.equiv SE_Z_SCROLL, 108
.equiv SE_Z_PAGE, 109
.equiv SE_PN_ON, 110
.equiv SE_PN_OFF, 111
.equiv SE_Z_SEARCH, 112
.equiv SE_TAMAGO, 113
.equiv SE_TB_START, 114
.equiv SE_TB_KON, 115
.equiv SE_TB_KARA, 116
.equiv SE_BIDORO, 117
.equiv SE_W085, 118
.equiv SE_W085B, 119
.equiv SE_W231, 120
.equiv SE_W171, 121
.equiv SE_W233, 122
.equiv SE_W233B, 123
.equiv SE_W145, 124
.equiv SE_W145B, 125
.equiv SE_W145C, 126
.equiv SE_W240, 127
.equiv SE_W015, 128
.equiv SE_W081, 129
.equiv SE_W081B, 130
.equiv SE_W088, 131
.equiv SE_W016, 132
.equiv SE_W016B, 133
.equiv SE_W003, 134
.equiv SE_W104, 135
.equiv SE_W013, 136
.equiv SE_W196, 137
.equiv SE_W086, 138
.equiv SE_W004, 139
.equiv SE_W025, 140
.equiv SE_W025B, 141
.equiv SE_W152, 142
.equiv SE_W026, 143
.equiv SE_W172, 144
.equiv SE_W172B, 145
.equiv SE_W053, 146
.equiv SE_W007, 147
.equiv SE_W092, 148
.equiv SE_W221, 149
.equiv SE_W221B, 150
.equiv SE_W052, 151
.equiv SE_W036, 152
.equiv SE_W059, 153
.equiv SE_W059B, 154
.equiv SE_W010, 155
.equiv SE_W011, 156
.equiv SE_W017, 157
.equiv SE_W019, 158
.equiv SE_W028, 159
.equiv SE_W013B, 160
.equiv SE_W044, 161
.equiv SE_W029, 162
.equiv SE_W057, 163
.equiv SE_W056, 164
.equiv SE_W250, 165
.equiv SE_W030, 166
.equiv SE_W039, 167
.equiv SE_W054, 168
.equiv SE_W077, 169
.equiv SE_W020, 170
.equiv SE_W082, 171
.equiv SE_W047, 172
.equiv SE_W195, 173
.equiv SE_W006, 174
.equiv SE_W091, 175
.equiv SE_W146, 176
.equiv SE_W120, 177
.equiv SE_W153, 178
.equiv SE_W071B, 179
.equiv SE_W071, 180
.equiv SE_W103, 181
.equiv SE_W062, 182
.equiv SE_W062B, 183
.equiv SE_W048, 184
.equiv SE_W187, 185
.equiv SE_W118, 186
.equiv SE_W155, 187
.equiv SE_W122, 188
.equiv SE_W060, 189
.equiv SE_W185, 190
.equiv SE_W014, 191
.equiv SE_W043, 192
.equiv SE_W207, 193
.equiv SE_W207B, 194
.equiv SE_W215, 195
.equiv SE_W109, 196
.equiv SE_W173, 197
.equiv SE_W280, 198
.equiv SE_W202, 199
.equiv SE_W060B, 200
.equiv SE_W076, 201
.equiv SE_W080, 202
.equiv SE_W100, 203
.equiv SE_W107, 204
.equiv SE_W166, 205
.equiv SE_W129, 206
.equiv SE_W115, 207
.equiv SE_W112, 208
.equiv SE_W197, 209
.equiv SE_W199, 210
.equiv SE_W236, 211
.equiv SE_W204, 212
.equiv SE_W268, 213
.equiv SE_W070, 214
.equiv SE_W063, 215
.equiv SE_W127, 216
.equiv SE_W179, 217
.equiv SE_W151, 218
.equiv SE_W201, 219
.equiv SE_W161, 220
.equiv SE_W161B, 221
.equiv SE_W227, 222
.equiv SE_W227B, 223
.equiv SE_W226, 224
.equiv SE_W208, 225
.equiv SE_W213, 226
.equiv SE_W213B, 227
.equiv SE_W234, 228
.equiv SE_W260, 229
.equiv SE_W328, 230
.equiv SE_W320, 231
.equiv SE_W255, 232
.equiv SE_W291, 233
.equiv SE_W089, 234
.equiv SE_W239, 235
.equiv SE_W230, 236
.equiv SE_W281, 237
.equiv SE_W327, 238
.equiv SE_W287, 239
.equiv SE_W257, 240
.equiv SE_W253, 241
.equiv SE_W258, 242
.equiv SE_W322, 243
.equiv SE_W298, 244
.equiv SE_W287B, 245
.equiv SE_W114, 246
.equiv SE_W063B, 247
.equiv BGM_STOP, 349
.equiv BGM_TETSUJI, 350
.equiv BGM_FIELD13, 351
.equiv BGM_KACHI22, 352
.equiv BGM_KACHI2, 353
.equiv BGM_KACHI3, 354
.equiv BGM_KACHI5, 355
.equiv BGM_PCC, 356
.equiv BGM_NIBI, 357
.equiv BGM_SUIKUN, 358
.equiv BGM_DOORO1, 359
.equiv BGM_DOORO_X1, 360
.equiv BGM_DOORO_X3, 361
.equiv BGM_MACHI_S2, 362
.equiv BGM_MACHI_S4, 363
.equiv BGM_GIM, 364
.equiv BGM_NAMINORI, 365
.equiv BGM_DAN01, 366
.equiv BGM_FANFA1, 367
.equiv BGM_ME_ASA, 368
.equiv BGM_ME_BACHI, 369
.equiv BGM_FANFA4, 370
.equiv BGM_FANFA5, 371
.equiv BGM_ME_WAZA, 372
.equiv BGM_BIJYUTU, 373
.equiv BGM_DOORO_X4, 374
.equiv BGM_FUNE_KAN, 375
.equiv BGM_ME_SHINKA, 376
.equiv BGM_SHINKA, 377
.equiv BGM_ME_WASURE, 378
.equiv BGM_SYOUJOEYE, 379
.equiv BGM_BOYEYE, 380
.equiv BGM_DAN02, 381
.equiv BGM_MACHI_S3, 382
.equiv BGM_ODAMAKI, 383
.equiv BGM_B_TOWER, 384
.equiv BGM_SWIMEYE, 385
.equiv BGM_DAN03, 386
.equiv BGM_ME_KINOMI, 387
.equiv BGM_ME_TAMA, 388
.equiv BGM_ME_B_BIG, 389
.equiv BGM_ME_B_SMALL, 390
.equiv BGM_ME_ZANNEN, 391
.equiv BGM_BD_TIME, 392
.equiv BGM_TEST1, 393
.equiv BGM_TEST2, 394
.equiv BGM_TEST3, 395
.equiv BGM_TEST4, 396
.equiv BGM_TEST, 397
.equiv BGM_GOMACHI0, 398
.equiv BGM_GOTOWN, 399
.equiv BGM_POKECEN, 400
.equiv BGM_NEXTROAD, 401
.equiv BGM_GRANROAD, 402
.equiv BGM_CYCLING, 403
.equiv BGM_FRIENDLY, 404
.equiv BGM_MISHIRO, 405
.equiv BGM_TOZAN, 406
.equiv BGM_GIRLEYE, 407
.equiv BGM_MINAMO, 408
.equiv BGM_ASHROAD, 409
.equiv BGM_EVENT0, 410
.equiv BGM_DEEPDEEP, 411
.equiv BGM_KACHI1, 412
.equiv BGM_TITLE3, 413
.equiv BGM_DEMO1, 414
.equiv BGM_GIRL_SUP, 415
.equiv BGM_HAGESHII, 416
.equiv BGM_KAKKOII, 417
.equiv BGM_KAZANBAI, 418
.equiv BGM_AQA_0, 419
.equiv BGM_TSURETEK, 420
.equiv BGM_BOY_SUP, 421
.equiv BGM_RAINBOW, 422
.equiv BGM_AYASII, 423
.equiv BGM_KACHI4, 424
.equiv BGM_ROPEWAY, 425
.equiv BGM_CASINO, 426
.equiv BGM_HIGHTOWN, 427
.equiv BGM_SAFARI, 428
.equiv BGM_C_ROAD, 429
.equiv BGM_AJITO, 430
.equiv BGM_M_BOAT, 431
.equiv BGM_M_DUNGON, 432
.equiv BGM_FINECITY, 433
.equiv BGM_MACHUPI, 434
.equiv BGM_P_SCHOOL, 435
.equiv BGM_DENDOU, 436
.equiv BGM_TONEKUSA, 437
.equiv BGM_MABOROSI, 438
.equiv BGM_CON_FAN, 439
.equiv BGM_CONTEST0, 440
.equiv BGM_MGM0, 441
.equiv BGM_T_BATTLE, 442
.equiv BGM_OOAME, 443
.equiv BGM_HIDERI, 444
.equiv BGM_RUNECITY, 445
.equiv BGM_CON_K, 446
.equiv BGM_EIKOU_R, 447
.equiv BGM_KARAKURI, 448
.equiv BGM_HUTAGO, 449
.equiv BGM_SITENNOU, 450
.equiv BGM_YAMA_EYE, 451
.equiv BGM_CONLOBBY, 452
.equiv BGM_INTER_V, 453
.equiv BGM_DAIGO, 454
.equiv BGM_THANKFOR, 455
.equiv BGM_END, 456
.equiv BGM_BATTLE_FRONTIER, 457
.equiv BGM_BATTLE_ARENA, 458
.equiv BGM_ME_BATTLE_POINTS, 459
.equiv BGM_ME_MATCH_CALL, 460
.equiv BGM_BATTLE_PYRAMID, 461
.equiv BGM_BATTLE_PYRAMID_SUMMIT, 462
.equiv BGM_BATTLE_PALACE, 463
.equiv BGM_FANFA_RAYQUAZA, 464
.equiv BGM_BATTLE_TOWER, 465
.equiv BGM_ME_BATTLE_SYMBOL, 466
.equiv BGM_BATTLE_DOME_TOURNAMENT, 467
.equiv BGM_BATTLE_PIKE, 468
.equiv BGM_BATTLE_FACTORY, 469
.equiv BGM_BATTLE_LEGENDARY, 470
.equiv BGM_BATTLE_FRONTIER_BRAIN, 471
.equiv BGM_BATTLE_MEW, 472
.equiv BGM_BATTLE_DOME, 473
.equiv BGM_BATTLE27, 474
.equiv BGM_BATTLE31, 475
.equiv BGM_BATTLE20, 476
.equiv BGM_BATTLE32, 477
.equiv BGM_BATTLE33, 478
.equiv BGM_BATTLE36, 479
.equiv BGM_BATTLE34, 480
.equiv BGM_BATTLE35, 481
.equiv BGM_BATTLE38, 482
.equiv BGM_BATTLE30, 483
.equiv BGM_FRLG_FOLLOW_ME, 484
.equiv BGM_FRLG_GAMECORNER, 485
.equiv BGM_FRLG_ROCKET_HIDEOUT, 486
.equiv BGM_FRLG_GYM, 487
.equiv BGM_FRLG_JIGGLYPUFF, 488
.equiv BGM_FRLG_OPENING, 489
.equiv BGM_FRLG_TITLE, 490
.equiv BGM_FRLG_CINNABAR_ISLAND, 491
.equiv BGM_FRLG_LAVENDER_TOWN, 492
.equiv BGM_FRLG_HEALING_TEST, 493
.equiv BGM_FRLG_BICYCLE, 494
.equiv BGM_FRLG_SUSPICIOUS_EYE, 495
.equiv BGM_FRLG_GIRL_EYE, 496
.equiv BGM_FRLG_BOY_EYE, 497
.equiv BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME, 498
.equiv BGM_FRLG_VIRIDIAN_FOREST, 499
.equiv BGM_FRLG_MT_MOON, 500
.equiv BGM_FRLG_POKEMON_MANSION, 501
.equiv BGM_FRLG_CREDITS, 502
.equiv BGM_FRLG_ROUTE_1, 503
.equiv BGM_FRLG_ROUTE_24, 504
.equiv BGM_FRLG_ROUTE_3, 505
.equiv BGM_FRLG_ROUTE_11, 506
.equiv BGM_FRLG_INDIGO_PLATEAU, 507
.equiv BGM_FRLG_BATTLE_LEADER, 508
.equiv BGM_FRLG_BATTLE_TRAINER, 509
.equiv BGM_FRLG_BATTLE_WILD_POKEMON, 510
.equiv BGM_FRLG_BATTLE_CHAMPION, 511
.equiv BGM_FRLG_PALLET_TOWN, 512
.equiv BGM_FRLG_OAK_LAB, 513
.equiv BGM_FRLG_PROF_OAK, 514
.equiv BGM_FRLG_POKEMON_CENTER, 515
.equiv BGM_FRLG_SS_ANNE, 516
.equiv BGM_FRLG_SURF, 517
.equiv BGM_FRLG_POKEMON_TOWER, 518
.equiv BGM_FRLG_SILPH, 519
.equiv BGM_FRLG_CERULEAN_CITY, 520
.equiv BGM_FRLG_CELADON_CITY, 521
.equiv BGM_FRLG_KACHI_TRAINER, 522
.equiv BGM_FRLG_KACHI_WILD_POKEMON, 523
.equiv BGM_FRLG_KACHI_LEADER, 524
.equiv BGM_FRLG_VERMILION_CITY, 525
.equiv BGM_FRLG_VIRIDIAN_CITY, 526
.equiv BGM_FRLG_RIVAL, 527
.equiv BGM_FRLG_RIVAL_POSTBATTLE, 528
.equiv BGM_FRLG_ME_POKEDEX_EVAL, 529
.equiv BGM_FRLG_ME_KEYITEM, 530
.equiv BGM_FRLG_FANFA_POKEMON_CAUGHT, 531
.equiv BGM_FRLG_FANFA_TRAINERCARD_PHOTO, 532
.equiv BGM_FRLG_GAMEFREAK_LOGO, 533
.equiv BGM_FRLG_CAUGHT_POKEMON, 534
.equiv BGM_FRLG_GAME_EXPLANATION_START, 535
.equiv BGM_FRLG_GAME_EXPLANATION_MIDDLE, 536
.equiv BGM_FRLG_GAME_EXPLANATION_END, 537
.equiv BGM_FRLG_POKEMON_JUMP, 538
.equiv BGM_FRLG_UNION_ROOM, 539
.equiv BGM_FRLG_POKEMON_NETWORK_CENTER, 540
.equiv BGM_FRLG_MYSTERY_GIFT, 541
.equiv BGM_FRLG_DODRIO_BERRY_PICK, 542
.equiv BGM_FRLG_MT_EMBER, 543
.equiv BGM_FRLG_TEACHY_TV_EPISODE, 544
.equiv BGM_FRLG_SEVII_ISLANDS, 545
.equiv BGM_FRLG_TANOBY_RUINS, 546
.equiv BGM_FRLG_ISLAND_ONE, 547
.equiv BGM_FRLG_ISLAND_FOUR, 548
.equiv BGM_FRLG_ISLAND_SIX, 549
.equiv BGM_FRLG_FLUTE, 550
.equiv BGM_FRLG_BATTLE_DEOXYS, 551
.equiv BGM_FRLG_BATTLE_MEWTWO, 552
.equiv BGM_FRLG_BATTLE_LEGENDARY, 553
.equiv BGM_FRLG_LEADER_EYE, 554
.equiv BGM_FRLG_DEOXYS_EYE, 555
.equiv BGM_FRLG_TRAINER_TOWER, 556
.equiv BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 557
.equiv BGM_FRLG_TEACHY_TV, 558
.equiv BGM_ROUTE_118, 0x7fff
constants/variables.inc
+278
View File
@@ -0,0 +1,278 @@
.equiv VAR_0x4000, 0x4000
.equiv VAR_0x4001, 0x4001
.equiv VAR_0x4002, 0x4002
.equiv VAR_0x4003, 0x4003
.equiv VAR_0x4004, 0x4004
.equiv VAR_0x4005, 0x4005
.equiv VAR_0x4006, 0x4006
.equiv VAR_0x4007, 0x4007
.equiv VAR_0x4008, 0x4008
.equiv VAR_0x4009, 0x4009
.equiv VAR_0x400A, 0x400A
.equiv VAR_0x400B, 0x400B
.equiv VAR_0x400C, 0x400C
.equiv VAR_0x400D, 0x400D
.equiv VAR_0x400E, 0x400E
.equiv VAR_0x400F, 0x400F
.equiv VAR_0x4010, 0x4010
.equiv VAR_0x4011, 0x4011
.equiv VAR_0x4012, 0x4012
.equiv VAR_0x4013, 0x4013
.equiv VAR_0x4014, 0x4014
.equiv VAR_0x4015, 0x4015
.equiv VAR_0x4016, 0x4016
.equiv VAR_0x4017, 0x4017
.equiv VAR_0x4018, 0x4018
.equiv VAR_0x4019, 0x4019
.equiv VAR_0x401A, 0x401A
.equiv VAR_0x401B, 0x401B
.equiv VAR_0x401C, 0x401C
.equiv VAR_0x401D, 0x401D
.equiv VAR_0x401E, 0x401E
.equiv VAR_0x401F, 0x401F
.equiv VAR_RECYCLE_GOODS, 0x4020
.equiv VAR_REPEL_STEP_COUNT, 0x4021
.equiv VAR_ICE_STEP_COUNT, 0x4022
.equiv VAR_FIRST_POKE, 0x4023
.equiv VAR_MIRAGE_RND_H, 0x4024
.equiv VAR_MIRAGE_RND_L, 0x4025
.equiv VAR_SECRET_BASE_MAP, 0x4026
.equiv VAR_0x4027, 0x4027
.equiv VAR_0x4028, 0x4028
.equiv VAR_0x4029, 0x4029
.equiv VAR_HAPPINESS_STEP_COUNTER, 0x402A
.equiv VAR_POISON_STEP_COUNTER, 0x402B
.equiv VAR_RESET_RTC_ENABLE, 0x402C
.equiv VAR_0x402D, 0x402D
.equiv VAR_0x402E, 0x402E
.equiv VAR_0x402F, 0x402F
.equiv VAR_0x4030, 0x4030
.equiv VAR_0x4031, 0x4031
.equiv VAR_0x4032, 0x4032
.equiv VAR_0x4033, 0x4033
.equiv VAR_0x4034, 0x4034
.equiv VAR_0x4035, 0x4035
.equiv VAR_STORAGE_UNKNOWN, 0x4036
.equiv VAR_0x4037, 0x4037
.equiv VAR_0x4038, 0x4038
.equiv VAR_0x4039, 0x4039
.equiv VAR_0x403A, 0x403A
.equiv VAR_0x403B, 0x403B
.equiv VAR_0x403C, 0x403C
.equiv VAR_0x403D, 0x403D
.equiv VAR_0x403E, 0x403E
.equiv VAR_0x403F, 0x403F
.equiv VAR_DAYS, 0x4040
.equiv VAR_0x4041, 0x4041
.equiv VAR_0x4042, 0x4042
.equiv VAR_DEPT_STORE_FLOOR, 0x4043
.equiv VAR_0x4044, 0x4044
.equiv VAR_POKELOT_PRIZE, 0x4045
.equiv VAR_NATIONAL_DEX, 0x4046
.equiv VAR_SEEDOT_SIZE_RECORD, 0x4047
.equiv VAR_ASH_GATHER_COUNT, 0x4048
.equiv VAR_BIRCH_STATE, 0x4049
.equiv VAR_CRUISE_STEP_COUNT, 0x404A
.equiv VAR_POKELOT_RND1, 0x404B
.equiv VAR_POKELOT_RND2, 0x404C
.equiv VAR_0x404D, 0x404D
.equiv VAR_0x404E, 0x404E
.equiv VAR_LOTAD_SIZE_RECORD, 0x404F
.equiv VAR_0x4050, 0x4050
.equiv VAR_0x4051, 0x4051
.equiv VAR_0x4052, 0x4052
.equiv VAR_0x4053, 0x4053
.equiv VAR_0x4054, 0x4054
.equiv VAR_0x4055, 0x4055
.equiv VAR_0x4056, 0x4056
.equiv VAR_0x4057, 0x4057
.equiv VAR_0x4058, 0x4058
.equiv VAR_0x4059, 0x4059
.equiv VAR_0x405A, 0x405A
.equiv VAR_0x405B, 0x405B
.equiv VAR_0x405C, 0x405C
.equiv VAR_0x405D, 0x405D
.equiv VAR_0x405E, 0x405E
.equiv VAR_0x405F, 0x405F
.equiv VAR_0x4060, 0x4060
.equiv VAR_0x4061, 0x4061
.equiv VAR_0x4062, 0x4062
.equiv VAR_0x4063, 0x4063
.equiv VAR_0x4064, 0x4064
.equiv VAR_0x4065, 0x4065
.equiv VAR_0x4066, 0x4066
.equiv VAR_0x4067, 0x4067
.equiv VAR_0x4068, 0x4068
.equiv VAR_0x4069, 0x4069
.equiv VAR_0x406A, 0x406A
.equiv VAR_0x406B, 0x406B
.equiv VAR_0x406C, 0x406C
.equiv VAR_0x406D, 0x406D
.equiv VAR_0x406E, 0x406E
.equiv VAR_0x406F, 0x406F
.equiv VAR_0x4070, 0x4070
.equiv VAR_0x4071, 0x4071
.equiv VAR_0x4072, 0x4072
.equiv VAR_0x4073, 0x4073
.equiv VAR_0x4074, 0x4074
.equiv VAR_0x4075, 0x4075
.equiv VAR_0x4076, 0x4076
.equiv VAR_0x4077, 0x4077
.equiv VAR_0x4078, 0x4078
.equiv VAR_0x4079, 0x4079
.equiv VAR_0x407A, 0x407A
.equiv VAR_0x407B, 0x407B
.equiv VAR_0x407C, 0x407C
.equiv VAR_0x407D, 0x407D
.equiv VAR_0x407E, 0x407E
.equiv VAR_0x407F, 0x407F
.equiv VAR_0x4080, 0x4080
.equiv VAR_0x4081, 0x4081
.equiv VAR_0x4082, 0x4082
.equiv VAR_0x4083, 0x4083
.equiv VAR_0x4084, 0x4084
.equiv VAR_0x4085, 0x4085
.equiv VAR_0x4086, 0x4086
.equiv VAR_0x4087, 0x4087
.equiv VAR_0x4088, 0x4088
.equiv VAR_0x4089, 0x4089
.equiv VAR_0x408A, 0x408A
.equiv VAR_0x408B, 0x408B
.equiv VAR_0x408C, 0x408C
.equiv VAR_0x408D, 0x408D
.equiv VAR_0x408E, 0x408E
.equiv VAR_0x408F, 0x408F
.equiv VAR_0x4090, 0x4090
.equiv VAR_0x4091, 0x4091
.equiv VAR_0x4092, 0x4092
.equiv VAR_0x4093, 0x4093
.equiv VAR_0x4094, 0x4094
.equiv VAR_0x4095, 0x4095
.equiv VAR_0x4096, 0x4096
.equiv VAR_0x4097, 0x4097
.equiv VAR_0x4098, 0x4098
.equiv VAR_0x4099, 0x4099
.equiv VAR_0x409A, 0x409A
.equiv VAR_0x409B, 0x409B
.equiv VAR_0x409C, 0x409C
.equiv VAR_0x409D, 0x409D
.equiv VAR_0x409E, 0x409E
.equiv VAR_0x409F, 0x409F
.equiv VAR_0x40A0, 0x40A0
.equiv VAR_0x40A1, 0x40A1
.equiv VAR_0x40A2, 0x40A2
.equiv VAR_0x40A3, 0x40A3
.equiv VAR_0x40A4, 0x40A4
.equiv VAR_0x40A5, 0x40A5
.equiv VAR_0x40A6, 0x40A6
.equiv VAR_0x40A7, 0x40A7
.equiv VAR_0x40A8, 0x40A8
.equiv VAR_0x40A9, 0x40A9
.equiv VAR_0x40AA, 0x40AA
.equiv VAR_0x40AB, 0x40AB
.equiv VAR_0x40AC, 0x40AC
.equiv VAR_0x40AD, 0x40AD
.equiv VAR_0x40AE, 0x40AE
.equiv VAR_0x40AF, 0x40AF
.equiv VAR_0x40B0, 0x40B0
.equiv VAR_0x40B1, 0x40B1
.equiv VAR_0x40B2, 0x40B2
.equiv VAR_0x40B3, 0x40B3
.equiv VAR_PORTHOLE, 0x40B4
.equiv VAR_0x40B5, 0x40B5
.equiv VAR_0x40B6, 0x40B6
.equiv VAR_0x40B7, 0x40B7
.equiv VAR_0x40B8, 0x40B8
.equiv VAR_0x40B9, 0x40B9
.equiv VAR_0x40BA, 0x40BA
.equiv VAR_0x40BB, 0x40BB
.equiv VAR_0x40BC, 0x40BC
.equiv VAR_0x40BD, 0x40BD
.equiv VAR_0x40BE, 0x40BE
.equiv VAR_0x40BF, 0x40BF
.equiv VAR_0x40C0, 0x40C0
.equiv VAR_0x40C1, 0x40C1
.equiv VAR_0x40C2, 0x40C2
.equiv VAR_0x40C3, 0x40C3
.equiv VAR_0x40C4, 0x40C4
.equiv VAR_0x40C5, 0x40C5
.equiv VAR_0x40C6, 0x40C6
.equiv VAR_0x40C7, 0x40C7
.equiv VAR_0x40C8, 0x40C8
.equiv VAR_0x40C9, 0x40C9
.equiv VAR_0x40CA, 0x40CA
.equiv VAR_0x40CB, 0x40CB
.equiv VAR_0x40CC, 0x40CC
.equiv VAR_0x40CD, 0x40CD
.equiv VAR_0x40CE, 0x40CE
.equiv VAR_FRONTIER_FACILITY, 0x40CF
.equiv VAR_0x40D0, 0x40D0
.equiv VAR_0x40D1, 0x40D1
.equiv VAR_0x40D2, 0x40D2
.equiv VAR_0x40D3, 0x40D3
.equiv VAR_0x40D4, 0x40D4
.equiv VAR_0x40D5, 0x40D5
.equiv VAR_0x40D6, 0x40D6
.equiv VAR_0x40D7, 0x40D7
.equiv VAR_0x40D8, 0x40D8
.equiv VAR_0x40D9, 0x40D9
.equiv VAR_0x40DA, 0x40DA
.equiv VAR_0x40DB, 0x40DB
.equiv VAR_0x40DC, 0x40DC
.equiv VAR_0x40DD, 0x40DD
.equiv VAR_0x40DE, 0x40DE
.equiv VAR_0x40DF, 0x40DF
.equiv VAR_0x40E0, 0x40E0
.equiv VAR_0x40E1, 0x40E1
.equiv VAR_0x40E2, 0x40E2
.equiv VAR_0x40E3, 0x40E3
.equiv VAR_0x40E4, 0x40E4
.equiv VAR_0x40E5, 0x40E5
.equiv VAR_DAILY_SLOTS, 0x40E6
.equiv VAR_DAILY_WILDS, 0x40E7
.equiv VAR_DAILY_BLENDER, 0x40E8
.equiv VAR_DAILY_PLANTED_BERRIES, 0x40E9
.equiv VAR_DAILY_PICKED_BERRIES, 0x40EA
.equiv VAR_DAILY_ROULETTE, 0x40EB
.equiv VAR_0x40EC, 0x40EC
.equiv VAR_0x40ED, 0x40ED
.equiv VAR_0x40EE, 0x40EE
.equiv VAR_0x40EF, 0x40EF
.equiv VAR_0x40F0, 0x40F0
.equiv VAR_DAILY_BP, 0x40F1
.equiv VAR_0x40F2, 0x40F2
.equiv VAR_0x40F3, 0x40F3
.equiv VAR_0x40F4, 0x40F4
.equiv VAR_0x40F5, 0x40F5
.equiv VAR_0x40F6, 0x40F6
.equiv VAR_0x40F7, 0x40F7
.equiv VAR_0x40F8, 0x40F8
.equiv VAR_0x40F9, 0x40F9
.equiv VAR_0x40FA, 0x40FA
.equiv VAR_0x40FB, 0x40FB
.equiv VAR_0x40FC, 0x40FC
.equiv VAR_0x40FD, 0x40FD
.equiv VAR_0x40FE, 0x40FE
.equiv VAR_0x40FF, 0x40FF
.equiv VAR_0x8000, 0x8000
.equiv VAR_0x8001, 0x8001
.equiv VAR_0x8002, 0x8002
.equiv VAR_0x8003, 0x8003
.equiv VAR_0x8004, 0x8004
.equiv VAR_0x8005, 0x8005
.equiv VAR_0x8006, 0x8006
.equiv VAR_0x8007, 0x8007
.equiv VAR_0x8008, 0x8008
.equiv VAR_0x8009, 0x8009
.equiv VAR_0x800A, 0x800A
.equiv VAR_0x800B, 0x800B
.equiv VAR_FACING, 0x800C
.equiv VAR_RESULT, 0x800D
.equiv VAR_ITEM_ID, 0x800E
.equiv VAR_LAST_TALKED, 0x800F
.equiv VAR_CONTEST_RANK, 0x8010
.equiv VAR_CONTEST_CATEGORY, 0x8011
.equiv VAR_MON_BOX_ID, 0x8012
.equiv VAR_MON_BOX_POS, 0x8013
.equiv VAR_0x8014, 0x8014
data/battle_anim_80A9C70.s
+23
View File
@@ -0,0 +1,23 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.incbin "baserom.gba", 0x53ede4, 0x14c
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
data/cable_car.s
+1 -1
View File
@@ -86,7 +86,7 @@ gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
.byte MAP_OBJ_GFX_HIKER
.byte MAP_OBJ_GFX_CAMPER
.byte MAP_OBJ_GFX_PICNICKER
.byte MAP_OBJ_GFX_ZIGZAGOON @ not used
.byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
.align 1
gMtChimneyHikerCoords:: @ 85CDBEA
data/event_scripts.s
+13623 -624
View File
File diff suppressed because it is too large Load Diff
data/map_events.s
+526
View File
@@ -0,0 +1,526 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "constants/flags.inc"
.include "constants/variables.inc"
.section .rodata
.include "data/maps/events/PetalburgCity.inc"
.include "data/maps/events/SlateportCity.inc"
.include "data/maps/events/MauvilleCity.inc"
.include "data/maps/events/RustboroCity.inc"
.include "data/maps/events/FortreeCity.inc"
.include "data/maps/events/LilycoveCity.inc"
.include "data/maps/events/MossdeepCity.inc"
.include "data/maps/events/SootopolisCity.inc"
.include "data/maps/events/EverGrandeCity.inc"
.include "data/maps/events/LittlerootTown.inc"
.include "data/maps/events/OldaleTown.inc"
.include "data/maps/events/DewfordTown.inc"
.include "data/maps/events/LavaridgeTown.inc"
.include "data/maps/events/FallarborTown.inc"
.include "data/maps/events/VerdanturfTown.inc"
.include "data/maps/events/PacifidlogTown.inc"
.include "data/maps/events/Route101.inc"
.include "data/maps/events/Route102.inc"
.include "data/maps/events/Route103.inc"
.include "data/maps/events/Route104.inc"
.include "data/maps/events/Route105.inc"
.include "data/maps/events/Route106.inc"
.include "data/maps/events/Route107.inc"
.include "data/maps/events/Route108.inc"
.include "data/maps/events/Route109.inc"
.include "data/maps/events/Route110.inc"
.include "data/maps/events/Route111.inc"
.include "data/maps/events/Route112.inc"
.include "data/maps/events/Route113.inc"
.include "data/maps/events/Route114.inc"
.include "data/maps/events/Route115.inc"
.include "data/maps/events/Route116.inc"
.include "data/maps/events/Route117.inc"
.include "data/maps/events/Route118.inc"
.include "data/maps/events/Route119.inc"
.include "data/maps/events/Route120.inc"
.include "data/maps/events/Route121.inc"
.include "data/maps/events/Route122.inc"
.include "data/maps/events/Route123.inc"
.include "data/maps/events/Route124.inc"
.include "data/maps/events/Route125.inc"
.include "data/maps/events/Route126.inc"
.include "data/maps/events/Route127.inc"
.include "data/maps/events/Route128.inc"
.include "data/maps/events/Route129.inc"
.include "data/maps/events/Route130.inc"
.include "data/maps/events/Route131.inc"
.include "data/maps/events/Route132.inc"
.include "data/maps/events/Route133.inc"
.include "data/maps/events/Route134.inc"
.include "data/maps/events/Underwater1.inc"
.include "data/maps/events/Underwater2.inc"
.include "data/maps/events/Underwater3.inc"
.include "data/maps/events/Underwater4.inc"
.include "data/maps/events/Underwater5.inc"
.include "data/maps/events/Underwater6.inc"
.include "data/maps/events/Underwater7.inc"
.include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc"
.include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc"
.include "data/maps/events/LittlerootTown_MaysHouse_1F.inc"
.include "data/maps/events/LittlerootTown_MaysHouse_2F.inc"
.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc"
.include "data/maps/events/OldaleTown_House1.inc"
.include "data/maps/events/OldaleTown_House2.inc"
.include "data/maps/events/OldaleTown_PokemonCenter_1F.inc"
.include "data/maps/events/OldaleTown_PokemonCenter_2F.inc"
.include "data/maps/events/OldaleTown_Mart.inc"
.include "data/maps/events/DewfordTown_House1.inc"
.include "data/maps/events/DewfordTown_PokemonCenter_1F.inc"
.include "data/maps/events/DewfordTown_PokemonCenter_2F.inc"
.include "data/maps/events/DewfordTown_Gym.inc"
.include "data/maps/events/DewfordTown_Hall.inc"
.include "data/maps/events/DewfordTown_House2.inc"
.include "data/maps/events/LavaridgeTown_HerbShop.inc"
.include "data/maps/events/LavaridgeTown_Gym_1F.inc"
.include "data/maps/events/LavaridgeTown_Gym_B1F.inc"
.include "data/maps/events/LavaridgeTown_House.inc"
.include "data/maps/events/LavaridgeTown_Mart.inc"
.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc"
.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc"
.include "data/maps/events/FallarborTown_Mart.inc"
.include "data/maps/events/FallarborTown_BattleTentLobby.inc"
.include "data/maps/events/FallarborTown_BattleTentCorridor.inc"
.include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc"
.include "data/maps/events/FallarborTown_PokemonCenter_1F.inc"
.include "data/maps/events/FallarborTown_PokemonCenter_2F.inc"
.include "data/maps/events/FallarborTown_House1.inc"
.include "data/maps/events/FallarborTown_House2.inc"
.include "data/maps/events/VerdanturfTown_BattleTentLobby.inc"
.include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc"
.include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc"
.include "data/maps/events/VerdanturfTown_Mart.inc"
.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc"
.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc"
.include "data/maps/events/VerdanturfTown_WandasHouse.inc"
.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc"
.include "data/maps/events/VerdanturfTown_House.inc"
.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc"
.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc"
.include "data/maps/events/PacifidlogTown_House1.inc"
.include "data/maps/events/PacifidlogTown_House2.inc"
.include "data/maps/events/PacifidlogTown_House3.inc"
.include "data/maps/events/PacifidlogTown_House4.inc"
.include "data/maps/events/PacifidlogTown_House5.inc"
.include "data/maps/events/PetalburgCity_WallysHouse.inc"
.include "data/maps/events/PetalburgCity_Gym.inc"
.include "data/maps/events/PetalburgCity_House1.inc"
.include "data/maps/events/PetalburgCity_House2.inc"
.include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc"
.include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc"
.include "data/maps/events/PetalburgCity_Mart.inc"
.include "data/maps/events/SlateportCity_SternsShipyard_1F.inc"
.include "data/maps/events/SlateportCity_SternsShipyard_2F.inc"
.include "data/maps/events/SlateportCity_BattleTentLobby.inc"
.include "data/maps/events/SlateportCity_BattleTentCorridor.inc"
.include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc"
.include "data/maps/events/SlateportCity_House1.inc"
.include "data/maps/events/SlateportCity_PokemonFanClub.inc"
.include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc"
.include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc"
.include "data/maps/events/SlateportCity_Harbor.inc"
.include "data/maps/events/SlateportCity_House2.inc"
.include "data/maps/events/SlateportCity_PokemonCenter_1F.inc"
.include "data/maps/events/SlateportCity_PokemonCenter_2F.inc"
.include "data/maps/events/SlateportCity_Mart.inc"
.include "data/maps/events/MauvilleCity_Gym.inc"
.include "data/maps/events/MauvilleCity_BikeShop.inc"
.include "data/maps/events/MauvilleCity_House1.inc"
.include "data/maps/events/MauvilleCity_GameCorner.inc"
.include "data/maps/events/MauvilleCity_House2.inc"
.include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc"
.include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc"
.include "data/maps/events/MauvilleCity_Mart.inc"
.include "data/maps/events/RustboroCity_DevonCorp_1F.inc"
.include "data/maps/events/RustboroCity_DevonCorp_2F.inc"
.include "data/maps/events/RustboroCity_DevonCorp_3F.inc"
.include "data/maps/events/RustboroCity_Gym.inc"
.include "data/maps/events/RustboroCity_PokemonSchool.inc"
.include "data/maps/events/RustboroCity_PokemonCenter_1F.inc"
.include "data/maps/events/RustboroCity_PokemonCenter_2F.inc"
.include "data/maps/events/RustboroCity_Mart.inc"
.include "data/maps/events/RustboroCity_Flat1_1F.inc"
.include "data/maps/events/RustboroCity_Flat1_2F.inc"
.include "data/maps/events/RustboroCity_House1.inc"
.include "data/maps/events/RustboroCity_CuttersHouse.inc"
.include "data/maps/events/RustboroCity_House2.inc"
.include "data/maps/events/RustboroCity_Flat2_1F.inc"
.include "data/maps/events/RustboroCity_Flat2_2F.inc"
.include "data/maps/events/RustboroCity_Flat2_3F.inc"
.include "data/maps/events/RustboroCity_House3.inc"
.include "data/maps/events/FortreeCity_House1.inc"
.include "data/maps/events/FortreeCity_Gym.inc"
.include "data/maps/events/FortreeCity_PokemonCenter_1F.inc"
.include "data/maps/events/FortreeCity_PokemonCenter_2F.inc"
.include "data/maps/events/FortreeCity_Mart.inc"
.include "data/maps/events/FortreeCity_House2.inc"
.include "data/maps/events/FortreeCity_House3.inc"
.include "data/maps/events/FortreeCity_House4.inc"
.include "data/maps/events/FortreeCity_House5.inc"
.include "data/maps/events/FortreeCity_DecorationShop.inc"
.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc"
.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc"
.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc"
.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc"
.include "data/maps/events/LilycoveCity_ContestLobby.inc"
.include "data/maps/events/LilycoveCity_ContestHall.inc"
.include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc"
.include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc"
.include "data/maps/events/LilycoveCity_UnusedMart.inc"
.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc"
.include "data/maps/events/LilycoveCity_Harbor.inc"
.include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc"
.include "data/maps/events/LilycoveCity_House1.inc"
.include "data/maps/events/LilycoveCity_House2.inc"
.include "data/maps/events/LilycoveCity_House3.inc"
.include "data/maps/events/LilycoveCity_House4.inc"
.include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc"
.include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc"
.include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc"
.include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc"
.include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc"
.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc"
.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc"
.include "data/maps/events/MossdeepCity_Gym.inc"
.include "data/maps/events/MossdeepCity_House1.inc"
.include "data/maps/events/MossdeepCity_House2.inc"
.include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc"
.include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc"
.include "data/maps/events/MossdeepCity_Mart.inc"
.include "data/maps/events/MossdeepCity_House3.inc"
.include "data/maps/events/MossdeepCity_StevensHouse.inc"
.include "data/maps/events/MossdeepCity_House4.inc"
.include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc"
.include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc"
.include "data/maps/events/MossdeepCity_GameCorner_1F.inc"
.include "data/maps/events/MossdeepCity_GameCorner_B1F.inc"
.include "data/maps/events/SootopolisCity_Gym_1F.inc"
.include "data/maps/events/SootopolisCity_Gym_B1F.inc"
.include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc"
.include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc"
.include "data/maps/events/SootopolisCity_Mart.inc"
.include "data/maps/events/SootopolisCity_House1.inc"
.include "data/maps/events/SootopolisCity_House2.inc"
.include "data/maps/events/SootopolisCity_House3.inc"
.include "data/maps/events/SootopolisCity_House4.inc"
.include "data/maps/events/SootopolisCity_House5.inc"
.include "data/maps/events/SootopolisCity_House6.inc"
.include "data/maps/events/SootopolisCity_House7.inc"
.include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc"
.include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc"
.include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc"
.include "data/maps/events/EverGrandeCity_SidneysRoom.inc"
.include "data/maps/events/EverGrandeCity_PhoebesRoom.inc"
.include "data/maps/events/EverGrandeCity_GlaciasRoom.inc"
.include "data/maps/events/EverGrandeCity_DrakesRoom.inc"
.include "data/maps/events/EverGrandeCity_ChampionsRoom.inc"
.include "data/maps/events/EverGrandeCity_Hall1.inc"
.include "data/maps/events/EverGrandeCity_Hall2.inc"
.include "data/maps/events/EverGrandeCity_Hall3.inc"
.include "data/maps/events/EverGrandeCity_Hall4.inc"
.include "data/maps/events/EverGrandeCity_Hall5.inc"
.include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc"
.include "data/maps/events/EverGrandeCity_HallOfFame.inc"
.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc"
.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc"
.include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc"
.include "data/maps/events/Route104_MrBrineysHouse.inc"
.include "data/maps/events/Route104_PrettyPetalFlowerShop.inc"
.include "data/maps/events/Route111_WinstrateFamilysHouse.inc"
.include "data/maps/events/Route111_OldLadysRestStop.inc"
.include "data/maps/events/Route112_CableCarStation.inc"
.include "data/maps/events/MtChimney_CableCarStation.inc"
.include "data/maps/events/Route114_FossilManiacsHouse.inc"
.include "data/maps/events/Route114_FossilManiacsTunnel.inc"
.include "data/maps/events/Route114_LanettesHouse.inc"
.include "data/maps/events/Route116_TunnelersRestHouse.inc"
.include "data/maps/events/Route117_PokemonDayCare.inc"
.include "data/maps/events/Route121_SafariZoneEntrance.inc"
.include "data/maps/events/MeteorFalls_1F_1R.inc"
.include "data/maps/events/MeteorFalls_1F_2R.inc"
.include "data/maps/events/MeteorFalls_B1F_1R.inc"
.include "data/maps/events/MeteorFalls_B1F_2R.inc"
.include "data/maps/events/RusturfTunnel.inc"
.include "data/maps/events/Underwater_SootopolisCity.inc"
.include "data/maps/events/DesertRuins.inc"
.include "data/maps/events/GraniteCave_1F.inc"
.include "data/maps/events/GraniteCave_B1F.inc"
.include "data/maps/events/GraniteCave_B2F.inc"
.include "data/maps/events/GraniteCave_StevensRoom.inc"
.include "data/maps/events/PetalburgWoods.inc"
.include "data/maps/events/MtChimney.inc"
.include "data/maps/events/JaggedPass.inc"
.include "data/maps/events/FieryPath.inc"
.include "data/maps/events/MtPyre_1F.inc"
.include "data/maps/events/MtPyre_2F.inc"
.include "data/maps/events/MtPyre_3F.inc"
.include "data/maps/events/MtPyre_4F.inc"
.include "data/maps/events/MtPyre_5F.inc"
.include "data/maps/events/MtPyre_6F.inc"
.include "data/maps/events/MtPyre_Exterior.inc"
.include "data/maps/events/MtPyre_Summit.inc"
.include "data/maps/events/AquaHideout_1F.inc"
.include "data/maps/events/AquaHideout_B1F.inc"
.include "data/maps/events/AquaHideout_B2F.inc"
.include "data/maps/events/Underwater_SeafloorCavern.inc"
.include "data/maps/events/SeafloorCavern_Entrance.inc"
.include "data/maps/events/SeafloorCavern_Room1.inc"
.include "data/maps/events/SeafloorCavern_Room2.inc"
.include "data/maps/events/SeafloorCavern_Room3.inc"
.include "data/maps/events/SeafloorCavern_Room4.inc"
.include "data/maps/events/SeafloorCavern_Room5.inc"
.include "data/maps/events/SeafloorCavern_Room6.inc"
.include "data/maps/events/SeafloorCavern_Room7.inc"
.include "data/maps/events/SeafloorCavern_Room8.inc"
.include "data/maps/events/SeafloorCavern_Room9.inc"
.include "data/maps/events/CaveOfOrigin_Entrance.inc"
.include "data/maps/events/CaveOfOrigin_1F.inc"
.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc"
.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc"
.include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc"
.include "data/maps/events/CaveOfOrigin_B1F.inc"
.include "data/maps/events/VictoryRoad_1F.inc"
.include "data/maps/events/VictoryRoad_B1F.inc"
.include "data/maps/events/VictoryRoad_B2F.inc"
.include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc"
.include "data/maps/events/ShoalCave_LowTideInnerRoom.inc"
.include "data/maps/events/ShoalCave_LowTideStairsRoom.inc"
.include "data/maps/events/ShoalCave_LowTideLowerRoom.inc"
.include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc"
.include "data/maps/events/ShoalCave_HighTideInnerRoom.inc"
.include "data/maps/events/NewMauville_Entrance.inc"
.include "data/maps/events/NewMauville_Inside.inc"
.include "data/maps/events/AbandonedShip_Deck.inc"
.include "data/maps/events/AbandonedShip_Corridors_1F.inc"
.include "data/maps/events/AbandonedShip_Rooms_1F.inc"
.include "data/maps/events/AbandonedShip_Corridors_B1F.inc"
.include "data/maps/events/AbandonedShip_Rooms_B1F.inc"
.include "data/maps/events/AbandonedShip_Rooms2_B1F.inc"
.include "data/maps/events/AbandonedShip_Underwater1.inc"
.include "data/maps/events/AbandonedShip_Room_B1F.inc"
.include "data/maps/events/AbandonedShip_Rooms2_1F.inc"
.include "data/maps/events/AbandonedShip_CaptainsOffice.inc"
.include "data/maps/events/AbandonedShip_Underwater2.inc"
.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc"
.include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc"
.include "data/maps/events/IslandCave.inc"
.include "data/maps/events/AncientTomb.inc"
.include "data/maps/events/Underwater_Route134.inc"
.include "data/maps/events/Underwater_SealedChamber.inc"
.include "data/maps/events/SealedChamber_OuterRoom.inc"
.include "data/maps/events/SealedChamber_InnerRoom.inc"
.include "data/maps/events/ScorchedSlab.inc"
.include "data/maps/events/AquaHideout_UnusedRubyMap1.inc"
.include "data/maps/events/AquaHideout_UnusedRubyMap2.inc"
.include "data/maps/events/AquaHideout_UnusedRubyMap3.inc"
.include "data/maps/events/SkyPillar_Entrance.inc"
.include "data/maps/events/SkyPillar_Outside.inc"
.include "data/maps/events/SkyPillar_1F.inc"
.include "data/maps/events/SkyPillar_2F.inc"
.include "data/maps/events/SkyPillar_3F.inc"
.include "data/maps/events/SkyPillar_4F.inc"
.include "data/maps/events/ShoalCave_LowTideIceRoom.inc"
.include "data/maps/events/SkyPillar_5F.inc"
.include "data/maps/events/SkyPillar_Top.inc"
.include "data/maps/events/MagmaHideout_1F.inc"
.include "data/maps/events/MagmaHideout_2F_1R.inc"
.include "data/maps/events/MagmaHideout_2F_2R.inc"
.include "data/maps/events/MagmaHideout_3F_1R.inc"
.include "data/maps/events/MagmaHideout_3F_2R.inc"
.include "data/maps/events/MagmaHideout_4F.inc"
.include "data/maps/events/MagmaHideout_3F_3R.inc"
.include "data/maps/events/MagmaHideout_2F_3R.inc"
.include "data/maps/events/MirageTower_1F.inc"
.include "data/maps/events/MirageTower_2F.inc"
.include "data/maps/events/MirageTower_3F.inc"
.include "data/maps/events/MirageTower_4F.inc"
.include "data/maps/events/DesertUnderpass.inc"
.include "data/maps/events/ArtisanCave_B1F.inc"
.include "data/maps/events/ArtisanCave_1F.inc"
.include "data/maps/events/Underwater_MarineCave.inc"
.include "data/maps/events/MarineCave_Entrance.inc"
.include "data/maps/events/MarineCave_End.inc"
.include "data/maps/events/TerraCave_Entrance.inc"
.include "data/maps/events/TerraCave_End.inc"
.include "data/maps/events/AlteringCave.inc"
.include "data/maps/events/MeteorFalls_StevensCave.inc"
.include "data/maps/events/SecretBase_RedCave1.inc"
.include "data/maps/events/SecretBase_BrownCave1.inc"
.include "data/maps/events/SecretBase_BlueCave1.inc"
.include "data/maps/events/SecretBase_YellowCave1.inc"
.include "data/maps/events/SecretBase_Tree1.inc"
.include "data/maps/events/SecretBase_Shrub1.inc"
.include "data/maps/events/SecretBase_RedCave2.inc"
.include "data/maps/events/SecretBase_BrownCave2.inc"
.include "data/maps/events/SecretBase_BlueCave2.inc"
.include "data/maps/events/SecretBase_YellowCave2.inc"
.include "data/maps/events/SecretBase_Tree2.inc"
.include "data/maps/events/SecretBase_Shrub2.inc"
.include "data/maps/events/SecretBase_RedCave3.inc"
.include "data/maps/events/SecretBase_BrownCave3.inc"
.include "data/maps/events/SecretBase_BlueCave3.inc"
.include "data/maps/events/SecretBase_YellowCave3.inc"
.include "data/maps/events/SecretBase_Tree3.inc"
.include "data/maps/events/SecretBase_Shrub3.inc"
.include "data/maps/events/SecretBase_RedCave4.inc"
.include "data/maps/events/SecretBase_BrownCave4.inc"
.include "data/maps/events/SecretBase_BlueCave4.inc"
.include "data/maps/events/SecretBase_YellowCave4.inc"
.include "data/maps/events/SecretBase_Tree4.inc"
.include "data/maps/events/SecretBase_Shrub4.inc"
.include "data/maps/events/SingleBattleColosseum.inc"
.include "data/maps/events/TradeCenter.inc"
.include "data/maps/events/RecordCorner.inc"
.include "data/maps/events/DoubleBattleColosseum.inc"
.include "data/maps/events/LinkContestRoom1.inc"
.include "data/maps/events/LinkContestRoom2.inc"
.include "data/maps/events/LinkContestRoom3.inc"
.include "data/maps/events/LinkContestRoom4.inc"
.include "data/maps/events/LinkContestRoom5.inc"
.include "data/maps/events/LinkContestRoom6.inc"
.include "data/maps/events/UnknownMap_25_29.inc"
.include "data/maps/events/UnknownMap_25_30.inc"
.include "data/maps/events/UnknownMap_25_31.inc"
.include "data/maps/events/UnknownMap_25_32.inc"
.include "data/maps/events/UnknownMap_25_33.inc"
.include "data/maps/events/UnknownMap_25_34.inc"
.include "data/maps/events/InsideOfTruck.inc"
.include "data/maps/events/SSTidalCorridor.inc"
.include "data/maps/events/SSTidalLowerDeck.inc"
.include "data/maps/events/SSTidalRooms.inc"
.include "data/maps/events/BattlePyramidSquare01.inc"
.include "data/maps/events/BattlePyramidSquare02.inc"
.include "data/maps/events/BattlePyramidSquare03.inc"
.include "data/maps/events/BattlePyramidSquare04.inc"
.include "data/maps/events/BattlePyramidSquare05.inc"
.include "data/maps/events/BattlePyramidSquare06.inc"
.include "data/maps/events/BattlePyramidSquare07.inc"
.include "data/maps/events/BattlePyramidSquare08.inc"
.include "data/maps/events/BattlePyramidSquare09.inc"
.include "data/maps/events/BattlePyramidSquare10.inc"
.include "data/maps/events/BattlePyramidSquare11.inc"
.include "data/maps/events/BattlePyramidSquare12.inc"
.include "data/maps/events/BattlePyramidSquare13.inc"
.include "data/maps/events/BattlePyramidSquare14.inc"
.include "data/maps/events/BattlePyramidSquare15.inc"
.include "data/maps/events/BattlePyramidSquare16.inc"
.include "data/maps/events/UnionRoom.inc"
.include "data/maps/events/SafariZone_Northwest.inc"
.include "data/maps/events/SafariZone_North.inc"
.include "data/maps/events/SafariZone_Southwest.inc"
.include "data/maps/events/SafariZone_South.inc"
.include "data/maps/events/BattleFrontier_OutsideWest.inc"
.include "data/maps/events/BattleFrontier_BattleTowerLobby.inc"
.include "data/maps/events/BattleFrontier_BattleTowerElevator.inc"
.include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc"
.include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc"
.include "data/maps/events/SouthernIsland_Exterior.inc"
.include "data/maps/events/SouthernIsland_Interior.inc"
.include "data/maps/events/SafariZone_RestHouse.inc"
.include "data/maps/events/SafariZone_Northeast.inc"
.include "data/maps/events/SafariZone_Southeast.inc"
.include "data/maps/events/BattleFrontier_OutsideEast.inc"
.include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc"
.include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc"
.include "data/maps/events/BattleFrontier_BattleDomeLobby.inc"
.include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc"
.include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc"
.include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc"
.include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc"
.include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc"
.include "data/maps/events/BattleFrontier_BattlePyramidTop.inc"
.include "data/maps/events/BattleFrontier_BattleArenaLobby.inc"
.include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc"
.include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc"
.include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc"
.include "data/maps/events/BattleFrontier_BattlePikeLobby.inc"
.include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc"
.include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc"
.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc"
.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc"
.include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc"
.include "data/maps/events/BattleFrontier_RankingHall.inc"
.include "data/maps/events/BattleFrontier_Lounge1.inc"
.include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc"
.include "data/maps/events/BattleFrontier_Lounge2.inc"
.include "data/maps/events/BattleFrontier_Lounge3.inc"
.include "data/maps/events/BattleFrontier_Lounge4.inc"
.include "data/maps/events/BattleFrontier_ScottsHouse.inc"
.include "data/maps/events/BattleFrontier_Lounge5.inc"
.include "data/maps/events/BattleFrontier_Lounge6.inc"
.include "data/maps/events/BattleFrontier_Lounge7.inc"
.include "data/maps/events/BattleFrontier_ReceptionGate.inc"
.include "data/maps/events/BattleFrontier_Lounge8.inc"
.include "data/maps/events/BattleFrontier_Lounge9.inc"
.include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc"
.include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc"
.include "data/maps/events/BattleFrontier_Mart.inc"
.include "data/maps/events/FarawayIsland_Entrance.inc"
.include "data/maps/events/FarawayIsland_Interior.inc"
.include "data/maps/events/BirthIsland_Exterior.inc"
.include "data/maps/events/BirthIsland_Harbor.inc"
.include "data/maps/events/TrainerHill_Entrance.inc"
.include "data/maps/events/TrainerHill_1F.inc"
.include "data/maps/events/TrainerHill_2F.inc"
.include "data/maps/events/TrainerHill_3F.inc"
.include "data/maps/events/TrainerHill_4F.inc"
.include "data/maps/events/TrainerHill_Roof.inc"
.include "data/maps/events/NavelRock_Exterior.inc"
.include "data/maps/events/NavelRock_Harbor.inc"
.include "data/maps/events/NavelRock_Entrance.inc"
.include "data/maps/events/NavelRock_B1F.inc"
.include "data/maps/events/NavelRock_Fork.inc"
.include "data/maps/events/NavelRock_Up1.inc"
.include "data/maps/events/NavelRock_Up2.inc"
.include "data/maps/events/NavelRock_Up3.inc"
.include "data/maps/events/NavelRock_Up4.inc"
.include "data/maps/events/NavelRock_Top.inc"
.include "data/maps/events/NavelRock_Down01.inc"
.include "data/maps/events/NavelRock_Down02.inc"
.include "data/maps/events/NavelRock_Down03.inc"
.include "data/maps/events/NavelRock_Down04.inc"
.include "data/maps/events/NavelRock_Down05.inc"
.include "data/maps/events/NavelRock_Down06.inc"
.include "data/maps/events/NavelRock_Down07.inc"
.include "data/maps/events/NavelRock_Down08.inc"
.include "data/maps/events/NavelRock_Down09.inc"
.include "data/maps/events/NavelRock_Down10.inc"
.include "data/maps/events/NavelRock_Down11.inc"
.include "data/maps/events/NavelRock_Bottom.inc"
.include "data/maps/events/TrainerHill_Elevator.inc"
.include "data/maps/events/Route104_Prototype.inc"
.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc"
.include "data/maps/events/Route109_SeashoreHouse.inc"
.include "data/maps/events/Route110_TrickHouseEntrance.inc"
.include "data/maps/events/Route110_TrickHouseEnd.inc"
.include "data/maps/events/Route110_TrickHouseCorridor.inc"
.include "data/maps/events/Route110_TrickHousePuzzle1.inc"
.include "data/maps/events/Route110_TrickHousePuzzle2.inc"
.include "data/maps/events/Route110_TrickHousePuzzle3.inc"
.include "data/maps/events/Route110_TrickHousePuzzle4.inc"
.include "data/maps/events/Route110_TrickHousePuzzle5.inc"
.include "data/maps/events/Route110_TrickHousePuzzle6.inc"
.include "data/maps/events/Route110_TrickHousePuzzle7.inc"
.include "data/maps/events/Route110_TrickHousePuzzle8.inc"
.include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc"
.include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc"
.include "data/maps/events/Route113_GlassWorkshop.inc"
.include "data/maps/events/Route123_BerryMastersHouse.inc"
.include "data/maps/events/Route119_WeatherInstitute_1F.inc"
.include "data/maps/events/Route119_WeatherInstitute_2F.inc"
.include "data/maps/events/Route119_House.inc"
.include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc"
data/maps.s
+10
View File
@@ -0,0 +1,10 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.include "data/maps/_assets.inc"
.include "data/maps/attributes_table.inc"
.include "data/maps/headers.inc"
.include "data/maps/_groups.inc"
.include "data/maps/connections.inc"
data/maps/AbandonedShip_CaptainsOffice/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_CaptainsOffice/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_CaptainsOffice: @ 84845A4
.4byte AbandonedShip_CaptainsOffice_MapAttributes
.4byte AbandonedShip_CaptainsOffice_MapEvents
.4byte AbandonedShip_CaptainsOffice_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 195
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_CaptainsOffice/map.bin
BIN
View File
Binary file not shown.
data/maps/AbandonedShip_Corridors_1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Corridors_1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Corridors_1F: @ 84844C4
.4byte AbandonedShip_Corridors_1F_MapAttributes
.4byte AbandonedShip_Corridors_1F_MapEvents
.4byte AbandonedShip_Corridors_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 187
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Corridors_1F/map.bin
+3
View File
@@ -0,0 +1,3 @@
 ��� �� � ������22222
2 6�62222222
2 622222222222222222�62012222201111222220122222011112222201222220111122222012222201111222�62%#&2222%�$"#&2222-+6.2222-�2,*+6.2�622222222222222222�2�222222�2�222222222
data/maps/AbandonedShip_Corridors_B1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Corridors_B1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Corridors_B1F: @ 84844FC
.4byte AbandonedShip_Corridors_B1F_MapAttributes
.4byte AbandonedShip_Corridors_B1F_MapEvents
.4byte AbandonedShip_Corridors_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 189
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Corridors_B1F/map.bin
+1
View File
@@ -0,0 +1 @@
!!011112!!011)�011112)�011�2�011112�2�01122%#$"�&22%#$22-+6,*�2.22-+6,2222222222222222222222222�62222222222222�62220111111122222011111112
data/maps/AbandonedShip_Deck/border.bin
+1
View File
@@ -0,0 +1 @@
pppp
data/maps/AbandonedShip_Deck/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Deck: @ 84844A8
.4byte AbandonedShip_Deck_MapAttributes
.4byte AbandonedShip_Deck_MapEvents
.4byte AbandonedShip_Deck_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 186
.byte 61
.byte 0
.byte 0
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Deck/map.bin
+1
View File
@@ -0,0 +1 @@
(((`(`(((((b`(((((((((((`(''`(eif(b`((¡(((((((`('/`(((((b`('¡(¡(ef(`(/'hiiiiij`(''¡('¡((((`(*/ÉÉÉÃÄÅ`(//¡(/¡((((`(È* ]]]ËÌ2Íhiiiiiiii(((`(((33È*2*2¾2*2¿2ÉÉÉÉÉÉÉÉef(hiiiiif(2(2ei ÌÍÌÍÌÍÌÍ(((ÉÉÉÃÄů0Ï0ÃijÉÉÉÉÉÉÉÉ((( ]]]ËÌ2ͯ0Ï0ËÌ2Í]]]]]]]](((33*2*2Ⱦ2*2¿2*2Ⱦ2*2¿2È*2*2*2*2*2*2*2((((È((È(2(2(2(2È(2(2(2È(2È(2(2(2(2iiiiiiiiiiiif(2(2eiiiiiiiÉÉÉÉÉÉÉÉÉÉÉɯ0Ï0ÉÉÉÉÉÉÉËËËËËËËËËËËË ¯0Ï0 ËËËËËËËÊÊÊÊÊÊÊÊÊÊÊÊ Î2Ï2 ÊÊÊÊÊÊÊžžžžžžžžžžžž4žž4žžžžžžžžžžžžžžžžžžžžžžžžžžžžžž£žžžžžžžžžžžžžžžžžžžžžž½¾¾¾¾¾¾¾£žžžžžžžžžžžžžžpppppppp½¾¾¾¾¾¾¾¾¾¾¾¾¾¾
data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_HiddenFloorCorridors: @ 84845DC
.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 289
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
+1
View File
@@ -0,0 +1 @@
 ¨  ©¨ ±°°±±°2222222222222­622422222242222220111111122¬6­6201111111222220111111122222%#$"#$"#&22‰�-36,*36,*+6.22Vš�2222222222GVx2222222222
data/maps/AbandonedShip_HiddenFloorRooms/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_HiddenFloorRooms: @ 84845F8
.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
.4byte AbandonedShip_HiddenFloorRooms_MapEvents
.4byte AbandonedShip_HiddenFloorRooms_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 310
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 7
.byte 0
data/maps/AbandonedShip_HiddenFloorRooms/map.bin
+1
View File
@@ -0,0 +1 @@
6''''•c–'''''76'''''•¯–'''''76'''''•c–'''''7>////�—6ž/////?>/////�·2ž/////GF/////�—6ž/////?>h;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2665;2™6š6;2;2;2;2ON:2;2;2;2;2;2;2g2;2;2™6š6;2?>=28282828282a282828282ª6?>«682a2^6_682b 6¢682828282;2;2<28282b6828282828282 6¢682?>=282V6W68282828282a28282?>=28282`2828282828282828282?>=282828282`282828282828282?>«682^6_6828282828282`282?>=2`2828282828282828282a282?>«682V6W682828282b6828282a2?>=28282828282828282828282?>=2828282828282828282828282?>=282^6_6828282a282828282ª6?6''''''''''''76'''''''''''''76'''''''''''''7>////////////?>/////////////?>/////////////?>:2g2;2;2;2;25;2;2;2;2;2?>:2;2;2;2;2;2;2;2;2;2;2;2;2?>:2;2;2g2;2;2;2;2;2;2™6š6;2?>=282828282a2828282V6W682?>=28282828282`2828282b682ª6?>«682828282V6W6828282 6¢682?>=28282828282828282^6_682?>=28282a2`28282828282828282?>=282828282^6_68282a2828282?>«682`2828282828282828282?>=2V6W682828282828282828282?>=28282828282828282828282ª6?>=282828282d2e282828282ª6?>=2^6_6828282d2e2828282a282?>=2`282b68282d2e282828282a2?
data/maps/AbandonedShip_Room_B1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Room_B1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Room_B1F: @ 848456C
.4byte AbandonedShip_Room_B1F_MapAttributes
.4byte AbandonedShip_Room_B1F_MapEvents
.4byte AbandonedShip_Room_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 193
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Room_B1F/map.bin
+1
View File
@@ -0,0 +1 @@
6'''''''7>///////?>:2;2;2;2;2;2;2?>=282a282828282?>=2`28282828282?>=282828282a282?>=2828282828282?>=28282d2e282b?
data/maps/AbandonedShip_Rooms2_1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Rooms2_1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms2_1F: @ 8484588
.4byte AbandonedShip_Rooms2_1F_MapAttributes
.4byte AbandonedShip_Rooms2_1F_MapEvents
.4byte AbandonedShip_Rooms2_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 194
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Rooms2_1F/map.bin
+1
View File
@@ -0,0 +1 @@
6@k•c–''7>Hs�—6ž//?>PQ:2;2;2;2;2?>XY=282828282?>2;2<28282a282?>=2828282828282?>=282b82a28282?>=2828282828282?=26'''=2'''7>///=2///?>:2;2;2<2;2;2;2?>=2828282828282?>=2VW82a28282?>=2^_a2828282?>=2828282828282?>=28282d2e28282?
data/maps/AbandonedShip_Rooms2_B1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Rooms2_B1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms2_B1F: @ 8484534
.4byte AbandonedShip_Rooms2_B1F_MapAttributes
.4byte AbandonedShip_Rooms2_B1F_MapEvents
.4byte AbandonedShip_Rooms2_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 191
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Rooms2_B1F/map.bin
+1
View File
@@ -0,0 +1 @@
6@AB''''76@AB'CDE7>HIJ////?>HIJ/KLM?>PQ:2;2;2;2;2GFPQ:2;2;2TU?>XY=282VWª6ONXY=28282\]?>:2;2<282^_82;2;2;2;2f28282;2;2?>=2828282828282?>=28282828282ª6?>«6828282828282?>«682828282`282?>=28282d2e282b?>=28282d2e28282?
data/maps/AbandonedShip_Rooms_1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Rooms_1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms_1F: @ 84844E0
.4byte AbandonedShip_Rooms_1F_MapAttributes
.4byte AbandonedShip_Rooms_1F_MapEvents
.4byte AbandonedShip_Rooms_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 188
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Rooms_1F/map.bin
+1
View File
@@ -0,0 +1 @@
6''•c–''76@k•c–''7>//�—6ž//?>Hs�—6ž//?>:2;2;2;2;2;2;2?>PQ:2;2;2;2;2?>=2828282828282?>XY=2828282ª6?>«682828282a282?>:2;2<282828282?>=2828282828282?>=2828282`28282?>=2b8282828282?>«6828282828282?>=2828282a28282?>=2828282828282?=26@AB'''E76'''=2CDE7>HIJ////?>///=2KLM?>PQ:2;2;2;2;2GF:2;2;2<2;2TU?>XY=282`28282ON=282828282\]?>:2;2<2b828282;2;2<282828282;2;2?>=2828282828282?>=2VW828282ª6?>=2a28282828282?>=2^_82828282?>«68282d2e28282?>=28282d2e28282?
data/maps/AbandonedShip_Rooms_B1F/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Rooms_B1F/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms_B1F: @ 8484518
.4byte AbandonedShip_Rooms_B1F_MapAttributes
.4byte AbandonedShip_Rooms_B1F_MapEvents
.4byte AbandonedShip_Rooms_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte 190
.byte 61
.byte 0
.byte 11
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AbandonedShip_Rooms_B1F/map.bin
+1
View File
@@ -0,0 +1 @@
6@k•Ż–mE@k•c–''@k•Ż–mE7>Hsť·2žuMHsť—6ž//Hsť·2žuM?>PQ:2;2;2TUPQ:2;2;2;2;2PQ:2;2;2TU?>XY=28282\]XY=28282a282XY=2a282\]?>:2;2<2a282;2;2:2;2<2828282Ş6:2;2<28282;2;2?>=2VW828282Ş6=2€‰‰‰�82=28282a2828282?>=2^_82`28282=2�pVp’82=2`2828282b82?>«6828282828282=2�VGV’82=28282828282Ş6?
data/maps/AbandonedShip_Underwater1/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Underwater1/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Underwater1: @ 8484550
.4byte AbandonedShip_Underwater1_MapAttributes
.4byte AbandonedShip_Underwater1_MapEvents
.4byte AbandonedShip_Underwater1_MapScripts
.4byte 0x0
.2byte BGM_DEEPDEEP
.2byte 192
.byte 61
.byte 0
.byte 14
.byte 5
.2byte 0
.byte 13
.byte 0
data/maps/AbandonedShip_Underwater1/map.bin
+1
View File
@@ -0,0 +1 @@
мнлнлнмнувтжтжужо2о2о2о2о2о2п2я2о2Ь2р2с2и2и2о2о2Ь2и2и2и2и2и2и2о2Ь2и2и2и2р2с2и2о2З2и2и2и2и2и2и2п2В2О2и2й2к2и2Ы2о2
data/maps/AbandonedShip_Underwater2/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AbandonedShip_Underwater2/header.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Underwater2: @ 84845C0
.4byte AbandonedShip_Underwater2_MapAttributes
.4byte AbandonedShip_Underwater2_MapEvents
.4byte AbandonedShip_Underwater2_MapScripts
.4byte 0x0
.2byte BGM_DEEPDEEP
.2byte 196
.byte 61
.byte 0
.byte 14
.byte 5
.2byte 0
.byte 13
.byte 0
data/maps/AbandonedShip_Underwater2/map.bin
+1
View File
@@ -0,0 +1 @@
ΜΞΨΩΪΞΝΞΜΞΝΞΜΞΜΞΝΞΝΞΜΤΦΫά2έΦΥΦΤΦΥΧΤΧΤΦΥΧΥΦΤΟ2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Π2Ρ2Ο2Ο2Ο2ψ2Ι2�2Σ2Ι2Ρ2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2ψ2Ι2Ι2Ι2Ι2Ι2Ο2Ο2Ο2Ο2Ο2Ο2Π2Ρ2Ο2Ο2Ο2Ο2Ο2Ο2ψ2Ι2Ι2Ι2Ι2Ι2Ι2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2χ2ο2Ι2Ι2Ι2Ι2�2Π2Ρ2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Ο2Π2Ρ2χ2ο2Ι2Ι2Ι2Ι2
data/maps/AlteringCave/border.bin
+1
View File
@@ -0,0 +1 @@

data/maps/AlteringCave/header.inc
+15
View File
@@ -0,0 +1,15 @@
AlteringCave: @ 8484A58
.4byte AlteringCave_MapAttributes
.4byte AlteringCave_MapEvents
.4byte AlteringCave_MapScripts
.4byte 0x0
.2byte BGM_FRLG_MT_EMBER
.2byte 420
.byte 210
.byte 0
.byte 0
.byte 4
.2byte 0
.byte 15
.byte 0
data/maps/AlteringCave/map.bin
+1
View File
@@ -0,0 +1 @@
f222f222ff6662222226662222226662f2222222222222######"f22222222#######"2222222 !B!B!B!B!B!B"P22222222BBBBBBP22˜2™2™2š2222222fP222BBBBBB22˜2¡2¡2¡2¢22222ffPf2BBBBBB22 2¡2¡2¡2¡2š2222222222BBBBB22 2¡2¡2¡2¡2¢2222222222222¨2¡2¡2¡2¡2¢222f2222222222222222f22¨2©2©2©2ª22222Pf22222222222222222P2222222222f22222222222222222####"22222222222222222 ##################"22222222666666222222226666662222222 #666666###"2<22#XYZ##

Some files were not shown because too many files have changed in this diff Show More