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

Merge remote-tracking branch 'Egg/decompile_use_pokeblock'

Browse Source
This commit is contained in:
Diegoisawesome
2017-12-21 16:19:50 -06:00
parent eb65458b67 bcffcb0c1c
commit 0403f6eea9
98 changed files with 12920 additions and 14984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
data/data4c.s → data/data4d.s
View File

@@ -5,60 +5,6 @@
.section .rodata
gPokeblockFlavorCompatibilityTable:: @ 85B25A0
.incbin "baserom.gba", 0x5b25a0, 0x80
gUnknown_085B2620:: @ 85B2620
.incbin "baserom.gba", 0x5b2620, 0xc
gPokeblockNames:: @ 85B262C
.incbin "baserom.gba", 0x5b262c, 0x3c
gUnknown_085B2668:: @ 85B2668
.incbin "baserom.gba", 0x5b2668, 0x30
gUnknown_085B2698:: @ 85B2698
.incbin "baserom.gba", 0x5b2698, 0x3
gUnknown_085B269B:: @ 85B269B
.incbin "baserom.gba", 0x5b269b, 0x2
gUnknown_085B269D:: @ 85B269D
.incbin "baserom.gba", 0x5b269d, 0x2
gUnknown_085B269F:: @ 85B269F
.incbin "baserom.gba", 0x5b269f, 0x5
gUnknown_085B26A4:: @ 85B26A4
.incbin "baserom.gba", 0x5b26a4, 0x4c
gUnknown_085B26F0:: @ 85B26F0
.incbin "baserom.gba", 0x5b26f0, 0x4
gUnknown_085B26F4:: @ 85B26F4
.incbin "baserom.gba", 0x5b26f4, 0x8
gUnknown_085B26FC:: @ 85B26FC
.incbin "baserom.gba", 0x5b26fc, 0x8
gUnknown_085B2704:: @ 85B2704
.incbin "baserom.gba", 0x5b2704, 0x18
gUnknown_085B271C:: @ 85B271C
.incbin "baserom.gba", 0x5b271c, 0x4
gUnknown_085B2720:: @ 85B2720
.incbin "baserom.gba", 0x5b2720, 0x28
gUnknown_085B2748:: @ 85B2748
.incbin "baserom.gba", 0x5b2748, 0x60
gUnknown_085B27A8:: @ 85B27A8
.incbin "baserom.gba", 0x5b27a8, 0x8
gUnknown_085B27B0:: @ 85B27B0
.incbin "baserom.gba", 0x5b27b0, 0x18
gUnknown_085B27C8:: @ 85B27C8
.incbin "baserom.gba", 0x5b27c8, 0x88
@@ -797,4 +743,3 @@ gUnknown_085C9A30:: @ 85C9A30
gUnknown_085C9A53:: @ 85C9A53
.incbin "baserom.gba", 0x5c9a53, 0x41

6
data/event_scripts.s
View File

@@ -1435,7 +1435,7 @@ OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993
waitfieldeffect 25
applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA
waitmovement 0
special sp000_heal_pokemon
special HealPlayerParty
return
OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1
@@ -2194,7 +2194,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083
fadescreen 1
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
fadescreen 0
return
@@ -5133,7 +5133,7 @@ SecretBase_RedCave1_EventScript_276286:: @ 8276286
call_if 1, SecretBase_RedCave1_EventScript_2762C1
compare VAR_RESULT, 2
call_if 1, SecretBase_RedCave1_EventScript_2762C5
special sp000_heal_pokemon
special HealPlayerParty
release
end

76
data/graphics.s
View File

