dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish field_specials

Browse Source
This commit is contained in:
PikalaxALT
2019-10-24 15:28:43 -04:00
parent 0d73967f6c
commit 7c3d9df380
21 changed files with 664 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+16 -15
View File
@@ -15,6 +15,7 @@
#include "constants/map_objects.h"
#include "constants/fame_checker.h"
#include "constants/seagallop.h"
#include "constants/game_stat.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -1599,7 +1600,7 @@ EventScript_1A6578:: @ 81A6578
end
EventScript_1A65B8:: @ 81A65B8
incrementgamestat 15
incrementgamestat GAME_STAT_USED_POKECENTER
message Text_1A54E1
waitmessage
call EventScript_1A65CE
@@ -1618,7 +1619,7 @@ EventScript_1A65CE:: @ 81A65CE
return
EventScript_1A65EC:: @ 81A65EC
specialvar VAR_RESULT, sub_80CD074
specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1A661D
specialvar VAR_RESULT, sp182_move_string
@@ -1797,7 +1798,7 @@ gStdScript_1:: @ 81A67B3
EventScript_1A67EE:: @ 81A67EE
removeobject VAR_LAST_TALKED
additem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, sub_80CC8CC
specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8008, 1
call_if eq, EventScript_1A6821
@@ -2500,7 +2501,7 @@ Movement_1A75D3:: @ 81A75D3
step_end
EventScript_1A75D5:: @ 81A75D5
special sub_80CC974
special Special_PokemonLeagueLightingEffect
return
Movement_1A75D9:: @ 81A75D9
@@ -2704,7 +2705,7 @@ gUnknown_81A7702:: @ 81A7702
call EventScript_1A6AC0
lock
faceplayer
specialvar VAR_0x8008, sub_80CC4D4
specialvar VAR_0x8008, Special_GetMartClerkObjectId
textcolor 0
compare_var_to_value VAR_0x8004, 0
goto_if eq, EventScript_1A774D
@@ -4392,12 +4393,12 @@ EventScript_1A925E:: @ 81A925E
doweather
return
EventScript_1A926C:: @ 81A926C
special sub_80CD098
EventScript_BrailleCursorWaitButton:: @ 81A926C
special Special_BrailleCursorToggle
waitbuttonpress
playse SE_SELECT
setvar VAR_0x8006, 1
special sub_80CD098
special Special_BrailleCursorToggle
return
EventScript_1A927C:: @ 81A927C
@@ -9182,7 +9183,7 @@ EventScript_1BBA04:: @ 81BBA04
faceplayer
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1BB877
specialvar VAR_RESULT, sub_80CD034
specialvar VAR_RESULT, Special_BadEggInParty
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1BB867
copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -9304,7 +9305,7 @@ EventScript_1BBB9C:: @ 81BBB9C
faceplayer
checkflag FLAG_SYS_POKEDEX_GET
goto_if FALSE, EventScript_1BB877
specialvar VAR_RESULT, sub_80CD034
specialvar VAR_RESULT, Special_BadEggInParty
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1BB867
specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -11504,7 +11505,7 @@ EventScript_1BF3DD:: @ 81BF3DD
msgbox Text_19DE24
waitmoncry
special PutMonInRoute5Daycare
incrementgamestat 47
incrementgamestat GAME_STAT_USED_DAYCARE
goto EventScript_1BF541
end
@@ -13879,13 +13880,13 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
special sub_8112364
lock
faceplayer
checkflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK
checkflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK
goto_if TRUE, EventScript_1C4EA1
checkflag FLAG_TEMP_2
goto_if TRUE, EventScript_1C4E97
getfirstpartymonname 0
msgbox Text_1A46C6
specialvar VAR_RESULT, sub_80CCB94
specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1C4F26
copyvar VAR_0x8009, VAR_0x8005
@@ -13925,7 +13926,7 @@ EventScript_1C4EA1:: @ 81C4EA1
EventScript_1C4EAB:: @ 81C4EAB
copyvar VAR_0x8005, VAR_0x8009
specialvar VAR_RESULT, sub_80CCCF8
specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_1C4ECD
msgbox Text_1A4865
@@ -13935,7 +13936,7 @@ EventScript_1C4EAB:: @ 81C4EAB
EventScript_1C4ECD:: @ 81C4ECD
msgbox Text_1A48F3
setflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK
setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK
release
end
data/field_specials.s
-105
View File
@@ -1,105 +0,0 @@
#include "constants/species.h"
#include "constants/items.h"
#include "constants/maps.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83F5F50:: @ 83F5F50
.incbin "data/field_specials/unk_83F5F50.gbapal"
.incbin "data/field_specials/unk_83F5F70.gbapal"
.incbin "data/field_specials/unk_83F5F90.gbapal"
.incbin "data/field_specials/unk_83F5FB0.gbapal"
.incbin "data/field_specials/unk_83F5FD0.gbapal"
.incbin "data/field_specials/unk_83F5FF0.gbapal"
.incbin "data/field_specials/unk_83F6010.gbapal"
.incbin "data/field_specials/unk_83F6030.gbapal"
.incbin "data/field_specials/unk_83F6050.gbapal"
.incbin "data/field_specials/unk_83F6070.gbapal"
.incbin "data/field_specials/unk_83F6090.gbapal"
gUnknown_83F60B0:: @ 83F60B0
.incbin "data/field_specials/unk_83F60B0.gbapal"
gUnknown_83F60D0:: @ 83F60D0
.incbin "data/field_specials/unk_83F60D0.gbapal"
.incbin "data/field_specials/unk_83F60F0.gbapal"
.incbin "data/field_specials/unk_83F6110.gbapal"
.incbin "data/field_specials/unk_83F6130.gbapal"
.incbin "data/field_specials/unk_83F6150.gbapal"
.incbin "data/field_specials/unk_83F6170.gbapal"
.incbin "data/field_specials/unk_83F6190.gbapal"
.incbin "data/field_specials/unk_83F61B0.gbapal"
gUnknown_83F61D0:: @ 83F61D0
.incbin "data/field_specials/unk_83F61D0.gbapal"
gUnknown_83F61F0:: @ 83F61F0
.byte 40
.byte 12
.byte 12
.byte 12
.byte 12
.byte 12
.byte 12
.byte 12
.byte 12
.byte 12
.byte 12
gUnknown_83F61FB:: @ 83F61FB
.byte 20
.byte 8
.byte 8
.byte 8
.byte 8
.byte 8
.byte 8
.byte 8
gUnknown_83F6203:: @ 83F6203
.byte 3
.byte 6
.byte 9
.align 1
gUnknown_83F6206:: @ 83F6206
.incbin "data/field_specials/unk_83F6206.gbapal"
.incbin "data/field_specials/unk_83F6226.gbapal"
.incbin "data/field_specials/unk_83F6246.gbapal"
.incbin "data/field_specials/unk_83F6266.gbapal"
.incbin "data/field_specials/unk_83F6286.gbapal"
.incbin "data/field_specials/unk_83F62A6.gbapal"
.incbin "data/field_specials/unk_83F62C6.gbapal"
.incbin "data/field_specials/unk_83F62E6.gbapal"
.incbin "data/field_specials/unk_83F6306.gbapal"
.incbin "data/field_specials/unk_83F6326.gbapal"
.incbin "data/field_specials/unk_83F6346.gbapal"
gUnknown_83F6366:: @ 83F6366
.byte 0x0f, 0x0c
.byte 0x0b, 0x0e
.byte 0x0f, 0x08
.byte 0x13, 0x0e
.byte 0x0c, 0x0b
.byte 0x12, 0x0b
.byte 0x0f, 0x0e
.byte 0x0b, 0x0e
.byte 0x13, 0x0e
.byte 0x0f, 0x0f
.byte 0x0f, 0x0a
gUnknown_83F637C:: @ 83F637C
.byte 0x04
.byte 0x08
.byte 0x08
.byte 0x08
.byte 0x04
.byte 0x04
.byte 0x04
.byte 0x06
.byte 0x03
.byte 0x03
.align 2
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ BirthIsland_Exterior_MapScripts:: @ 8165203
.byte 0
BirthIsland_Exterior_MapScript3_165213:: @ 8165213
special sub_80CD008
special Special_SetDeoxysTriangleObjectPal
end
BirthIsland_Exterior_MapScript1_165217:: @ 8165217
@@ -50,7 +50,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_80CCDFC
special Special_DeoxysSound
waitstate
switch VAR_RESULT
case 0, EventScript_1652BA
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+2 -2
View File
@@ -49,12 +49,12 @@ EventScript_1688BA:: @ 81688BA
EventScript_1688E3:: @ 81688E3
getspeciesname 1, SPECIES_TOGEPI
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, sub_80CD0F4
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_168895
getspeciesname 1, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, sub_80CD0F4
specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID
compare_var_to_value VAR_RESULT, 1
goto_if eq, EventScript_168895
msgbox gUnknown_818A9C0
data/maps/FourIsland_PokemonDayCare/scripts.inc
+1 -1
View File
@@ -40,7 +40,7 @@ EventScript_171993:: @ 8171993
msgbox gUnknown_81BF860
waitmoncry
special StoreSelectedPokemonInDaycare
incrementgamestat 47
incrementgamestat GAME_STAT_USED_DAYCARE
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_171A01
data/maps/MtEmber_RubyPath_B5F/scripts.inc
+7 -7
View File
@@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92C5
getbraillestringwidth gUnknown_81A92C5
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92D0
getbraillestringwidth gUnknown_81A92D0
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92DC
getbraillestringwidth gUnknown_81A92DC
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92E6
getbraillestringwidth gUnknown_81A92E6
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92F2
getbraillestringwidth gUnknown_81A92F2
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A92FE
getbraillestringwidth gUnknown_81A92FE
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A930A
getbraillestringwidth gUnknown_81A930A
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A9316
waitbuttonpress
releaseall
data/maps/NavelRock_Summit/scripts.inc
+2 -2
View File
@@ -45,7 +45,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
special SpawnCameraObject
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
special sub_80CD1B4
special Special_LoopWingFlapSound
applymovement 1, Movement_1650E0
applymovement 127, Movement_1650CD
waitmovement 0
@@ -59,7 +59,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
delay 60
setvar VAR_0x8004, 3
setvar VAR_0x8005, 35
special sub_80CD1B4
special Special_LoopWingFlapSound
applymovement 127, Movement_1650D1
applymovement 1, Movement_1650D7
waitmovement 0
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+15 -15
View File
@@ -241,63 +241,63 @@ SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9321
getbraillestringwidth gUnknown_81A9321
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A932D
getbraillestringwidth gUnknown_81A932D
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9338
getbraillestringwidth gUnknown_81A9338
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A933F
getbraillestringwidth gUnknown_81A933F
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A934A
getbraillestringwidth gUnknown_81A934A
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9356
getbraillestringwidth gUnknown_81A9356
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9362
getbraillestringwidth gUnknown_81A9362
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9368
getbraillestringwidth gUnknown_81A9368
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9374
getbraillestringwidth gUnknown_81A9374
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A937C
getbraillestringwidth gUnknown_81A937C
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9387
getbraillestringwidth gUnknown_81A9387
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A9393
getbraillestringwidth gUnknown_81A9393
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A939F
getbraillestringwidth gUnknown_81A939F
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93AB
getbraillestringwidth gUnknown_81A93AB
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
setvar VAR_0x8006, 0
braillemessage gUnknown_81A93B4
getbraillestringwidth gUnknown_81A93B4
call EventScript_1A926C
call EventScript_BrailleCursorWaitButton
braillemessage gUnknown_81A93C0
waitbuttonpress
releaseall
data/specials.inc
+12 -12
View File
@@ -398,7 +398,7 @@ gSpecials:: @ 815FD60
def_special sub_811999C
def_special sp182_move_string
def_special sub_811390C
def_special sub_80CC4D4
def_special Special_GetMartClerkObjectId
def_special Special_BattleCardAction
def_special sub_8110AB4
def_special sub_8112364
@@ -415,7 +415,7 @@ gSpecials:: @ 815FD60
def_special IsNationalPokedexEnabled
def_special sub_815D9E8
def_special sub_814B504
def_special sub_80CC8CC
def_special Special_ItemIsTM_GetMoveName
def_special Special_DaisyMassageServices
def_special HelpSystem_Disable
def_special HelpSystem_Enable
@@ -426,31 +426,31 @@ gSpecials:: @ 815FD60
def_special sub_815EEB0
def_special sub_815EF5C
def_special sub_815F070
def_special sub_80CC974
def_special Special_PokemonLeagueLightingEffect
def_special sub_814EA7C
def_special sub_80CCB94
def_special sub_80CCCF8
def_special Special_CapeBrinkGetMoveToTeachLeadPokemon
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits
def_special sub_8153810
def_special sub_809D764
def_special sub_809D8C0
def_special sub_8147500
def_special GetPlayerFacingDirection
def_special sub_80CCDFC
def_special sub_80CD008
def_special Special_DeoxysSound
def_special Special_SetDeoxysTriangleObjectPal
def_special sub_8147594
def_special sub_80CD034
def_special Special_BadEggInParty
def_special sub_815D834
def_special HasAllMons
def_special sub_80CD074
def_special sub_80CD098
def_special Special_PlayerIsNotInTrainerTowerLobby
def_special Special_BrailleCursorToggle
def_special sub_811B15C
def_special sub_80CD0F4
def_special Special_PlayerPartyContainsSpeciesWithPlayerID
def_special sub_809C4A8
def_special sub_81537C0
def_special sub_809C5FC
def_special Special_InitElevatorFloorSelectMenuPos
def_special Special_ComputeLoreleiDollCollection
def_special sub_80CD1B4
def_special Special_LoopWingFlapSound
def_special CreateObedientEnemyMon
gSpecialsEnd::