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

merge union room with master

Browse Source
This commit is contained in:
DizzyEggg
2018-07-22 13:14:58 +02:00
parent c9d486a5d3 06b3ce408f
commit 1e9143e0b2
5307 changed files with 54502 additions and 62660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2
View File
@@ -26,3 +26,5 @@ matrix:
script:
- ./build_tools.sh
- make -j2 compare
after_success:
- .travis/calcrom/webhook.sh pokeemerald
.travis/calcrom/calcrom.pl
Executable
+37
View File
@@ -0,0 +1,37 @@
#!/usr/bin/perl
(@ARGV == 1)
or die "ERROR: no map file specified.\n";
open(my $file, $ARGV[0])
or die "ERROR: could not open file '$ARGV[0]'.\n";
my $src = 0;
my $asm = 0;
while (my $line = <$file>)
{
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
{
my $section = $1;
my $size = hex($2);
my $dir = $3;
if ($section =~ /text/)
{
if ($dir eq 'src')
{
$src += $size;
}
elsif ($dir eq 'asm')
{
$asm += $size;
}
}
}
}
my $total = $src + $asm;
my $srcPct = sprintf("%.4f", 100 * $src / $total);
my $asmPct = sprintf("%.4f", 100 * $asm / $total);
print "$total total bytes of code\n";
print "$src bytes of code in src ($srcPct%)\n";
print "$asm bytes of code in asm ($asmPct%)\n";
.travis/calcrom/webhook.sh
Executable
+16
View File
@@ -0,0 +1,16 @@
#!/bin/bash -ex
# Only run this script if it's the master branch build.
if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" ]]; then
exit 0
fi
build_name=$1
map_file=$build_name.map
if [ ! -f $map_file ]; then
echo "$map_file does not exist!"
exit 1
fi
output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL
Makefile
+1 -1
View File
@@ -99,7 +99,7 @@ include graphics_file_rules.mk
%.lz: % ; $(GFX) $< $@
%.rl: % ; $(GFX) $< $@
sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
%.bin: %.aif ; $(AIF) $< $@
sound/%.bin: sound/%.aif ; $(AIF) $< $@
sound/songs/%.s: sound/songs/%.mid
cd $(@D) && ../../$(MID) $(<F)
asm/battle_frontier_1.s
+5 -5
View File
@@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8
cmp r0, 0
bne _081960C2
bl ScriptContext2_Enable
bl FreezeMapObjects
bl FreezeEventObjects
bl sub_808B864
bl sub_808BCF4
_081960C2:
@@ -14285,18 +14285,18 @@ sub_81963F0: @ 81963F0
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
bl sub_80D338C
bl UnfreezeMapObjects
bl UnfreezeEventObjects
bl ScriptContext2_Disable
_08196446:
movs r0, 0x1
asm/battle_frontier_2.s
+43 -43
View File
@@ -12444,7 +12444,7 @@ _081A0C8E:
sub_81A0C9C: @ 81A0C9C
push {lr}
bl ScriptContext2_Enable
bl FreezeMapObjects
bl FreezeEventObjects
bl sub_808B864
bl sub_808BCF4
movs r0, 0
@@ -19871,8 +19871,8 @@ _081A4C84:
.pool
thumb_func_end sub_81A4C30
thumb_func_start sub_81A4CB0
sub_81A4CB0: @ 81A4CB0
thumb_func_start GetFrontierBrainTrainerPicIndex
GetFrontierBrainTrainerPicIndex: @ 81A4CB0
push {lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -19881,7 +19881,7 @@ sub_81A4CB0: @ 81A4CB0
ands r0, r1
cmp r0, 0
beq _081A4CD0
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4CDA
@@ -19893,7 +19893,7 @@ _081A4CD0:
lsrs r0, 16
_081A4CDA:
ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
ldr r1, =gFacilityToBrainTrainerId
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
@@ -19905,10 +19905,10 @@ _081A4CDA:
pop {r1}
bx r1
.pool
thumb_func_end sub_81A4CB0
thumb_func_end GetFrontierBrainTrainerPicIndex
thumb_func_start sub_81A4D00
sub_81A4D00: @ 81A4D00
thumb_func_start GetFrontierBrainTrainerClass
GetFrontierBrainTrainerClass: @ 81A4D00
push {lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
@@ -19917,7 +19917,7 @@ sub_81A4D00: @ 81A4D00
ands r0, r1
cmp r0, 0
beq _081A4D20
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4D2A
@@ -19929,7 +19929,7 @@ _081A4D20:
lsrs r0, 16
_081A4D2A:
ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
ldr r1, =gFacilityToBrainTrainerId
lsls r0, 1
adds r0, r1
ldrh r1, [r0]
@@ -19941,10 +19941,10 @@ _081A4D2A:
pop {r1}
bx r1
.pool
thumb_func_end sub_81A4D00
thumb_func_end GetFrontierBrainTrainerClass
thumb_func_start sub_81A4D50
sub_81A4D50: @ 81A4D50
thumb_func_start CopyFrontierBrainTrainerName
CopyFrontierBrainTrainerName: @ 81A4D50
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleTypeFlags
@@ -19954,7 +19954,7 @@ sub_81A4D50: @ 81A4D50
ands r0, r1
cmp r0, 0
beq _081A4D70
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r0, 24
b _081A4D7A
@@ -19968,7 +19968,7 @@ _081A4D7A:
movs r3, 0
lsls r0, 1
ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
ldr r1, =gFacilityToBrainTrainerId
adds r0, r1
ldrh r1, [r0]
lsls r0, r1, 2
@@ -19991,7 +19991,7 @@ _081A4D90:
pop {r0}
bx r0
.pool
thumb_func_end sub_81A4D50
thumb_func_end CopyFrontierBrainTrainerName
thumb_func_start sub_81A4DB8
sub_81A4DB8: @ 81A4DB8
@@ -20483,7 +20483,7 @@ sub_81A51A8: @ 81A51A8
ands r0, r1
cmp r0, 0
beq _081A51D4
bl sub_8185EA0
bl GetRecordedBattleFrontierFacility
lsls r0, 24
lsrs r4, r0, 24
bl sub_8185EAC
@@ -20646,29 +20646,29 @@ _081A5328:
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Vs
movs r1, 0x10
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Mind
movs r1, 0x12
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Skill
movs r1, 0x13
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Body
movs r1, 0x14
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Judgement
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
b _081A553E
.pool
_081A53B4:
@@ -20752,7 +20752,7 @@ _081A5464:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -27213,16 +27213,16 @@ _081A896E:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
bl sub_80D338C
pop {r4}
pop {r0}
@@ -27355,7 +27355,7 @@ _081A8A74:
ldr r2, [r6]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -27511,14 +27511,14 @@ _081A8BB4:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
bne _081A8BDC
b _081A8D32
_081A8BDC:
ldr r0, =gMapObjects
ldr r0, =gEventObjects
lsls r1, r2, 3
adds r1, r2
lsls r1, 2
@@ -28521,8 +28521,8 @@ sub_81A9424: @ 81A9424
lsls r1, 4
adds r1, r0
mov r8, r1
ldr r2, =gMapObjects
ldr r0, =gSelectedMapObject
ldr r2, =gEventObjects
ldr r0, =gSelectedEventObject
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -28569,8 +28569,8 @@ _081A9488:
mov r9, r0
_081A94AE:
ldr r3, =gUnknown_08613ED8
ldr r2, =gMapObjects
ldr r0, =gSelectedMapObject
ldr r2, =gEventObjects
ldr r0, =gSelectedEventObject
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -29181,7 +29181,7 @@ sub_81A9998: @ 81A9998
mov r8, r0
ldr r1, =0x0000028e
mov r12, r1
ldr r0, =gMapObjects
ldr r0, =gEventObjects
mov r9, r0
_081A99CC:
movs r2, 0
@@ -29194,7 +29194,7 @@ _081A99CE:
cmp r0, r12
bne _081A9A8A
adds r2, 0x7
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
ldrb r1, [r0]
lsls r0, r1, 3
adds r0, r1
@@ -29322,7 +29322,7 @@ GetBattlePyramidTrainerFlag: @ 81A9AC4
ldr r1, =0x00000e2a
adds r2, r1
ldr r4, =gBitTable
ldr r3, =gMapObjects
ldr r3, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -29354,8 +29354,8 @@ sub_81A9B04: @ 81A9B04
cmp r0, 0
beq _081A9B2E
movs r0, 0x1
bl GetChosenApproachingTrainerMapObjectId
ldr r1, =gSelectedMapObject
bl GetChosenApproachingTrainerEventObjectId
ldr r1, =gSelectedEventObject
strb r0, [r1]
ldr r0, =gTrainerBattleOpponent_B
ldrh r0, [r0]
@@ -29376,9 +29376,9 @@ sub_81A9B44: @ 81A9B44
lsls r0, 16
lsrs r5, r0, 16
movs r3, 0
ldr r0, =gMapObjects
ldr r0, =gEventObjects
mov r12, r0
ldr r6, =gSelectedMapObject
ldr r6, =gSelectedEventObject
ldr r1, =gSaveBlock1Ptr
mov r10, r1
ldr r7, =gSaveBlock2Ptr
@@ -30026,7 +30026,7 @@ _081AA0A6:
ldr r2, =0x00000169
adds r0, r2
lsls r0, 2
ldr r1, =gMapAttributes
ldr r1, =gMapLayouts
adds r0, r1
ldr r6, [r0]
ldr r2, [r6, 0xC]
asm/battle_tent.s
-580
View File
@@ -5,586 +5,6 @@
.text
thumb_func_start sub_81B99B4
sub_81B99B4: @ 81B99B4
push {lr}
ldr r1, =gUnknown_086160B4
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {r0}
bx r0
.pool
thumb_func_end sub_81B99B4
thumb_func_start sub_81B99D4
sub_81B99D4: @ 81B99D4
push {lr}
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000ca8
adds r0, r2
movs r2, 0
strb r2, [r0]
ldr r1, [r1]
ldr r3, =0x00000cb2
adds r0, r1, r3
strh r2, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
movs r2, 0x5
ldrsb r2, [r0, r2]
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
pop {r0}
bx r0
.pool
thumb_func_end sub_81B99D4
thumb_func_start sub_81B9A28
sub_81B9A28: @ 81B9A28
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6a
adds r0, r2
ldrh r0, [r0]
strh r0, [r1]
bx lr
.pool
thumb_func_end sub_81B9A28
thumb_func_start sub_81B9A44
sub_81B9A44: @ 81B9A44
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
ldr r2, =0x00000e6a
adds r0, r2
strh r1, [r0]
bx lr
.pool
thumb_func_end sub_81B9A44
thumb_func_start sub_81B9A60
sub_81B9A60: @ 81B9A60
push {r4,lr}
ldr r4, =gTrainerBattleOpponent_A
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xFF
bl __umodsi3
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 2
adds r1, r0
lsrs r1, 6
strh r1, [r4]
ldrh r0, [r4]
movs r1, 0
bl sub_8162614
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9A60
thumb_func_start sub_81B9A90
sub_81B9A90: @ 81B9A90
push {lr}
ldr r3, =gTrainerBattleOpponent_A
ldrh r1, [r3]
ldr r0, =0x0000012b
cmp r1, r0
bhi _081B9AAC
ldr r2, =gUnknown_0203BC88
movs r0, 0x34
muls r1, r0
ldr r0, [r2]
adds r0, r1
adds r0, 0xC
bl ConvertBattleFrontierTrainerSpeechToString
_081B9AAC:
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9A90
thumb_func_start sub_81B9ABC
sub_81B9ABC: @ 81B9ABC
push {r4,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, =0x00000ca8
adds r0, r2
strb r1, [r0]
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl VarSet
ldr r1, [r4]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
bl sub_81A4C30
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9ABC
thumb_func_start sub_81B9B00
sub_81B9B00: @ 81B9B00
push {r4,r5,lr}
ldr r0, =gSaveBlock2Ptr
ldr r4, [r0]
ldr r5, =gUnknown_086160D4
bl Random
ldrh r0, [r5]
ldr r1, =0x00000e6a
adds r4, r1
strh r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9B00
thumb_func_start sub_81B9B28
sub_81B9B28: @ 81B9B28
push {r4,r5,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000e6a
adds r0, r1
ldrh r0, [r0]
movs r1, 0x1
bl AddBagItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
bne _081B9B70
ldr r0, [r4]
ldr r1, =0x00000e6a
adds r0, r1
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
ldr r0, [r4]
ldr r1, =0x00000e6a
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9B76
.pool
_081B9B70:
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9B76:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9B28
thumb_func_start sub_81B9B80
sub_81B9B80: @ 81B9B80
push {lr}
ldr r1, =gUnknown_086160D8
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9B80
thumb_func_start sub_81B9BA0
sub_81B9BA0: @ 81B9BA0
push {lr}
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000ca8
adds r0, r2
movs r2, 0
strb r2, [r0]
ldr r1, [r1]
ldr r3, =0x00000cb2
adds r0, r1, r3
strh r2, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
movs r2, 0x5
ldrsb r2, [r0, r2]
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9BA0
thumb_func_start sub_81B9BF4
sub_81B9BF4: @ 81B9BF4
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6c
adds r0, r2
ldrh r0, [r0]
strh r0, [r1]
bx lr
.pool
thumb_func_end sub_81B9BF4
thumb_func_start sub_81B9C10
sub_81B9C10: @ 81B9C10
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
ldr r2, =0x00000e6c
adds r0, r2
strh r1, [r0]
bx lr
.pool
thumb_func_end sub_81B9C10
thumb_func_start sub_81B9C2C
sub_81B9C2C: @ 81B9C2C
push {r4,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, =0x00000ca8
adds r0, r2
strb r1, [r0]
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl VarSet
ldr r1, [r4]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
bl sub_81A4C30
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9C2C
thumb_func_start sub_81B9C70
sub_81B9C70: @ 81B9C70
push {r4,r5,lr}
ldr r0, =gSaveBlock2Ptr
ldr r4, [r0]
ldr r5, =gUnknown_086160F4
bl Random
ldrh r0, [r5]
ldr r1, =0x00000e6c
adds r4, r1
strh r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9C70
thumb_func_start sub_81B9C98
sub_81B9C98: @ 81B9C98
push {r4,r5,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000e6c
adds r0, r1
ldrh r0, [r0]
movs r1, 0x1
bl AddBagItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
bne _081B9CE0
ldr r0, [r4]
ldr r1, =0x00000e6c
adds r0, r1
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
ldr r0, [r4]
ldr r1, =0x00000e6c
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9CE6
.pool
_081B9CE0:
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9CE6:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9C98
thumb_func_start sub_81B9CF0
sub_81B9CF0: @ 81B9CF0
push {lr}
ldr r0, =gStringVar1
ldr r1, =gTrainerBattleOpponent_A
ldrh r1, [r1]
bl GetFrontierTrainerName
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9CF0
thumb_func_start sub_81B9D08
sub_81B9D08: @ 81B9D08
push {lr}
ldr r1, =gUnknown_086160F8
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl _call_via_r0
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9D08
thumb_func_start sub_81B9D28
sub_81B9D28: @ 81B9D28
push {lr}
ldr r1, =gSaveBlock2Ptr
ldr r0, [r1]
ldr r2, =0x00000ca8
adds r0, r2
movs r2, 0
strb r2, [r0]
ldr r1, [r1]
ldr r3, =0x00000cb2
adds r0, r1, r3
strh r2, [r0]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
movs r2, 0x5
ldrsb r2, [r0, r2]
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9D28
thumb_func_start sub_81B9D7C
sub_81B9D7C: @ 81B9D7C
ldr r1, =gSpecialVar_Result
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000e6e
adds r0, r2
ldrh r0, [r0]
strh r0, [r1]
bx lr
.pool
thumb_func_end sub_81B9D7C
thumb_func_start sub_81B9D98
sub_81B9D98: @ 81B9D98
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =gSpecialVar_0x8006
ldrh r1, [r1]
ldr r2, =0x00000e6e
adds r0, r2
strh r1, [r0]
bx lr
.pool
thumb_func_end sub_81B9D98
thumb_func_start sub_81B9DB4
sub_81B9DB4: @ 81B9DB4
push {r4,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =gSpecialVar_0x8005
ldrh r1, [r1]
ldr r2, =0x00000ca8
adds r0, r2
strb r1, [r0]
movs r0, 0x80
lsls r0, 7
movs r1, 0
bl VarSet
ldr r1, [r4]
ldr r0, =0x00000ca9
adds r1, r0
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
bl sub_81A4C30
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9DB4
thumb_func_start sub_81B9DF8
sub_81B9DF8: @ 81B9DF8
push {r4,r5,lr}
ldr r0, =gSaveBlock2Ptr
ldr r4, [r0]
ldr r5, =gUnknown_08616120
bl Random
ldrh r0, [r5]
ldr r1, =0x00000e6e
adds r4, r1
strh r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9DF8
thumb_func_start sub_81B9E20
sub_81B9E20: @ 81B9E20
push {r4,r5,lr}
ldr r4, =gSaveBlock2Ptr
ldr r0, [r4]
ldr r1, =0x00000e6e
adds r0, r1
ldrh r0, [r0]
movs r1, 0x1
bl AddBagItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x1
bne _081B9E68
ldr r0, [r4]
ldr r1, =0x00000e6e
adds r0, r1
ldrh r0, [r0]
ldr r1, =gStringVar1
bl CopyItemName
ldr r0, [r4]
ldr r1, =0x00000e6e
adds r0, r1
movs r1, 0
strh r1, [r0]
ldr r0, =gSpecialVar_Result
strh r5, [r0]
b _081B9E6E
.pool
_081B9E68:
ldr r1, =gSpecialVar_Result
movs r0, 0
strh r0, [r1]
_081B9E6E:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81B9E20
thumb_func_start sub_81B9E78
sub_81B9E78: @ 81B9E78
push {lr}
bl ZeroPlayerPartyMons
bl sub_819A4F8
pop {r0}
bx r0
thumb_func_end sub_81B9E78
thumb_func_start sub_81B9E88
sub_81B9E88: @ 81B9E88
push {lr}
bl sub_819DC00
pop {r0}
bx r0
thumb_func_end sub_81B9E88
thumb_func_start sub_81B9E94
sub_81B9E94: @ 81B9E94
push {lr}
movs r2, 0
ldr r1, =gMapHeader
ldrb r0, [r1, 0x14]
cmp r0, 0x8
bne _081B9EB2
ldr r3, =0xfffffe7f
adds r0, r3, 0
ldrh r1, [r1, 0x12]
adds r0, r1
lsls r0, 16
lsrs r0, 16
cmp r0, 0x1
bhi _081B9EB2
movs r2, 0x1
_081B9EB2:
adds r0, r2, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81B9E94
thumb_func_start sub_81B9EC0
sub_81B9EC0: @ 81B9EC0
asm/battle_tower.s
+3 -3
View File
@@ -1353,7 +1353,7 @@ _08162AD0:
ldr r0, =0x000003fe
cmp r4, r0
bne _08162AE4
bl sub_81A4CB0
bl GetFrontierBrainTrainerPicIndex
lsls r0, 24
lsrs r0, 24
b _08162BCA
@@ -1479,7 +1479,7 @@ _08162C08:
ldr r0, =0x000003fe
cmp r4, r0
bne _08162C1C
bl sub_81A4D00
bl GetFrontierBrainTrainerClass
lsls r0, 24
lsrs r0, 24
b _08162D1E
@@ -1729,7 +1729,7 @@ _08162E54:
cmp r5, r0
bne _08162E68
adds r0, r6, 0
bl sub_81A4D50
bl CopyFrontierBrainTrainerName
b _08162F62
.pool
_08162E68:
asm/cable_car.s
+3 -3
View File
@@ -1956,7 +1956,7 @@ _08150D86:
str r2, [sp]
movs r2, 0xC8
movs r3, 0x49
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -2062,7 +2062,7 @@ _08150E68:
str r2, [sp]
movs r2, 0x80
movs r3, 0x27
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -2195,7 +2195,7 @@ _08150F3E:
ldrsh r3, [r3, r4]
movs r4, 0x6A
str r4, [sp]
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
asm/contest.s
+2 -2
View File
@@ -6770,8 +6770,8 @@ _080DB1CC:
bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
bl sub_806A068
ldr r4, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r4, =gMultiuseSpriteTemplate
movs r0, 0x2
adds r1, r5, 0
movs r2, 0
asm/contest_link_80F57C4.s
+2 -2
View File
@@ -1420,8 +1420,8 @@ _080F64F2:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
bl sub_806A068
ldr r0, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
movs r1, 0x88
asm/easy_chat.s
+3 -3
View File
@@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
@@ -8988,7 +8988,7 @@ _0811E852:
adds r1, r5, 0
movs r2, 0x4C
movs r3, 0x28
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -9019,7 +9019,7 @@ _0811E8A0:
adds r1, r5, 0
movs r2, 0x34
movs r3, 0x28
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
asm/field_control_avatar.s
+34 -34
View File
@@ -187,9 +187,9 @@ sub_809C014: @ 809C014
ldr r0, =gSpecialVar_LastTalked
movs r1, 0
strh r1, [r0]
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
strb r1, [r0]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r6, r0, 24
mov r4, sp
@@ -479,13 +479,13 @@ TryGetScriptOnPressingA: @ 809C270
adds r7, r4, 0
adds r1, r5, 0
adds r2, r4, 0
bl TryGetMapObjectScript
bl TryGetEventObjectScript
cmp r0, 0
bne _0809C2BC
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
bl TryGetInvisibleMapObjectScript
bl TryGetInvisibleEventObjectScript
cmp r0, 0
bne _0809C2BC
adds r0, r6, 0
@@ -547,12 +547,12 @@ _0809C2F0:
lsrs r1, 16
_0809C30E:
ldrb r2, [r4, 0x4]
bl GetFieldObjectIdByXYZ
bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x10
beq _0809C32E
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r2, r3, 3
adds r0, r2, r3
lsls r0, 2
@@ -567,7 +567,7 @@ _0809C32E:
.pool
_0809C33C:
movs r4, 0
ldr r1, =gLinkPlayerMapObjects
ldr r1, =gLinkPlayerEventObjects
_0809C340:
ldrb r0, [r1]
cmp r0, 0x1
@@ -580,7 +580,7 @@ _0809C34C:
adds r4, 0x1
cmp r4, 0x3
ble _0809C340
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
strb r3, [r0]
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r3
@@ -591,7 +591,7 @@ _0809C34C:
ldr r0, =gSpecialVar_Facing
strh r6, [r0]
adds r0, r3, 0
bl GetFieldObjectScriptPointerByFieldObjectId
bl GetEventObjectScriptPointerByEventObjectId
_0809C36E:
pop {r4-r6}
pop {r1}
@@ -599,8 +599,8 @@ _0809C36E:
.pool
thumb_func_end sub_809C2C8
thumb_func_start TryGetMapObjectScript
TryGetMapObjectScript: @ 809C384
thumb_func_start TryGetEventObjectScript
TryGetEventObjectScript: @ 809C384
push {r4-r7,lr}
adds r5, r0, 0
lsls r1, 24
@@ -610,12 +610,12 @@ TryGetMapObjectScript: @ 809C384
ldrh r0, [r5]
ldrh r1, [r5, 0x2]
ldrb r2, [r5, 0x4]
bl GetFieldObjectIdByXYZ
bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C3B4
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -647,12 +647,12 @@ _0809C3B4:
lsls r1, 16
lsrs r1, 16
ldrb r2, [r5, 0x4]
bl GetFieldObjectIdByXYZ
bl GetEventObjectIdByXYZ
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x10
beq _0809C400
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r2, r4, 3
adds r0, r2, r4
lsls r0, 2
@@ -666,7 +666,7 @@ _0809C400:
b _0809C44E
.pool
_0809C40C:
ldr r0, =gSelectedMapObject
ldr r0, =gSelectedEventObject
strb r4, [r0]
ldr r1, =gSpecialVar_LastTalked
adds r0, r2, r4
@@ -684,7 +684,7 @@ _0809C40C:
.pool
_0809C43C:
adds r0, r4, 0
bl GetFieldObjectScriptPointerByFieldObjectId
bl GetEventObjectScriptPointerByEventObjectId
_0809C442:
adds r1, r0, 0
ldr r0, =gSpecialVar_LastTalked
@@ -696,11 +696,11 @@ _0809C44E:
pop {r1}
bx r1
.pool
thumb_func_end TryGetMapObjectScript
thumb_func_end TryGetEventObjectScript
thumb_func_start TryGetInvisibleMapObjectScript
@ signed int TryGetInvisibleMapObjectScript(int a1, int a2, u8 playerFacingDirection)
TryGetInvisibleMapObjectScript: @ 809C458
thumb_func_start TryGetInvisibleEventObjectScript
@ signed int TryGetInvisibleEventObjectScript(int a1, int a2, u8 playerFacingDirection)
TryGetInvisibleEventObjectScript: @ 809C458
push {r4,r5,lr}
lsls r2, 24
lsrs r5, r2, 24
@@ -715,7 +715,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
bl FindInvisibleMapObjectByPosition
bl FindInvisibleEventObjectByPosition
cmp r0, 0
beq _0809C4CC
ldr r2, [r0, 0x8]
@@ -799,7 +799,7 @@ _0809C532:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end TryGetInvisibleMapObjectScript
thumb_func_end TryGetInvisibleEventObjectScript
thumb_func_start TryGetMetatileBehaviorScript
TryGetMetatileBehaviorScript: @ 809C538
@@ -2261,9 +2261,9 @@ sub_809D0F4: @ 809D0F4
.pool
thumb_func_end sub_809D0F4
thumb_func_start FindInvisibleMapObjectByPosition
@ int FindInvisibleMapObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
FindInvisibleMapObjectByPosition: @ 809D11C
thumb_func_start FindInvisibleEventObjectByPosition
@ int FindInvisibleEventObjectByPosition(struct mapheader *mapHeader, u16 x, u16 y, u8 elevation)
FindInvisibleEventObjectByPosition: @ 809D11C
push {r4-r7,lr}
lsls r1, 16
lsrs r7, r1, 16
@@ -2308,7 +2308,7 @@ _0809D164:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end FindInvisibleMapObjectByPosition
thumb_func_end FindInvisibleEventObjectByPosition
thumb_func_start dive_warp
dive_warp: @ 809D16C
@@ -2447,12 +2447,12 @@ _0809D276:
bx r1
thumb_func_end sub_809D1E8
thumb_func_start GetFieldObjectScriptPointerForComparison
@ u8 *GetFieldObjectScriptPointerForComparison()
GetFieldObjectScriptPointerForComparison: @ 809D280
thumb_func_start GetEventObjectScriptPointerForComparison
@ u8 *GetEventObjectScriptPointerForComparison()
GetEventObjectScriptPointerForComparison: @ 809D280
push {r4,r5,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2470,18 +2470,18 @@ GetFieldObjectScriptPointerForComparison: @ 809D280
lsrs r1, 24
mov r0, sp
adds r2, r4, 0
bl TryGetMapObjectScript
bl TryGetEventObjectScript
add sp, 0x8
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end GetFieldObjectScriptPointerForComparison
thumb_func_end GetEventObjectScriptPointerForComparison
thumb_func_start sub_809D2BC
sub_809D2BC: @ 809D2BC
push {r4,lr}
sub sp, 0x8
bl player_get_direction_upper_nybble
bl GetPlayerMovementDirection
mov r4, sp
mov r0, sp
bl player_get_pos_to_and_height
asm/field_effect_helpers.s
+61 -61
View File
@@ -100,7 +100,7 @@ _08153F7A:
sub_8153F98: @ 8153F98
push {lr}
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
ldrh r0, [r0, 0xA]
subs r0, 0x2
lsls r0, 16
@@ -123,7 +123,7 @@ npc_pal_op: @ 8153FAC
movs r0, 0
strh r0, [r4, 0x32]
ldrb r0, [r5, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
ldrb r1, [r0, 0xC]
movs r0, 0x80
ands r0, r1
@@ -172,7 +172,7 @@ npc_pal_op_B: @ 815401C
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, =0x000011ff
@@ -217,7 +217,7 @@ npc_pal_op_A: @ 8154078
lsls r1, 24
lsrs r4, r1, 24
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r2, r0, 0
ldrh r1, [r2, 0x4]
ldr r0, =0x000011ff
@@ -248,7 +248,7 @@ objc_reflection_maybe: @ 81540A8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r7, r0, r1
ldrb r1, [r7, 0x4]
lsls r0, r1, 4
@@ -578,16 +578,16 @@ oei_shadow: @ 8154340
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r4, r0, 0
ldr r2, =gFieldEffectObjectTemplatePointers
ldr r1, =gUnknown_085CDC3E
@@ -659,7 +659,7 @@ oamc_shadow: @ 81543E4
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08154412
@@ -673,7 +673,7 @@ _08154412:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r0, [r4, 0x4]
lsls r1, r0, 4
@@ -877,7 +877,7 @@ _0815459C:
adds r1, r4, 0
adds r2, r7, 0
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081545F0
@@ -909,7 +909,7 @@ _08154604:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -931,7 +931,7 @@ _08154624:
_08154632:
adds r0, r5, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r1, [r5, 0x2E]
lsls r1, 24
lsrs r1, 24
@@ -1216,7 +1216,7 @@ _0815484C:
adds r1, r7, 0
adds r2, r6, 0
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081548A0
@@ -1248,7 +1248,7 @@ _081548B4:
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r2, r0, r1
ldr r0, [r2, 0x10]
ldr r1, [r5, 0x30]
@@ -1262,7 +1262,7 @@ _081548B4:
_081548D4:
adds r0, r5, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r1, [r5, 0x2E]
lsls r1, 24
lsrs r1, 24
@@ -1340,13 +1340,13 @@ sub_815496C: @ 815496C
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x78]
@@ -1428,11 +1428,11 @@ sub_8154A10: @ 8154A10
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08154A4E
ldr r5, =gMapObjects
ldr r5, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1451,7 +1451,7 @@ _08154A4E:
.pool
_08154A5C:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r8, r0
mov r0, sp
ldrb r1, [r0]
@@ -1523,7 +1523,7 @@ _08154AB2:
lsls r1, 29
lsrs r1, 31
adds r0, r4, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_08154AF2:
add sp, 0x4
pop {r3}
@@ -1729,7 +1729,7 @@ sub_8154C7C: @ 8154C7C
_08154C92:
adds r0, r1, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
pop {r0}
bx r0
thumb_func_end sub_8154C7C
@@ -1758,7 +1758,7 @@ sub_8154CA0: @ 8154CA0
lsls r1, 29
lsrs r1, 31
adds r0, r4, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
movs r1, 0x30
ldrsh r0, [r4, r1]
cmp r0, 0x38
@@ -1781,13 +1781,13 @@ sub_8154CEC: @ 8154CEC
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -1800,7 +1800,7 @@ sub_8154CEC: @ 8154CEC
cmp r4, 0x40
beq _08154D76
ldrb r0, [r5, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
lsls r3, r4, 4
adds r3, r4
lsls r3, 2
@@ -1870,7 +1870,7 @@ sub_8154D90: @ 8154D90
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08154DCA
@@ -1881,7 +1881,7 @@ _08154DC0:
b _08154E0A
_08154DCA:
ldr r3, =gSprites
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1910,7 +1910,7 @@ _08154DCA:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_08154E0A:
add sp, 0x4
pop {r4}
@@ -2034,13 +2034,13 @@ sub_8154EFC: @ 8154EFC
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
@@ -2053,7 +2053,7 @@ sub_8154EFC: @ 8154EFC
cmp r5, 0x40
beq _08154F92
ldrb r0, [r6, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r4, r0, 0
lsls r0, r5, 4
adds r0, r5
@@ -2123,11 +2123,11 @@ sub_8154FB4: @ 8154FB4
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08154FEE
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2162,7 +2162,7 @@ _08154FFC:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldr r1, [r5, 0x10]
ldr r0, [r4, 0x34]
cmp r1, r0
@@ -2242,13 +2242,13 @@ sub_81550B4: @ 81550B4
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x7C]
@@ -2328,11 +2328,11 @@ sub_8155158: @ 8155158
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08155192
ldr r5, =gMapObjects
ldr r5, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -2351,7 +2351,7 @@ _08155192:
.pool
_081551A0:
ldrb r0, [r1, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r1, sp
ldrb r2, [r1]
lsls r1, r2, 3
@@ -2381,7 +2381,7 @@ _081551A0:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_081551E4:
add sp, 0x4
pop {r4,r5}
@@ -2765,7 +2765,7 @@ sub_81554AC: @ 81554AC
movs r2, 0x32
ldrsh r1, [r4, r2]
bl CurrentMapDrawMetatileAt
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -2789,7 +2789,7 @@ sub_815550C: @ 815550C
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
@@ -2972,7 +2972,7 @@ sub_8155658: @ 8155658
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r4, r0
ldrb r0, [r4, 0x4]
lsls r5, r0, 4
@@ -3319,13 +3319,13 @@ sub_8155900: @ 8155900
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r6, r1, r0
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x74]
@@ -3338,7 +3338,7 @@ sub_8155900: @ 8155900
cmp r4, 0x40
beq _081559A4
ldrb r0, [r6, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
adds r5, r0, 0
lsls r0, r4, 4
adds r0, r4
@@ -3415,11 +3415,11 @@ sub_81559BC: @ 81559BC
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _081559F6
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3474,7 +3474,7 @@ _08155A46:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
ldr r3, =gSprites
ldr r2, =gMapObjects
ldr r2, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3493,7 +3493,7 @@ _08155A46:
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_08155A76:
add sp, 0x4
pop {r4-r6}
@@ -3567,7 +3567,7 @@ sub_8155AEC: @ 8155AEC
strh r1, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r1, [r4, 0x3E]
ldr r0, =0x00001004
ands r0, r1
@@ -3694,7 +3694,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08155C08
@@ -3783,7 +3783,7 @@ sub_8155C88: @ 8155C88
lsls r2, 24
lsrs r2, 24
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08155CB8
@@ -3793,7 +3793,7 @@ sub_8155C88: @ 8155C88
adds r0, r5, 0
bl FieldEffectStop
_08155CB8:
ldr r4, =gMapObjects
ldr r4, =gEventObjects
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -3801,7 +3801,7 @@ _08155CB8:
lsls r0, 2
adds r0, r4
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r1, sp
ldrb r2, [r1]
lsls r1, r2, 3
@@ -4460,7 +4460,7 @@ sub_8156194: @ 8156194
_081561B2:
adds r0, r4, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r0, 24
@@ -4492,7 +4492,7 @@ sub_81561D0: @ 81561D0
_081561EE:
adds r0, r2, 0
movs r1, 0
bl sub_80979D4
bl UpdateEventObjectSpriteVisibility
_081561F6:
pop {r0}
bx r0
@@ -4514,14 +4514,14 @@ _08156212:
lsls r0, r7, 3
adds r0, r7
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
ldrb r0, [r4]
lsls r0, 31
cmp r0, 0
beq _081562B4
ldrb r0, [r4, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
asm/field_ground_effect.s
-1929
View File
File diff suppressed because it is too large Load Diff
asm/field_player_avatar.s
+204 -204
View File
File diff suppressed because it is too large Load Diff
asm/field_screen.s
+33 -33
View File
@@ -8382,7 +8382,7 @@ _080AF46C:
_080AF480:
movs r0, 0
bl sub_80AF0F4
bl FreezeMapObjects
bl FreezeEventObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -8403,17 +8403,17 @@ _080AF4A4:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
movs r1, 0x8
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AF54A
@@ -8434,16 +8434,16 @@ _080AF4DC:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF54A
@@ -8461,7 +8461,7 @@ _080AF520:
cmp r0, 0x1
beq _080AF54A
_080AF536:
bl UnfreezeMapObjects
bl UnfreezeEventObjects
movs r0, 0x4
strh r0, [r5, 0x8]
b _080AF54A
@@ -8508,7 +8508,7 @@ _080AF580:
_080AF58A:
movs r0, 0
bl sub_80AF0F4
bl FreezeMapObjects
bl FreezeEventObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -8524,23 +8524,23 @@ _080AF5A2:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r4, r0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetGoSpeed0AnimId
bl GetWalkNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AF60A
@@ -8550,7 +8550,7 @@ _080AF5EC:
lsls r0, 24
cmp r0, 0
beq _080AF60A
bl UnfreezeMapObjects
bl UnfreezeEventObjects
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF60A
@@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610
b _080AF65A
.pool
_080AF634:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -8593,7 +8593,7 @@ _080AF644:
bl sub_80AF71C
cmp r0, 0
beq _080AF65A
bl UnfreezeMapObjects
bl UnfreezeEventObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -8656,7 +8656,7 @@ task_mpl_807E3C8: @ 80AF6B0
bl ScriptContext2_Disable
adds r0, r4, 0
bl DestroyTask
bl sub_80984F4
bl ScriptUnfreezeEventObjects
_080AF6CC:
pop {r4}
pop {r0}
@@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C
movs r0, 0x1
bl sub_8085540
bl ScriptContext2_Enable
bl SaveMapObjects
bl SaveEventObjects
bl music_something
bl sub_80AF0B4
movs r0, 0x2D
@@ -9062,7 +9062,7 @@ _080AFA34:
beq _080AFA6C
b _080AFA7C
_080AFA3A:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
b _080AFA64
_080AFA44:
@@ -9133,7 +9133,7 @@ _080AFAC0:
.4byte _080AFBB8
.4byte _080AFBD4
_080AFAD4:
bl FreezeMapObjects
bl FreezeEventObjects
adds r0, r4, 0
adds r1, r6, 0
bl PlayerGetDestCoords
@@ -9174,20 +9174,20 @@ _080AFB26:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r4, =gMapObjects
ldr r4, =gEventObjects
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimActive
bl EventObjectClearHeldMovementIfActive
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9196,7 +9196,7 @@ _080AFB26:
lsls r0, 2
adds r0, r4
movs r1, 0x9
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
movs r0, 0x2
strh r0, [r5, 0x8]
b _080AFBE8
@@ -9218,16 +9218,16 @@ _080AFB6C:
movs r0, 0xFF
movs r1, 0
movs r2, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
movs r0, 0
bl sub_80AF0F4
movs r0, 0x3
@@ -9290,7 +9290,7 @@ _080AFC1C:
beq _080AFC46
b _080AFC56
_080AFC22:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
b _080AFC3E
_080AFC2C:
@@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160
b _080B01B6
.pool
_080B0184:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
bl sub_808D194
ldrh r0, [r4, 0x8]
@@ -9996,7 +9996,7 @@ _080B0198:
bl sub_808D1B4
cmp r0, 0x1
beq _080B01B6
bl UnfreezeMapObjects
bl UnfreezeEventObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -10033,7 +10033,7 @@ _080B01E4:
beq _080B022A
b _080B023A
_080B01EE:
bl FreezeMapObjects
bl FreezeEventObjects
bl ScriptContext2_Enable
movs r0, 0x2D
bl PlaySE
asm/field_specials.s
+24 -24
View File
@@ -741,8 +741,8 @@ _0813828A:
.pool
thumb_func_end GetLinkPartnerNames
thumb_func_start SpawnLinkPartnerFieldObject
SpawnLinkPartnerFieldObject: @ 81382A0
thumb_func_start SpawnLinkPartnerEventObject
SpawnLinkPartnerEventObject: @ 81382A0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -766,7 +766,7 @@ SpawnLinkPartnerFieldObject: @ 81382A0
lsls r0, 24
lsrs r0, 24
mov r10, r0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0
adds r2, r4, 0
mov r3, r12
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialEventObjectParameterized
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -941,7 +941,7 @@ _08138410:
pop {r0}
bx r0
.pool
thumb_func_end SpawnLinkPartnerFieldObject
thumb_func_end SpawnLinkPartnerEventObject
thumb_func_start sub_813842C
sub_813842C: @ 813842C
@@ -971,12 +971,12 @@ _08138454:
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
adds r0, r3, 0
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
beq _081384E6
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r0, r2, 3
adds r0, r2
lsls r0, 2
@@ -1008,15 +1008,15 @@ _081384A8:
beq _081384BC
b _081384E6
_081384B2:
ldr r0, =gFieldObjectPalette33
ldr r0, =gEventObjectPalette33
b _081384C6
.pool
_081384BC:
ldr r0, =gFieldObjectPalette34
ldr r0, =gEventObjectPalette34
b _081384C6
.pool
_081384C4:
ldr r0, =gFieldObjectPalette8
ldr r0, =gEventObjectPalette8
_081384C6:
movs r2, 0x80
lsls r2, 1
@@ -1026,7 +1026,7 @@ _081384C6:
b _081384E6
.pool
_081384D8:
ldr r0, =gFieldObjectPalette17
ldr r0, =gEventObjectPalette17
movs r2, 0x80
lsls r2, 1
adds r1, r3, r2
@@ -1989,7 +1989,7 @@ PCTurnOnEffect_0: @ 8138D10
cmp r0, 0x6
bne _08138D7C
strh r5, [r4, 0xE]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -2134,7 +2134,7 @@ PCTurnOffEffect: @ 8138E2C
movs r6, 0
movs r5, 0
movs r4, 0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -2537,8 +2537,8 @@ _0813914A:
.pool
thumb_func_end IsGrassTypeInParty
thumb_func_start SpawnScriptFieldObject
SpawnScriptFieldObject: @ 8139158
thumb_func_start SpawnScriptEventObject
SpawnScriptEventObject: @ 8139158
push {lr}
sub sp, 0x8
ldr r0, =gSaveBlock1Ptr
@@ -2557,10 +2557,10 @@ SpawnScriptFieldObject: @ 8139158
movs r0, 0x7
movs r1, 0x8
movs r2, 0x7F
bl SpawnSpecialFieldObjectParametrized
bl SpawnSpecialEventObjectParameterized
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -2575,10 +2575,10 @@ SpawnScriptFieldObject: @ 8139158
pop {r0}
bx r0
.pool
thumb_func_end SpawnScriptFieldObject
thumb_func_end SpawnScriptEventObject
thumb_func_start RemoveScriptFieldObject
RemoveScriptFieldObject: @ 81391AC
thumb_func_start RemoveScriptEventObject
RemoveScriptEventObject: @ 81391AC
push {lr}
bl GetPlayerAvatarObjectId
lsls r0, 24
@@ -2589,11 +2589,11 @@ RemoveScriptFieldObject: @ 81391AC
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x7F
bl RemoveFieldObjectByLocalIdAndMap
bl RemoveEventObjectByLocalIdAndMap
pop {r0}
bx r0
.pool
thumb_func_end RemoveScriptFieldObject
thumb_func_end RemoveScriptEventObject
thumb_func_start GetPokeblockNameByMonNature
GetPokeblockNameByMonNature: @ 81391D0
@@ -6327,7 +6327,7 @@ sub_813B0B4: @ 813B0B4
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
cmp r4, 0
bne _0813B0F0
movs r0, 0xC4
@@ -6377,7 +6377,7 @@ _0813B13A:
adds r0, r5, r0
ldrb r2, [r0]
movs r0, 0x1
bl Overworld_SetMapObjTemplateCoords
bl Overworld_SetEventObjTemplateCoords
add sp, 0x4
pop {r4,r5}
pop {r0}
asm/fldeff_80F9BCC.s
+28 -28
View File
@@ -467,7 +467,7 @@ _080F9F54:
thumb_func_start sub_80F9F5C
sub_80F9F5C: @ 80F9F5C
push {lr}
ldr r0, =gUnknown_0203AB40
ldr r0, =gPlayerFacingPosition
ldr r1, =gMapHeader
ldr r1, [r1, 0x4]
bl sub_80E9608
@@ -567,12 +567,12 @@ sub_80FA004: @ 80FA004
ldrh r0, [r0]
cmp r0, 0x1
beq _080FA0AE
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _080FA0AE
ldr r4, =gUnknown_0203AB40
ldr r4, =gPlayerFacingPosition
adds r1, r4, 0x2
adds r0, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
@@ -590,10 +590,10 @@ sub_80FA004: @ 80FA004
cmp r0, 0x1
bne _080FA070
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_80FA0DC
b _080FA0C0
.pool
@@ -605,10 +605,10 @@ _080FA070:
cmp r0, 0x1
bne _080FA0A0
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_80FA1E8
b _080FA0C0
.pool
@@ -624,10 +624,10 @@ _080FA0AE:
b _080FA0C4
_080FA0B2:
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_80FA34C
_080FA0C0:
str r0, [r1]
@@ -824,7 +824,7 @@ sub_80FA234: @ 80FA234
thumb_func_start sub_80FA248
sub_80FA248: @ 80FA248
push {r4,lr}
ldr r1, =gUnknown_0203AB40
ldr r1, =gPlayerFacingPosition
movs r2, 0
ldrsh r0, [r1, r2]
movs r2, 0x2
@@ -1493,7 +1493,7 @@ sub_80FA794: @ 80FA794
lsls r1, 16
lsrs r4, r1, 16
adds r6, r4, 0
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1722,7 +1722,7 @@ _080FA9CA:
sub_80FA9D0: @ 80FA9D0
push {r4,lr}
sub sp, 0x4
ldr r3, =gMapObjects
ldr r3, =gEventObjects
ldr r2, =gPlayerAvatar
ldrb r1, [r2, 0x5]
lsls r0, r1, 3
@@ -1815,7 +1815,7 @@ sub_80FAA7C: @ 80FAA7C
movs r3, 0
ldrsh r0, [r4, r3]
str r0, [r1, 0x18]
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2312,32 +2312,32 @@ sub_80FAEF0: @ 80FAEF0
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl EventObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _080FAF1C
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080FAF4E
_080FAF1C:
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl sub_808C228
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetStepInPlaceDelay16AnimId
bl GetWalkInPlaceNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -2362,10 +2362,10 @@ sub_80FAF64: @ 80FAF64
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r5, r0, r1
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _080FAFC8
@@ -2381,15 +2381,15 @@ sub_80FAF64: @ 80FAF64
asrs r0, 16
cmp r0, 0x9
bgt _080FAFC4
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
bl GetStepInPlaceDelay16AnimId
bl GetWalkInPlaceNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
b _080FAFC8
.pool
_080FAFC4:
asm/fldeff_cut.s
-1486
View File
File diff suppressed because it is too large Load Diff
asm/learn_move.s
+1 -1
View File
@@ -1270,7 +1270,7 @@ _081611D4:
ldrb r0, [r0]
cmp r0, 0xFF
bne _08161210
ldr r0, =gUnknown_0203CE8C
ldr r0, =gTempScrollArrowTemplate
adds r2, r0, 0
ldr r1, =gUnknown_085CEBD0
ldm r1!, {r3,r5,r6}
asm/link_rfu.s
+1 -1
View File
@@ -856,7 +856,7 @@ sub_8011AFC: @ 8011AFC
bl ResetPaletteFade
ldr r0, =sub_8011AE8
bl SetVBlankCallback
bl sub_80093CC
bl IsWirelessAdapterConnected
lsls r0, 24
cmp r0, 0
beq _08011B70
asm/macros/battle_script.inc
+3 -3
View File
@@ -511,7 +511,7 @@
.byte \bank
.endm
.macro atk5F
.macro swapattackerwithtarget
.byte 0x5f
.endm
@@ -525,7 +525,7 @@
.byte \bank
.endm
.macro atk62 bank
.macro hidepartystatussummary bank
.byte 0x62
.byte \bank
.endm
@@ -1163,7 +1163,7 @@
.4byte \param0
.endm
.macro snatchsetbanks
.macro snatchsetbattlers
.byte 0xed
.endm
asm/macros/map.inc
+34 -46
View File
@@ -1,38 +1,8 @@
.macro new_map_group
inc cur_map_group
.set cur_map_num, 0
.macro map map_id
.byte \map_id >> 8 @ map group
.byte \map_id & 0xFF @ map num
.endm
.macro map_group map_name
.set GROUP_\map_name, cur_map_group
.set MAP_\map_name, cur_map_num
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
@@ -44,37 +14,47 @@
.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
.macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag
.byte \index, \gfx, \replacement, 0
.2byte \x
.2byte \y
.byte \elevation, \movement_type, \radius, \filler2
.byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0
.2byte \trainer_type, \sight_radius_tree_etc
.4byte \script
.2byte \event_flag
.byte \filler3, \filler4
.2byte 0
inc _num_npcs
.endm
.macro warp_def x, y, byte, warp, map
.macro warp_def x, y, byte, warp, map_id
.2byte \x, \y
.byte \byte, \warp
warp_map \map
.byte \map_id & 0xFF @ map num
.byte \map_id >> 8 @ map group
inc _num_warps
.endm
.macro coord_event x, y, byte1, byte2, word1, word2, word3, script
.macro coord_event x, y, elevation, trigger, index, script
.2byte \x, \y
.byte \byte1, \byte2
.2byte \word1, \word2, \word3
.byte \elevation, 0
.2byte \trigger, \index, 0
.4byte \script
inc _num_traps
.endm
.macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
.macro coord_weather_event x, y, elevation, weather
.2byte \x, \y
.byte \byte, \kind
.2byte \word
.byte \elevation, 0
.2byte \weather
.2byte 0, 0
.4byte 0
inc _num_traps
.endm
.macro bg_event x, y, elevation, kind, arg6, arg7, arg8
.2byte \x, \y
.byte \elevation, \kind
.2byte 0
.if \kind < 5
.4byte \arg6
.else
@@ -84,6 +64,14 @@
inc _num_signs
.endm
.macro bg_hidden_item_event x, y, height, item, flag
bg_event \x, \y, \height, 7, \item, \flag, 0
.endm
.macro bg_secret_base_event x, y, height, secret_base_id
bg_event \x, \y, \height, 8, \secret_base_id, 0, 0
.endm
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs
@@ -107,7 +95,7 @@
.equiv connection_dive, 5
.equiv connection_emerge, 6
.macro connection direction, offset, map, filler
.macro connection direction, offset, map
.4byte connection_\direction
.4byte \offset
map \map
asm/macros/movement.inc
+121 -113
View File
@@ -1,4 +1,4 @@
.macro create_movement name
.macro create_movement_action name
enum _\name
.macro \name
.byte _\name
@@ -6,118 +6,126 @@
.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
create_movement_action face_down
create_movement_action face_up
create_movement_action face_left
create_movement_action face_right
create_movement_action walk_slow_down
create_movement_action walk_slow_up
create_movement_action walk_slow_left
create_movement_action walk_slow_right
create_movement_action walk_down
create_movement_action walk_up
create_movement_action walk_left
create_movement_action walk_right
create_movement_action jump_2_down
create_movement_action jump_2_up
create_movement_action jump_2_left
create_movement_action jump_2_right
create_movement_action delay_1
create_movement_action delay_2
create_movement_action delay_4
create_movement_action delay_8
create_movement_action delay_16
create_movement_action walk_fast_down
create_movement_action walk_fast_up
create_movement_action walk_fast_left
create_movement_action walk_fast_right
create_movement_action walk_in_place_slow_down
create_movement_action walk_in_place_slow_up
create_movement_action walk_in_place_slow_left
create_movement_action walk_in_place_slow_right
create_movement_action walk_in_place_down
create_movement_action walk_in_place_up
create_movement_action walk_in_place_left
create_movement_action walk_in_place_right
create_movement_action walk_in_place_fast_down
create_movement_action walk_in_place_fast_up
create_movement_action walk_in_place_fast_left
create_movement_action walk_in_place_fast_right
create_movement_action walk_in_place_fastest_down
create_movement_action walk_in_place_fastest_up
create_movement_action walk_in_place_fastest_left
create_movement_action walk_in_place_fastest_right
create_movement_action ride_water_current_down
create_movement_action ride_water_current_up
create_movement_action ride_water_current_left
create_movement_action ride_water_current_right
create_movement_action walk_fastest_down
create_movement_action walk_fastest_up
create_movement_action walk_fastest_left
create_movement_action walk_fastest_right
create_movement_action slide_down
create_movement_action slide_up
create_movement_action slide_left
create_movement_action slide_right
create_movement_action player_run_down
create_movement_action player_run_up
create_movement_action player_run_left
create_movement_action player_run_right
create_movement_action start_anim_in_direction
create_movement_action jump_special_down
create_movement_action jump_special_up
create_movement_action jump_special_left
create_movement_action jump_special_right
create_movement_action face_player
create_movement_action face_away_player
create_movement_action lock_facing_direction
create_movement_action unlock_facing_direction
create_movement_action jump_down
create_movement_action jump_up
create_movement_action jump_left
create_movement_action jump_right
create_movement_action jump_in_place_down
create_movement_action jump_in_place_up
create_movement_action jump_in_place_left
create_movement_action jump_in_place_right
create_movement_action jump_in_place_down_up
create_movement_action jump_in_place_up_down
create_movement_action jump_in_place_left_right
create_movement_action jump_in_place_right_left
create_movement_action face_original_direction
create_movement_action nurse_joy_bow
create_movement_action enable_jump_landing_ground_effect
create_movement_action disable_jump_landing_ground_effect
create_movement_action disable_anim
create_movement_action restore_anim
create_movement_action set_invisible
create_movement_action set_visible
create_movement_action emote_exclamation_mark
create_movement_action emote_question_mark
create_movement_action emote_heart
create_movement_action reveal_trainer
create_movement_action rock_smash_break
create_movement_action cut_tree
create_movement_action set_fixed_priority
create_movement_action clear_fixed_priority
create_movement_action init_affine_anim
create_movement_action clear_affine_anim
create_movement_action unknown_movement_1
create_movement_action unknown_movement_2
create_movement_action walk_down_start_affine
create_movement_action walk_down_affine
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 0x8C
create_movement_action walk_diag_northwest
create_movement_action walk_diag_northeast
create_movement_action walk_diag_southwest
create_movement_action walk_diag_southeast
create_movement_action walk_slow_diag_northwest
create_movement_action walk_slow_diag_northeast
create_movement_action walk_slow_diag_southwest
create_movement_action walk_slow_diag_southeast
create_movement_action store_lock_anim
create_movement_action free_unlock_anim
create_movement_action walk_left_affine
create_movement_action walk_right_affine
create_movement_action levitate
create_movement_action stop_levitate
create_movement_action destroy_extra_task
create_movement_action figure_8
create_movement_action fly_up
create_movement_action fly_down
enum_start 0xfe
create_movement step_end
create_movement_action step_end
asm/party_menu.s
+25 -25
View File
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
@@ -10199,10 +10199,10 @@ _081B5714:
movs r0, 0x5
bl PlaySE
_081B571A:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
movs r1, 0
str r1, [r0]
ldr r0, =gUnknown_0203CEEC
ldr r0, =gPostMenuFieldCallback
str r1, [r0]
adds r0, r4, 0
bl sub_81B1C1C
@@ -10213,8 +10213,8 @@ _081B572A:
.pool
thumb_func_end sub_81B56D8
thumb_func_start FieldCallback_Teleport
FieldCallback_Teleport: @ 81B5738
thumb_func_start FieldCallback_PrepareFadeInFromMenu
FieldCallback_PrepareFadeInFromMenu: @ 81B5738
push {lr}
bl pal_fill_black
ldr r0, =task_launch_hm_phase_2
@@ -10224,7 +10224,7 @@ FieldCallback_Teleport: @ 81B5738
pop {r1}
bx r1
.pool
thumb_func_end FieldCallback_Teleport
thumb_func_end FieldCallback_PrepareFadeInFromMenu
thumb_func_start task_launch_hm_phase_2
task_launch_hm_phase_2: @ 81B5750
@@ -10241,7 +10241,7 @@ task_launch_hm_phase_2: @ 81B5750
lsls r0, 16
lsrs r0, 16
str r0, [r1]
ldr r0, =gUnknown_0203CEEC
ldr r0, =gPostMenuFieldCallback
ldr r0, [r0]
bl _call_via_r0
adds r0, r4, 0
@@ -10345,10 +10345,10 @@ sub_81B5820: @ 81B5820
lsrs r0, 24
cmp r0, 0x1
bne _081B585C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =hm_surf_run_dp02scr
str r0, [r1]
movs r0, 0x1
@@ -10463,10 +10463,10 @@ hm_prepare_waterfall: @ 81B58F0
lsrs r0, 24
cmp r0, 0x1
bne _081B594C
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =hm2_waterfall
str r0, [r1]
movs r0, 0x1
@@ -10510,10 +10510,10 @@ sub_81B5974: @ 81B5974
b _081B599E
.pool
_081B5990:
ldr r1, =gUnknown_03005DB0
ldr r0, =FieldCallback_Teleport
ldr r1, =gFieldCallback2
ldr r0, =FieldCallback_PrepareFadeInFromMenu
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r1, =gPostMenuFieldCallback
ldr r0, =sub_81B5958
str r0, [r1]
movs r0, 0x1
@@ -12158,7 +12158,7 @@ sub_81B672C: @ 81B672C
bl sub_81B1B5C
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
bl sub_805EAE8
bl HandleBattleLowHpMusicChange
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -16079,8 +16079,8 @@ _081B89A6:
bx r1
thumb_func_end sub_81B8984
thumb_func_start sub_81B89AC
sub_81B89AC: @ 81B89AC
thumb_func_start OpenPartyMenuInBattle
OpenPartyMenuInBattle: @ 81B89AC
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -16107,7 +16107,7 @@ sub_81B89AC: @ 81B89AC
pop {r0}
bx r0
.pool
thumb_func_end sub_81B89AC
thumb_func_end OpenPartyMenuInBattle
thumb_func_start sub_81B89F0
sub_81B89F0: @ 81B89F0
@@ -16288,7 +16288,7 @@ _081B8B94:
ldrb r0, [r0, 0xB]
cmp r0, 0x4
bne _081B8BA8
bl sub_806E994
bl SetMonPreventsSwitchingString
b _081B8C46
.pool
_081B8BA8:
@@ -17276,7 +17276,7 @@ sub_81B9354: @ 81B9354
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_03005DB0
ldr r2, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r2]
movs r1, 0
@@ -17308,7 +17308,7 @@ sub_81B9390: @ 81B9390
movs r0, 0xFF
strh r0, [r4]
_081B93A6:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r0, =CB2_ReturnToField
@@ -17417,7 +17417,7 @@ _081B9486:
ldr r1, =gSpecialVar_0x8004
ldrb r0, [r2]
strh r0, [r1]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback2
ldr r0, =hm_add_c3_without_phase_2
str r0, [r1]
ldr r0, =CB2_ReturnToField
@@ -17553,7 +17553,7 @@ _081B95A4:
lsrs r0, 24
strh r0, [r4]
_081B95BA:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r0, =CB2_ReturnToField
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
b _080C8198
.pool
_080C808C:
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
asm/pokemon_summary_screen.s
+8 -8
View File
@@ -1092,7 +1092,7 @@ _081C4750:
bl LoadCompressedObjectPalette
ldrh r0, [r4, 0x4]
movs r1, 0x1
bl sub_806A068
bl SetMultiuseSpriteTemplateToPokemon
_081C4768:
ldrh r0, [r6]
adds r0, 0x1
@@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778
bne _081C47AE
adds r0, r1, 0
adds r0, 0xC
bl ShouldPlayNormalPokeCry
bl ShouldPlayNormalMonCry
cmp r0, 0x1
bne _081C47A4
ldrh r0, [r4, 0x2]
@@ -1144,7 +1144,7 @@ sub_81C47B4: @ 81C47B4
ldr r0, =gUnknown_0203CF1C
ldr r6, [r0]
adds r6, 0x70
ldr r0, =gUnknown_0202499C
ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x28
movs r2, 0x40
movs r3, 0x5
@@ -2070,7 +2070,7 @@ sub_81C4F44: @ 81C4F44
cmp r0, 0
bne _081C4F6E
bl overworld_free_bg_tilemaps
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r1, =CB2_ReturnToField
@@ -2869,7 +2869,7 @@ sub_81C5674: @ 81C5674
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
ldr r2, =0x00000816
adds r1, r2
@@ -4868,7 +4868,7 @@ sub_81C67CC: @ 81C67CC
ldrb r0, [r5]
movs r1, 0x10
movs r2, 0x1
bl sub_81AF15C
bl ListMenuSetUnkIndicatorsStructField
ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
movs r0, 0x2
@@ -5293,11 +5293,11 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
asm/pokenav.s
+26 -26
View File
@@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x40
bl sub_809882C
bl LoadUserWindowBorderGfx
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x4
@@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C
lsrs r0, 24
movs r1, 0x42
movs r2, 0x40
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
@@ -21001,7 +21001,7 @@ sub_81D1E90: @ 81D1E90
movs r1, 0xC8
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0x9]
add sp, 0x10
pop {r4}
@@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
@@ -25584,7 +25584,7 @@ sub_81D4258: @ 81D4258
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
mov r0, sp
ldrb r0, [r0]
add sp, 0x4
@@ -25606,7 +25606,7 @@ sub_81D427C: @ 81D427C
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r2, =gMapObjects
ldr r2, =gEventObjects
adds r5, r1, r2
ldr r4, =gUnknown_030012F8
ldr r3, =gPlayerAvatar
@@ -25644,7 +25644,7 @@ _081D42CA:
mov r8, r0
cmp r0, 0x3
bls _081D42CA
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -25700,7 +25700,7 @@ _081D4356:
_081D4360:
movs r4, 0
mov r8, r4
ldr r6, =gMapObjects
ldr r6, =gEventObjects
mov r10, r6
_081D4368:
ldr r3, =gPlayerAvatar
@@ -25718,7 +25718,7 @@ _081D4368:
ldrsh r2, [r4, r6]
movs r6, 0
ldrsh r0, [r0, r6]
ldr r6, =gMapObjects
ldr r6, =gEventObjects
mov r9, r6
mov r12, r3
adds r7, r1, 0
@@ -25866,7 +25866,7 @@ _081D449E:
ldrsh r1, [r4, r3]
movs r3, 0
ldrsh r0, [r0, r3]
ldr r3, =gMapObjects
ldr r3, =gEventObjects
mov r9, r3
mov r12, r2
cmp r1, r0
@@ -26124,7 +26124,7 @@ _081D46D0:
ldrsh r0, [r0, r3]
cmp r0, 0
bne _081D476E
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26149,7 +26149,7 @@ _081D46D0:
beq _081D470C
b _081D447C
_081D470C:
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26203,7 +26203,7 @@ _081D476E:
ldrsh r0, [r0, r2]
cmp r0, 0
bne _081D480C
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26228,7 +26228,7 @@ _081D476E:
beq _081D47AA
b _081D45AA
_081D47AA:
ldr r2, =gMapObjects
ldr r2, =gEventObjects
ldr r0, =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -26299,7 +26299,7 @@ sub_81D4834: @ 81D4834
lsls r0, 16
lsls r1, 16
lsrs r4, r1, 16
ldr r3, =gMapObjects
ldr r3, =gEventObjects
ldr r1, =gPlayerAvatar
ldrb r2, [r1, 0x5]
lsls r1, r2, 3
@@ -26350,7 +26350,7 @@ sub_81D4890: @ 81D4890
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r4, r1, r0
movs r1, 0
ldr r3, =gUnknown_030012FC
@@ -26503,9 +26503,9 @@ _081D49E0:
bx r0
thumb_func_end sub_81D4998
thumb_func_start FieldObjectIsFarawayIslandMew
@ bool8 FieldObjectIsFarawayIslandMew(struct npc_state *fieldObject)
FieldObjectIsFarawayIslandMew: @ 81D49E8
thumb_func_start EventObjectIsFarawayIslandMew
@ bool8 EventObjectIsFarawayIslandMew(struct npc_state *eventObject)
EventObjectIsFarawayIslandMew: @ 81D49E8
push {lr}
adds r2, r0, 0
ldr r0, =gSaveBlock1Ptr
@@ -26525,10 +26525,10 @@ _081D4A0C:
_081D4A0E:
pop {r1}
bx r1
thumb_func_end FieldObjectIsFarawayIslandMew
thumb_func_end EventObjectIsFarawayIslandMew
thumb_func_start unown_chamber_related
unown_chamber_related: @ 81D4A14
thumb_func_start IsMewPlayingHideAndSeek
IsMewPlayingHideAndSeek: @ 81D4A14
push {lr}
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
@@ -26557,7 +26557,7 @@ _081D4A50:
_081D4A52:
pop {r1}
bx r1
thumb_func_end unown_chamber_related
thumb_func_end IsMewPlayingHideAndSeek
thumb_func_start sub_81D4A58
sub_81D4A58: @ 81D4A58
@@ -26598,7 +26598,7 @@ sub_81D4A90: @ 81D4A90
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
ldr r0, =gMapObjects
ldr r0, =gEventObjects
adds r5, r1, r0
ldrb r1, [r5, 0x1]
movs r0, 0x21
@@ -29331,7 +29331,7 @@ sub_81D6180: @ 81D6180
thumb_func_end sub_81D6180
thumb_func_start GetTrainerHillTrainerFlag
@ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)
@ u8 GetTrainerHillTrainerFlag(u8 eventObjectId)
GetTrainerHillTrainerFlag: @ 81D619C
push {r4,lr}
adds r4, r0, 0
@@ -29340,7 +29340,7 @@ GetTrainerHillTrainerFlag: @ 81D619C
bl sub_81D5520
lsls r0, 24
lsrs r0, 23
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r4, 3
adds r1, r4
lsls r1, 2
asm/rom_8011DC0.s
+24 -24
View File
@@ -5090,7 +5090,7 @@ _080181BC:
sub_80181CC: @ 80181CC
push {lr}
bl ScriptContext2_Enable
bl ScriptFreezeMapObjects
bl ScriptFreezeEventObjects
pop {r0}
bx r0
thumb_func_end sub_80181CC
@@ -5511,11 +5511,11 @@ _08018574:
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -8117,7 +8117,7 @@ sub_8019AB8: @ 8019AB8
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl RemoveFieldObjectByLocalIdAndMap
bl RemoveEventObjectByLocalIdAndMap
pop {r0}
bx r0
.pool
@@ -8136,7 +8136,7 @@ sub_8019AD8: @ 8019AD8
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08019B30
@@ -8145,16 +8145,16 @@ sub_8019AD8: @ 8019AD8
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
bl EventObjectIsMovementOverridden
lsls r0, 24
cmp r0, 0
bne _08019B30
ldrb r1, [r5]
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
bl EventObjectSetHeldMovement
lsls r0, 24
cmp r0, 0
bne _08019B30
@@ -8182,7 +8182,7 @@ sub_8019B3C: @ 8019B3C
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
bl TryGetFieldObjectIdByLocalIdAndMap
bl TryGetEventObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08019B9C
@@ -8191,10 +8191,10 @@ sub_8019B3C: @ 8019B3C
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, =gMapObjects
ldr r1, =gEventObjects
adds r4, r0, r1
adds r0, r4, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
bl EventObjectClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
bne _08019B84
@@ -8207,11 +8207,11 @@ _08019B84:
cmp r0, 0
bne _08019B96
adds r0, r4, 0
bl npc_sync_anim_pause_bits
bl UnfreezeEventObject
b _08019B9C
_08019B96:
adds r0, r4, 0
bl FreezeMapObject
bl FreezeEventObject
_08019B9C:
movs r0, 0x1
_08019B9E:
@@ -9158,7 +9158,7 @@ sub_801A2A8: @ 801A2A8
b _0801A396
_0801A2C4:
ldr r4, =gUnknown_082F076A
bl player_get_direction_lower_nybble
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -10446,11 +10446,11 @@ _0801AD8C:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
bl sub_819789C
ldr r0, =sub_801AC40
bl SetVBlankCallback
@@ -21620,11 +21620,11 @@ sub_8020740: @ 8020740
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldr r0, =gUnknown_0860F074
movs r1, 0xE0
movs r2, 0x20
@@ -24710,7 +24710,7 @@ _0802210C:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
@@ -24909,7 +24909,7 @@ _08022296:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r0, [r6, 0x2]
movs r1, 0
adds r2, r4, 0
@@ -29760,7 +29760,7 @@ sub_80248B0: @ 80248B0
ldr r5, =0x0000021d
adds r1, r5, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
ldrb r4, [r4]
bl sub_80247BC
adds r3, r0, 0
@@ -36184,7 +36184,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
@@ -38753,7 +38753,7 @@ sub_802902C: @ 802902C
movs r0, 0
movs r1, 0xA
movs r2, 0xB0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
pop {r0}
bx r0
thumb_func_end sub_802902C
@@ -49177,7 +49177,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
asm/script_pokemon_util_80F87D8.s
+8 -8
View File
@@ -505,10 +505,10 @@ _080F8BBA:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap
bl GetEventObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, =gMapObjects
ldr r2, =gEventObjects
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -534,12 +534,12 @@ _080F8BBA:
cmp r0, 0
bne _080F8C2C
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette33
ldr r0, =gEventObjectPalette33
b _080F8C42
.pool
_080F8C2C:
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette34
ldr r0, =gEventObjectPalette34
b _080F8C42
.pool
_080F8C38:
@@ -547,7 +547,7 @@ _080F8C38:
cmp r0, 0
bne _080F8C50
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette8
ldr r0, =gEventObjectPalette8
_080F8C42:
movs r2, 0x20
bl LoadPalette
@@ -555,7 +555,7 @@ _080F8C42:
.pool
_080F8C50:
lsrs r1, r4, 16
ldr r0, =gFieldObjectPalette17
ldr r0, =gEventObjectPalette17
movs r2, 0x20
bl LoadPalette
_080F8C5A:
@@ -737,8 +737,8 @@ _080F8DD8:
bl LoadCompressedObjectPalette
adds r0, r6, 0
movs r1, 0x1
bl sub_806A068
ldr r0, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, =gMultiuseSpriteTemplate
ldrh r1, [r4, 0x4]
strh r1, [r0, 0x2]
mov r1, r9
asm/shop.s
+22 -22
View File
@@ -877,7 +877,7 @@ BuyMenuAddScrollIndicatorArrows: @ 80E01C8
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
bl AddScrollIndicatorArrowPairParametrized
bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r5]
adds r1, r4
strb r0, [r1]
@@ -1157,11 +1157,11 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
@@ -1277,8 +1277,8 @@ BuyMenuDrawGraphics: @ 80E0524
@ void BuyMenuDrawMapGraphics()
BuyMenuDrawMapGraphics: @ 80E0570
push {lr}
bl BuyMenuCollectFieldObjectData
bl BuyMenuDrawFieldObjects
bl BuyMenuCollectEventObjectData
bl BuyMenuDrawEventObjects
bl BuyMenuDrawMapBg
pop {r0}
bx r0
@@ -1525,9 +1525,9 @@ BuyMenuDrawMapMetatileLayer: @ 80E0734
bx lr
thumb_func_end BuyMenuDrawMapMetatileLayer
thumb_func_start BuyMenuCollectFieldObjectData
@ void BuyMenuCollectFieldObjectData()
BuyMenuCollectFieldObjectData: @ 80E075C
thumb_func_start BuyMenuCollectEventObjectData
@ void BuyMenuCollectEventObjectData()
BuyMenuCollectEventObjectData: @ 80E075C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1584,7 +1584,7 @@ _080E07AA:
lsls r1, 16
asrs r1, 16
str r3, [sp, 0x10]
bl GetFieldObjectIdByXY
bl GetEventObjectIdByXY
lsls r0, 24
lsrs r6, r0, 24
ldr r3, [sp, 0x10]
@@ -1633,7 +1633,7 @@ _080E07AA:
lsrs r0, 24
mov r1, r12
strh r0, [r1]
ldr r1, =gMapObjects
ldr r1, =gEventObjects
lsls r0, r6, 3
adds r0, r6
lsls r0, 2
@@ -1716,11 +1716,11 @@ _080E08DA:
pop {r0}
bx r0
.pool
thumb_func_end BuyMenuCollectFieldObjectData
thumb_func_end BuyMenuCollectEventObjectData
thumb_func_start BuyMenuDrawFieldObjects
@ void BuyMenuDrawFieldObjects()
BuyMenuDrawFieldObjects: @ 80E08F0
thumb_func_start BuyMenuDrawEventObjects
@ void BuyMenuDrawEventObjects()
BuyMenuDrawEventObjects: @ 80E08F0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1730,7 +1730,7 @@ BuyMenuDrawFieldObjects: @ 80E08F0
movs r7, 0
ldr r0, =gUnknown_02039F70
mov r8, r0
ldr r1, =gMapObjects
ldr r1, =gEventObjects
mov r10, r1
ldr r2, =gSprites
mov r9, r2
@@ -1753,7 +1753,7 @@ _080E090A:
lsls r0, 2
add r0, r10
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
bl GetEventObjectGraphicsInfo
mov r4, r8
ldr r3, [r4]
ldr r2, =0x00002010
@@ -1792,7 +1792,7 @@ _080E090A:
str r0, [sp]
adds r0, r4, 0
ldr r1, =SpriteCallbackDummy
bl AddPseudoFieldObject
bl AddPseudoEventObject
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -1801,7 +1801,7 @@ _080E090A:
mov r3, r8
ldr r0, [r3]
adds r0, r1
bl BuyMenuCheckIfFieldObjectOverlapsMenuBg
bl BuyMenuCheckIfEventObjectOverlapsMenuBg
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1850,10 +1850,10 @@ _080E09D8:
pop {r0}
bx r0
.pool
thumb_func_end BuyMenuDrawFieldObjects
thumb_func_end BuyMenuDrawEventObjects
thumb_func_start BuyMenuCheckIfFieldObjectOverlapsMenuBg
BuyMenuCheckIfFieldObjectOverlapsMenuBg: @ 80E0A14
thumb_func_start BuyMenuCheckIfEventObjectOverlapsMenuBg
BuyMenuCheckIfEventObjectOverlapsMenuBg: @ 80E0A14
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2
@@ -1877,7 +1877,7 @@ _080E0A3A:
pop {r4}
pop {r1}
bx r1
thumb_func_end BuyMenuCheckIfFieldObjectOverlapsMenuBg
thumb_func_end BuyMenuCheckIfEventObjectOverlapsMenuBg
thumb_func_start BuyMenuCopyMenuBgToBg1TilemapBuffer
@ void BuyMenuCopyMenuBgToBg1TilemapBuffer()
asm/slot_machine.s
+2 -2
View File
@@ -634,12 +634,12 @@ sub_812AA48: @ 812AA48
lsls r1, 2
movs r0, 0
movs r2, 0xF0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
movs r1, 0x85
lsls r1, 2
movs r0, 0
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
movs r0, 0
bl PutWindowTilemap
pop {r0}
asm/trade.s
+4 -4
View File
@@ -241,11 +241,11 @@ _08077310:
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
bl box_border_load_tiles_and_pal
bl LoadUserWindowBorderGfx_
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadUserWindowBorderGfx
bl LoadMonIconPalettes
ldr r2, =gUnknown_0203229C
ldr r0, [r2]
@@ -7174,8 +7174,8 @@ _0807ADE0:
bl GetMonSpritePalStruct
ldrh r0, [r0, 0x4]
adds r1, r4, 0
bl sub_806A068
ldr r0, =gUnknown_0202499C
bl SetMultiuseSpriteTemplateToPokemon
ldr r0, =gMultiuseSpriteTemplate
movs r1, 0x78
movs r2, 0x3C
movs r3, 0x6
common_syms/list_menu.txt
+1 -1
View File
@@ -1,2 +1,2 @@
gUnknown_03006300
gListMenuOverride
gMultiuseListMenuTemplate
common_syms/overworld.txt
+1 -1
View File
@@ -1,5 +1,5 @@
gUnknown_03005DA8
gFieldCallback
gUnknown_03005DB0
gFieldCallback2
gUnknown_03005DB4
gFieldLinkPlayerCount
constants/constants.inc
-1
View File
@@ -3,6 +3,5 @@
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/berry_constants.inc"
.include "constants/contest_move_effects.inc"
constants/map_constants.inc
-588
View File
@@ -1,588 +0,0 @@
@ TODO: these need to match the names in include/constants/maps.h
.set cur_map_group, -1
new_map_group
map_group PETALBURG_CITY @ 0.0
map_group SLATEPORT_CITY @ 0.1
map_group MAUVILLE_CITY @ 0.2
map_group RUSTBORO_CITY @ 0.3
map_group FORTREE_CITY @ 0.4
map_group LILYCOVE_CITY @ 0.5
map_group MOSSDEEP_CITY @ 0.6
map_group SOOTOPOLIS_CITY @ 0.7
map_group EVER_GRANDE_CITY @ 0.8
map_group LITTLEROOT_TOWN @ 0.9
map_group OLDALE_TOWN @ 0.10
map_group DEWFORD_TOWN @ 0.11
map_group LAVARIDGE_TOWN @ 0.12
map_group FALLARBOR_TOWN @ 0.13
map_group VERDANTURF_TOWN @ 0.14
map_group PACIFIDLOG_TOWN @ 0.15
map_group ROUTE_101 @ 0.16
map_group ROUTE_102 @ 0.17
map_group ROUTE_103 @ 0.18
map_group ROUTE_104 @ 0.19
map_group ROUTE_105 @ 0.20
map_group ROUTE_106 @ 0.21
map_group ROUTE_107 @ 0.22
map_group ROUTE_108 @ 0.23
map_group ROUTE_109 @ 0.24
map_group ROUTE_110 @ 0.25
map_group ROUTE_111 @ 0.26
map_group ROUTE_112 @ 0.27
map_group ROUTE_113 @ 0.28
map_group ROUTE_114 @ 0.29
map_group ROUTE_115 @ 0.30
map_group ROUTE_116 @ 0.31
map_group ROUTE_117 @ 0.32
map_group ROUTE_118 @ 0.33
map_group ROUTE_119 @ 0.34
map_group ROUTE_120 @ 0.35
map_group ROUTE_121 @ 0.36
map_group ROUTE_122 @ 0.37
map_group ROUTE_123 @ 0.38
map_group ROUTE_124 @ 0.39
map_group ROUTE_125 @ 0.40
map_group ROUTE_126 @ 0.41
map_group ROUTE_127 @ 0.42
map_group ROUTE_128 @ 0.43
map_group ROUTE_129 @ 0.44
map_group ROUTE_130 @ 0.45
map_group ROUTE_131 @ 0.46
map_group ROUTE_132 @ 0.47
map_group ROUTE_133 @ 0.48
map_group ROUTE_134 @ 0.49
map_group UNDERWATER_1 @ 0.50
map_group UNDERWATER_2 @ 0.51
map_group UNDERWATER_3 @ 0.52
map_group UNDERWATER_4 @ 0.53
map_group UNDERWATER_5 @ 0.54
map_group UNDERWATER_6 @ 0.55
map_group UNDERWATER_7 @ 0.56
new_map_group
map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_1F @ 1.0
map_group LITTLEROOT_TOWN_BRENDANS_HOUSE_2F @ 1.1
map_group LITTLEROOT_TOWN_MAYS_HOUSE_1F @ 1.2
map_group LITTLEROOT_TOWN_MAYS_HOUSE_2F @ 1.3
map_group LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB @ 1.4
new_map_group
map_group OLDALE_TOWN_HOUSE_1 @ 2.0
map_group OLDALE_TOWN_HOUSE_2 @ 2.1
map_group OLDALE_TOWN_POKEMON_CENTER_1F @ 2.2
map_group OLDALE_TOWN_POKEMON_CENTER_2F @ 2.3
map_group OLDALE_TOWN_MART @ 2.4
new_map_group
map_group DEWFORD_TOWN_HOUSE_1 @ 3.0
map_group DEWFORD_TOWN_POKEMON_CENTER_1F @ 3.1
map_group DEWFORD_TOWN_POKEMON_CENTER_2F @ 3.2
map_group DEWFORD_TOWN_GYM @ 3.3
map_group DEWFORD_TOWN_HALL @ 3.4
map_group DEWFORD_TOWN_HOUSE_2 @ 3.5
new_map_group
map_group LAVARIDGE_TOWN_HERB_SHOP @ 4.0
map_group LAVARIDGE_TOWN_GYM_1F @ 4.1
map_group LAVARIDGE_TOWN_GYM_B1F @ 4.2
map_group LAVARIDGE_TOWN_HOUSE @ 4.3
map_group LAVARIDGE_TOWN_MART @ 4.4
map_group LAVARIDGE_TOWN_POKEMON_CENTER_1F @ 4.5
map_group LAVARIDGE_TOWN_POKEMON_CENTER_2F @ 4.6
new_map_group
map_group FALLARBOR_TOWN_MART @ 5.0
map_group FALLARBOR_TOWN_BATTLE_TENT_LOBBY @ 5.1
map_group FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR @ 5.2
map_group FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM @ 5.3
map_group FALLARBOR_TOWN_POKEMON_CENTER_1F @ 5.4
map_group FALLARBOR_TOWN_POKEMON_CENTER_2F @ 5.5
map_group FALLARBOR_TOWN_HOUSE_1 @ 5.6
map_group FALLARBOR_TOWN_HOUSE_2 @ 5.7
new_map_group
map_group VERDANTURF_TOWN_BATTLE_TENT_LOBBY @ 6.0
map_group VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR @ 6.1
map_group VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM @ 6.2
map_group VERDANTURF_TOWN_MART @ 6.3
map_group VERDANTURF_TOWN_POKEMON_CENTER_1F @ 6.4
map_group VERDANTURF_TOWN_POKEMON_CENTER_2F @ 6.5
map_group VERDANTURF_TOWN_WANDAS_HOUSE @ 6.6
map_group VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE @ 6.7
map_group VERDANTURF_TOWN_HOUSE @ 6.8
new_map_group
map_group PACIFIDLOG_TOWN_POKEMON_CENTER_1F @ 7.0
map_group PACIFIDLOG_TOWN_POKEMON_CENTER_2F @ 7.1
map_group PACIFIDLOG_TOWN_HOUSE_1 @ 7.2
map_group PACIFIDLOG_TOWN_HOUSE_2 @ 7.3
map_group PACIFIDLOG_TOWN_HOUSE_3 @ 7.4
map_group PACIFIDLOG_TOWN_HOUSE_4 @ 7.5
map_group PACIFIDLOG_TOWN_HOUSE_5 @ 7.6
new_map_group
map_group PETALBURG_CITY_WALLYS_HOUSE @ 8.0
map_group PETALBURG_CITY_GYM @ 8.1
map_group PETALBURG_CITY_HOUSE_1 @ 8.2
map_group PETALBURG_CITY_HOUSE_2 @ 8.3
map_group PETALBURG_CITY_POKEMON_CENTER_1F @ 8.4
map_group PETALBURG_CITY_POKEMON_CENTER_2F @ 8.5
map_group PETALBURG_CITY_MART @ 8.6
new_map_group
map_group SLATEPORT_CITY_STERNS_SHIPYARD_1F @ 9.0
map_group SLATEPORT_CITY_STERNS_SHIPYARD_2F @ 9.1
map_group SLATEPORT_CITY_BATTLE_TENT_LOBBY @ 9.2
map_group SLATEPORT_CITY_BATTLE_TENT_CORRIDOR @ 9.3
map_group SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM @ 9.4
map_group SLATEPORT_CITY_HOUSE_1 @ 9.5
map_group SLATEPORT_CITY_POKEMON_FAN_CLUB @ 9.6
map_group SLATEPORT_CITY_OCEANIC_MUSEUM_1F @ 9.7
map_group SLATEPORT_CITY_OCEANIC_MUSEUM_2F @ 9.8
map_group SLATEPORT_CITY_HARBOR @ 9.9
map_group SLATEPORT_CITY_HOUSE_2 @ 9.10
map_group SLATEPORT_CITY_POKEMON_CENTER_1F @ 9.11
map_group SLATEPORT_CITY_POKEMON_CENTER_2F @ 9.12
map_group SLATEPORT_CITY_MART @ 9.13
new_map_group
map_group MAUVILLE_CITY_GYM @ 10.0
map_group MAUVILLE_CITY_BIKE_SHOP @ 10.1
map_group MAUVILLE_CITY_HOUSE_1 @ 10.2
map_group MAUVILLE_CITY_GAME_CORNER @ 10.3
map_group MAUVILLE_CITY_HOUSE_2 @ 10.4
map_group MAUVILLE_CITY_POKEMON_CENTER_1F @ 10.5
map_group MAUVILLE_CITY_POKEMON_CENTER_2F @ 10.6
map_group MAUVILLE_CITY_MART @ 10.7
new_map_group
map_group RUSTBORO_CITY_DEVON_CORP_1F @ 11.0
map_group RUSTBORO_CITY_DEVON_CORP_2F @ 11.1
map_group RUSTBORO_CITY_DEVON_CORP_3F @ 11.2
map_group RUSTBORO_CITY_GYM @ 11.3
map_group RUSTBORO_CITY_POKEMON_SCHOOL @ 11.4
map_group RUSTBORO_CITY_POKEMON_CENTER_1F @ 11.5
map_group RUSTBORO_CITY_POKEMON_CENTER_2F @ 11.6
map_group RUSTBORO_CITY_MART @ 11.7
map_group RUSTBORO_CITY_FLAT_1_1F @ 11.8
map_group RUSTBORO_CITY_FLAT_1_2F @ 11.9
map_group RUSTBORO_CITY_HOUSE_1 @ 11.10
map_group RUSTBORO_CITY_CUTTERS_HOUSE @ 11.11
map_group RUSTBORO_CITY_HOUSE_2 @ 11.12
map_group RUSTBORO_CITY_FLAT_2_1F @ 11.13
map_group RUSTBORO_CITY_FLAT_2_2F @ 11.14
map_group RUSTBORO_CITY_FLAT_2_3F @ 11.15
map_group RUSTBORO_CITY_HOUSE_3 @ 11.16
new_map_group
map_group FORTREE_CITY_HOUSE_1 @ 12.0
map_group FORTREE_CITY_GYM @ 12.1
map_group FORTREE_CITY_POKEMON_CENTER_1F @ 12.2
map_group FORTREE_CITY_POKEMON_CENTER_2F @ 12.3
map_group FORTREE_CITY_MART @ 12.4
map_group FORTREE_CITY_HOUSE_2 @ 12.5
map_group FORTREE_CITY_HOUSE_3 @ 12.6
map_group FORTREE_CITY_HOUSE_4 @ 12.7
map_group FORTREE_CITY_HOUSE_5 @ 12.8
map_group FORTREE_CITY_DECORATION_SHOP @ 12.9
new_map_group
map_group LILYCOVE_CITY_COVE_LILY_MOTEL_1F @ 13.0
map_group LILYCOVE_CITY_COVE_LILY_MOTEL_2F @ 13.1
map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_1F @ 13.2
map_group LILYCOVE_CITY_LILYCOVE_MUSEUM_2F @ 13.3
map_group LILYCOVE_CITY_CONTEST_LOBBY @ 13.4
map_group LILYCOVE_CITY_CONTEST_HALL @ 13.5
map_group LILYCOVE_CITY_POKEMON_CENTER_1F @ 13.6
map_group LILYCOVE_CITY_POKEMON_CENTER_2F @ 13.7
map_group LILYCOVE_CITY_UNUSED_MART @ 13.8
map_group LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB @ 13.9
map_group LILYCOVE_CITY_HARBOR @ 13.10
map_group LILYCOVE_CITY_MOVE_DELETERS_HOUSE @ 13.11
map_group LILYCOVE_CITY_HOUSE_1 @ 13.12
map_group LILYCOVE_CITY_HOUSE_2 @ 13.13
map_group LILYCOVE_CITY_HOUSE_3 @ 13.14
map_group LILYCOVE_CITY_HOUSE_4 @ 13.15
map_group LILYCOVE_CITY_DEPARTMENT_STORE_1F @ 13.16
map_group LILYCOVE_CITY_DEPARTMENT_STORE_2F @ 13.17
map_group LILYCOVE_CITY_DEPARTMENT_STORE_3F @ 13.18
map_group LILYCOVE_CITY_DEPARTMENT_STORE_4F @ 13.19
map_group LILYCOVE_CITY_DEPARTMENT_STORE_5F @ 13.20
map_group LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP @ 13.21
map_group LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR @ 13.22
new_map_group
map_group MOSSDEEP_CITY_GYM @ 14.0
map_group MOSSDEEP_CITY_HOUSE_1 @ 14.1
map_group MOSSDEEP_CITY_HOUSE_2 @ 14.2
map_group MOSSDEEP_CITY_POKEMON_CENTER_1F @ 14.3
map_group MOSSDEEP_CITY_POKEMON_CENTER_2F @ 14.4
map_group MOSSDEEP_CITY_MART @ 14.5
map_group MOSSDEEP_CITY_HOUSE_3 @ 14.6
map_group MOSSDEEP_CITY_STEVENS_HOUSE @ 14.7
map_group MOSSDEEP_CITY_HOUSE_4 @ 14.8
map_group MOSSDEEP_CITY_SPACE_CENTER_1F @ 14.9
map_group MOSSDEEP_CITY_SPACE_CENTER_2F @ 14.10
map_group MOSSDEEP_CITY_GAME_CORNER_1F @ 14.11
map_group MOSSDEEP_CITY_GAME_CORNER_B1F @ 14.12
new_map_group
map_group SOOTOPOLIS_CITY_GYM_1F @ 15.0
map_group SOOTOPOLIS_CITY_GYM_B1F @ 15.1
map_group SOOTOPOLIS_CITY_POKEMON_CENTER_1F @ 15.2
map_group SOOTOPOLIS_CITY_POKEMON_CENTER_2F @ 15.3
map_group SOOTOPOLIS_CITY_MART @ 15.4
map_group SOOTOPOLIS_CITY_HOUSE_1 @ 15.5
map_group SOOTOPOLIS_CITY_HOUSE_2 @ 15.6
map_group SOOTOPOLIS_CITY_HOUSE_3 @ 15.7
map_group SOOTOPOLIS_CITY_HOUSE_4 @ 15.8
map_group SOOTOPOLIS_CITY_HOUSE_5 @ 15.9
map_group SOOTOPOLIS_CITY_HOUSE_6 @ 15.10
map_group SOOTOPOLIS_CITY_HOUSE_7 @ 15.11
map_group SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE @ 15.12
map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F @ 15.13
map_group SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F @ 15.14
new_map_group
map_group EVER_GRANDE_CITY_SIDNEYS_ROOM @ 16.0
map_group EVER_GRANDE_CITY_PHOEBES_ROOM @ 16.1
map_group EVER_GRANDE_CITY_GLACIAS_ROOM @ 16.2
map_group EVER_GRANDE_CITY_DRAKES_ROOM @ 16.3
map_group EVER_GRANDE_CITY_CHAMPIONS_ROOM @ 16.4
map_group EVER_GRANDE_CITY_HALL_1 @ 16.5
map_group EVER_GRANDE_CITY_HALL_2 @ 16.6
map_group EVER_GRANDE_CITY_HALL_3 @ 16.7
map_group EVER_GRANDE_CITY_HALL_4 @ 16.8
map_group EVER_GRANDE_CITY_HALL_5 @ 16.9
map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_1F @ 16.10
map_group EVER_GRANDE_CITY_HALL_OF_FAME @ 16.11
map_group EVER_GRANDE_CITY_POKEMON_CENTER_1F @ 16.12
map_group EVER_GRANDE_CITY_POKEMON_CENTER_2F @ 16.13
map_group EVER_GRANDE_CITY_POKEMON_LEAGUE_2F @ 16.14
new_map_group
map_group ROUTE_104_MR_BRINEYS_HOUSE @ 17.0
map_group ROUTE_104_PRETTY_PETAL_FLOWER_SHOP @ 17.1
new_map_group
map_group ROUTE_111_WINSTRATE_FAMILYS_HOUSE @ 18.0
map_group ROUTE_111_OLD_LADYS_REST_STOP @ 18.1
new_map_group
map_group ROUTE_112_CABLE_CAR_STATION @ 19.0
map_group MT_CHIMNEY_CABLE_CAR_STATION @ 19.1
new_map_group
map_group ROUTE_114_FOSSIL_MANIACS_HOUSE @ 20.0
map_group ROUTE_114_FOSSIL_MANIACS_TUNNEL @ 20.1
map_group ROUTE_114_LANETTES_HOUSE @ 20.2
new_map_group
map_group ROUTE_116_TUNNELERS_REST_HOUSE @ 21.0
new_map_group
map_group ROUTE_117_POKEMON_DAY_CARE @ 22.0
new_map_group
map_group ROUTE_121_SAFARI_ZONE_ENTRANCE @ 23.0
new_map_group
map_group METEOR_FALLS_1F_1R @ 24.0
map_group METEOR_FALLS_1F_2R @ 24.1
map_group METEOR_FALLS_B1F_1R @ 24.2
map_group METEOR_FALLS_B1F_2R @ 24.3
map_group RUSTURF_TUNNEL @ 24.4
map_group UNDERWATER_SOOTOPOLIS_CITY @ 24.5
map_group DESERT_RUINS @ 24.6
map_group GRANITE_CAVE_1F @ 24.7
map_group GRANITE_CAVE_B1F @ 24.8
map_group GRANITE_CAVE_B2F @ 24.9
map_group GRANITE_CAVE_STEVENS_ROOM @ 24.10
map_group PETALBURG_WOODS @ 24.11
map_group MT_CHIMNEY @ 24.12
map_group JAGGED_PASS @ 24.13
map_group FIERY_PATH @ 24.14
map_group MT_PYRE_1F @ 24.15
map_group MT_PYRE_2F @ 24.16
map_group MT_PYRE_3F @ 24.17
map_group MT_PYRE_4F @ 24.18
map_group MT_PYRE_5F @ 24.19
map_group MT_PYRE_6F @ 24.20
map_group MT_PYRE_EXTERIOR @ 24.21
map_group MT_PYRE_SUMMIT @ 24.22
map_group AQUA_HIDEOUT_1F @ 24.23
map_group AQUA_HIDEOUT_B1F @ 24.24
map_group AQUA_HIDEOUT_B2F @ 24.25
map_group UNDERWATER_SEAFLOOR_CAVERN @ 24.26
map_group SEAFLOOR_CAVERN_ENTRANCE @ 24.27
map_group SEAFLOOR_CAVERN_ROOM_1 @ 24.28
map_group SEAFLOOR_CAVERN_ROOM_2 @ 24.29
map_group SEAFLOOR_CAVERN_ROOM_3 @ 24.30
map_group SEAFLOOR_CAVERN_ROOM_4 @ 24.31
map_group SEAFLOOR_CAVERN_ROOM_5 @ 24.32
map_group SEAFLOOR_CAVERN_ROOM_6 @ 24.33
map_group SEAFLOOR_CAVERN_ROOM_7 @ 24.34
map_group SEAFLOOR_CAVERN_ROOM_8 @ 24.35
map_group SEAFLOOR_CAVERN_ROOM_9 @ 24.36
map_group CAVE_OF_ORIGIN_ENTRANCE @ 24.37
map_group CAVE_OF_ORIGIN_1F @ 24.38
map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_1 @ 24.39
map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_2 @ 24.40
map_group CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP_3 @ 24.41
map_group CAVE_OF_ORIGIN_B1F @ 24.42
map_group VICTORY_ROAD_1F @ 24.43
map_group VICTORY_ROAD_B1F @ 24.44
map_group VICTORY_ROAD_B2F @ 24.45
map_group SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @ 24.46
map_group SHOAL_CAVE_LOW_TIDE_INNER_ROOM @ 24.47
map_group SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM @ 24.48
map_group SHOAL_CAVE_LOW_TIDE_LOWER_ROOM @ 24.49
map_group SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM @ 24.50
map_group SHOAL_CAVE_HIGH_TIDE_INNER_ROOM @ 24.51
map_group NEW_MAUVILLE_ENTRANCE @ 24.52
map_group NEW_MAUVILLE_INSIDE @ 24.53
map_group ABANDONED_SHIP_DECK @ 24.54
map_group ABANDONED_SHIP_CORRIDORS_1F @ 24.55
map_group ABANDONED_SHIP_ROOMS_1F @ 24.56
map_group ABANDONED_SHIP_CORRIDORS_B1F @ 24.57
map_group ABANDONED_SHIP_ROOMS_B1F @ 24.58
map_group ABANDONED_SHIP_ROOMS_2_B1F @ 24.59
map_group ABANDONED_SHIP_UNDERWATER_1 @ 24.60
map_group ABANDONED_SHIP_ROOM_B1F @ 24.61
map_group ABANDONED_SHIP_ROOMS_2_1F @ 24.62
map_group ABANDONED_SHIP_CAPTAINS_OFFICE @ 24.63
map_group ABANDONED_SHIP_UNDERWATER_2 @ 24.64
map_group ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @ 24.65
map_group ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS @ 24.66
map_group ISLAND_CAVE @ 24.67
map_group ANCIENT_TOMB @ 24.68
map_group UNDERWATER_ROUTE_134 @ 24.69
map_group UNDERWATER_SEALED_CHAMBER @ 24.70
map_group SEALED_CHAMBER_OUTER_ROOM @ 24.71
map_group SEALED_CHAMBER_INNER_ROOM @ 24.72
map_group SCORCHED_SLAB @ 24.73
map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_1 @ 24.74
map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_2 @ 24.75
map_group AQUA_HIDEOUT_UNUSED_RUBY_MAP_3 @ 24.76
map_group SKY_PILLAR_ENTRANCE @ 24.77
map_group SKY_PILLAR_OUTSIDE @ 24.78
map_group SKY_PILLAR_1F @ 24.79
map_group SKY_PILLAR_2F @ 24.80
map_group SKY_PILLAR_3F @ 24.81
map_group SKY_PILLAR_4F @ 24.82
map_group SHOAL_CAVE_LOW_TIDE_ICE_ROOM @ 24.83
map_group SKY_PILLAR_5F @ 24.84
map_group SKY_PILLAR_TOP @ 24.85
map_group MAGMA_HIDEOUT_1F @ 24.86
map_group MAGMA_HIDEOUT_2F_1R @ 24.87
map_group MAGMA_HIDEOUT_2F_2R @ 24.88
map_group MAGMA_HIDEOUT_3F_1R @ 24.89
map_group MAGMA_HIDEOUT_3F_2R @ 24.90
map_group MAGMA_HIDEOUT_4F @ 24.91
map_group MAGMA_HIDEOUT_3F_3R @ 24.92
map_group MAGMA_HIDEOUT_2F_3R @ 24.93
map_group MIRAGE_TOWER_1F @ 24.94
map_group MIRAGE_TOWER_2F @ 24.95
map_group MIRAGE_TOWER_3F @ 24.96
map_group MIRAGE_TOWER_4F @ 24.97
map_group DESERT_UNDERPASS @ 24.98
map_group ARTISAN_CAVE_B1F @ 24.99
map_group ARTISAN_CAVE_1F @ 24.100
map_group UNDERWATER_MARINE_CAVE @ 24.101
map_group MARINE_CAVE_ENTRANCE @ 24.102
map_group MARINE_CAVE_END @ 24.103
map_group TERRA_CAVE_ENTRANCE @ 24.104
map_group TERRA_CAVE_END @ 24.105
map_group ALTERING_CAVE @ 24.106
map_group METEOR_FALLS_STEVENS_CAVE @ 24.107
new_map_group
map_group SECRET_BASE_RED_CAVE_1 @ 25.0
map_group SECRET_BASE_BROWN_CAVE_1 @ 25.1
map_group SECRET_BASE_BLUE_CAVE_1 @ 25.2
map_group SECRET_BASE_YELLOW_CAVE_1 @ 25.3
map_group SECRET_BASE_TREE_1 @ 25.4
map_group SECRET_BASE_SHRUB_1 @ 25.5
map_group SECRET_BASE_RED_CAVE_2 @ 25.6
map_group SECRET_BASE_BROWN_CAVE_2 @ 25.7
map_group SECRET_BASE_BLUE_CAVE_2 @ 25.8
map_group SECRET_BASE_YELLOW_CAVE_2 @ 25.9
map_group SECRET_BASE_TREE_2 @ 25.10
map_group SECRET_BASE_SHRUB_2 @ 25.11
map_group SECRET_BASE_RED_CAVE_3 @ 25.12
map_group SECRET_BASE_BROWN_CAVE_3 @ 25.13
map_group SECRET_BASE_BLUE_CAVE_3 @ 25.14
map_group SECRET_BASE_YELLOW_CAVE_3 @ 25.15
map_group SECRET_BASE_TREE_3 @ 25.16
map_group SECRET_BASE_SHRUB_3 @ 25.17
map_group SECRET_BASE_RED_CAVE_4 @ 25.18
map_group SECRET_BASE_BROWN_CAVE_4 @ 25.19
map_group SECRET_BASE_BLUE_CAVE_4 @ 25.20
map_group SECRET_BASE_YELLOW_CAVE_4 @ 25.21
map_group SECRET_BASE_TREE_4 @ 25.22
map_group SECRET_BASE_SHRUB_4 @ 25.23
map_group SINGLE_BATTLE_COLOSSEUM @ 25.24
map_group TRADE_CENTER @ 25.25
map_group RECORD_CORNER @ 25.26
map_group DOUBLE_BATTLE_COLOSSEUM @ 25.27
map_group LINK_CONTEST_ROOM_1 @ 25.28
map_group UNKNOWN_MAP_25_29 @ 25.29
map_group UNKNOWN_MAP_25_30 @ 25.30
map_group UNKNOWN_MAP_25_31 @ 25.31
map_group UNKNOWN_MAP_25_32 @ 25.32
map_group UNKNOWN_MAP_25_33 @ 25.33
map_group UNKNOWN_MAP_25_34 @ 25.34
map_group LINK_CONTEST_ROOM_2 @ 25.35
map_group LINK_CONTEST_ROOM_3 @ 25.36
map_group LINK_CONTEST_ROOM_4 @ 25.37
map_group LINK_CONTEST_ROOM_5 @ 25.38
map_group LINK_CONTEST_ROOM_6 @ 25.39
map_group INSIDE_OF_TRUCK @ 25.40
map_group SS_TIDAL_CORRIDOR @ 25.41
map_group SS_TIDAL_LOWER_DECK @ 25.42
map_group SS_TIDAL_ROOMS @ 25.43
map_group BATTLE_PYRAMID_SQUARE_01 @ 25.44
map_group BATTLE_PYRAMID_SQUARE_02 @ 25.45
map_group BATTLE_PYRAMID_SQUARE_03 @ 25.46
map_group BATTLE_PYRAMID_SQUARE_04 @ 25.47
map_group BATTLE_PYRAMID_SQUARE_05 @ 25.48
map_group BATTLE_PYRAMID_SQUARE_06 @ 25.49
map_group BATTLE_PYRAMID_SQUARE_07 @ 25.50
map_group BATTLE_PYRAMID_SQUARE_08 @ 25.51
map_group BATTLE_PYRAMID_SQUARE_09 @ 25.52
map_group BATTLE_PYRAMID_SQUARE_10 @ 25.53
map_group BATTLE_PYRAMID_SQUARE_11 @ 25.54
map_group BATTLE_PYRAMID_SQUARE_12 @ 25.55
map_group BATTLE_PYRAMID_SQUARE_13 @ 25.56
map_group BATTLE_PYRAMID_SQUARE_14 @ 25.57
map_group BATTLE_PYRAMID_SQUARE_15 @ 25.58
map_group BATTLE_PYRAMID_SQUARE_16 @ 25.59
map_group UNION_ROOM @ 25.60
new_map_group
map_group SAFARI_ZONE_NORTHWEST @ 26.0
map_group SAFARI_ZONE_NORTH @ 26.1
map_group SAFARI_ZONE_SOUTHWEST @ 26.2
map_group SAFARI_ZONE_SOUTH @ 26.3
map_group BATTLE_FRONTIER_OUTSIDE_WEST @ 26.4
map_group BATTLE_FRONTIER_BATTLE_TOWER_LOBBY @ 26.5
map_group BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR @ 26.6
map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR @ 26.7
map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM @ 26.8
map_group SOUTHERN_ISLAND_EXTERIOR @ 26.9
map_group SOUTHERN_ISLAND_INTERIOR @ 26.10
map_group SAFARI_ZONE_REST_HOUSE @ 26.11
map_group SAFARI_ZONE_NORTHEAST @ 26.12
map_group SAFARI_ZONE_SOUTHEAST @ 26.13
map_group BATTLE_FRONTIER_OUTSIDE_EAST @ 26.14
map_group BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM @ 26.15
map_group BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2 @ 26.16
map_group BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM_2 @ 26.17
map_group BATTLE_FRONTIER_BATTLE_DOME_LOBBY @ 26.18
map_group BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR @ 26.19
map_group BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM @ 26.20
map_group BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM @ 26.21
map_group BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @ 26.22
map_group BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR @ 26.23
map_group BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM @ 26.24
map_group BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY @ 26.25
map_group BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE @ 26.26
map_group BATTLE_FRONTIER_BATTLE_PYRAMID_TOP @ 26.27
map_group BATTLE_FRONTIER_BATTLE_ARENA_LOBBY @ 26.28
map_group BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR @ 26.29
map_group BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM @ 26.30
map_group BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY @ 26.31
map_group BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM @ 26.32
map_group BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @ 26.33
map_group BATTLE_FRONTIER_BATTLE_PIKE_LOBBY @ 26.34
map_group BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR @ 26.35
map_group BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM @ 26.36
map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 @ 26.37
map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_2 @ 26.38
map_group BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_3 @ 26.39
map_group BATTLE_FRONTIER_RANKING_HALL @ 26.40
map_group BATTLE_FRONTIER_LOUNGE_1 @ 26.41
map_group BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER @ 26.42
map_group BATTLE_FRONTIER_LOUNGE_2 @ 26.43
map_group BATTLE_FRONTIER_LOUNGE_3 @ 26.44
map_group BATTLE_FRONTIER_LOUNGE_4 @ 26.45
map_group BATTLE_FRONTIER_SCOTTS_HOUSE @ 26.46
map_group BATTLE_FRONTIER_LOUNGE_5 @ 26.47
map_group BATTLE_FRONTIER_LOUNGE_6 @ 26.48
map_group BATTLE_FRONTIER_LOUNGE_7 @ 26.49
map_group BATTLE_FRONTIER_RECEPTION_GATE @ 26.50
map_group BATTLE_FRONTIER_LOUNGE_8 @ 26.51
map_group BATTLE_FRONTIER_LOUNGE_9 @ 26.52
map_group BATTLE_FRONTIER_POKEMON_CENTER_1F @ 26.53
map_group BATTLE_FRONTIER_POKEMON_CENTER_2F @ 26.54
map_group BATTLE_FRONTIER_MART @ 26.55
map_group FARAWAY_ISLAND_ENTRANCE @ 26.56
map_group FARAWAY_ISLAND_INTERIOR @ 26.57
map_group BIRTH_ISLAND_EXTERIOR @ 26.58
map_group BIRTH_ISLAND_HARBOR @ 26.59
map_group TRAINER_HILL_ENTRANCE @ 26.60
map_group TRAINER_HILL_1F @ 26.61
map_group TRAINER_HILL_2F @ 26.62
map_group TRAINER_HILL_3F @ 26.63
map_group TRAINER_HILL_4F @ 26.64
map_group TRAINER_HILL_ROOF @ 26.65
map_group NAVEL_ROCK_EXTERIOR @ 26.66
map_group NAVEL_ROCK_HARBOR @ 26.67
map_group NAVEL_ROCK_ENTRANCE @ 26.68
map_group NAVEL_ROCK_B1F @ 26.69
map_group NAVEL_ROCK_FORK @ 26.70
map_group NAVEL_ROCK_UP_1 @ 26.71
map_group NAVEL_ROCK_UP_2 @ 26.72
map_group NAVEL_ROCK_UP_3 @ 26.73
map_group NAVEL_ROCK_UP_4 @ 26.74
map_group NAVEL_ROCK_TOP @ 26.75
map_group NAVEL_ROCK_DOWN_01 @ 26.76
map_group NAVEL_ROCK_DOWN_02 @ 26.77
map_group NAVEL_ROCK_DOWN_03 @ 26.78
map_group NAVEL_ROCK_DOWN_04 @ 26.79
map_group NAVEL_ROCK_DOWN_05 @ 26.80
map_group NAVEL_ROCK_DOWN_06 @ 26.81
map_group NAVEL_ROCK_DOWN_07 @ 26.82
map_group NAVEL_ROCK_DOWN_08 @ 26.83
map_group NAVEL_ROCK_DOWN_09 @ 26.84
map_group NAVEL_ROCK_DOWN_10 @ 26.85
map_group NAVEL_ROCK_DOWN_11 @ 26.86
map_group NAVEL_ROCK_BOTTOM @ 26.87
map_group TRAINER_HILL_ELEVATOR @ 26.88
new_map_group
map_group ROUTE_104_PROTOTYPE @ 27.0
map_group ROUTE_104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP @ 27.1
new_map_group
map_group ROUTE_109_SEASHORE_HOUSE @ 28.0
new_map_group
map_group ROUTE_110_TRICK_HOUSE_ENTRANCE @ 29.0
map_group ROUTE_110_TRICK_HOUSE_END @ 29.1
map_group ROUTE_110_TRICK_HOUSE_CORRIDOR @ 29.2
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_1 @ 29.3
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_2 @ 29.4
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_3 @ 29.5
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_4 @ 29.6
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_5 @ 29.7
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_6 @ 29.8
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_7 @ 29.9
map_group ROUTE_110_TRICK_HOUSE_PUZZLE_8 @ 29.10
map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_1 @ 29.11
map_group ROUTE_110_SEASIDE_CYCLING_ROAD_ENTRANCE_2 @ 29.12
new_map_group
map_group ROUTE_113_GLASS_WORKSHOP @ 30.0
new_map_group
map_group ROUTE_123_BERRY_MASTERS_HOUSE @ 31.0
new_map_group
map_group ROUTE_119_WEATHER_INSTITUTE_1F @ 32.0
map_group ROUTE_119_WEATHER_INSTITUTE_2F @ 32.1
map_group ROUTE_119_HOUSE @ 32.2
new_map_group
map_group ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE @ 33.0
data/battle_ai_scripts.s
+3 -3
View File
@@ -3382,11 +3382,11 @@ AI_Safari_Flee:
flee
AI_FirstBattle:
if_hp_equal AI_TARGET, 20, BattleAIScript_82DE34D
if_hp_less_than AI_TARGET, 20, BattleAIScript_82DE34D
if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee
if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee
end
BattleAIScript_82DE34D:
AI_FirstBattle_Flee:
flee
AI_Ret:
data/battle_frontier_2.s
+21 -18
View File
@@ -1,5 +1,6 @@
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -1049,8 +1050,10 @@ gUnknown_08611D08:: @ 8611D08
.4byte gUnknown_085EE3C4
.align 1
gUnknown_08611D30:: @ 8611D30
.2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000
gFacilityToBrainTrainerId:: @ 8611D30
.2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER
.2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY
.2byte TRAINER_BRANDON
.align 2
gUnknown_08611D40:: @ 8611D40
@@ -1454,43 +1457,43 @@ gUnknown_08612690:: @ 8612690
.4byte 0x00000400, 0x00000800
gUnknown_08612698:: @ 8612698
step_94
step_right
step_95
store_lock_anim
walk_right
free_unlock_anim
step_end
gUnknown_0861269C:: @ 861269C
step_94
step_down
step_95
store_lock_anim
walk_down
free_unlock_anim
step_end
gUnknown_086126A0:: @ 86126A0
step_94
step_left
step_95
store_lock_anim
walk_left
free_unlock_anim
step_end
gUnknown_086126A4:: @ 86126A4
step_94
step_up
step_95
store_lock_anim
walk_up
free_unlock_anim
step_end
gUnknown_086126A8:: @ 86126A8
step_03
face_right
step_end
gUnknown_086126AA:: @ 86126AA
step_00
face_down
step_end
gUnknown_086126AC:: @ 86126AC
step_02
face_left
step_end
gUnknown_086126AE:: @ 86126AE
step_01
face_up
step_end
@ 86126B0
data/battle_scripts_1.s
+16 -16
View File
@@ -2873,7 +2873,7 @@ BattleScript_FaintedMonTryChooseAnother::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
@@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
atk62 BS_ATTACKER
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, 0x0
waitstate
switchineffects BS_ATTACKER
@@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
atk62 BS_FAINTED
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
various7 BS_ATTACKER
@@ -2933,7 +2933,7 @@ BattleScript_82DA908::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
atk62 BS_FAINTED
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
switchineffects 5
@@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
BattleScript_LocalBattleLost::
jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
@@ -3120,10 +3120,10 @@ BattleScript_PursuitSwitchDmgSetMultihit::
setmultihit 0x2
BattleScript_PursuitSwitchDmgLoop::
jumpifnopursuitswitchdmg BattleScript_DoSwitchOut
atk5F
swapattackerwithtarget
trysetdestinybondtohappen
call BattleScript_PursuitDmgOnSwitchOut
atk5F
swapattackerwithtarget
BattleScript_DoSwitchOut::
decrementmultihit BattleScript_PursuitSwitchDmgLoop
switchoutabilities BS_ATTACKER
@@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
atk62 BS_ATTACKER
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, FALSE
waitstate
switchineffects BS_ATTACKER
@@ -3230,7 +3230,7 @@ BattleScript_DamagingWeatherContinues::
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
printfromtable gSandStormHailDmgStringIds
@@ -3710,12 +3710,12 @@ BattleScript_MagicCoatBounce::
BattleScript_SnatchedMove::
attackstring
ppreduce
snatchsetbanks
snatchsetbattlers
playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
printstring STRINGID_PKMNSNATCHEDMOVE
waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
atk5F
swapattackerwithtarget
return
BattleScript_EnduredMsg::
@@ -3991,7 +3991,7 @@ BattleScript_DrizzleActivates::
pause 0x20
printstring STRINGID_PKMNMADEITRAIN
waitstate
playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4019,7 +4019,7 @@ BattleScript_SandstreamActivates::
pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4085,7 +4085,7 @@ BattleScript_DroughtActivates::
pause 0x20
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4561,8 +4561,8 @@ BattleScript_82DB973::
end2
BattleScript_82DB992::
various16 BS_BANK_0
various17 BS_BANK_0
various16 BS_BATTLER_0
various17 BS_BATTLER_0
various9 BS_ATTACKER
various15 BS_ATTACKER
printstring STRINGID_TIEDOPPONENTBYREFEREE
data/battle_scripts_2.s
+5 -5
View File
@@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58
.4byte BattleScript_ActionWatchesCarefully
.4byte BattleScript_ActionGetNear
.4byte BattleScript_ActionThrowPokeblock
.4byte BattleScript_82DBEE3
.4byte BattleScript_ActionWallyThrow
BattleScript_BallThrow::
jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
@@ -176,17 +176,17 @@ BattleScript_RunByUsingItem::
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
BattleScript_ActionWatchesCarefully::
BattleScript_ActionWatchesCarefully:
printstring STRINGID_PKMNWATCHINGCAREFULLY
waitmessage 0x40
end2
BattleScript_ActionGetNear::
BattleScript_ActionGetNear:
printfromtable gSafariGetNearStringIds
waitmessage 0x40
end2
BattleScript_ActionThrowPokeblock::
BattleScript_ActionThrowPokeblock:
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_x4, NULL
@@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock::
waitmessage 0x40
end2
BattleScript_82DBEE3::
BattleScript_ActionWallyThrow:
printstring STRINGID_RETURNMON
waitmessage 0x40
returnatktoball
data/battle_tent.s
-51
View File
@@ -1,51 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_086160B4:: @ 86160B4
.4byte sub_81B99D4
.4byte sub_81B9A28
.4byte sub_81B9A44
.4byte sub_81B9A60
.4byte sub_81B9A90
.4byte sub_81B9ABC
.4byte sub_81B9B00
.4byte sub_81B9B28
.align 2
gUnknown_086160D4:: @ 86160D4
.4byte 0x00000008
.align 2
gUnknown_086160D8:: @ 86160D8
.4byte sub_81B9BA0
.4byte sub_81B9BF4
.4byte sub_81B9C10
.4byte sub_81B9C2C
.4byte sub_81B9C70
.4byte sub_81B9C98
.4byte sub_81B9CF0
.align 2
gUnknown_086160F4:: @ 86160F4
.4byte 0x00000015
.align 2
gUnknown_086160F8:: @ 86160F8
.4byte sub_81B9D28
.4byte sub_81B9D7C
.4byte sub_81B9D98
.4byte sub_81B9DB4
.4byte sub_81B9DF8
.4byte sub_81B9E20
.4byte sub_81B9E78
.4byte sub_81B9E88
.4byte sub_81BA040
.4byte sub_81B9EC0
.align 2
gUnknown_08616120:: @ 8616120
.4byte 0x00000017
data/cable_car.s
+7 -7
View File
@@ -1,4 +1,4 @@
#include "constants/map_objects.h"
#include "constants/event_objects.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -80,14 +80,14 @@ gSpriteTemplate_85CDBCC:: @ 85CDBCC
spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58
gCableCarPlayerGraphicsIDs:: @ 85CDBE4
.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
.byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
.byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
.byte MAP_OBJ_GFX_HIKER
.byte MAP_OBJ_GFX_CAMPER
.byte MAP_OBJ_GFX_PICNICKER
.byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used
.byte EVENT_OBJ_GFX_HIKER
.byte EVENT_OBJ_GFX_CAMPER
.byte EVENT_OBJ_GFX_PICNICKER
.byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used
.align 1
gMtChimneyHikerCoords:: @ 85CDBEA
data/data2b.s
+3 -7
View File
@@ -235,7 +235,7 @@ gUnknown_082FF704:: @ 82FF704
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082FF70C:: @ 82FF70C
gPlayerMonSpriteAnimsTable:: @ 82FF70C
.4byte gUnknown_082FF6EC
.4byte gUnknown_082FF6F4
.4byte gUnknown_082FF6FC
@@ -4684,7 +4684,7 @@ gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gUnknown_0831AA08:: @ 831AA08
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
@@ -4743,7 +4743,7 @@ gUnknown_0831AAE0:: @ 831AAE0
null_window_template
.align 2
gUnknown_0831ABA0:: @ 831ABA0
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
@@ -4862,7 +4862,3 @@ gUnknown_0831ACC4:: @ 831ACC4
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4
.align 2
gUnknown_0831ACE0:: @ 831ACE0
.byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00
data/event_scripts.s
+636 -635
View File
File diff suppressed because it is too large Load Diff
data/field_effect_misc.s
+3 -3
View File
@@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78
.align 2
gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
.incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
.align 2
gSpriteImage_858DC38:: @ 858DC38
@@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138
.align 2
gFieldEffectObjectPalette8:: @ 858E1B8
.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
.incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
.align 2
gSpriteImage_858E1D8:: @ 858E1D8
@@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C
.align 2
gUnknown_0858E880:: @ 858E880
spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/field_effect_scripts.s
+7 -7
View File
@@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown30
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
.4byte gFieldEffectScript_ExclamationMarkIcon2
.4byte gFieldEffectScript_QuestionMarkIcon
.4byte gFieldEffectScript_FeetInFlowingWater
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
@@ -74,15 +74,15 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown66
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_callnative FldEff_ExclamationMarkIcon1
field_eff_callnative FldEff_ExclamationMarkIcon
field_eff_end
gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
field_eff_callnative sub_80D3A6C
field_eff_callnative FldEff_UseCutOnGrass
field_eff_end
gFieldEffectScript_UseCutOnTree:: @ 82DBAEC
field_eff_callnative sub_80D3ABC
field_eff_callnative FldEff_UseCutOnTree
field_eff_end
gFieldEffectScript_Shadow:: @ 82DBAF2
@@ -206,8 +206,8 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9
field_eff_callnative FldEff_FlyIn
field_eff_end
gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
field_eff_callnative FldEff_ExclamationMarkIcon2
gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
field_eff_callnative FldEff_QuestionMarkIcon
field_eff_end
gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
@@ -308,7 +308,7 @@ gFieldEffectScript_Unknown57:: @ 82DBCB8
field_eff_end
gFieldEffectScript_Unknown58:: @ 82DBCC2
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
field_eff_end
gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
data/field_ground_effect.s
-63
View File
@@ -4,66 +4,3 @@
.section .rodata
.align 2, 0
gUnknown_0850E5DC:: @ 850E5DC
.4byte 0x00000020, 0x00000010
gUnknown_0850E5E4:: @ 850E5E4
.4byte MetatileBehavior_IsTallGrass
.4byte MetatileBehavior_IsLongGrass
.4byte MetatileBehavior_IsPuddle
.4byte MetatileBehavior_IsSurfableWaterOrUnderwater
.4byte MetatileBehavior_IsShallowFlowingWater
.4byte ShouldDoJumpLandingDustEffect
gUnknown_0850E5FC:: @ 850E5FC
.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
gUnknown_0850E614:: @ 850E614
.4byte MetatileBehavior_IsJumpSouth
.4byte MetatileBehavior_IsJumpNorth
.4byte MetatileBehavior_IsJumpWest
.4byte MetatileBehavior_IsJumpEast
gUnknown_0850E624:: @ 850E624
.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
gUnknown_0850E634:: @ 850E634
.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
gUnknown_0850E644:: @ 850E644
.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
gUnknown_0850E654:: @ 850E654
.4byte DoTracksGroundEffect_None
.4byte DoTracksGroundEffect_Footprints
.4byte DoTracksGroundEffect_BikeTireTracks
gUnknown_0850E660:: @ 850E660
.byte 13, 0
.byte 24, 0
gUnknown_0850E664:: @ 850E664
.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
gUnknown_0850E674:: @ 850E674
.4byte GroundEffect_SpawnOnTallGrass
.4byte GroundEffect_StepOnTallGrass
.4byte GroundEffect_SpawnOnLongGrass
.4byte GroundEffect_StepOnLongGrass
.4byte GroundEffect_WaterReflection
.4byte GroundEffect_IceReflection
.4byte GroundEffect_FlowingWater
.4byte GroundEffect_SandTracks
.4byte GroundEffect_DeepSandTracks
.4byte GroundEffect_Ripple
.4byte GroundEffect_StepOnPuddle
.4byte GroundEffect_SandHeap
.4byte GroundEffect_JumpOnTallGrass
.4byte GroundEffect_JumpOnLongGrass
.4byte GroundEffect_JumpOnShallowWater
.4byte GroundEffect_JumpOnWater
.4byte GroundEffect_JumpLandingDust
.4byte GroundEffect_ShortGrass
.4byte GroundEffect_HotSprings
.4byte GroundEffect_Seaweed
data/field_map_obj.s
-1731
View File
File diff suppressed because it is too large Load Diff
data/fldeff_cut.s
-32
View File
@@ -1,32 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0857C608:: @ 857C608
.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00
gUnknown_0857C648:: @ 857C648
.2byte 0
.2byte 0
.2byte 0x1401
.2byte 0
gUnknown_0857C650:: @ 857C650
obj_image_anim_frame 0, 0x1E
obj_image_anim_jump 0
gUnknown_0857C658:: @ 857C658
.4byte gUnknown_0857C650
gUnknown_0857C65C:: @ 857C65C
obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
.align 2
gFieldEffectObjectPaletteInfo6:: @ 857C664
obj_pal gFieldEffectObjectPalette6, 0x1000
gUnknown_0857C66C:: @ 857C66C
spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8
data/graphics.s
+4 -4
View File
@@ -2895,19 +2895,19 @@ gUnknown_08D85620:: @ 8D85620
@ dome anim pals
.align 2
gUnknown_08D85640:: @ 8D85640
gTilesetAnims_BattleDomePals0_0:: @ 8D85640
.incbin "graphics/battle_frontier/dome_anim1.gbapal"
.align 2
gUnknown_08D85660:: @ 8D85660
gTilesetAnims_BattleDomePals0_1:: @ 8D85660
.incbin "graphics/battle_frontier/dome_anim2.gbapal"
.align 2
gUnknown_08D85680:: @ 8D85680
gTilesetAnims_BattleDomePals0_2:: @ 8D85680
.incbin "graphics/battle_frontier/dome_anim3.gbapal"
.align 2
gUnknown_08D856A0:: @ 8D856A0
gTilesetAnims_BattleDomePals0_3:: @ 8D856A0
.incbin "graphics/battle_frontier/dome_anim4.gbapal"
@ 8D856C0
data/graphics/field_objects/berry_tree_graphics_tables.inc
-635
View File
@@ -1,635 +0,0 @@
.align 2
gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PechaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Pecha:: @ 850BE90
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_KelpsyBerryTree_0, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_1, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_2, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_3, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_WepearBerryTree_0, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_1, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_2, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_3, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Wepear:: @ 850BF30
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_IapapaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_CheriBerryTree_0, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_1, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_2, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_3, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_FigyBerryTree_0, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_1, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_2, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_3, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Figy:: @ 850C020
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_MagoBerryTree:: @ 850C028
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_MagoBerryTree_0, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_1, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_2, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_3, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Mago:: @ 850C070
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_LumBerryTree:: @ 850C078
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LumBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Lum:: @ 850C0C0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_RazzBerryTree_0, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_1, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_2, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_3, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Razz:: @ 850C110
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_GrepaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Grepa:: @ 850C160
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_RabutaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_NomelBerryTree_0, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_1, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_2, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_3, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Nomel:: @ 850C200
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LeppaBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Leppa:: @ 850C250
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LiechiBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_HondewBerryTree_0, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_1, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_2, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_3, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0
berry_tree_palette_slot_table 5
.align 2
gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_AguavBerryTree_0, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_1, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_2, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_3, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Aguav:: @ 850C340
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_WikiBerryTree:: @ 850C348
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_WikiBerryTree_0, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_1, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_2, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_3, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Wiki:: @ 850C390
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_PomegBerryTree:: @ 850C398
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PomegBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_RawstBerryTree_0, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_1, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_2, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_3, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Rawst:: @ 850C430
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_SpelonBerryTree_0, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_1, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_2, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_3, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Spelon:: @ 850C480
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_ChestoBerryTree_0, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_1, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_2, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_3, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_OranBerryTree_0, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_1, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_2, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_3, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Oran:: @ 850C520
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_PersimBerryTree:: @ 850C528
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PersimBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Persim:: @ 850C570
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_SitrusBerryTree_0, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_1, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_2, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_3, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_AspearBerryTree_0, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_1, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_2, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_3, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Aspear:: @ 850C610
berry_tree_palette_slot_table 3
.align 2
gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_PamtreBerryTree_0, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_1, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_2, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_3, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Pamtre:: @ 850C660
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_CornnBerryTree:: @ 850C668
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_CornnBerryTree_0, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_1, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_2, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_3, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_LansatBerryTree_0, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_1, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_2, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_3, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Lansat:: @ 850C700
berry_tree_palette_slot_table 2
.align 2
gFieldObjectPicTable_DurinBerryTree:: @ 850C708
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_DurinBerryTree_0, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_1, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_2, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_3, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Durin:: @ 850C750
berry_tree_palette_slot_table 4
.align 2
gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80
obj_tiles gFieldObjectPic_TamatoBerryTree_0, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_1, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_2, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_3, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100
.align 2
gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
berry_tree_palette_slot_table 2
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2
gBerryTreePicTablePointers:: @ 850C7B0
.4byte gFieldObjectPicTable_CheriBerryTree @ Cheri
.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
.4byte gFieldObjectPicTable_PechaBerryTree @ Pecha
.4byte gFieldObjectPicTable_RawstBerryTree @ Rawst
.4byte gFieldObjectPicTable_AspearBerryTree @ Aspear
.4byte gFieldObjectPicTable_LeppaBerryTree @ Leppa
.4byte gFieldObjectPicTable_OranBerryTree @ Oran
.4byte gFieldObjectPicTable_PersimBerryTree @ Persim
.4byte gFieldObjectPicTable_LumBerryTree @ Lum
.4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus
.4byte gFieldObjectPicTable_FigyBerryTree @ Figy
.4byte gFieldObjectPicTable_WikiBerryTree @ Wiki
.4byte gFieldObjectPicTable_MagoBerryTree @ Mago
.4byte gFieldObjectPicTable_AguavBerryTree @ Aguav
.4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa
.4byte gFieldObjectPicTable_RazzBerryTree @ Razz
.4byte gFieldObjectPicTable_RazzBerryTree @ Bluk
.4byte gFieldObjectPicTable_MagoBerryTree @ Nanab
.4byte gFieldObjectPicTable_WepearBerryTree @ Wepear
.4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap
.4byte gFieldObjectPicTable_PomegBerryTree @ Pomeg
.4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy
.4byte gFieldObjectPicTable_WepearBerryTree @ Qualot
.4byte gFieldObjectPicTable_HondewBerryTree @ Hondew
.4byte gFieldObjectPicTable_GrepaBerryTree @ Grepa
.4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato
.4byte gFieldObjectPicTable_CornnBerryTree @ Cornn
.4byte gFieldObjectPicTable_PomegBerryTree @ Magost
.4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta
.4byte gFieldObjectPicTable_NomelBerryTree @ Nomel
.4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon
.4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre
.4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel
.4byte gFieldObjectPicTable_DurinBerryTree @ Durin
.4byte gFieldObjectPicTable_HondewBerryTree @ Belue
.4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi
.4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon
.4byte gFieldObjectPicTable_AguavBerryTree @ Salac
.4byte gFieldObjectPicTable_PomegBerryTree @ Petaya
.4byte gFieldObjectPicTable_GrepaBerryTree @ Apicot
.4byte gFieldObjectPicTable_LansatBerryTree @ Lansat
.4byte gFieldObjectPicTable_CornnBerryTree @ Starf
.4byte gFieldObjectPicTable_DurinBerryTree @ Enigma
.align 2
gBerryTreePaletteSlotTablePointers:: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cheri @ Cheri
.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
.4byte gBerryTreePaletteSlotTable_Pecha @ Pecha
.4byte gBerryTreePaletteSlotTable_Rawst @ Rawst
.4byte gBerryTreePaletteSlotTable_Aspear @ Aspear
.4byte gBerryTreePaletteSlotTable_Leppa @ Leppa
.4byte gBerryTreePaletteSlotTable_Oran @ Oran
.4byte gBerryTreePaletteSlotTable_Persim @ Persim
.4byte gBerryTreePaletteSlotTable_Lum @ Lum
.4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus
.4byte gBerryTreePaletteSlotTable_Figy @ Figy
.4byte gBerryTreePaletteSlotTable_Wiki @ Wiki
.4byte gBerryTreePaletteSlotTable_Mago @ Mago
.4byte gBerryTreePaletteSlotTable_Aguav @ Aguav
.4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa
.4byte gBerryTreePaletteSlotTable_Razz @ Razz
.4byte gBerryTreePaletteSlotTable_Razz @ Bluk
.4byte gBerryTreePaletteSlotTable_Mago @ Nanab
.4byte gBerryTreePaletteSlotTable_Wepear @ Wepear
.4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap
.4byte gBerryTreePaletteSlotTable_Pomeg @ Pomeg
.4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy
.4byte gBerryTreePaletteSlotTable_Wepear @ Qualot
.4byte gBerryTreePaletteSlotTable_Hondew @ Hondew
.4byte gBerryTreePaletteSlotTable_Grepa @ Grepa
.4byte gBerryTreePaletteSlotTable_Tamato @ Tamato
.4byte gBerryTreePaletteSlotTable_Cornn @ Cornn
.4byte gBerryTreePaletteSlotTable_Pomeg @ Magost
.4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta
.4byte gBerryTreePaletteSlotTable_Nomel @ Nomel
.4byte gBerryTreePaletteSlotTable_Spelon @ Spelon
.4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre
.4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel
.4byte gBerryTreePaletteSlotTable_Durin @ Durin
.4byte gBerryTreePaletteSlotTable_Hondew @ Belue
.4byte gBerryTreePaletteSlotTable_Liechi @ Liechi
.4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon
.4byte gBerryTreePaletteSlotTable_Aguav @ Salac
.4byte gBerryTreePaletteSlotTable_Pomeg @ Petaya
.4byte gBerryTreePaletteSlotTable_Grepa @ Apicot
.4byte gBerryTreePaletteSlotTable_Lansat @ Lansat
.4byte gBerryTreePaletteSlotTable_Cornn @ Starf
.4byte gBerryTreePaletteSlotTable_Durin @ Enigma
.align 2
gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma
@ extras
.4byte gBerryTreeFieldObjectGraphicsIdTable
.4byte gBerryTreeFieldObjectGraphicsIdTable
.4byte gBerryTreeFieldObjectGraphicsIdTable
data/graphics/field_objects/field_effect_object_template_pointers.inc
-39
View File
@@ -1,39 +0,0 @@
.align 2
gFieldEffectObjectTemplatePointers:: @ 85059F8
.4byte gFieldEffectObjectTemplate_ShadowSmall
.4byte gFieldEffectObjectTemplate_ShadowMedium
.4byte gFieldEffectObjectTemplate_ShadowLarge
.4byte gFieldEffectObjectTemplate_ShadowExtraLarge
.4byte gFieldEffectObjectTemplate_TallGrass
.4byte gFieldEffectObjectTemplate_Ripple
.4byte gFieldEffectObjectTemplate_Ash
.4byte gFieldEffectObjectTemplate_SurfBlob
.4byte gFieldEffectObjectTemplate_Arrow
.4byte gFieldEffectObjectTemplate_GroundImpactDust
.4byte gFieldEffectObjectTemplate_BikeHopTallGrass
.4byte gFieldEffectObjectTemplate_SandFootprints
.4byte gFieldEffectObjectTemplate_BikeHopBigSplash
.4byte gFieldEffectObjectTemplate_Splash
.4byte gFieldEffectObjectTemplate_BikeHopSmallSplash
.4byte gFieldEffectObjectTemplate_LongGrass
.4byte gFieldEffectObjectTemplate_Unknown16
.4byte gFieldEffectObjectTemplate_Unknown17
.4byte gFieldEffectObjectTemplate_Unknown18
.4byte gFieldEffectObjectTemplate_Unknown19
.4byte gFieldEffectObjectTemplate_Unknown20
.4byte gFieldEffectObjectTemplate_Unknown21
.4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle
.4byte gFieldEffectObjectTemplate_DeepSandFootprints
.4byte gFieldEffectObjectTemplate_TreeDisguise
.4byte gFieldEffectObjectTemplate_MountainDisguise
.4byte gFieldEffectObjectTemplate_Bird
.4byte gFieldEffectObjectTemplate_BikeTireTracks
.4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder
.4byte gFieldEffectObjectTemplate_Unknown29
.4byte gFieldEffectObjectTemplate_ShortGrass
.4byte gFieldEffectObjectTemplate_HotSpringsWater
.4byte gFieldEffectObjectTemplate_JumpOutOfAsh
.4byte gFieldEffectObjectTemplate_Unknown33
.4byte gFieldEffectObjectTemplate_Bubbles
.4byte gFieldEffectObjectTemplate_Unknown35
.4byte gFieldEffectObjectTemplate_Rayquaza
data/graphics/field_objects/field_effect_objects.inc
-1208
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_anims.inc
-1029
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics.inc
-6530
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics_info.inc
-4164
View File
File diff suppressed because it is too large Load Diff
data/graphics/field_objects/field_object_graphics_info_pointers.inc
-251
View File
@@ -1,251 +0,0 @@
.align 2
gFieldObjectGraphicsInfoPointers:: @ 8505620
.4byte gFieldObjectGraphicsInfo_BrendanNormal
.4byte gFieldObjectGraphicsInfo_BrendanMachBike
.4byte gFieldObjectGraphicsInfo_BrendanSurfing
.4byte gFieldObjectGraphicsInfo_BrendanFieldMove
.4byte gFieldObjectGraphicsInfo_QuintyPlump
.4byte gFieldObjectGraphicsInfo_LittleBoy1
.4byte gFieldObjectGraphicsInfo_LittleGirl1
.4byte gFieldObjectGraphicsInfo_Boy1
.4byte gFieldObjectGraphicsInfo_Girl1
.4byte gFieldObjectGraphicsInfo_Boy2
.4byte gFieldObjectGraphicsInfo_Girl2
.4byte gFieldObjectGraphicsInfo_LittleBoy2
.4byte gFieldObjectGraphicsInfo_LittleGirl2
.4byte gFieldObjectGraphicsInfo_Boy3
.4byte gFieldObjectGraphicsInfo_Girl3
.4byte gFieldObjectGraphicsInfo_Boy4
.4byte gFieldObjectGraphicsInfo_Woman1
.4byte gFieldObjectGraphicsInfo_FatMan
.4byte gFieldObjectGraphicsInfo_Woman2
.4byte gFieldObjectGraphicsInfo_Man1
.4byte gFieldObjectGraphicsInfo_Woman3
.4byte gFieldObjectGraphicsInfo_OldMan1
.4byte gFieldObjectGraphicsInfo_OldWoman1
.4byte gFieldObjectGraphicsInfo_Man2
.4byte gFieldObjectGraphicsInfo_Woman4
.4byte gFieldObjectGraphicsInfo_Man3
.4byte gFieldObjectGraphicsInfo_Woman5
.4byte gFieldObjectGraphicsInfo_Cook
.4byte gFieldObjectGraphicsInfo_Woman6
.4byte gFieldObjectGraphicsInfo_OldMan2
.4byte gFieldObjectGraphicsInfo_OldWoman2
.4byte gFieldObjectGraphicsInfo_Camper
.4byte gFieldObjectGraphicsInfo_Picnicker
.4byte gFieldObjectGraphicsInfo_Man4
.4byte gFieldObjectGraphicsInfo_Woman7
.4byte gFieldObjectGraphicsInfo_Youngster
.4byte gFieldObjectGraphicsInfo_BugCatcher
.4byte gFieldObjectGraphicsInfo_PsychicM
.4byte gFieldObjectGraphicsInfo_SchoolKidM
.4byte gFieldObjectGraphicsInfo_Maniac
.4byte gFieldObjectGraphicsInfo_HexManiac
.4byte gFieldObjectGraphicsInfo_Rayquaza1
.4byte gFieldObjectGraphicsInfo_SwimmerM
.4byte gFieldObjectGraphicsInfo_SwimmerF
.4byte gFieldObjectGraphicsInfo_BlackBelt
.4byte gFieldObjectGraphicsInfo_Beauty
.4byte gFieldObjectGraphicsInfo_Scientist1
.4byte gFieldObjectGraphicsInfo_Lass
.4byte gFieldObjectGraphicsInfo_Gentleman
.4byte gFieldObjectGraphicsInfo_Sailor
.4byte gFieldObjectGraphicsInfo_Fisherman
.4byte gFieldObjectGraphicsInfo_RunningTriathleteM
.4byte gFieldObjectGraphicsInfo_RunningTriathleteF
.4byte gFieldObjectGraphicsInfo_TuberF
.4byte gFieldObjectGraphicsInfo_TuberM
.4byte gFieldObjectGraphicsInfo_Hiker
.4byte gFieldObjectGraphicsInfo_CyclingTriathleteM
.4byte gFieldObjectGraphicsInfo_CyclingTriathleteF
.4byte gFieldObjectGraphicsInfo_Nurse
.4byte gFieldObjectGraphicsInfo_ItemBall
.4byte gFieldObjectGraphicsInfo_BerryTree
.4byte gFieldObjectGraphicsInfo_BerryTreeEarlyStages
.4byte gFieldObjectGraphicsInfo_BerryTreeLateStages
.4byte gFieldObjectGraphicsInfo_BrendanAcroBike
.4byte gFieldObjectGraphicsInfo_ProfBirch
.4byte gFieldObjectGraphicsInfo_Man5
.4byte gFieldObjectGraphicsInfo_Man6
.4byte gFieldObjectGraphicsInfo_ReporterM
.4byte gFieldObjectGraphicsInfo_ReporterF
.4byte gFieldObjectGraphicsInfo_Bard
.4byte gFieldObjectGraphicsInfo_Anabel
.4byte gFieldObjectGraphicsInfo_Tucker
.4byte gFieldObjectGraphicsInfo_Greta
.4byte gFieldObjectGraphicsInfo_Spenser
.4byte gFieldObjectGraphicsInfo_Noland
.4byte gFieldObjectGraphicsInfo_Lucy
.4byte gFieldObjectGraphicsInfo_UnusedNatuDoll
.4byte gFieldObjectGraphicsInfo_UnusedMagnemiteDoll
.4byte gFieldObjectGraphicsInfo_UnusedSquirtleDoll
.4byte gFieldObjectGraphicsInfo_UnusedWooperDoll
.4byte gFieldObjectGraphicsInfo_UnusedPikachuDoll
.4byte gFieldObjectGraphicsInfo_UnusedPorygon2Doll
.4byte gFieldObjectGraphicsInfo_CuttableTree
.4byte gFieldObjectGraphicsInfo_MartEmployee
.4byte gFieldObjectGraphicsInfo_RooftopSaleWoman
.4byte gFieldObjectGraphicsInfo_Teala
.4byte gFieldObjectGraphicsInfo_BreakableRock
.4byte gFieldObjectGraphicsInfo_PushableBoulder
.4byte gFieldObjectGraphicsInfo_MrBrineysBoat
.4byte gFieldObjectGraphicsInfo_MayNormal
.4byte gFieldObjectGraphicsInfo_MayMachBike
.4byte gFieldObjectGraphicsInfo_MayAcroBike
.4byte gFieldObjectGraphicsInfo_MaySurfing
.4byte gFieldObjectGraphicsInfo_MayFieldMove
.4byte gFieldObjectGraphicsInfo_Truck
.4byte gFieldObjectGraphicsInfo_VigorothCarryingBox
.4byte gFieldObjectGraphicsInfo_VigorothFacingAway
.4byte gFieldObjectGraphicsInfo_BirchsBag
.4byte gFieldObjectGraphicsInfo_EnemyZigzagoon
.4byte gFieldObjectGraphicsInfo_Artist
.4byte gFieldObjectGraphicsInfo_RivalBrendanNormal
.4byte gFieldObjectGraphicsInfo_RivalBrendanMachBike
.4byte gFieldObjectGraphicsInfo_RivalBrendanAcroBike
.4byte gFieldObjectGraphicsInfo_RivalBrendanSurfing
.4byte gFieldObjectGraphicsInfo_RivalBrendanFieldMove
.4byte gFieldObjectGraphicsInfo_RivalMayNormal
.4byte gFieldObjectGraphicsInfo_RivalMayMachBike
.4byte gFieldObjectGraphicsInfo_RivalMayAcroBike
.4byte gFieldObjectGraphicsInfo_RivalMaySurfing
.4byte gFieldObjectGraphicsInfo_RivalMayFieldMove
.4byte gFieldObjectGraphicsInfo_Cameraman
.4byte gFieldObjectGraphicsInfo_BrendanUnderwater
.4byte gFieldObjectGraphicsInfo_MayUnderwater
.4byte gFieldObjectGraphicsInfo_MovingBox
.4byte gFieldObjectGraphicsInfo_CableCar
.4byte gFieldObjectGraphicsInfo_Scientist2
.4byte gFieldObjectGraphicsInfo_Man7
.4byte gFieldObjectGraphicsInfo_AquaMemberM
.4byte gFieldObjectGraphicsInfo_AquaMemberF
.4byte gFieldObjectGraphicsInfo_MagmaMemberM
.4byte gFieldObjectGraphicsInfo_MagmaMemberF
.4byte gFieldObjectGraphicsInfo_Sidney
.4byte gFieldObjectGraphicsInfo_Phoebe
.4byte gFieldObjectGraphicsInfo_Glacia
.4byte gFieldObjectGraphicsInfo_Drake
.4byte gFieldObjectGraphicsInfo_Roxanne
.4byte gFieldObjectGraphicsInfo_Brawly
.4byte gFieldObjectGraphicsInfo_Wattson
.4byte gFieldObjectGraphicsInfo_Flannery
.4byte gFieldObjectGraphicsInfo_Norman
.4byte gFieldObjectGraphicsInfo_Winona
.4byte gFieldObjectGraphicsInfo_Liza
.4byte gFieldObjectGraphicsInfo_Tate
.4byte gFieldObjectGraphicsInfo_Wallace
.4byte gFieldObjectGraphicsInfo_Steven
.4byte gFieldObjectGraphicsInfo_Wally
.4byte gFieldObjectGraphicsInfo_RubySapphireLittleBoy
.4byte gFieldObjectGraphicsInfo_BrendanFishing
.4byte gFieldObjectGraphicsInfo_MayFishing
.4byte gFieldObjectGraphicsInfo_HotSpringsOldWoman
.4byte gFieldObjectGraphicsInfo_SSTidal
.4byte gFieldObjectGraphicsInfo_SubmarineShadow
.4byte gFieldObjectGraphicsInfo_PichuDoll
.4byte gFieldObjectGraphicsInfo_PikachuDoll
.4byte gFieldObjectGraphicsInfo_MarillDoll
.4byte gFieldObjectGraphicsInfo_TogepiDoll
.4byte gFieldObjectGraphicsInfo_CyndaquilDoll
.4byte gFieldObjectGraphicsInfo_ChikoritaDoll
.4byte gFieldObjectGraphicsInfo_TotodileDoll
.4byte gFieldObjectGraphicsInfo_JigglypuffDoll
.4byte gFieldObjectGraphicsInfo_MeowthDoll
.4byte gFieldObjectGraphicsInfo_ClefairyDoll
.4byte gFieldObjectGraphicsInfo_DittoDoll
.4byte gFieldObjectGraphicsInfo_SmoochumDoll
.4byte gFieldObjectGraphicsInfo_TreeckoDoll
.4byte gFieldObjectGraphicsInfo_TorchicDoll
.4byte gFieldObjectGraphicsInfo_MudkipDoll
.4byte gFieldObjectGraphicsInfo_DuskullDoll
.4byte gFieldObjectGraphicsInfo_WynautDoll
.4byte gFieldObjectGraphicsInfo_BaltoyDoll
.4byte gFieldObjectGraphicsInfo_KecleonDoll
.4byte gFieldObjectGraphicsInfo_AzurillDoll
.4byte gFieldObjectGraphicsInfo_SkittyDoll
.4byte gFieldObjectGraphicsInfo_SwabluDoll
.4byte gFieldObjectGraphicsInfo_GulpinDoll
.4byte gFieldObjectGraphicsInfo_LotadDoll
.4byte gFieldObjectGraphicsInfo_SeedotDoll
.4byte gFieldObjectGraphicsInfo_PikaCushion
.4byte gFieldObjectGraphicsInfo_RoundCushion
.4byte gFieldObjectGraphicsInfo_KissCushion
.4byte gFieldObjectGraphicsInfo_ZigzagCushion
.4byte gFieldObjectGraphicsInfo_SpinCushion
.4byte gFieldObjectGraphicsInfo_DiamondCushion
.4byte gFieldObjectGraphicsInfo_BallCushion
.4byte gFieldObjectGraphicsInfo_GrassCushion
.4byte gFieldObjectGraphicsInfo_FireCushion
.4byte gFieldObjectGraphicsInfo_WaterCushion
.4byte gFieldObjectGraphicsInfo_BigSnorlaxDoll
.4byte gFieldObjectGraphicsInfo_BigRhydonDoll
.4byte gFieldObjectGraphicsInfo_BigLaprasDoll
.4byte gFieldObjectGraphicsInfo_BigVenusaurDoll
.4byte gFieldObjectGraphicsInfo_BigCharizardDoll
.4byte gFieldObjectGraphicsInfo_BigBlastoiseDoll
.4byte gFieldObjectGraphicsInfo_BigWailmerDoll
.4byte gFieldObjectGraphicsInfo_BigRegirockDoll
.4byte gFieldObjectGraphicsInfo_BigRegiceDoll
.4byte gFieldObjectGraphicsInfo_BigRegisteelDoll
.4byte gFieldObjectGraphicsInfo_Latias
.4byte gFieldObjectGraphicsInfo_Latios
.4byte gFieldObjectGraphicsInfo_Boy5
.4byte gFieldObjectGraphicsInfo_ContestOldMan
.4byte gFieldObjectGraphicsInfo_BrendanWatering
.4byte gFieldObjectGraphicsInfo_MayWatering
.4byte gFieldObjectGraphicsInfo_BrendanDecorating
.4byte gFieldObjectGraphicsInfo_MayDecorating
.4byte gFieldObjectGraphicsInfo_Archie
.4byte gFieldObjectGraphicsInfo_Maxie
.4byte gFieldObjectGraphicsInfo_Kyogre1
.4byte gFieldObjectGraphicsInfo_Groudon1
.4byte gFieldObjectGraphicsInfo_Fossil
.4byte gFieldObjectGraphicsInfo_Regirock
.4byte gFieldObjectGraphicsInfo_Regice
.4byte gFieldObjectGraphicsInfo_Registeel
.4byte gFieldObjectGraphicsInfo_Skitty
.4byte gFieldObjectGraphicsInfo_Kecleon1
.4byte gFieldObjectGraphicsInfo_Kyogre2
.4byte gFieldObjectGraphicsInfo_Groudon2
.4byte gFieldObjectGraphicsInfo_Rayquaza2
.4byte gFieldObjectGraphicsInfo_Zigzagoon
.4byte gFieldObjectGraphicsInfo_Pikachu
.4byte gFieldObjectGraphicsInfo_Azumarill
.4byte gFieldObjectGraphicsInfo_Wingull
.4byte gFieldObjectGraphicsInfo_Kecleon2
.4byte gFieldObjectGraphicsInfo_TuberMSwimming
.4byte gFieldObjectGraphicsInfo_Azurill
.4byte gFieldObjectGraphicsInfo_Mom
.4byte gFieldObjectGraphicsInfo_LinkBrendan
.4byte gFieldObjectGraphicsInfo_LinkMay
.4byte gFieldObjectGraphicsInfo_Juan
.4byte gFieldObjectGraphicsInfo_Scott
.4byte gFieldObjectGraphicsInfo_Poochyena
.4byte gFieldObjectGraphicsInfo_Kyogre3
.4byte gFieldObjectGraphicsInfo_Groudon3
.4byte gFieldObjectGraphicsInfo_MysteryEventDeliveryman
.4byte gFieldObjectGraphicsInfo_Statue
.4byte gFieldObjectGraphicsInfo_Kirlia
.4byte gFieldObjectGraphicsInfo_Dusclops
.4byte gFieldObjectGraphicsInfo_UnionRoomAttendant
.4byte gFieldObjectGraphicsInfo_Sudowoodo
.4byte gFieldObjectGraphicsInfo_Mew
.4byte gFieldObjectGraphicsInfo_Red
.4byte gFieldObjectGraphicsInfo_Leaf
.4byte gFieldObjectGraphicsInfo_Deoxys
.4byte gFieldObjectGraphicsInfo_BirthIslandStone
.4byte gFieldObjectGraphicsInfo_Brandon
.4byte gFieldObjectGraphicsInfo_RubySapphireBrendan
.4byte gFieldObjectGraphicsInfo_RubySapphireMay
.4byte gFieldObjectGraphicsInfo_Lugia
.4byte gFieldObjectGraphicsInfo_HoOh
.align 2
gMauvilleOldManGraphicsInfoPointers:: @ 85059DC
.4byte gFieldObjectGraphicsInfo_Bard
.4byte gFieldObjectGraphicsInfo_Hipster
.4byte gFieldObjectGraphicsInfo_Trader
.4byte gFieldObjectGraphicsInfo_Storyteller
.4byte gFieldObjectGraphicsInfo_Giddy
.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1
.4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2
data/graphics/field_objects/field_object_oam.inc
-465
View File
@@ -1,465 +0,0 @@
.align 2
gFieldObjectBaseOam_8x8:: @ 85094EC
.4byte OAM_SIZE_8x8
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_16x8:: @ 85094F4
.4byte OAM_SIZE_16x8
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_16x16:: @ 85094FC
.4byte OAM_SIZE_16x16
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_32x8:: @ 8509504
.4byte OAM_SIZE_32x8
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_64x32:: @ 850950C
.4byte OAM_SIZE_64x32
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_16x32:: @ 8509514
.4byte OAM_SIZE_16x32
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_32x32:: @ 850951C
.4byte OAM_SIZE_32x32
.2byte 2 << 10 @ priority
.align 2
gFieldObjectBaseOam_64x64:: @ 8509524
.4byte OAM_SIZE_64x64
.2byte 2 << 10 @ priority
.align 2
gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
subsprite -8, -8, 2, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
subsprite -8, -8, 1, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
subsprite -8, -8, 2, 0, 16x8
subsprite -8, 0, 3, 2, 16x8
.align 2
gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
subsprite -8, -8, 2, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
subsprite -8, -8, 1, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTables_16x16:: @ 850954C
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
subsprite -8, -16, 2, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
subsprite -8, -16, 1, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 2, 4, 16x8
subsprite -8, 8, 3, 6, 16x8
.align 2
gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
subsprite -8, -16, 1, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTables_16x32:: @ 85095A0
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge
.4byte 3 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
subsprite -16, -16, 2, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
subsprite -16, -16, 1, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 2, 8, 32x8
subsprite -16, 8, 3, 12, 32x8
.align 2
gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
subsprite -16, -16, 1, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTables_32x32:: @ 85095F4
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge
.4byte 3 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge
.4byte 2 @ number of sprites
.4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
subsprite -24, -24, 2, 0, 32x8
subsprite 8, -24, 2, 4, 16x8
subsprite -24, -16, 2, 6, 32x8
subsprite 8, -16, 2, 10, 16x8
subsprite -24, -8, 2, 12, 32x8
subsprite 8, -8, 2, 16, 16x8
subsprite -24, 0, 2, 18, 32x8
subsprite 8, 0, 2, 22, 16x8
subsprite -24, 8, 2, 24, 32x8
subsprite 8, 8, 2, 28, 16x8
subsprite -24, 16, 2, 30, 32x8
subsprite 8, 16, 2, 34, 16x8
.align 2
gFieldObjectSpriteOamTables_Truck:: @ 8509654
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge
.4byte 12 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
subsprite -32, -16, 1, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTables_Unused:: @ 8509694
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
subsprite -32, -32, 1, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTables_64x64:: @ 85096D4
.4byte 0 @ number of sprites
.4byte NULL @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge
.4byte 1 @ number of sprites
.4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 32x8
subsprite -48, -12, 2, 12, 32x8
subsprite -16, -12, 2, 16, 32x8
subsprite 16, -12, 2, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 32x8
subsprite -48, -12, 1, 12, 32x8
subsprite -16, -12, 1, 16, 32x8
subsprite 16, -12, 1, 20, 32x8
subsprite -48, -4, 1, 24, 32x8
subsprite -16, -4, 1, 28, 32x8
subsprite 16, -4, 1, 32, 32x8
subsprite -48, 4, 1, 36, 32x8
subsprite -16, 4, 1, 40, 32x8
subsprite 16, 4, 1, 44, 32x8
subsprite -48, 12, 1, 48, 32x8
subsprite -16, 12, 1, 52, 32x8
subsprite 16, 12, 1, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 32x8
subsprite -48, -12, 2, 12, 32x8
subsprite -16, -12, 2, 16, 32x8
subsprite 16, -12, 2, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 32x8
subsprite -48, -12, 1, 12, 32x8
subsprite -16, -12, 1, 16, 32x8
subsprite 16, -12, 1, 20, 32x8
subsprite -48, -4, 2, 24, 32x8
subsprite -16, -4, 2, 28, 32x8
subsprite 16, -4, 2, 32, 32x8
subsprite -48, 4, 2, 36, 32x8
subsprite -16, 4, 2, 40, 32x8
subsprite 16, 4, 2, 44, 32x8
subsprite -48, 12, 2, 48, 32x8
subsprite -16, 12, 2, 52, 32x8
subsprite 16, 12, 2, 56, 32x8
.align 2
gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge
.4byte 15 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 16x8
subsprite 32, -20, 2, 10, 8x8
subsprite -48, -12, 2, 11, 32x8
subsprite -16, -12, 2, 15, 32x8
subsprite 16, -12, 2, 19, 16x8
subsprite 32, -12, 2, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 16x8
subsprite 32, -20, 1, 10, 8x8
subsprite -48, -12, 1, 11, 32x8
subsprite -16, -12, 1, 15, 32x8
subsprite 16, -12, 1, 19, 16x8
subsprite 32, -12, 1, 21, 8x8
subsprite -48, -4, 1, 22, 32x8
subsprite -16, -4, 1, 26, 32x8
subsprite 16, -4, 1, 30, 16x8
subsprite 32, -4, 1, 32, 8x8
subsprite -48, 4, 1, 33, 32x8
subsprite -16, 4, 1, 37, 32x8
subsprite 16, 4, 1, 41, 16x8
subsprite 32, 4, 1, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4
subsprite -48, -20, 2, 0, 32x8
subsprite -16, -20, 2, 4, 32x8
subsprite 16, -20, 2, 8, 16x8
subsprite 32, -20, 2, 10, 8x8
subsprite -48, -12, 2, 11, 32x8
subsprite -16, -12, 2, 15, 32x8
subsprite 16, -12, 2, 19, 16x8
subsprite 32, -12, 2, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4
subsprite -48, -20, 1, 0, 32x8
subsprite -16, -20, 1, 4, 32x8
subsprite 16, -20, 1, 8, 16x8
subsprite 32, -20, 1, 10, 8x8
subsprite -48, -12, 1, 11, 32x8
subsprite -16, -12, 1, 15, 32x8
subsprite 16, -12, 1, 19, 16x8
subsprite 32, -12, 1, 21, 8x8
subsprite -48, -4, 2, 22, 32x8
subsprite -16, -4, 2, 26, 32x8
subsprite 16, -4, 2, 30, 16x8
subsprite 32, -4, 2, 32, 8x8
subsprite -48, 4, 2, 33, 32x8
subsprite -16, 4, 2, 37, 32x8
subsprite 16, 4, 2, 41, 16x8
subsprite 32, 4, 2, 43, 8x8
.align 2
gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge
.4byte 16 @ number of sprites
.4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge
data/graphics/field_objects/field_object_pic_tables.inc
-2174
View File
File diff suppressed because it is too large Load Diff
data/layouts.inc
Executable
+441
View File
@@ -0,0 +1,441 @@
.include "data/layouts/PetalburgCity/layout.inc"
.include "data/layouts/SlateportCity/layout.inc"
.include "data/layouts/MauvilleCity/layout.inc"
.include "data/layouts/RustboroCity/layout.inc"
.include "data/layouts/FortreeCity/layout.inc"
.include "data/layouts/LilycoveCity/layout.inc"
.include "data/layouts/MossdeepCity/layout.inc"
.include "data/layouts/SootopolisCity/layout.inc"
.include "data/layouts/EverGrandeCity/layout.inc"
.include "data/layouts/LittlerootTown/layout.inc"
.include "data/layouts/OldaleTown/layout.inc"
.include "data/layouts/DewfordTown/layout.inc"
.include "data/layouts/LavaridgeTown/layout.inc"
.include "data/layouts/FallarborTown/layout.inc"
.include "data/layouts/VerdanturfTown/layout.inc"
.include "data/layouts/PacifidlogTown/layout.inc"
.include "data/layouts/Route101/layout.inc"
.include "data/layouts/Route102/layout.inc"
.include "data/layouts/Route103/layout.inc"
.include "data/layouts/Route104/layout.inc"
.include "data/layouts/Route105/layout.inc"
.include "data/layouts/Route106/layout.inc"
.include "data/layouts/Route107/layout.inc"
.include "data/layouts/Route108/layout.inc"
.include "data/layouts/Route109/layout.inc"
.include "data/layouts/Route110/layout.inc"
.include "data/layouts/Route111/layout.inc"
.include "data/layouts/Route112/layout.inc"
.include "data/layouts/Route113/layout.inc"
.include "data/layouts/Route114/layout.inc"
.include "data/layouts/Route115/layout.inc"
.include "data/layouts/Route116/layout.inc"
.include "data/layouts/Route117/layout.inc"
.include "data/layouts/Route118/layout.inc"
.include "data/layouts/Route119/layout.inc"
.include "data/layouts/Route120/layout.inc"
.include "data/layouts/Route121/layout.inc"
.include "data/layouts/Route122/layout.inc"
.include "data/layouts/Route123/layout.inc"
.include "data/layouts/Route124/layout.inc"
.include "data/layouts/Route125/layout.inc"
.include "data/layouts/Route126/layout.inc"
.include "data/layouts/Route127/layout.inc"
.include "data/layouts/Route128/layout.inc"
.include "data/layouts/Route129/layout.inc"
.include "data/layouts/UnknownMap_08417FC4/layout.inc"
.include "data/layouts/Route131/layout.inc"
.include "data/layouts/Route132/layout.inc"
.include "data/layouts/Route133/layout.inc"
.include "data/layouts/Route134/layout.inc"
.include "data/layouts/Underwater2/layout.inc"
.include "data/layouts/Underwater3/layout.inc"
.include "data/layouts/Underwater4/layout.inc"
.include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc"
.include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc"
.include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc"
.include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc"
.include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc"
.include "data/layouts/House1/layout.inc"
.include "data/layouts/House2/layout.inc"
.include "data/layouts/PokemonCenter_1F/layout.inc"
.include "data/layouts/PokemonCenter_2F/layout.inc"
.include "data/layouts/Mart/layout.inc"
.include "data/layouts/House3/layout.inc"
.include "data/layouts/DewfordTown_Gym/layout.inc"
.include "data/layouts/DewfordTown_Hall/layout.inc"
.include "data/layouts/House4/layout.inc"
.include "data/layouts/LavaridgeTown_HerbShop/layout.inc"
.include "data/layouts/LavaridgeTown_Gym_1F/layout.inc"
.include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc"
.include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc"
.include "data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc"
.include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc"
.include "data/layouts/LilycoveCity_House2/layout.inc"
.include "data/layouts/UnknownMap_08428450/layout.inc"
.include "data/layouts/VerdanturfTown_WandasHouse/layout.inc"
.include "data/layouts/PacifidlogTown_House1/layout.inc"
.include "data/layouts/PacifidlogTown_House2/layout.inc"
.include "data/layouts/PetalburgCity_Gym/layout.inc"
.include "data/layouts/HouseWithBed/layout.inc"
.include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc"
.include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc"
.include "data/layouts/UnknownMap_084294C4/layout.inc"
.include "data/layouts/UnknownMap_084294E8/layout.inc"
.include "data/layouts/SlateportCity_PokemonFanClub/layout.inc"
.include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc"
.include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc"
.include "data/layouts/Harbor/layout.inc"
.include "data/layouts/MauvilleCity_Gym/layout.inc"
.include "data/layouts/MauvilleCity_BikeShop/layout.inc"
.include "data/layouts/MauvilleCity_GameCorner/layout.inc"
.include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc"
.include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc"
.include "data/layouts/RustboroCity_Gym/layout.inc"
.include "data/layouts/RustboroCity_PokemonSchool/layout.inc"
.include "data/layouts/RustboroCity_House/layout.inc"
.include "data/layouts/RustboroCity_House1/layout.inc"
.include "data/layouts/RustboroCity_CuttersHouse/layout.inc"
.include "data/layouts/FortreeCity_House1/layout.inc"
.include "data/layouts/FortreeCity_Gym/layout.inc"
.include "data/layouts/FortreeCity_House2/layout.inc"
.include "data/layouts/Route104_MrBrineysHouse/layout.inc"
.include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc"
.include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc"
.include "data/layouts/LilycoveCity_ContestLobby/layout.inc"
.include "data/layouts/LilycoveCity_ContestHall/layout.inc"
.include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc"
.include "data/layouts/MossdeepCity_Gym/layout.inc"
.include "data/layouts/SootopolisCity_Gym_1F/layout.inc"
.include "data/layouts/SootopolisCity_Gym_B1F/layout.inc"
.include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc"
.include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc"
.include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc"
.include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc"
.include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc"
.include "data/layouts/EverGrandeCity_ShortHall/layout.inc"
.include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc"
.include "data/layouts/CableCarStation/layout.inc"
.include "data/layouts/Route114_FossilManiacsHouse/layout.inc"
.include "data/layouts/Route114_FossilManiacsTunnel/layout.inc"
.include "data/layouts/Route114_LanettesHouse/layout.inc"
.include "data/layouts/Route116_TunnelersRestHouse/layout.inc"
.include "data/layouts/Route117_PokemonDayCare/layout.inc"
.include "data/layouts/Route121_SafariZoneEntrance/layout.inc"
.include "data/layouts/MeteorFalls_1F_1R/layout.inc"
.include "data/layouts/MeteorFalls_1F_2R/layout.inc"
.include "data/layouts/MeteorFalls_B1F_1R/layout.inc"
.include "data/layouts/MeteorFalls_B1F_2R/layout.inc"
.include "data/layouts/RusturfTunnel/layout.inc"
.include "data/layouts/Underwater_SootopolisCity/layout.inc"
.include "data/layouts/DesertRuins/layout.inc"
.include "data/layouts/GraniteCave_1F/layout.inc"
.include "data/layouts/GraniteCave_B1F/layout.inc"
.include "data/layouts/GraniteCave_B2F/layout.inc"
.include "data/layouts/PetalburgWoods/layout.inc"
.include "data/layouts/MtChimney/layout.inc"
.include "data/layouts/MtPyre_1F/layout.inc"
.include "data/layouts/MtPyre_2F/layout.inc"
.include "data/layouts/MtPyre_3F/layout.inc"
.include "data/layouts/MtPyre_4F/layout.inc"
.include "data/layouts/MtPyre_5F/layout.inc"
.include "data/layouts/MtPyre_6F/layout.inc"
.include "data/layouts/AquaHideout_1F/layout.inc"
.include "data/layouts/AquaHideout_B1F/layout.inc"
.include "data/layouts/AquaHideout_B2F/layout.inc"
.include "data/layouts/Underwater_SeafloorCavern/layout.inc"
.include "data/layouts/SeafloorCavern_Entrance/layout.inc"
.include "data/layouts/SeafloorCavern_Room1/layout.inc"
.include "data/layouts/SeafloorCavern_Room2/layout.inc"
.include "data/layouts/SeafloorCavern_Room3/layout.inc"
.include "data/layouts/SeafloorCavern_Room4/layout.inc"
.include "data/layouts/SeafloorCavern_Room5/layout.inc"
.include "data/layouts/SeafloorCavern_Room6/layout.inc"
.include "data/layouts/SeafloorCavern_Room7/layout.inc"
.include "data/layouts/SeafloorCavern_Room8/layout.inc"
.include "data/layouts/SeafloorCavern_Room9/layout.inc"
.include "data/layouts/CaveOfOrigin_Entrance/layout.inc"
.include "data/layouts/CaveOfOrigin_1F/layout.inc"
.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc"
.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc"
.include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc"
.include "data/layouts/CaveOfOrigin_B1F/layout.inc"
.include "data/layouts/VictoryRoad_1F/layout.inc"
.include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc"
.include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc"
.include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc"
.include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc"
.include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc"
.include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc"
.include "data/layouts/UnknownMap_0843E6C0/layout.inc"
.include "data/layouts/UnknownMap_0843E6E4/layout.inc"
.include "data/layouts/UnknownMap_0843E708/layout.inc"
.include "data/layouts/UnknownMap_0843E72C/layout.inc"
.include "data/layouts/UnknownMap_0843E750/layout.inc"
.include "data/layouts/UnknownMap_0843E774/layout.inc"
.include "data/layouts/UnknownMap_0843E798/layout.inc"
.include "data/layouts/UnknownMap_0843E7BC/layout.inc"
.include "data/layouts/UnknownMap_0843E7E0/layout.inc"
.include "data/layouts/UnknownMap_0843E804/layout.inc"
.include "data/layouts/UnknownMap_0843E828/layout.inc"
.include "data/layouts/UnknownMap_0843E84C/layout.inc"
.include "data/layouts/UnknownMap_0843E870/layout.inc"
.include "data/layouts/UnknownMap_0843E894/layout.inc"
.include "data/layouts/NewMauville_Entrance/layout.inc"
.include "data/layouts/NewMauville_Inside/layout.inc"
.include "data/layouts/AbandonedShip_Deck/layout.inc"
.include "data/layouts/AbandonedShip_Corridors_1F/layout.inc"
.include "data/layouts/AbandonedShip_Rooms_1F/layout.inc"
.include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc"
.include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc"
.include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc"
.include "data/layouts/AbandonedShip_Underwater1/layout.inc"
.include "data/layouts/AbandonedShip_Room_B1F/layout.inc"
.include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc"
.include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc"
.include "data/layouts/AbandonedShip_Underwater2/layout.inc"
.include "data/layouts/SecretBase_RedCave1/layout.inc"
.include "data/layouts/SecretBase_BrownCave1/layout.inc"
.include "data/layouts/SecretBase_BlueCave1/layout.inc"
.include "data/layouts/SecretBase_YellowCave1/layout.inc"
.include "data/layouts/SecretBase_Tree1/layout.inc"
.include "data/layouts/SecretBase_Shrub1/layout.inc"
.include "data/layouts/SecretBase_RedCave2/layout.inc"
.include "data/layouts/SecretBase_BrownCave2/layout.inc"
.include "data/layouts/SecretBase_BlueCave2/layout.inc"
.include "data/layouts/SecretBase_YellowCave2/layout.inc"
.include "data/layouts/SecretBase_Tree2/layout.inc"
.include "data/layouts/SecretBase_Shrub2/layout.inc"
.include "data/layouts/SecretBase_RedCave3/layout.inc"
.include "data/layouts/SecretBase_BrownCave3/layout.inc"
.include "data/layouts/SecretBase_BlueCave3/layout.inc"
.include "data/layouts/SecretBase_YellowCave3/layout.inc"
.include "data/layouts/SecretBase_Tree3/layout.inc"
.include "data/layouts/SecretBase_Shrub3/layout.inc"
.include "data/layouts/SecretBase_RedCave4/layout.inc"
.include "data/layouts/SecretBase_BrownCave4/layout.inc"
.include "data/layouts/SecretBase_BlueCave4/layout.inc"
.include "data/layouts/SecretBase_YellowCave4/layout.inc"
.include "data/layouts/SecretBase_Tree4/layout.inc"
.include "data/layouts/SecretBase_Shrub4/layout.inc"
.include "data/layouts/SingleBattleColosseum/layout.inc"
.include "data/layouts/TradeCenter/layout.inc"
.include "data/layouts/RecordCorner/layout.inc"
.include "data/layouts/DoubleBattleColosseum/layout.inc"
.include "data/layouts/LinkContestRoom1/layout.inc"
.include "data/layouts/UnknownMap_25_29/layout.inc"
.include "data/layouts/UnknownMap_25_30/layout.inc"
.include "data/layouts/UnknownMap_25_31/layout.inc"
.include "data/layouts/UnknownMap_25_32/layout.inc"
.include "data/layouts/UnknownMap_25_33/layout.inc"
.include "data/layouts/UnknownMap_25_34/layout.inc"
.include "data/layouts/LinkContestRoom2/layout.inc"
.include "data/layouts/LinkContestRoom3/layout.inc"
.include "data/layouts/LinkContestRoom4/layout.inc"
.include "data/layouts/LinkContestRoom5/layout.inc"
.include "data/layouts/LinkContestRoom6/layout.inc"
.include "data/layouts/InsideOfTruck/layout.inc"
.include "data/layouts/SafariZone_Northwest/layout.inc"
.include "data/layouts/SafariZone_North/layout.inc"
.include "data/layouts/SafariZone_Southwest/layout.inc"
.include "data/layouts/SafariZone_South/layout.inc"
.include "data/layouts/UnknownMap_08447028/layout.inc"
.include "data/layouts/Route109_SeashoreHouse/layout.inc"
.include "data/layouts/Route110_TrickHouseEntrance/layout.inc"
.include "data/layouts/Route110_TrickHouseEnd/layout.inc"
.include "data/layouts/Route110_TrickHouseCorridor/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle1/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle2/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle3/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle4/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle5/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle6/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle7/layout.inc"
.include "data/layouts/Route110_TrickHousePuzzle8/layout.inc"
.include "data/layouts/FortreeCity_DecorationShop/layout.inc"
.include "data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc"
.include "data/layouts/Route130/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerLobby/layout.inc"
.include "data/layouts/BattleFrontier_OutsideWest/layout.inc"
.include "data/layouts/BattleElevator/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc"
.include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
.include "data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc"
.include "data/layouts/Route119_WeatherInstitute_1F/layout.inc"
.include "data/layouts/Route119_WeatherInstitute_2F/layout.inc"
.include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc"
.include "data/layouts/Underwater1/layout.inc"
.include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc"
.include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc"
.include "data/layouts/SSTidalCorridor/layout.inc"
.include "data/layouts/SSTidalLowerDeck/layout.inc"
.include "data/layouts/SSTidalRooms/layout.inc"
.include "data/layouts/IslandCave/layout.inc"
.include "data/layouts/AncientTomb/layout.inc"
.include "data/layouts/Underwater_Route134/layout.inc"
.include "data/layouts/Underwater_SealedChamber/layout.inc"
.include "data/layouts/SealedChamber_OuterRoom/layout.inc"
.include "data/layouts/VictoryRoad_B1F/layout.inc"
.include "data/layouts/VictoryRoad_B2F/layout.inc"
.include "data/layouts/Route104_Prototype/layout.inc"
.include "data/layouts/GraniteCave_StevensRoom/layout.inc"
.include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc"
.include "data/layouts/SouthernIsland_Exterior/layout.inc"
.include "data/layouts/SouthernIsland_Interior/layout.inc"
.include "data/layouts/JaggedPass/layout.inc"
.include "data/layouts/FieryPath/layout.inc"
.include "data/layouts/RustboroCity_Flat2_1F/layout.inc"
.include "data/layouts/RustboroCity_Flat2_2F/layout.inc"
.include "data/layouts/RustboroCity_Flat2_3F/layout.inc"
.include "data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc"
.include "data/layouts/EverGrandeCity_HallOfFame/layout.inc"
.include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc"
.include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc"
.include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc"
.include "data/layouts/MtPyre_Exterior/layout.inc"
.include "data/layouts/MtPyre_Summit/layout.inc"
.include "data/layouts/SealedChamber_InnerRoom/layout.inc"
.include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc"
.include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc"
.include "data/layouts/SootopolisCity_House1/layout.inc"
.include "data/layouts/SootopolisCity_House2/layout.inc"
.include "data/layouts/SootopolisCity_House3/layout.inc"
.include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc"
.include "data/layouts/ScorchedSlab/layout.inc"
.include "data/layouts/UnknownMap_0845A394/layout.inc"
.include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
.include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
.include "data/layouts/EverGrandeCity_Hall4/layout.inc"
.include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc"
.include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc"
.include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc"
.include "data/layouts/UnknownMap_0845D470/layout.inc"
.include "data/layouts/SkyPillar_Entrance/layout.inc"
.include "data/layouts/SkyPillar_Outside/layout.inc"
.include "data/layouts/SkyPillar_1F/layout.inc"
.include "data/layouts/SkyPillar_2F/layout.inc"
.include "data/layouts/SkyPillar_3F/layout.inc"
.include "data/layouts/SkyPillar_4F/layout.inc"
.include "data/layouts/UnknownMap_0845ECB4/layout.inc"
.include "data/layouts/MossdeepCity_StevensHouse/layout.inc"
.include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc"
.include "data/layouts/SafariZone_RestHouse/layout.inc"
.include "data/layouts/SkyPillar_5F/layout.inc"
.include "data/layouts/SkyPillar_Top/layout.inc"
.include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc"
.include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc"
.include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc"
.include "data/layouts/MagmaHideout_1F/layout.inc"
.include "data/layouts/MagmaHideout_2F_1R/layout.inc"
.include "data/layouts/MagmaHideout_2F_2R/layout.inc"
.include "data/layouts/MagmaHideout_3F_1R/layout.inc"
.include "data/layouts/MagmaHideout_3F_2R/layout.inc"
.include "data/layouts/MagmaHideout_4F/layout.inc"
.include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc"
.include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc"
.include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_OutsideEast/layout.inc"
.include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc"
.include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc"
.include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc"
.include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc"
.include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc"
.include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc"
.include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc"
.include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc"
.include "data/layouts/UnknownMap_08469200/layout.inc"
.include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc"
.include "data/layouts/UnknownMap_084693AC/layout.inc"
.include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc"
.include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc"
.include "data/layouts/BattlePyramidSquare01/layout.inc"
.include "data/layouts/BattlePyramidSquare02/layout.inc"
.include "data/layouts/BattlePyramidSquare03/layout.inc"
.include "data/layouts/BattlePyramidSquare04/layout.inc"
.include "data/layouts/BattlePyramidSquare05/layout.inc"
.include "data/layouts/BattlePyramidSquare06/layout.inc"
.include "data/layouts/BattlePyramidSquare07/layout.inc"
.include "data/layouts/BattlePyramidSquare08/layout.inc"
.include "data/layouts/BattlePyramidSquare09/layout.inc"
.include "data/layouts/BattlePyramidSquare10/layout.inc"
.include "data/layouts/BattlePyramidSquare11/layout.inc"
.include "data/layouts/BattlePyramidSquare12/layout.inc"
.include "data/layouts/BattlePyramidSquare13/layout.inc"
.include "data/layouts/BattlePyramidSquare14/layout.inc"
.include "data/layouts/BattlePyramidSquare15/layout.inc"
.include "data/layouts/BattlePyramidSquare16/layout.inc"
.include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc"
.include "data/layouts/MagmaHideout_3F_3R/layout.inc"
.include "data/layouts/MagmaHideout_2F_3R/layout.inc"
.include "data/layouts/MirageTower_1F/layout.inc"
.include "data/layouts/MirageTower_2F/layout.inc"
.include "data/layouts/MirageTower_3F/layout.inc"
.include "data/layouts/BattleTentLobby/layout.inc"
.include "data/layouts/BattleTentCorridor/layout.inc"
.include "data/layouts/BattleTentBattleRoom/layout.inc"
.include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc"
.include "data/layouts/MirageTower_4F/layout.inc"
.include "data/layouts/DesertUnderpass/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
.include "data/layouts/UnknownMap_08470BD8/layout.inc"
.include "data/layouts/UnionRoom/layout.inc"
.include "data/layouts/SafariZone_Northeast/layout.inc"
.include "data/layouts/SafariZone_Southeast/layout.inc"
.include "data/layouts/BattleFrontier_RankingHall/layout.inc"
.include "data/layouts/BattleFrontier_Lounge1/layout.inc"
.include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc"
.include "data/layouts/BattleFrontier_ReceptionGate/layout.inc"
.include "data/layouts/ArtisanCave_B1F/layout.inc"
.include "data/layouts/ArtisanCave_1F/layout.inc"
.include "data/layouts/FarawayIsland_Entrance/layout.inc"
.include "data/layouts/FarawayIsland_Interior/layout.inc"
.include "data/layouts/BirthIsland_Exterior/layout.inc"
.include "data/layouts/IslandHarbor/layout.inc"
.include "data/layouts/Underwater_MarineCave/layout.inc"
.include "data/layouts/MarineCave_Entrance/layout.inc"
.include "data/layouts/TerraCave_Entrance/layout.inc"
.include "data/layouts/TerraCave_End/layout.inc"
.include "data/layouts/Underwater6/layout.inc"
.include "data/layouts/Underwater7/layout.inc"
.include "data/layouts/Underwater5/layout.inc"
.include "data/layouts/MarineCave_End/layout.inc"
.include "data/layouts/TrainerHill_Entrance/layout.inc"
.include "data/layouts/TrainerHill_1F/layout.inc"
.include "data/layouts/TrainerHill_2F/layout.inc"
.include "data/layouts/TrainerHill_3F/layout.inc"
.include "data/layouts/TrainerHill_4F/layout.inc"
.include "data/layouts/TrainerHill_Roof/layout.inc"
.include "data/layouts/AlteringCave/layout.inc"
.include "data/layouts/NavelRock_Exterior/layout.inc"
.include "data/layouts/NavelRock_Entrance/layout.inc"
.include "data/layouts/NavelRock_Top/layout.inc"
.include "data/layouts/NavelRock_Bottom/layout.inc"
.include "data/layouts/NavelRock_LadderRoom1/layout.inc"
.include "data/layouts/NavelRock_LadderRoom2/layout.inc"
.include "data/layouts/NavelRock_B1F/layout.inc"
.include "data/layouts/NavelRock_Fork/layout.inc"
.include "data/layouts/BattleFrontier_Lounge2/layout.inc"
.include "data/layouts/BattleFrontier_ScottsHouse/layout.inc"
.include "data/layouts/MeteorFalls_StevensCave/layout.inc"
.include "data/layouts/UnknownMap_08480DAC/layout.inc"
.include "data/layouts/UnknownMap_08480F54/layout.inc"
.include "data/layouts/UnknownMap_084810FC/layout.inc"
.include "data/layouts/UnknownMap_084812A4/layout.inc"
.include "data/layouts/UnknownMap_0848144C/layout.inc"
.include "data/layouts/UnknownMap_084815F4/layout.inc"
.include "data/layouts/UnknownMap_08481B24/layout.inc"
.include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc"
.include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc"
.include "data/layouts/UnknownMap_08481DBC/layout.inc"
data/maps/AbandonedShip_CaptainsOffice/border.bin → data/layouts/AbandonedShip_CaptainsOffice/border.bin
View File
data/layouts/AbandonedShip_CaptainsOffice/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_CaptainsOffice_MapBorder::
.incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
AbandonedShip_CaptainsOffice_MapBlockdata::
.incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
.align 2
AbandonedShip_CaptainsOffice_Layout::
.4byte 0x9
.4byte 0x7
.4byte AbandonedShip_CaptainsOffice_MapBorder
.4byte AbandonedShip_CaptainsOffice_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Facility
data/maps/AbandonedShip_CaptainsOffice/map.bin → data/layouts/AbandonedShip_CaptainsOffice/map.bin
View File
data/maps/AbandonedShip_Corridors_1F/border.bin → data/layouts/AbandonedShip_Corridors_1F/border.bin
View File
data/layouts/AbandonedShip_Corridors_1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Corridors_1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
AbandonedShip_Corridors_1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
.align 2
AbandonedShip_Corridors_1F_Layout::
.4byte 0x12
.4byte 0xc
.4byte AbandonedShip_Corridors_1F_MapBorder
.4byte AbandonedShip_Corridors_1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Corridors_1F/map.bin → data/layouts/AbandonedShip_Corridors_1F/map.bin
View File
data/maps/AbandonedShip_Corridors_B1F/border.bin → data/layouts/AbandonedShip_Corridors_B1F/border.bin
View File
data/layouts/AbandonedShip_Corridors_B1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Corridors_B1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
AbandonedShip_Corridors_B1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
.align 2
AbandonedShip_Corridors_B1F_Layout::
.4byte 0xd
.4byte 0xa
.4byte AbandonedShip_Corridors_B1F_MapBorder
.4byte AbandonedShip_Corridors_B1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Corridors_B1F/map.bin → data/layouts/AbandonedShip_Corridors_B1F/map.bin
View File
data/maps/AbandonedShip_Deck/border.bin → data/layouts/AbandonedShip_Deck/border.bin
View File
data/layouts/AbandonedShip_Deck/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Deck_MapBorder::
.incbin "data/layouts/AbandonedShip_Deck/border.bin"
AbandonedShip_Deck_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Deck/map.bin"
.align 2
AbandonedShip_Deck_Layout::
.4byte 0x17
.4byte 0x15
.4byte AbandonedShip_Deck_MapBorder
.4byte AbandonedShip_Deck_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Facility
data/maps/AbandonedShip_Deck/map.bin → data/layouts/AbandonedShip_Deck/map.bin
View File
data/maps/AbandonedShip_HiddenFloorCorridors/border.bin → data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
View File
data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_HiddenFloorCorridors_MapBorder::
.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
AbandonedShip_HiddenFloorCorridors_MapBlockdata::
.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
.align 2
AbandonedShip_HiddenFloorCorridors_Layout::
.4byte 0xd
.4byte 0xb
.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_HiddenFloorCorridors/map.bin → data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
View File
data/maps/AbandonedShip_HiddenFloorRooms/border.bin → data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
View File
data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_HiddenFloorRooms_MapBorder::
.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
AbandonedShip_HiddenFloorRooms_MapBlockdata::
.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
.align 2
AbandonedShip_HiddenFloorRooms_Layout::
.4byte 0x2c
.4byte 0xf
.4byte AbandonedShip_HiddenFloorRooms_MapBorder
.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_HiddenFloorRooms/map.bin → data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
View File
data/maps/AbandonedShip_Room_B1F/border.bin → data/layouts/AbandonedShip_Room_B1F/border.bin
View File
data/layouts/AbandonedShip_Room_B1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Room_B1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
AbandonedShip_Room_B1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
.align 2
AbandonedShip_Room_B1F_Layout::
.4byte 0x9
.4byte 0x8
.4byte AbandonedShip_Room_B1F_MapBorder
.4byte AbandonedShip_Room_B1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Room_B1F/map.bin → data/layouts/AbandonedShip_Room_B1F/map.bin
View File
data/maps/AbandonedShip_Rooms2_1F/border.bin → data/layouts/AbandonedShip_Rooms2_1F/border.bin
View File
data/layouts/AbandonedShip_Rooms2_1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms2_1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
AbandonedShip_Rooms2_1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
.align 2
AbandonedShip_Rooms2_1F_Layout::
.4byte 0x9
.4byte 0x11
.4byte AbandonedShip_Rooms2_1F_MapBorder
.4byte AbandonedShip_Rooms2_1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Rooms2_1F/map.bin → data/layouts/AbandonedShip_Rooms2_1F/map.bin
View File
data/maps/AbandonedShip_Rooms2_B1F/border.bin → data/layouts/AbandonedShip_Rooms2_B1F/border.bin
View File
data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms2_B1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
AbandonedShip_Rooms2_B1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
.align 2
AbandonedShip_Rooms2_B1F_Layout::
.4byte 0x12
.4byte 0x8
.4byte AbandonedShip_Rooms2_B1F_MapBorder
.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Rooms2_B1F/map.bin → data/layouts/AbandonedShip_Rooms2_B1F/map.bin
View File
data/maps/AbandonedShip_Rooms_1F/border.bin → data/layouts/AbandonedShip_Rooms_1F/border.bin
View File
data/layouts/AbandonedShip_Rooms_1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms_1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
AbandonedShip_Rooms_1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
.align 2
AbandonedShip_Rooms_1F_Layout::
.4byte 0x12
.4byte 0x11
.4byte AbandonedShip_Rooms_1F_MapBorder
.4byte AbandonedShip_Rooms_1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Rooms_1F/map.bin → data/layouts/AbandonedShip_Rooms_1F/map.bin
View File
data/maps/AbandonedShip_Rooms_B1F/border.bin → data/layouts/AbandonedShip_Rooms_B1F/border.bin
View File
data/layouts/AbandonedShip_Rooms_B1F/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Rooms_B1F_MapBorder::
.incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
AbandonedShip_Rooms_B1F_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
.align 2
AbandonedShip_Rooms_B1F_Layout::
.4byte 0x1b
.4byte 0x8
.4byte AbandonedShip_Rooms_B1F_MapBorder
.4byte AbandonedShip_Rooms_B1F_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Rooms_B1F/map.bin → data/layouts/AbandonedShip_Rooms_B1F/map.bin
View File
data/maps/AbandonedShip_Underwater1/border.bin → data/layouts/AbandonedShip_Underwater1/border.bin
View File
data/layouts/AbandonedShip_Underwater1/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Underwater1_MapBorder::
.incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
AbandonedShip_Underwater1_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
.align 2
AbandonedShip_Underwater1_Layout::
.4byte 0x8
.4byte 0x8
.4byte AbandonedShip_Underwater1_MapBorder
.4byte AbandonedShip_Underwater1_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip
data/maps/AbandonedShip_Underwater1/map.bin → data/layouts/AbandonedShip_Underwater1/map.bin
View File
data/maps/AbandonedShip_Underwater2/border.bin → data/layouts/AbandonedShip_Underwater2/border.bin
View File
data/layouts/AbandonedShip_Underwater2/layout.inc
+15
View File
@@ -0,0 +1,15 @@
AbandonedShip_Underwater2_MapBorder::
.incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
AbandonedShip_Underwater2_MapBlockdata::
.incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
.align 2
AbandonedShip_Underwater2_Layout::
.4byte 0x15
.4byte 0x7
.4byte AbandonedShip_Underwater2_MapBorder
.4byte AbandonedShip_Underwater2_MapBlockdata
.4byte gTileset_General
.4byte gTileset_InsideShip

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