@@ -880,14 +880,80 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0
gMenuMoneyGfx:: @ 8D9B230
.incbin "baserom.gba", 0xd9b230, 0x84
gUnknown_08D9B2B4:: @ 8D9B2B4
gMenuPokeblock_Gfx:: @ 8D9B2B4
.incbin "baserom.gba", 0xd9b2b4, 0x1bc
gUnknown_08D9B470:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x358
gMenuPokeblock_Pal:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x70
gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
.incbin "baserom.gba", 0xd9b4e0, 0x2c0
gMenuPokeblockDevice_Pal:: @ 8D9B7A0
.incbin "baserom.gba", 0xd9b7a0, 0x28
gUnknown_08D9B7C8:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x27c
gMenuPokeblock_Tilemap:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x148
.align 2
gPokeblock_Gfx::
.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
.align 2
gPokeblockRed_Pal::
.incbin "graphics/pokeblock/red.gbapal.lz"
.align 2
gPokeblockBlue_Pal::
.incbin "graphics/pokeblock/blue.gbapal.lz"
.align 2
gPokeblockPink_Pal::
.incbin "graphics/pokeblock/pink.gbapal.lz"
.align 2
gPokeblockGreen_Pal::
.incbin "graphics/pokeblock/green.gbapal.lz"
.align 2
gPokeblockYellow_Pal::
.incbin "graphics/pokeblock/yellow.gbapal.lz"
.align 2
gPokeblockPurple_Pal::
.incbin "graphics/pokeblock/purple.gbapal.lz"
.align 2
gPokeblockIndigo_Pal::
.incbin "graphics/pokeblock/indigo.gbapal.lz"
.align 2
gPokeblockBrown_Pal::
.incbin "graphics/pokeblock/brown.gbapal.lz"
.align 2
gPokeblockLiteBlue_Pal::
.incbin "graphics/pokeblock/liteblue.gbapal.lz"
.align 2
gPokeblockOlive_Pal::
.incbin "graphics/pokeblock/olive.gbapal.lz"
.align 2
gPokeblockGray_Pal::
.incbin "graphics/pokeblock/gray.gbapal.lz"
.align 2
gPokeblockBlack_Pal::
.incbin "graphics/pokeblock/black.gbapal.lz"
.align 2
gPokeblockWhite_Pal::
.incbin "graphics/pokeblock/white.gbapal.lz"
.align 2
gPokeblockGold_Pal::
.incbin "graphics/pokeblock/gold.gbapal.lz"
gUnknown_08D9BA44:: @ 8D9BA44
.incbin "baserom.gba", 0xd9ba44, 0x100

43
data/pokeblock_feed.s
View File

@@ -1,43 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085EFEBC:: @ 85EFEBC
.incbin "baserom.gba", 0x5efebc, 0x32
gUnknown_085EFEEE:: @ 85EFEEE
.incbin "baserom.gba", 0x5efeee, 0x12
gUnknown_085EFF00:: @ 85EFF00
.incbin "baserom.gba", 0x5eff00, 0x5fc
gUnknown_085F04FC:: @ 85F04FC
.incbin "baserom.gba", 0x5f04fc, 0x54
gUnknown_085F0550:: @ 85F0550
.incbin "baserom.gba", 0x5f0550, 0x8
gUnknown_085F0558:: @ 85F0558
.incbin "baserom.gba", 0x5f0558, 0x10
gUnknown_085F0568:: @ 85F0568
.incbin "baserom.gba", 0x5f0568, 0x48
gUnknown_085F05B0:: @ 85F05B0
.incbin "baserom.gba", 0x5f05b0, 0xb4
gUnknown_085F0664:: @ 85F0664
.incbin "baserom.gba", 0x5f0664, 0x4
gUnknown_085F0668:: @ 85F0668
.incbin "baserom.gba", 0x5f0668, 0x4
gUnknown_085F066C:: @ 85F066C
.incbin "baserom.gba", 0x5f066c, 0x34
gUnknown_085F06A0:: @ 85F06A0
.incbin "baserom.gba", 0x5f06a0, 0x8
gUnknown_085F06A8:: @ 85F06A8
.incbin "baserom.gba", 0x5f06a8, 0x18

4
data/scripts/cable_club.inc
View File

@@ -449,7 +449,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
end
OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
special sp000_heal_pokemon
special HealPlayerParty
special copy_player_party_to_sav1
special copy_bags_and_unk_data_from_save_blocks
copyvar VAR_0x4087, VAR_0x8004
@@ -1031,7 +1031,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4
closemessage
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 6
copyvar VAR_0x4087, VAR_0x8004
call OldaleTown_PokemonCenter_2F_EventScript_277BBE

6
data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc
View File

@@ -143,7 +143,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
special sub_81A1780
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
setvar VAR_0x8004, 9
@@ -430,14 +430,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 5
setvar VAR_0x8005, 0
special sub_8163AC4
waitstate
setvar VAR_0x8004, 18
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 21
special sub_81A1780
return

2
data/scripts/maps/BattleFrontier_BattleArenaLobby.inc
View File

