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

Split rom_81370FC and port function names

Browse Source
This commit is contained in:
Diegoisawesome
2017-12-28 02:09:11 -06:00
parent ca49f8438d
commit 2d04eb22ab
95 changed files with 2437 additions and 2381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/contest.s
+89 -67
View File
@@ -15,111 +15,127 @@ gUnknown_08587A74:: @ 8587A74
obj_tiles gUnknown_08C19450, 0x0020, 0x4e20
.align 2
gUnknown_08587A7C:: @ 8587A7C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gOamData_8587A7C:: @ 8587A7C
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gUnknown_08587A84:: @ 8587A84
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
gSpriteAffineAnim_8587A84:: @ 8587A84
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gUnknown_08587A94:: @ 8587A94
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff6, 0xfff6, 0x14ec, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
gSpriteAffineAnim_8587A94:: @ 8587A94
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20
obj_rot_scal_anim_end
.align 2
gUnknown_08587AAC:: @ 8587AAC
.2byte 0x0038, 0x0038, 0x0000, 0x0000, 0x000a, 0x000a, 0x1414, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
gSpriteAffineAnim_8587AAC:: @ 8587AAC
obj_rot_scal_anim_frame 0x38, 0x38, 0, 0
obj_rot_scal_anim_frame 0xA, 0xA, 20, 20
obj_rot_scal_anim_end
.align 2
gUnknown_08587AC4:: @ 8587AC4
.4byte gUnknown_08587A84
.4byte gUnknown_08587A94
.4byte gUnknown_08587AAC
gSpriteAffineAnimTable_8587AC4:: @ 8587AC4
.4byte gSpriteAffineAnim_8587A84
.4byte gSpriteAffineAnim_8587A94
.4byte gSpriteAffineAnim_8587AAC
.align 2
gUnknown_08587AD0:: @ 8587AD0
spr_template 0x4e20, 0xabe0, gUnknown_08587A7C, gDummySpriteAnimTable, NULL, gUnknown_08587AC4, SpriteCallbackDummy
gSpriteTemplate_8587AD0:: @ 8587AD0
spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy
.align 2
gUnknown_08587AE8:: @ 8587AE8
obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e22
obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e23
obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e24
obj_tiles gUnknown_08D8E93C, 0x0100, 0x4e25
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25
.align 2
gUnknown_08587B08:: @ 8587B08
obj_pal gUnknown_08D8ECA4, 0x4e22
obj_pal gContestPal, 0x4e22
.align 2
gUnknown_08587B10:: @ 8587B10
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
gOamData_8587B10:: @ 8587B10
.2byte 0x4000
.2byte 0x4000
.2byte 0x0000
.align 2
gUnknown_08587B18:: @ 8587B18
spr_template 0x4e22, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e23, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e24, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e25, 0x4e22, gUnknown_08587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gSpriteTemplate_8587B18:: @ 8587B18
spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587B78:: @ 8587B78
.byte 0xe4, 0xfc, 0x05, 0x00, 0x04, 0xfc, 0x45, 0x00
gSubspriteTable_8587B78:: @ 8587B78
subsprite -28, -4, 0, 0, 32x8
subsprite 4, -4, 0, 4, 32x8
.align 2
gUnknown_08587B80:: @ 8587B80
.4byte 0x00000002, gUnknown_08587B78
gSubspriteTables_8587B80:: @ 8587B80
.4byte 2, gSubspriteTable_8587B78
.align 2
gUnknown_08587B88:: @ 8587B88
obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
.align 2
gUnknown_08587B90:: @ 8587B90
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
gOamData_8587B90:: @ 8587B90
.2byte 0x0000
.2byte 0x4000
.2byte 0x0000
.align 2
gUnknown_08587B98:: @ 8587B98
spr_template 0xabe1, 0xabe0, gUnknown_08587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gSpriteTemplate_8587B98:: @ 8587B98
spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587BB0:: @ 8587BB0
obj_tiles gUnknown_08D8EAE4, 0x0400, 0xabe2
obj_tiles gContestApplauseGfx, 0x0400, 0xabe2
.align 2
gUnknown_08587BB8:: @ 8587BB8
obj_pal gUnknown_08D8ECA4, 0xabe2
obj_pal gContestPal, 0xabe2
.align 2
gUnknown_08587BC0:: @ 8587BC0
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
gOamData_8587BC0:: @ 8587BC0
.2byte 0x4000
.2byte 0xC000
.2byte 0x0000
.align 2
gUnknown_08587BC8:: @ 8587BC8
spr_template 0xabe2, 0xabe2, gUnknown_08587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gSpriteTemplate_8587BC8:: @ 8587BC8
spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587BE0:: @ 8587BE0
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x2c, 0x00, 0x00
gOamData_8587BE0:: @ 8587BE0
.2byte 0x0000
.2byte 0xC000
.2byte 0x2C00
.align 2
gUnknown_08587BE8:: @ 8587BE8
spr_template 0x4e21, 0x4e21, gUnknown_08587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gSpriteTemplate_8587BE8:: @ 8587BE8
spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587C00:: @ 8587C00
obj_tiles gUnknown_08C1C3E4, 0x0800, 0x4e21
obj_tiles gContestJudgeGfx, 0x0800, 0x4e21
.align 2
gUnknown_08587C08:: @ 8587C08
obj_tiles gUnknown_08C19284, 0x0380, 0xabe0
obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0
.align 2
gUnknown_08587C10:: @ 8587C10
obj_pal gUnknown_08C19428, 0xabe0
obj_pal gContest3Pal, 0xabe0
.align 2
gUnknown_08587C18:: @ 8587C18
gSpriteTemplate_8587C18:: @ 8587C18
spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
@@ -300,10 +316,10 @@ gUnknown_085898A4:: @ 85898A4
.align 2
gUnknown_08589904:: @ 8589904
obj_tiles gUnknown_08C0237C, 0x1000, 0x80e8
obj_tiles gUnknown_08C0237C, 0x1000, 0x80e9
obj_tiles gUnknown_08C0237C, 0x1000, 0x80ea
obj_tiles gUnknown_08C0237C, 0x1000, 0x80eb
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9
obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea
obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb
.align 2
gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here
@@ -313,29 +329,35 @@ gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is h
obj_pal gHeap + 0x1A104, 0x80eb
.align 2
gUnknown_08589944:: @ 8589944
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
gOamData_8589944:: @ 8589944
.2byte 0x0700
.2byte 0xC000
.2byte 0x0000
.align 2
gUnknown_0858994C:: @ 858994C
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
gSpriteAffineAnim_858994C:: @ 858994C
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gUnknown_0858995C:: @ 858995C
.2byte 0x0003, 0x0003, 0x0f00, 0x0000, 0xfffd, 0xfffd, 0x0f00, 0x0000, 0x0003, 0x0003, 0x0f00, 0x0000, 0xfffd, 0xfffd, 0x0f00, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
gSpriteAffineAnim_858995C:: @ 858995C
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_end
.align 2
gUnknown_08589984:: @ 8589984
.4byte gUnknown_0858994C
.4byte gUnknown_0858995C
gSpriteAffineAnimTable_8589984:: @ 8589984
.4byte gSpriteAffineAnim_858994C
.4byte gSpriteAffineAnim_858995C
.align 2
gUnknown_0858998C:: @ 858998C
spr_template 0x80e8, 0x80e8, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
spr_template 0x80e9, 0x80e9, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
spr_template 0x80ea, 0x80ea, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
spr_template 0x80eb, 0x80eb, gUnknown_08589944, gDummySpriteAnimTable, NULL, gUnknown_08589984, SpriteCallbackDummy
gSpriteTemplate_858998C:: @ 858998C
spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
.align 2
gUnknown_085899EC:: @ 85899EC
data/contest_link_80F57C4.s
+33 -30
View File
@@ -1,30 +1,31 @@
@ the third big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.align 2
gUnknown_0858D6B0:: @ 858D6B0
.incbin "graphics/unknown/unknown_58D6B0.gbapal"
.align 2
.align 2
gUnknown_0858D6D0:: @ 858D6D0
.incbin "graphics/unknown/unknown_58D6D0.4bpp"
.align 2
gUnknown_0858D7D0:: @ 858D7D0
.align 2
gMiscBlank_Pal:: @ 858D7D0
.incbin "graphics/interface/blank.gbapal"
.align 2
gUnknown_0858D7F0:: @ 858D7F0
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x2c, 0x00, 0x00
.align 2
gOamData_858D7F0:: @ 858D7F0
.2byte 0x4000
.2byte 0xC000
.2byte 0x2C00
.align 2
gUnknown_0858D7F8:: @ 858D7F8
spr_template 0x0bc1, 0x0bc1, gUnknown_0858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteTemplate_858D7F8:: @ 858D7F8
spr_template 0x0bc1, 0x0bc1, gOamData_858D7F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.align 2
gUnknown_0858D810:: @ 858D810
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc1
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc2
@@ -35,31 +36,33 @@ gUnknown_0858D810:: @ 858D810
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc7
obj_tiles gMiscBlank_Gfx, 0x0400, 0x0bc8
.align 2
.align 2
gUnknown_0858D850:: @ 858D850
obj_pal gUnknown_0858D7D0, 0x0bc1
obj_pal gMiscBlank_Pal, 0x0bc1
.align 2
gUnknown_0858D858:: @ 858D858
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.align 2
gOamData_858D858:: @ 858D858
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gUnknown_0858D860:: @ 858D860
spr_template 0x0bc9, 0x0bc9, gUnknown_0858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768
.align 2
gSpriteTemplate_858D860:: @ 858D860
spr_template 0x0bc9, 0x0bc9, gOamData_858D858, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F7768
.align 2
.align 2
gUnknown_0858D878:: @ 858D878
obj_tiles gContestConfetti_Gfx, 0x0220, 0x0bc9
.align 2
.align 2
gUnknown_0858D880:: @ 858D880
obj_pal gContestConfetti_Pal, 0x0bc9
.align 2
.align 2
gUnknown_0858D888:: @ 858D888
.4byte 0x000001e0, 0x00003181, 0x000031c2, 0x000031a3
.align 2
.align 2
gUnknown_0858D898:: @ 858D898
window_template 0x01, 0x07, 0x04, 0x0c, 0x02, 0x0f, 0x0302
window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
@@ -67,19 +70,19 @@ gUnknown_0858D898:: @ 858D898
window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
window_template_terminator
.align 2
.align 2
gUnknown_0858D8C0:: @ 858D8C0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0858D8C8:: @ 858D8C8
.align 2
gSpriteTemplate_858D8C8:: @ 858D8C8
spr_template 0x56ce, 0x0000, gUnknown_0858D8C0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.align 2
gUnknown_0858D8E0:: @ 858D8E0
obj_tiles gMiscBlank_Gfx, 0x0200, 0x56ce
.align 2
.align 2
gUnknown_0858D8E8:: @ 858D8E8
.byte 0x01, 0x0f, 0x0e, 0x00
data/event_scripts.s
+10 -10
View File
@@ -1481,7 +1481,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19
return
OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43
specialvar VAR_RESULT, sub_8139540
specialvar VAR_RESULT, IsPokerusInParty
compare VAR_RESULT, 1
goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F
compare VAR_RESULT, 0
@@ -1724,7 +1724,7 @@ EventScript_271D2A:: @ 8271D2A
copyvar VAR_0x8004, VAR_0x8008
msgbox gUnknown_08272A9A, 4
special sub_80EDCE8
special sub_8138BC8
special SetFlagInVar
releaseall
end
@@ -1761,7 +1761,7 @@ EventScript_271D89:: @ 8271D89
EventScript_271D92:: @ 8271D92
lockall
setvar VAR_0x8004, 0
special sp0D9_ComputerRelated
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_27265A, 4
goto EventScript_271DAC
@@ -1815,7 +1815,7 @@ EventScript_271E3E:: @ 8271E3E
EventScript_271E47:: @ 8271E47
setvar VAR_0x8004, 0
playse SE_PC_OFF
special sub_8138E20
special DoPCTurnOffEffect
releaseall
end
@@ -1823,7 +1823,7 @@ EventScript_271E54:: @ 8271E54
checkflag FLAG_SYS_GAME_CLEAR
goto_if 0, EventScript_271E47
playse SE_PC_LOGIN
special sub_8137C28
special AccessHallOfFamePC
waitstate
goto EventScript_271DBC
end
@@ -2202,7 +2202,7 @@ EventScript_27208F:: @ 827208F
lockall
msgbox LittlerootTown_BrendansHouse_2F_Text_1F8820, 4
fadescreen 1
special sub_8138C94
special FieldShowRegionMap
waitstate
releaseall
end
@@ -2292,7 +2292,7 @@ Route101_EventScript_27216F:: @ 827216F
Route101_EventScript_272179:: @ 8272179
copyvar VAR_0x8004, VAR_0x8009
special sub_8137C10
special ShowPokedexRatingMessage
waitmessage
waitbuttonpress
return
@@ -2300,7 +2300,7 @@ Route101_EventScript_272179:: @ 8272179
EverGrandeCity_ChampionsRoom_EventScript_272184:: @ 8272184
Route101_EventScript_272184:: @ 8272184
setvar VAR_0x8004, 0
specialvar VAR_RESULT, sub_8137A4C
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
@@ -2311,7 +2311,7 @@ Route101_EventScript_272184:: @ 8272184
compare VAR_0x800A, 0
goto_eq Route101_EventScript_27374E
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_8137A4C
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
buffernumberstring 0, VAR_0x8008
@@ -4594,7 +4594,7 @@ EventScript_275BE8:: @ 8275BE8
setfieldeffectargument 0, VAR_RESULT
setorcopyvar VAR_0x8004, VAR_RESULT
lockall
special sub_8139200
special GetSecretBaseNearbyMapName
msgbox Text_276A3D, 5
compare VAR_RESULT, 0
goto_eq EventScript_275CDE
data/rom_81370FC.s → data/field_specials.s
-66
View File
@@ -1,74 +1,8 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B27C8:: @ 85B27C8
.byte 0x01, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x02, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x03, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x05, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x06, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x07, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x08, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x09, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x04, 0x01, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x02, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x03, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x05, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x06, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x07, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x08, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x09, 0x00, 0x01
.4byte sub_81373F0
.byte 0x00, 0x00, 0x00, 0x00
.4byte NULL
.align 2
gUnknown_085B2850:: @ 85B2850
.incbin "graphics/unknown/unknown_5B2850.gbapal"
.align 2
gUnknown_085B2870:: @ 85B2870
.incbin "graphics/unknown/unknown_5B2870.gbapal"
.align 2
gUnknown_085B2890:: @ 85B2890
.incbin "graphics/unknown/unknown_5B2890.gbapal"
.align 2
gUnknown_085B28A0:: @ 85B28A0
.incbin "graphics/unknown/unknown_5B28A0.gbapal"
.align 2
gUnknown_085B28B0:: @ 85B28B0
.incbin "graphics/unknown/unknown_5B28B0.bin.lz"
.align 2
gUnknown_085B2A90:: @ 85B2A90
.incbin "graphics/unknown/unknown_5B2A90.4bpp.lz"
gUnknown_085B2B44:: @ 85B2B44
.byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01
.align 2
gUnknown_085B2B5C:: @ 85B2B5C
.byte 0x07, 0x09, 0x08, 0x0a
data/fldeff_flash.s
+81
View File
@@ -0,0 +1,81 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B27C8:: @ 85B27C8
.byte 0x01, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x02, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x03, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x05, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x06, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x07, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x08, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x09, 0x04, 0x01, 0x00
.4byte sub_81375A8
.byte 0x04, 0x01, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x02, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x03, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x05, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x06, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x07, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x08, 0x00, 0x01
.4byte sub_81373F0
.byte 0x04, 0x09, 0x00, 0x01
.4byte sub_81373F0
.byte 0x00, 0x00, 0x00, 0x00
.4byte NULL
.align 2
gCaveTransitionPalette_White:: @ 85B2850
.incbin "graphics/misc/cave_transition_white.gbapal"
.align 2
gCaveTransitionPalette_Black:: @ 85B2870
.incbin "graphics/misc/cave_transition_black.gbapal"
.align 2
gUnknown_085B2890:: @ 85B2890
.incbin "graphics/misc/85B2890.gbapal"
.align 2
gUnknown_085B28A0:: @ 85B28A0
.incbin "graphics/misc/85B28A0.gbapal"
.align 2
gCaveTransitionTilemap:: @ 85B28B0
.incbin "graphics/misc/cave_transition_map.bin.lz"
.align 2
gCaveTransitionTiles:: @ 85B2A90
.incbin "graphics/misc/cave_transition.4bpp.lz"
data/graphics.s
+7 -7
View File
@@ -120,7 +120,7 @@ gInterfacePal_PremierBall::
gOpenPokeballGfx:: @ 8C02300
.incbin "baserom.gba", 0xc02300, 0x7c
gUnknown_08C0237C:: @ 8C0237C
gBlankGfxCompressed:: @ 8C0237C
.incbin "baserom.gba", 0xc0237c, 0x7074
gUnknown_08C093F0:: @ 8C093F0
@@ -167,10 +167,10 @@ gUnknown_08C1850C:: @ 8C1850C
gUnknown_08C19168:: @ 8C19168
.incbin "baserom.gba", 0xc19168, 0x11c
gUnknown_08C19284:: @ 8C19284
gContestJudgeSymbolsGfx:: @ 8C19284
.incbin "baserom.gba", 0xc19284, 0x1a4
gUnknown_08C19428:: @ 8C19428
gContest3Pal:: @ 8C19428
.incbin "baserom.gba", 0xc19428, 0x28
gUnknown_08C19450:: @ 8C19450
@@ -197,7 +197,7 @@ gUnknown_08C1A490:: @ 8C1A490
gUnknown_08C1A564:: @ 8C1A564
.incbin "baserom.gba", 0xc1a564, 0x1E80
gUnknown_08C1C3E4:: @ 8C1C3E4
gContestJudgeGfx:: @ 8C1C3E4
.incbin "baserom.gba", 0xc1c3e4, 0x2d4
gUnknown_08C1C6B8:: @ 8C1C6B8
@@ -774,7 +774,7 @@ gUnknown_08D8D58C:: @ 8D8D58C
gUnknown_08D8DAB8:: @ 8D8DAB8
.incbin "baserom.gba", 0xd8dab8, 0xe84
gUnknown_08D8E93C:: @ 8D8E93C
gContestNextTurnGfx:: @ 8D8E93C
.incbin "baserom.gba", 0xd8e93c, 0x78
gUnknown_08D8E9B4:: @ 8D8E9B4
@@ -783,13 +783,13 @@ gUnknown_08D8E9B4:: @ 8D8E9B4
gUnknown_08D8EA34:: @ 8D8EA34
.incbin "baserom.gba", 0xd8ea34, 0xb0
gUnknown_08D8EAE4:: @ 8D8EAE4
gContestApplauseGfx:: @ 8D8EAE4
.incbin "baserom.gba", 0xd8eaE4, 0x140
gUnknown_08D8EC24:: @ 8D8EC24
.incbin "baserom.gba", 0xd8ec24, 0x80
gUnknown_08D8ECA4:: @ 8D8ECA4
gContestPal:: @ 8D8ECA4
.incbin "baserom.gba", 0xd8eca4, 0xef8
gUnknown_08D8FB9C:: @ 8D8FB9C
data/graphics/field_objects/field_object_oam.inc
+170 -170
View File
@@ -40,26 +40,26 @@ gFieldObjectBaseOam_64x64:: @ 8509524
.align 2
gFieldObjectSpriteOamTable_16x16_0:: @ 850952C
sprite_oam -8, -8, 2, 0, 16x16
subsprite -8, -8, 2, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_1:: @ 8509530
sprite_oam -8, -8, 1, 0, 16x16
subsprite -8, -8, 1, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_2:: @ 8509534
sprite_oam -8, -8, 2, 0, 16x8
sprite_oam -8, 0, 3, 2, 16x8
subsprite -8, -8, 2, 0, 16x8
subsprite -8, 0, 3, 2, 16x8
.align 2
gFieldObjectSpriteOamTable_16x16_3:: @ 850953C
sprite_oam -8, -8, 2, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16
subsprite -8, -8, 2, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTable_16x16_4:: @ 8509544
sprite_oam -8, -8, 1, 0, 16x16
sprite_oam -8, -8, 3, 0, 16x16
subsprite -8, -8, 1, 0, 16x16
subsprite -8, -8, 3, 0, 16x16
.align 2
gFieldObjectSpriteOamTables_16x16:: @ 850954C
@@ -83,27 +83,27 @@ gFieldObjectSpriteOamTables_16x16:: @ 850954C
.align 2
gFieldObjectSpriteOamTable_16x32_0:: @ 850957C
sprite_oam -8, -16, 2, 0, 16x32
subsprite -8, -16, 2, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_1:: @ 8509580
sprite_oam -8, -16, 1, 0, 16x32
subsprite -8, -16, 1, 0, 16x32
.align 2
gFieldObjectSpriteOamTable_16x32_2:: @ 8509584
sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 2, 4, 16x8
sprite_oam -8, 8, 3, 6, 16x8
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 2, 4, 16x8
subsprite -8, 8, 3, 6, 16x8
.align 2
gFieldObjectSpriteOamTable_16x32_3:: @ 8509590
sprite_oam -8, -16, 2, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16
subsprite -8, -16, 2, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTable_16x32_4:: @ 8509598
sprite_oam -8, -16, 1, 0, 16x16
sprite_oam -8, 0, 3, 4, 16x16
subsprite -8, -16, 1, 0, 16x16
subsprite -8, 0, 3, 4, 16x16
.align 2
gFieldObjectSpriteOamTables_16x32:: @ 85095A0
@@ -127,27 +127,27 @@ gFieldObjectSpriteOamTables_16x32:: @ 85095A0
.align 2
gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0
sprite_oam -16, -16, 2, 0, 32x32
subsprite -16, -16, 2, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4
sprite_oam -16, -16, 1, 0, 32x32
subsprite -16, -16, 1, 0, 32x32
.align 2
gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8
sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 2, 8, 32x8
sprite_oam -16, 8, 3, 12, 32x8
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 2, 8, 32x8
subsprite -16, 8, 3, 12, 32x8
.align 2
gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4
sprite_oam -16, -16, 2, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16
subsprite -16, -16, 2, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC
sprite_oam -16, -16, 1, 0, 32x16
sprite_oam -16, 0, 3, 8, 32x16
subsprite -16, -16, 1, 0, 32x16
subsprite -16, 0, 3, 8, 32x16
.align 2
gFieldObjectSpriteOamTables_32x32:: @ 85095F4
@@ -171,18 +171,18 @@ gFieldObjectSpriteOamTables_32x32:: @ 85095F4
.align 2
gFieldObjectSpriteOamTable_Truck_0:: @ 8509624
sprite_oam -24, -24, 2, 0, 32x8
sprite_oam 8, -24, 2, 4, 16x8
sprite_oam -24, -16, 2, 6, 32x8
sprite_oam 8, -16, 2, 10, 16x8
sprite_oam -24, -8, 2, 12, 32x8
sprite_oam 8, -8, 2, 16, 16x8
sprite_oam -24, 0, 2, 18, 32x8
sprite_oam 8, 0, 2, 22, 16x8
sprite_oam -24, 8, 2, 24, 32x8
sprite_oam 8, 8, 2, 28, 16x8
sprite_oam -24, 16, 2, 30, 32x8
sprite_oam 8, 16, 2, 34, 16x8
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
@@ -206,19 +206,19 @@ gFieldObjectSpriteOamTables_Truck:: @ 8509654
.align 2
gFieldObjectSpriteOamTable_Unused_0:: @ 8509684
sprite_oam -32, -16, 2, 0, 64x32
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_1:: @ 8509688
sprite_oam -32, -16, 1, 0, 64x32
subsprite -32, -16, 1, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_2:: @ 850968C
sprite_oam -32, -16, 2, 0, 64x32
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTable_Unused_3:: @ 8509690
sprite_oam -32, -16, 2, 0, 64x32
subsprite -32, -16, 2, 0, 64x32
.align 2
gFieldObjectSpriteOamTables_Unused:: @ 8509694
@@ -242,19 +242,19 @@ gFieldObjectSpriteOamTables_Unused:: @ 8509694
.align 2
gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4
sprite_oam -32, -32, 2, 0, 64x64
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8
sprite_oam -32, -32, 1, 0, 64x64
subsprite -32, -32, 1, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC
sprite_oam -32, -32, 2, 0, 64x64
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0
sprite_oam -32, -32, 2, 0, 64x64
subsprite -32, -32, 2, 0, 64x64
.align 2
gFieldObjectSpriteOamTables_64x64:: @ 85096D4
@@ -278,75 +278,75 @@ gFieldObjectSpriteOamTables_64x64:: @ 85096D4
.align 2
gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 32x8
sprite_oam -48, -12, 2, 12, 32x8
sprite_oam -16, -12, 2, 16, 32x8
sprite_oam 16, -12, 2, 20, 32x8
sprite_oam -48, -4, 2, 24, 32x8
sprite_oam -16, -4, 2, 28, 32x8
sprite_oam 16, -4, 2, 32, 32x8
sprite_oam -48, 4, 2, 36, 32x8
sprite_oam -16, 4, 2, 40, 32x8
sprite_oam 16, 4, 2, 44, 32x8
sprite_oam -48, 12, 2, 48, 32x8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
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
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 32x8
sprite_oam -48, -12, 1, 12, 32x8
sprite_oam -16, -12, 1, 16, 32x8
sprite_oam 16, -12, 1, 20, 32x8
sprite_oam -48, -4, 1, 24, 32x8
sprite_oam -16, -4, 1, 28, 32x8
sprite_oam 16, -4, 1, 32, 32x8
sprite_oam -48, 4, 1, 36, 32x8
sprite_oam -16, 4, 1, 40, 32x8
sprite_oam 16, 4, 1, 44, 32x8
sprite_oam -48, 12, 1, 48, 32x8
sprite_oam -16, 12, 1, 52, 32x8
sprite_oam 16, 12, 1, 56, 32x8
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
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 32x8
sprite_oam -48, -12, 2, 12, 32x8
sprite_oam -16, -12, 2, 16, 32x8
sprite_oam 16, -12, 2, 20, 32x8
sprite_oam -48, -4, 2, 24, 32x8
sprite_oam -16, -4, 2, 28, 32x8
sprite_oam 16, -4, 2, 32, 32x8
sprite_oam -48, 4, 2, 36, 32x8
sprite_oam -16, 4, 2, 40, 32x8
sprite_oam 16, 4, 2, 44, 32x8
sprite_oam -48, 12, 2, 48, 32x8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
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
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 32x8
sprite_oam -48, -12, 1, 12, 32x8
sprite_oam -16, -12, 1, 16, 32x8
sprite_oam 16, -12, 1, 20, 32x8
sprite_oam -48, -4, 2, 24, 32x8
sprite_oam -16, -4, 2, 28, 32x8
sprite_oam 16, -4, 2, 32, 32x8
sprite_oam -48, 4, 2, 36, 32x8
sprite_oam -16, 4, 2, 40, 32x8
sprite_oam 16, 4, 2, 44, 32x8
sprite_oam -48, 12, 2, 48, 32x8
sprite_oam -16, 12, 2, 52, 32x8
sprite_oam 16, 12, 2, 56, 32x8
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
@@ -370,79 +370,79 @@ gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4
.align 2
gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 16x8
sprite_oam 32, -20, 2, 10, 8x8
sprite_oam -48, -12, 2, 11, 32x8
sprite_oam -16, -12, 2, 15, 32x8
sprite_oam 16, -12, 2, 19, 16x8
sprite_oam 32, -12, 2, 21, 8x8
sprite_oam -48, -4, 2, 22, 32x8
sprite_oam -16, -4, 2, 26, 32x8
sprite_oam 16, -4, 2, 30, 16x8
sprite_oam 32, -4, 2, 32, 8x8
sprite_oam -48, 4, 2, 33, 32x8
sprite_oam -16, 4, 2, 37, 32x8
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
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
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 16x8
sprite_oam 32, -20, 1, 10, 8x8
sprite_oam -48, -12, 1, 11, 32x8
sprite_oam -16, -12, 1, 15, 32x8
sprite_oam 16, -12, 1, 19, 16x8
sprite_oam 32, -12, 1, 21, 8x8
sprite_oam -48, -4, 1, 22, 32x8
sprite_oam -16, -4, 1, 26, 32x8
sprite_oam 16, -4, 1, 30, 16x8
sprite_oam 32, -4, 1, 32, 8x8
sprite_oam -48, 4, 1, 33, 32x8
sprite_oam -16, 4, 1, 37, 32x8
sprite_oam 16, 4, 1, 41, 16x8
sprite_oam 32, 4, 1, 43, 8x8
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
sprite_oam -48, -20, 2, 0, 32x8
sprite_oam -16, -20, 2, 4, 32x8
sprite_oam 16, -20, 2, 8, 16x8
sprite_oam 32, -20, 2, 10, 8x8
sprite_oam -48, -12, 2, 11, 32x8
sprite_oam -16, -12, 2, 15, 32x8
sprite_oam 16, -12, 2, 19, 16x8
sprite_oam 32, -12, 2, 21, 8x8
sprite_oam -48, -4, 2, 22, 32x8
sprite_oam -16, -4, 2, 26, 32x8
sprite_oam 16, -4, 2, 30, 16x8
sprite_oam 32, -4, 2, 32, 8x8
sprite_oam -48, 4, 2, 33, 32x8
sprite_oam -16, 4, 2, 37, 32x8
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
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
sprite_oam -48, -20, 1, 0, 32x8
sprite_oam -16, -20, 1, 4, 32x8
sprite_oam 16, -20, 1, 8, 16x8
sprite_oam 32, -20, 1, 10, 8x8
sprite_oam -48, -12, 1, 11, 32x8
sprite_oam -16, -12, 1, 15, 32x8
sprite_oam 16, -12, 1, 19, 16x8
sprite_oam 32, -12, 1, 21, 8x8
sprite_oam -48, -4, 2, 22, 32x8
sprite_oam -16, -4, 2, 26, 32x8
sprite_oam 16, -4, 2, 30, 16x8
sprite_oam 32, -4, 2, 32, 8x8
sprite_oam -48, 4, 2, 33, 32x8
sprite_oam -16, 4, 2, 37, 32x8
sprite_oam 16, 4, 2, 41, 16x8
sprite_oam 32, 4, 2, 43, 8x8
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
data/pokedex_area_screen.s
+30 -17
View File
@@ -1,4 +1,6 @@
#include "constants/flags.h"
#include "constants/region_map_sections.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -6,11 +8,11 @@
.align 2
gUnknown_085B3D94:: @ 85B3D94
.incbin "graphics/unknown/unknown_5B3D94.gbapal"
.incbin "graphics/pokedex/area_glow.gbapal"
.align 2
gUnknown_085B3DB4:: @ 85B3DB4
.incbin "graphics/unknown/unknown_5B3DB4.4bpp.lz"
.incbin "graphics/pokedex/area_glow.4bpp.lz"
.align 1
gUnknown_085B3EE8:: @ 85B3EE8
@@ -18,15 +20,22 @@ gUnknown_085B3EE8:: @ 85B3EE8
.align 1
gUnknown_085B3EEA:: @ 85B3EEA
.2byte 0x00cb, 0x00cc, 0x00cd
.2byte MAPSEC_MARINE_CAVE, MAPSEC_UNDERWATER_MARINE_CAVE, MAPSEC_TERRA_CAVE
.align 1
gUnknown_085B3EF0:: @ 85B3EF0
.2byte 0x0148, 0x0000, 0x0022, 0x019c, 0x0000, 0x0000
.2byte SPECIES_FEEBAS, 0x0000, 0x0022
.2byte SPECIES_EGG, 0x0000, 0x0000
.align 1
gUnknown_085B3EFC:: @ 85B3EFC
.2byte 0x0055, 0x08be, 0x0044, 0x08a7, 0x00d2, 0x08dd, 0x00c7, 0x0078, 0x00d1, 0x08de, 0x00ca, 0x08df, 0x00d5, 0x0000
.2byte MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR
.2byte MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN
.2byte MAPSEC_ALTERING_CAVE_2, FLAG_LANDMARK_ALTERING_CAVE
.2byte MAPSEC_MIRAGE_TOWER, FLAG_LANDMARK_MIRAGE_TOWER
.2byte MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS
.2byte MAPSEC_ARTISAN_CAVE, FLAG_0x8DF
.2byte MAPSEC_NONE, 0x0000
gUnknown_085B3F18:: @ 85B3F18
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x11, 0x20, 0x02, 0x03, 0x27, 0x2d, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
@@ -44,36 +53,40 @@ gUnknown_085B4018:: @ 85B4018
.align 2
gUnknown_085B401C:: @ 85B401C
obj_tiles gUnknown_085B406C, 0x0080, 0x0002
obj_tiles AreaMarkerTiles, 0x0080, 0x0002
.align 2
gUnknown_085B4024:: @ 85B4024
obj_pal gUnknown_085B404C, 0x0002
obj_pal AreaMarkerPalette, 0x0002
.align 2
gUnknown_085B402C:: @ 85B402C
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
.2byte 0x0000
.2byte 0x4000
.2byte 0x0400
.align 2
gUnknown_085B4034:: @ 85B4034
spr_template 0x0002, 0x0002, gUnknown_085B402C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085B404C:: @ 85B404C
.incbin "graphics/unknown/unknown_5B404C.gbapal"
AreaMarkerPalette:: @ 85B404C
.incbin "graphics/pokedex/area_marker.gbapal"
.align 2
gUnknown_085B406C:: @ 85B406C
.incbin "graphics/unknown/unknown_5B406C.4bpp"
AreaMarkerTiles:: @ 85B406C
.incbin "graphics/pokedex/area_marker.4bpp"
.align 2
gUnknown_085B40EC:: @ 85B40EC
obj_pal gUnknown_08DC4120, 0x0003
.align 2
gUnknown_085B40F4:: @ 85B40F4
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00
gOamData_85B40F4:: @ 85B40F4
.2byte 0x0000
.2byte 0x8000
.2byte 0x0400
.align 2
gUnknown_085B40FC:: @ 85B40FC
spr_template 0x0003, 0x0003, gUnknown_085B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gSpriteTemplate_85B40FC:: @ 85B40FC
spr_template 0x0003, 0x0003, gOamData_85B40F4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/scripts/day_care.inc
+1 -1
View File
@@ -67,7 +67,7 @@ Route117_EventScript_291CE8:: @ 8291CE8
special GetDaycareMonNicknames
msgbox Route117_Text_292299, 4
special SetDaycareCompatibilityString
special sub_8138AC0
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
setvar VAR_0x8004, 0
data/scripts/maps/BattleFrontier_Lounge1.inc
+1 -1
View File
@@ -30,7 +30,7 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
return
BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
specialvar VAR_RESULT, sub_81396E0
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq BattleFrontier_Lounge1_EventScript_25E7FF
special sub_8139D98
data/scripts/maps/BattleFrontier_Lounge5.inc
+1 -1
View File
@@ -13,7 +13,7 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6
faceplayer
compare VAR_0x8004, 255
goto_eq BattleFrontier_Lounge5_EventScript_26460D
specialvar VAR_RESULT, sub_81396E0
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq BattleFrontier_Lounge5_EventScript_264603
special sub_813A7B8
data/scripts/maps/EverGrandeCity_HallOfFame.inc
+2 -2
View File
@@ -53,7 +53,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
setrespawn 1
fadescreenspeed 1, 24
special sub_8137734
special GameClear
waitstate
releaseall
end
@@ -61,7 +61,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
setrespawn 2
fadescreenspeed 1, 24
special sub_8137734
special GameClear
waitstate
releaseall
end
data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+1 -1
View File
@@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F
message LilycoveCity_CoveLilyMotel_2F_Text_21881C
waitmessage
call LilycoveCity_CoveLilyMotel_2F_EventScript_27207E
special sub_8137CB4
special Special_ShowDiploma
waitstate
release
end
data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+2 -2
View File
@@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
waitmovement 0
playse SE_PC_ON
special sub_8138EC0
special DoLotteryCornerComputerEffect
special PickLotteryCornerTicket
delay 220
special sub_8138FAC
special EndLotteryCornerComputerEffect
delay 10
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E
waitmovement 0
data/scripts/maps/LittlerootTown.inc
+3 -3
View File
@@ -246,7 +246,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034
end
LittlerootTown_EventScript_1E805D:: @ 81E805D
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, 4
closemessage
applymovement 1, LittlerootTown_Movement_2725A2
@@ -256,7 +256,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
end
LittlerootTown_EventScript_1E807A:: @ 81E807A
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8CE3, 4
release
end
@@ -364,7 +364,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
waitmovement 0
applymovement 255, LittlerootTown_Movement_2725A4
waitmovement 0
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, 4
closemessage
applymovement 1, LittlerootTown_Movement_2725A2
data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+1 -1
View File
@@ -98,7 +98,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_2725A4
applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
waitmovement 0
special sub_8138B48
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4
setflag FLAG_0x057
setvar VAR_0x4082, 2
data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+2 -2
View File
@@ -256,7 +256,7 @@ gUnknown_081F860D:: @ 81F860D
LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
setvar VAR_0x8004, 1
special sp0D9_ComputerRelated
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
@@ -267,7 +267,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F
setvar VAR_0x8004, 1
playse SE_PC_OFF
special sub_8138E20
special DoPCTurnOffEffect
releaseall
end
data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+3 -3
View File
@@ -98,7 +98,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
applymovement 255, LittlerootTown_MaysHouse_1F_Movement_2725A8
applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
waitmovement 0
special sub_8138B48
special GetRivalSonDaughterString
msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4
setflag FLAG_0x057
setvar VAR_0x408C, 2
@@ -124,7 +124,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29
compare VAR_0x408D, 3
goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F
special sub_8138B48
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4
release
end
@@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D
lock
faceplayer
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4
release
end
data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+2 -2
View File
@@ -317,7 +317,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C
LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
setvar VAR_0x8004, 2
special sp0D9_ComputerRelated
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, 4
special sub_816AE58
@@ -328,7 +328,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
LittlerootTown_MaysHouse_2F_EventScript_1F958F:: @ 81F958F
setvar VAR_0x8004, 2
playse SE_PC_OFF
special sub_8138E20
special DoPCTurnOffEffect
releaseall
end
data/scripts/maps/MauvilleCity_Gym.inc
+8 -8
View File
@@ -49,30 +49,30 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF
setvar VAR_0x8004, 0
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD
setvar VAR_0x8004, 1
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB
setvar VAR_0x8004, 2
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9
setvar VAR_0x8004, 3
special sub_81384F0
special MauvilleGymSpecial1
goto MauvilleCity_Gym_EventScript_20DDBA
end
MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7
special sub_8138750
special MauvilleGymSpecial3
end
MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
@@ -102,7 +102,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
call_if 1, MauvilleCity_Gym_EventScript_271E84
setvar VAR_0x8008, 3
call MauvilleCity_Gym_EventScript_271F43
special sub_8138750
special MauvilleGymSpecial3
special DrawWholeMapView
playse SE_KI_GASYAN
call MauvilleCity_Gym_EventScript_20DFB1
@@ -189,8 +189,8 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068
end
MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D
special sub_8138540
special sub_81384F0
special MauvilleGymSpecial2
special MauvilleGymSpecial1
special DrawWholeMapView
playse SE_KI_GASYAN
checkflag FLAG_0x063
data/scripts/maps/MossdeepCity_House1.inc
+1 -1
View File
@@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6
faceplayer
bufferleadmonspeciesname 0
msgbox MossdeepCity_House1_Text_22200F, 4
specialvar VAR_RESULT, sub_81391D0
specialvar VAR_RESULT, GetPokeblockNameByMonNature
compare VAR_RESULT, 0
goto_eq MossdeepCity_House1_EventScript_221FFC
msgbox MossdeepCity_House1_Text_22201D, 4
data/scripts/maps/MossdeepCity_House4.inc
+1 -1
View File
@@ -21,7 +21,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
special sub_80E8BC8
compare VAR_RESULT, 0
goto_eq MossdeepCity_House4_EventScript_222E14
special sub_8139200
special GetSecretBaseNearbyMapName
msgbox MossdeepCity_House4_Text_222ECC, 4
release
end
data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+2 -2
View File
@@ -53,7 +53,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
compare VAR_0x405D, 2
goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024
dodailyevents
specialvar VAR_RESULT, sub_8138BDC
specialvar VAR_RESULT, GetWeekCount
buffernumberstring 0, VAR_RESULT
compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012
@@ -75,7 +75,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B
MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
dodailyevents
specialvar VAR_RESULT, sub_8138BDC
specialvar VAR_RESULT, GetWeekCount
buffernumberstring 0, VAR_RESULT
compare VAR_RESULT, 0
call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051
data/scripts/maps/MtChimney_CableCarStation.inc
+1 -1
View File
@@ -47,7 +47,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
setvar VAR_0x8004, 1
setvar VAR_0x40A3, 2
incrementgamestat 48
special sub_8138B8C
special CableCarWarp
special sub_814FC9C
waitstate
release
data/scripts/maps/PacifidlogTown_House2.inc
+2 -2
View File
@@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
checkflag FLAG_0x12C
call_if 0, PacifidlogTown_House2_EventScript_203801
setflag FLAG_0x12C
specialvar VAR_RESULT, sub_8138C04
specialvar VAR_RESULT, GetLeadMonFriendshipScore
compare VAR_RESULT, 4
goto_if 4, PacifidlogTown_House2_EventScript_203816
specialvar VAR_RESULT, sub_8138C04
specialvar VAR_RESULT, GetLeadMonFriendshipScore
compare VAR_RESULT, 2
goto_if 4, PacifidlogTown_House2_EventScript_203845
goto PacifidlogTown_House2_EventScript_20384F
data/scripts/maps/PacifidlogTown_House5.inc
+1 -1
View File
@@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8204110
PacifidlogTown_House5_EventScript_204111:: @ 8204111
lock
faceplayer
specialvar VAR_RESULT, sub_813793C
specialvar VAR_RESULT, IsMirageIslandPresent
compare VAR_RESULT, 1
goto_eq PacifidlogTown_House5_EventScript_20412D
msgbox PacifidlogTown_House5_Text_204140, 4
data/scripts/maps/PetalburgCity.inc
+1 -1
View File
@@ -31,7 +31,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C
PetalburgCity_EventScript_1DC32E:: @ 81DC32E
lockall
special copy_player_party_to_sav1
special sub_813946C
special PutZigzagoonInPlayerParty
applymovement 2, PetalburgCity_Movement_1DC451
applymovement 255, PetalburgCity_Movement_1DC430
waitmovement 0
data/scripts/maps/PetalburgCity_Gym.inc
+3 -3
View File
@@ -222,7 +222,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
clearflag FLAG_0x2D6
clearflag FLAG_0x362
setflag FLAG_0x379
special sub_8137A0C
special InitBirchState
warp PETALBURG_CITY, 255, 15, 8
waitstate
release
@@ -1204,12 +1204,12 @@ PetalburgCity_Gym_EventScript_205733:: @ 8205733
return
PetalburgCity_Gym_EventScript_205746:: @ 8205746
special sub_81388E4
special PetalburgGymSpecial1
waitstate
return
PetalburgCity_Gym_EventScript_20574B:: @ 820574B
special sub_8138AA4
special PetalburgGymSpecial2
return
PetalburgCity_Gym_EventScript_20574F:: @ 820574F
data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+1 -1
View File
@@ -28,7 +28,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C
lock
faceplayer
msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4
specialvar VAR_RESULT, sub_81394D8
specialvar VAR_RESULT, IsStarterInParty
compare VAR_RESULT, 1
goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38
release
data/scripts/maps/Route104.inc
+2 -2
View File
@@ -1035,14 +1035,14 @@ Route104_EventScript_1ED580:: @ 81ED580
Route104_EventScript_1ED597:: @ 81ED597
trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox Route104_Text_2952FE, 4
release
end
Route104_EventScript_1ED5B6:: @ 81ED5B6
trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox Route104_Text_29540D, 4
release
end
data/scripts/maps/Route109.inc
+1 -1
View File
@@ -328,7 +328,7 @@ Route109_EventScript_1EE99E:: @ 81EE99E
Route109_EventScript_1EE9B5:: @ 81EE9B5
lock
faceplayer
special sub_8138B10
special GetPlayerBigGuyGirlString
checkflag FLAG_0x118
goto_eq Route109_EventScript_1EE9F2
msgbox Route109_Text_1EEFDE, 4
data/scripts/maps/Route110.inc
+5 -5
View File
@@ -5,7 +5,7 @@ Route110_MapScripts:: @ 81EF269
.byte 0
Route110_MapScript1_1EF279: @ 81EF279
special sub_8137F44
special UpdateCyclingRoadState
end
Route110_MapScript1_1EF27D: @ 81EF27D
@@ -24,7 +24,7 @@ Route110_MapScript2_1EF297: @ 81EF297
.2byte 0
Route110_EventScript_1EF2A1:: @ 81EF2A1
special sub_8137D0C
special Special_BeginCyclingRoadChallenge
setvar VAR_0x40A9, 2
return
@@ -130,7 +130,7 @@ Route110_EventScript_1EF389:: @ 81EF389
Route110_EventScript_1EF392:: @ 81EF392
lockall
specialvar VAR_RESULT, sub_8137EFC
specialvar VAR_RESULT, GetRecordedCyclingRoadResults
compare VAR_RESULT, 0
goto_eq Route110_EventScript_1EF3AD
msgbox Route110_Text_1F0A1E, 4
@@ -145,7 +145,7 @@ Route110_EventScript_1EF3AD:: @ 81EF3AD
Route110_EventScript_1EF3B7:: @ 81EF3B7
lock
faceplayer
specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF3E8
compare VAR_0x40A9, 0
@@ -326,7 +326,7 @@ Route110_EventScript_1EF661:: @ 81EF661
end
Route110_EventScript_1EF673:: @ 81EF673
special sub_8137E6C
special FinishCyclingRoadChallenge
msgbox Route110_Text_1F03FF, 4
switch VAR_RESULT
case 10, Route110_EventScript_1EF6FD
data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc
+1 -1
View File
@@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78
Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84
lockall
specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 0
goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F
setflag FLAG_SYS_CYCLING_ROAD
data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc
+1 -1
View File
@@ -22,7 +22,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4
Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0
lockall
specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 2
call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6
compare VAR_RESULT, 0
data/scripts/maps/Route110_TrickHouseEnd.inc
+2 -2
View File
@@ -13,7 +13,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4
Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0
setvar VAR_0x4001, 0
setvar VAR_0x4002, 0
special sub_8138FD4
special SetTrickHouseEndRoomFlag
end
Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
@@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
call_if 1, Route110_TrickHouseEnd_EventScript_26B002
msgbox Route110_TrickHouseEnd_Text_26B69A, 4
call Route110_TrickHouseEnd_EventScript_26AFCF
special sub_8138FEC
special ResetTrickHouseEndRoomFlag
release
end
data/scripts/maps/Route111.inc
+1 -1
View File
@@ -170,7 +170,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9
compare VAR_RESULT, 0
goto_eq Route111_EventScript_272054
setflag FLAG_0x92C
special sub_8138B10
special GetPlayerBigGuyGirlString
msgbox Route111_Text_2A6F3D, 4
release
end
data/scripts/maps/Route112_CableCarStation.inc
+1 -1
View File
@@ -48,7 +48,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
setvar VAR_0x8004, 0
setvar VAR_0x40A3, 1
incrementgamestat 48
special sub_8138B8C
special CableCarWarp
special sub_814FC9C
waitstate
release
data/scripts/maps/Route119.inc
+1 -1
View File
@@ -20,7 +20,7 @@ Route119_MapScript1_1F444D: @ 81F444D
call Route119_EventScript_271EFB
compare VAR_0x40B3, 1
call_if 1, Route119_EventScript_1F4466
special sub_8139648
special SetRoute119Weather
end
Route119_EventScript_1F4466:: @ 81F4466
data/scripts/maps/Route119_WeatherInstitute_1F.inc
+1 -1
View File
@@ -15,7 +15,7 @@ Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98
Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4
lock
faceplayer
special sub_8138B10
special GetPlayerBigGuyGirlString
compare VAR_0x40B3, 0
goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE
msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4
data/scripts/maps/Route120.inc
+1 -1
View File
@@ -110,7 +110,7 @@ Route120_EventScript_1F5527:: @ 81F5527
call_if 1, Route120_EventScript_1F562F
compare VAR_RESULT, 0
call_if 1, Route120_EventScript_1F5638
specialvar VAR_RESULT, sub_8138AF0
specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit
switch VAR_RESULT
case 0, Route120_EventScript_1F55CA
case 5, Route120_EventScript_1F55CA
data/scripts/maps/Route121_SafariZoneEntrance.inc
+1 -1
View File
@@ -91,7 +91,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF
getpartysize
compare VAR_RESULT, 6
goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9
specialvar VAR_RESULT, sub_8139530
specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace
compare VAR_RESULT, 1
goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9
msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4
data/scripts/maps/Route123.inc
+2 -2
View File
@@ -3,7 +3,7 @@ Route123_MapScripts:: @ 81F6147
.byte 0
Route123_MapScript1_1F614D: @ 81F614D
special sub_8139668
special SetRoute123Weather
end
Route123_EventScript_1F6151:: @ 81F6151
@@ -12,7 +12,7 @@ Route123_EventScript_1F6151:: @ 81F6151
checkflag FLAG_0x0E8
goto_eq Route123_EventScript_1F61A0
msgbox Route123_Text_1F641E, 4
special sub_81390E0
special IsGrassTypeInParty
compare VAR_RESULT, 0
goto_eq Route123_EventScript_1F619E
msgbox Route123_Text_1F645D, 4
data/scripts/maps/Route130.inc
+1 -1
View File
@@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81F735F
Route130_MapScript1_1F7365: @ 81F7365
compare VAR_0x405E, 4
call_if 4, Route130_EventScript_1F73B5
specialvar VAR_RESULT, sub_813793C
specialvar VAR_RESULT, IsMirageIslandPresent
compare VAR_RESULT, 1
goto_eq Route130_EventScript_1F73B1
setflag FLAG_0x011
data/scripts/maps/SSTidalCorridor.inc
+6 -6
View File
@@ -11,7 +11,7 @@ SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
.2byte 0
SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
special sub_8137F90
special SetSSTidalFlag
setvar VAR_PORTHOLE, 2
lockall
playse SE_PINPON
@@ -28,14 +28,14 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015
end
SSTidalRooms_EventScript_23C028:: @ 823C028
special sub_8137F90
special SetSSTidalFlag
setvar VAR_PORTHOLE, 7
playse SE_PINPON
msgbox SSTidalRooms_Text_23C462, 4
return
SSTidalRooms_EventScript_23C03C:: @ 823C03C
special sub_8137FB0
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 4
playse SE_PINPON
msgbox SSTidalRooms_Text_23C553, 4
@@ -49,7 +49,7 @@ SSTidalCorridor_EventScript_23C050:: @ 823C050
end
SSTidalCorridor_EventScript_23C067:: @ 823C067
special sub_8137FB0
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 3
lockall
playse SE_PINPON
@@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067
end
SSTidalCorridor_EventScript_23C07D:: @ 823C07D
special sub_8137FB0
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 8
lockall
playse SE_PINPON
@@ -67,7 +67,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D
end
SSTidalRooms_EventScript_23C093:: @ 823C093
special sub_8137FB0
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 8
playse SE_PINPON
msgbox SSTidalRooms_Text_23C50F, 4
data/scripts/maps/SeafloorCavern_Room9.inc
+1 -1
View File
@@ -33,7 +33,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
special sub_80B05B4
waitstate
msgbox SeafloorCavern_Room9_Text_235279, 4
special sub_81379F8
special WaitWeather
waitstate
setvar VAR_RESULT, 1
playse SE_W197
data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+1 -1
View File
@@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA
.byte 0
ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0
special sub_8137988
special UpdateShoalTideFlag
checkflag FLAG_SYS_SHOAL_TIDE
goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236DD1
goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5
data/scripts/maps/SkyPillar_Outside.inc
+1 -1
View File
@@ -76,7 +76,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
setflag FLAG_SYS_WEATHER_CTRL
setweather 15
doweather
special sub_81379F8
special WaitWeather
waitstate
delay 30
msgbox SkyPillar_Outside_Text_23953A, 4
data/scripts/maps/SlateportCity.inc
+3 -3
View File
@@ -142,10 +142,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4
faceplayer
bufferleadmonspeciesname 0
msgbox SlateportCity_Text_1DD68A, 4
specialvar VAR_RESULT, sub_8139348
specialvar VAR_RESULT, LeadMonHasEffortRibbon
compare VAR_RESULT, 1
call_if 1, SlateportCity_EventScript_1DCE38
specialvar VAR_RESULT, sub_81393C8
specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut
compare VAR_RESULT, 0
call_if 1, SlateportCity_EventScript_1DCE2E
msgbox SlateportCity_Text_1DD697, 4
@@ -153,7 +153,7 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4
message SlateportCity_Text_1DD6E3
waitfanfare
msgbox SlateportCity_Text_1DD702, 4
special sub_8139370
special GiveLeadMonEffortRibbon
release
end
data/scripts/maps/SlateportCity_House1.inc
+1 -1
View File
@@ -27,7 +27,7 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9
end
SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
specialvar VAR_RESULT, sub_81396E0
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq SlateportCity_House1_EventScript_209B46
special TV_CopyNicknameToStringVar1AndEnsureTerminated
data/scripts/maps/SlateportCity_PokemonFanClub.inc
+6 -6
View File
@@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5
end
SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF
specialvar VAR_RESULT, sub_8139004
specialvar VAR_RESULT, CheckLeadMonCool
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0
return
@@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0
return
SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6
specialvar VAR_RESULT, sub_8139030
specialvar VAR_RESULT, CheckLeadMonBeauty
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107
return
@@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107
return
SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D
specialvar VAR_RESULT, sub_813905C
specialvar VAR_RESULT, CheckLeadMonCute
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E
return
@@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E
return
SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124
specialvar VAR_RESULT, sub_8139088
specialvar VAR_RESULT, CheckLeadMonSmart
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135
return
@@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135
return
SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B
specialvar VAR_RESULT, sub_81390B4
specialvar VAR_RESULT, CheckLeadMonTough
compare VAR_RESULT, 1
call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C
return
@@ -217,7 +217,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E
checkflag FLAG_0x116
goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE
msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4
specialvar VAR_RESULT, sub_8138C04
specialvar VAR_RESULT, GetLeadMonFriendshipScore
compare VAR_RESULT, 4
goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3
release
data/scripts/maps/SootopolisCity.inc
+5 -5
View File
@@ -202,7 +202,7 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914
SootopolisCity_EventScript_1E5926:: @ 81E5926
lockall
special sub_8138AD0
special StorePlayerCoordsInVars
compare VAR_0x8004, 43
goto_if 5, SootopolisCity_EventScript_1E5A82
compare VAR_0x8005, 32
@@ -492,7 +492,7 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7
SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
lockall
special sub_8138AD0
special StorePlayerCoordsInVars
compare VAR_0x8004, 43
goto_if 5, SootopolisCity_EventScript_1E5CCE
compare VAR_0x8005, 32
@@ -541,7 +541,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
removeobject 11
special sub_81379F8
special WaitWeather
waitstate
clearflag FLAG_SYS_WEATHER_CTRL
setvar VAR_0x40CA, 3
@@ -594,7 +594,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
removeobject 11
special sub_81379F8
special WaitWeather
waitstate
clearflag FLAG_SYS_WEATHER_CTRL
setvar VAR_0x40CA, 2
@@ -747,7 +747,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10
SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
dodailyevents
special sub_8138B10
special GetPlayerBigGuyGirlString
checkflag FLAG_0x932
goto_eq SootopolisCity_EventScript_1E5FBB
msgbox SootopolisCity_Text_2A7BB0, 4
data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
+2 -2
View File
@@ -46,14 +46,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
setvar VAR_0x40C0, 1
special sub_8138AC0
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
return
SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
setvar VAR_0x40C0, 2
special sub_8138AC0
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
return
data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+1 -1
View File
@@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031
lock
faceplayer
msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4
specialvar VAR_RESULT, sub_8138C04
specialvar VAR_RESULT, GetLeadMonFriendshipScore
switch VAR_RESULT
case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094
case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_20309E
data/scripts/mauville_man.inc
+1 -1
View File
@@ -816,7 +816,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B
MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359
special sub_81203FC
special sub_8138AC0
special ShowFieldMessageStringVar4
waitmessage
yesnobox 20, 8
compare VAR_RESULT, 1
data/scripts/pokeblocks.inc
+1 -1
View File
@@ -680,7 +680,7 @@ LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D
LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA
fadescreen 1
specialvar VAR_RESULT, sub_8138240
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
special SpawnLinkPartnerFieldObject
data/specials.inc
+56 -56
View File
@@ -45,7 +45,7 @@ gSpecials:: @ 81DBA64
def_special nullsub_37
def_special sub_80B3254
def_special sub_80B2FD8
def_special sub_8138240
def_special GetLinkPartnerNames
def_special SpawnLinkPartnerFieldObject
def_special copy_player_party_to_sav1
def_special copy_player_party_from_sav1
@@ -149,19 +149,19 @@ gSpecials:: @ 81DBA64
def_special sub_80F8864
def_special sub_80F8940
def_special ShowContestWinner
def_special sub_8138540
def_special sub_81384F0
def_special sub_8138AC0
def_special MauvilleGymSpecial2
def_special MauvilleGymSpecial1
def_special ShowFieldMessageStringVar4
def_special DrawWholeMapView
def_special sub_8138AD0
def_special sub_8138750
def_special sub_81388E4
def_special sub_8138AA4
def_special sub_8138AF0
def_special sub_8138B10
def_special sub_8138B48
def_special sub_8138BC8
def_special sub_8138B8C
def_special StorePlayerCoordsInVars
def_special MauvilleGymSpecial3
def_special PetalburgGymSpecial1
def_special PetalburgGymSpecial2
def_special GetPlayerTrainerIdOnesDigit
def_special GetPlayerBigGuyGirlString
def_special GetRivalSonDaughterString
def_special SetFlagInVar
def_special CableCarWarp
def_special sub_814FC9C
def_special sub_8085784
def_special StartWallClock
@@ -213,34 +213,34 @@ gSpecials:: @ 81DBA64
def_special sp0C8_whiteout_maybe
def_special sub_80FBE90
def_special sub_80FBED0
def_special sub_8137F90
def_special sub_8137FB0
def_special SetSSTidalFlag
def_special ResetSSTidalFlag
def_special EnterSafariMode
def_special ExitSafariMode
def_special GetPokeblockFeederInFront
def_special OpenPokeblockCaseOnFeeder
def_special sub_813793C
def_special sub_8137988
def_special sub_8137A0C
def_special sub_8137A4C
def_special sub_8137C10
def_special sp0D9_ComputerRelated
def_special sub_8138E20
def_special IsMirageIslandPresent
def_special UpdateShoalTideFlag
def_special InitBirchState
def_special ScriptGetPokedexInfo
def_special ShowPokedexRatingMessage
def_special DoPCTurnOnEffect
def_special DoPCTurnOffEffect
def_special sub_8139994
def_special sub_8138EC0
def_special sub_8138FAC
def_special DoLotteryCornerComputerEffect
def_special EndLotteryCornerComputerEffect
def_special sub_81B951C
def_special sub_81B968C
def_special sub_81B9770
def_special sub_81B9718
def_special sub_81B96D0
def_special sub_8160638
def_special sub_8137EFC
def_special sub_8137D0C
def_special sp0E3_walkrun_bitfield_interpretation
def_special sub_8137E6C
def_special sub_8137F44
def_special sub_8138C04
def_special GetRecordedCyclingRoadResults
def_special Special_BeginCyclingRoadChallenge
def_special GetPlayerAvatarBike
def_special FinishCyclingRoadChallenge
def_special UpdateCyclingRoadState
def_special GetLeadMonFriendshipScore
def_special sub_81A1780
def_special sub_8161F74
def_special sub_818E9AC
@@ -261,39 +261,39 @@ gSpecials:: @ 81DBA64
def_special sub_80F94E8
def_special sub_816AE58
def_special sub_816AE98
def_special sub_8138C94
def_special FieldShowRegionMap
def_special sub_807E73C
def_special sub_807EA10
def_special sub_807F0E4
def_special sub_807E9D4
def_special sub_8138BDC
def_special GetWeekCount
def_special RetrieveLotteryNumber
def_special PickLotteryCornerTicket
def_special ShowBerryBlenderRecordWindow
def_special sub_8138FEC
def_special sub_8138FD4
def_special ResetTrickHouseEndRoomFlag
def_special SetTrickHouseEndRoomFlag
def_special sp109_CreatePCMenu
def_special sub_8137C28
def_special sub_8137CB4
def_special sub_8139004
def_special sub_8139030
def_special sub_813905C
def_special sub_8139088
def_special sub_81390B4
def_special AccessHallOfFamePC
def_special Special_ShowDiploma
def_special CheckLeadMonCool
def_special CheckLeadMonBeauty
def_special CheckLeadMonCute
def_special CheckLeadMonSmart
def_special CheckLeadMonTough
def_special sub_80FB7A4
def_special DoSoftReset
def_special sub_8137734
def_special GameClear
def_special sub_8139A78
def_special nullsub_55
def_special SpawnScriptFieldObject
def_special RemoveScriptFieldObject
def_special sub_81391D0
def_special sub_8139200
def_special GetPokeblockNameByMonNature
def_special GetSecretBaseNearbyMapName
def_special CheckRelicanthWailord
def_special ShouldDoBrailleStrengthEffectOld
def_special sub_80B0534
def_special sub_80B058C
def_special sub_81379F8
def_special WaitWeather
def_special sub_8139238
def_special sub_8139248
def_special player_get_direction_lower_nybble
@@ -301,23 +301,23 @@ gSpecials:: @ 81DBA64
def_special sub_81392D4
def_special sub_81392F8
def_special sub_8139320
def_special sub_8139348
def_special sub_8139370
def_special sub_81393C8
def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special Special_AreLeadMonEVsMaxedOut
def_special sub_8098574
def_special sub_809859C
def_special InitRoamer
def_special sub_81393FC
def_special sub_81390E0
def_special IsGrassTypeInParty
def_special sub_80AFC60
def_special sub_813946C
def_special sub_81394D8
def_special PutZigzagoonInPlayerParty
def_special IsStarterInParty
def_special sub_80E980C
def_special sub_8139530
def_special ScriptCheckFreePokemonStorageSpace
def_special DoSealedChamberShakingEffect1
def_special sub_8139B60
def_special sub_80FAC78
def_special sub_8139540
def_special IsPokerusInParty
def_special sub_809E1C8
def_special sub_8139560
def_special StartGroudonKyogreBattle
@@ -333,10 +333,10 @@ gSpecials:: @ 81DBA64
def_special sub_80F8EB8
def_special sub_8162794
def_special BattleSetup_StartLatiBattle
def_special sub_8139648
def_special sub_8139668
def_special SetRoute119Weather
def_special SetRoute123Weather
def_special sub_80F8FA0
def_special sub_81396E0
def_special ScriptGetPartyMonSpecies
def_special sub_81B98DC
def_special nullsub_54
def_special sub_80E9B70
data/time_events.s
+7
View File
@@ -0,0 +1,7 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085B2B44:: @ 85B2B44
.byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01