@@ -90,7 +90,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
setvar VAR_0x8004, 8
special sub_81A1780
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special sub_81A5238

4
data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc
View File

@@ -528,7 +528,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
setvar VAR_0x4009, 1
@@ -537,7 +537,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440
setvar VAR_0x4009, 0
setvar VAR_0x8004, 17
special sub_818E9AC
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 16
special sub_818E9AC
return

6
data/scripts/maps/BattleFrontier_BattleDomeLobby.inc
View File

@@ -95,7 +95,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
setvar VAR_0x8006, 1
special sub_818E9AC
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
goto BattleFrontier_BattleDomeLobby_EventScript_249991
BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
@@ -118,7 +118,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
setvar VAR_0x8006, 1
special sub_818E9AC
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
setvar VAR_0x8004, 13
@@ -265,7 +265,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4
closemessage
call BattleFrontier_BattleDomeLobby_EventScript_249C6E
special sp000_heal_pokemon
special HealPlayerParty
warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6
setvar VAR_0x4000, 0
waitstate

2
data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc
View File

@@ -249,7 +249,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
special sub_81A1780
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
fadescreen 1
setvar VAR_0x8004, 11

4
data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc
View File

@@ -89,7 +89,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8005, 0
special sub_8163AC4
@@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8005, 0
special sub_8163AC4

2
data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc
View File

@@ -72,7 +72,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 9
special sub_81A1780
compare VAR_RESULT, 0

6
data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc
View File

@@ -100,7 +100,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
special sub_81A1780
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
setvar VAR_0x8004, 9
@@ -337,14 +337,14 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 4
setvar VAR_0x8005, 0
special sub_8163AC4
waitstate
setvar VAR_0x8004, 18
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 21
special sub_81A1780
return

2
data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc
View File

@@ -90,7 +90,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
setvar VAR_0x8004, 8
special sub_81A1780
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special sub_8195960

8
data/scripts/maps/BattleFrontier_BattlePikeLobby.inc
View File

@@ -25,7 +25,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
end
BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 27
special sub_81A703C
lockall
@@ -77,7 +77,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
copyvar VAR_0x8006, VAR_RESULT
special sub_81A703C
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 27
special sub_81A703C
message BattleFrontier_BattlePikeLobby_Text_25C1DF
@@ -108,7 +108,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
setvar VAR_0x8006, 0
special sub_81A703C
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 27
special sub_81A703C
setvar VAR_0x8004, 8
@@ -210,7 +210,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_0x8004, 5
special sub_81A1780
call BattleFrontier_BattlePikeLobby_EventScript_25BA94
special sp000_heal_pokemon
special HealPlayerParty
call BattleFrontier_BattlePikeLobby_EventScript_25BB49
warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7
setvar VAR_0x4000, 0

4
data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc
View File

@@ -89,7 +89,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4
closemessage
release
@@ -257,7 +257,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E
waitmessage
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4
closemessage
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798

2
data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc
View File

@@ -90,7 +90,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
special sub_81A8E7C
setvar VAR_0x8004, 14
special sub_81A8E7C
special sp000_heal_pokemon
special HealPlayerParty
warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
waitstate
end

6
data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc
View File

@@ -70,7 +70,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
special copy_player_party_from_sav1
setvar VAR_0x8004, 14
special sub_81A8E7C
special sp000_heal_pokemon
special HealPlayerParty
message BattleFrontier_BattlePyramidLobby_Text_2519F8
waitmessage
playse SE_EXPMAX
@@ -100,7 +100,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
special copy_player_party_from_sav1
setvar VAR_0x8004, 14
special sub_81A8E7C
special sp000_heal_pokemon
special HealPlayerParty
lockall
message BattleFrontier_BattlePyramidLobby_Text_251B5A
waitmessage
@@ -218,7 +218,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
setvar VAR_0x8006, 0
special sub_81A1780
setvar VAR_RESULT, 0
special sp000_heal_pokemon
special HealPlayerParty
warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1
setvar VAR_0x4000, 0
waitstate

6
data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc
View File

@@ -84,7 +84,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
setvar VAR_0x8004, 9
@@ -361,7 +361,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
setvar VAR_0x8005, 6
setvar VAR_0x8006, 0
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 0
setvar VAR_0x8005, 0
special sub_8163AC4
@@ -371,7 +371,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
setvar VAR_0x8004, 18
special sub_81A1780
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 21
special sub_81A1780

2
data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc
View File

@@ -161,7 +161,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
setvar VAR_0x8004, 1

2
data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
View File

@@ -153,7 +153,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
setvar VAR_0x8004, 8
special sub_81A1780
special copy_player_party_from_sav1
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8005, 0
special sub_8161F74

2
data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc
View File

@@ -68,7 +68,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
waitmovement 0
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x4001, 1
releaseall
end

2
data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc
View File

@@ -110,7 +110,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
special sub_81A1780
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A
setvar VAR_0x8004, 1

2
data/scripts/maps/Route101.inc
View File

@@ -230,7 +230,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
applymovement 2, Route101_Movement_1EBE8D
waitmovement 0
msgbox Route101_Text_1EBF12, 4
special sp000_heal_pokemon
special HealPlayerParty
setflag FLAG_0x2D0
clearflag FLAG_0x2D1
setflag FLAG_0x2BC

2
data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc
View File

@@ -54,7 +54,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE
msgbox 0x2021fc4, 4
waitmessage
closemessage
special sp000_heal_pokemon
special HealPlayerParty
setvar VAR_0x8004, 6
setvar VAR_0x8005, 0
special sub_8163AC4

2
data/scripts/maps/SlateportCity_BattleTentCorridor.inc
View File

@@ -65,7 +65,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
setvar VAR_0x8004, 1

2
data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
View File

@@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
fadescreen 1
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
removeobject 1
setflag FLAG_0x384
compare VAR_0x40DA, 0

2
data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc
View File

@@ -29,7 +29,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
compare VAR_RESULT, 2
call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8
closemessage
special sp000_heal_pokemon
special HealPlayerParty
applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
waitmovement 0
special copy_player_party_from_sav1

4
data/scripts/maps/TrainerHill_Entrance.inc
View File

@@ -97,7 +97,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
applymovement 255, TrainerHill_Entrance_Movement_268381
waitmovement 0
setvar VAR_0x40D6, 0
special sp000_heal_pokemon
special HealPlayerParty
releaseall
TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
@@ -174,7 +174,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
special sp194_trainer_tower
setvar VAR_0x40D6, 1
setvar VAR_0x4005, 0
special sp000_heal_pokemon
special HealPlayerParty
msgbox TrainerHill_Entrance_Text_26862A, 4
setvar VAR_0x8004, 0
special sp194_trainer_tower

2
data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc
View File

@@ -88,7 +88,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
special sub_81A1780
playfanfare BGM_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
setvar VAR_0x8004, 1

2
data/scripts/safari_zone.inc
View File

@@ -53,7 +53,7 @@ EventScript_2A4BAC:: @ 82A4BAC
EventScript_2A4BD0:: @ 82A4BD0
fadescreen 1
special sub_8135908
special OpenPokeblockCaseOnFeeder
waitstate
compare VAR_RESULT, 65535
goto_if 5, EventScript_2A4BE2

4
data/specials.inc
View File

@@ -7,7 +7,7 @@
.set __special__, 0
.align 2
gSpecials:: @ 81DBA64
def_special sp000_heal_pokemon
def_special HealPlayerParty
def_special sub_809D2BC
def_special sub_80AF948
def_special sub_80AF9F8
@@ -218,7 +218,7 @@ gSpecials:: @ 81DBA64
def_special EnterSafariMode
def_special ExitSafariMode
def_special GetPokeblockFeederInFront
def_special sub_8135908
def_special OpenPokeblockCaseOnFeeder
def_special sub_813793C
def_special sub_8137988
def_special sub_8137A0C

38
data/strings.s
View File

@@ -832,46 +832,46 @@ gText_UnkF908Var1Var2:: @ 85E9263
gText_BerryTag:: @ 85E926B
.string "BERRY TAG$"
gUnknown_085E9275:: @ 85E9275
gText_RedPokeblock:: @ 85E9275
.string "RED {POKEBLOCK}$"
gUnknown_085E927F:: @ 85E927F
gText_BluePokeblock:: @ 85E927F
.string "BLUE {POKEBLOCK}$"
gUnknown_085E928A:: @ 85E928A
gText_PinkPokeblock:: @ 85E928A
.string "PINK {POKEBLOCK}$"
gUnknown_085E9295:: @ 85E9295
gText_GreenPokeblock:: @ 85E9295
.string "GREEN {POKEBLOCK}$"
gUnknown_085E92A1:: @ 85E92A1
gText_YellowPokeblock:: @ 85E92A1
.string "YELLOW {POKEBLOCK}$"
gUnknown_085E92AE:: @ 85E92AE
gText_PurplePokeblock:: @ 85E92AE
.string "PURPLE {POKEBLOCK}$"
gUnknown_085E92BB:: @ 85E92BB
gText_IndigoPokeblock:: @ 85E92BB
.string "INDIGO {POKEBLOCK}$"
gUnknown_085E92C8:: @ 85E92C8
gText_BrownPokeblock:: @ 85E92C8
.string "BROWN {POKEBLOCK}$"
gUnknown_085E92D4:: @ 85E92D4
gText_LiteBluePokeblock:: @ 85E92D4
.string "LITEBLUE {POKEBLOCK}$"
gUnknown_085E92E3:: @ 85E92E3
gText_OlivePokeblock:: @ 85E92E3
.string "OLIVE {POKEBLOCK}$"
gUnknown_085E92EF:: @ 85E92EF
gText_GrayPokeblock:: @ 85E92EF
.string "GRAY {POKEBLOCK}$"
gUnknown_085E92FA:: @ 85E92FA
gText_BlackPokeblock:: @ 85E92FA
.string "BLACK {POKEBLOCK}$"
gUnknown_085E9306:: @ 85E9306
gText_WhitePokeblock:: @ 85E9306
.string "WHITE {POKEBLOCK}$"
gUnknown_085E9312:: @ 85E9312
gText_GoldPokeblock:: @ 85E9312
.string "GOLD {POKEBLOCK}$"
gText_Spicy:: @ 85E931D
@@ -3158,19 +3158,19 @@ gText_PokemonCenter:: @ 85EC791
gText_GetsAPokeBlockQuestion:: @ 85EC7A0
.string " gets a {POKEBLOCK}?$"
gUnknown_085EC7AF:: @ 85EC7AF
gText_Coolness:: @ 85EC7AF
.string "Coolness $"
gUnknown_085EC7B9:: @ 85EC7B9
gText_Beauty3:: @ 85EC7B9
.string "Beauty $"
gUnknown_085EC7C1:: @ 85EC7C1
gText_Cuteness:: @ 85EC7C1
.string "Cuteness $"
gUnknown_085EC7CB:: @ 85EC7CB
gText_Smartness:: @ 85EC7CB
.string "Smartness $"
gUnknown_085EC7D6:: @ 85EC7D6
gText_Toughness:: @ 85EC7D6
.string "Toughness $"
gText_WasEnhanced:: @ 85EC7E1

26
data/use_pokeblock.s
View File

@@ -19,22 +19,32 @@ gUnknown_085DFCB0:: @ 85DFCB0
.incbin "baserom.gba", 0x5dfcb0, 0x14
gUnknown_085DFCC4:: @ 85DFCC4
.incbin "baserom.gba", 0x5dfcc4, 0x5
.byte 0, 4, 3, 2, 1
gUnknown_085DFCC9:: @ 85DFCC9
.incbin "baserom.gba", 0x5dfcc9, 0x3
.byte 0, 8, 1
gUnknown_085DFCCC:: @ 85DFCCC
.incbin "baserom.gba", 0x5dfccc, 0x10
.4byte 0x1F8
.4byte 0x31E1
.4byte 0x4021DF
.4byte 0x1172
gUnknown_085DFCDC:: @ 85DFCDC
.incbin "baserom.gba", 0x5dfcdc, 0x20
window_template 0, 0xD, 1, 0xD, 4, 0xF, 1
window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35
window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B
window_template_terminator
gUnknown_085DFCFC:: @ 85DFCFC
.incbin "baserom.gba", 0x5dfcfc, 0x8
sUsePokeblockYesNoWinTemplate:: @ 85DFCFC
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83
gUnknown_085DFD04:: @ 85DFD04
.incbin "baserom.gba", 0x5dfd04, 0x14
sContestStatNames:: @ 85DFD04
.4byte gText_Coolness
.4byte gText_Toughness
.4byte gText_Smartness
.4byte gText_Cuteness
.4byte gText_Beauty3
gUnknown_085DFD18:: @ 85DFD18
.incbin "baserom.gba", 0x5dfd18, 0x8