Erste Scripts: Noch nicht fehlerfrei.

data/pkmn_tables/pokemon_stats.s

@@ -3,7 +3,7 @@
 #include <constants/egggroup.h>
 #include <constants/ep.h>
 #include <constants/gender.h>
-#include <constants/items.h>
+#include <pymap_constants.h>
 #include <constants/ptypes.h>
 
 .text

patches/game_engine/quick_hacks.asm

@@ -1,10 +1,10 @@
 EGG_HATCH_LEVEL EQU 1
 EV_CAP EQU 252
 
-PLAYER_S_X EQU 0x0
-PLAYER_S_Y EQU 0x0
+PLAYER_S_X EQU 0x2
+PLAYER_S_Y EQU 0x2
 
-PLAYER_S_B EQU 0xFF
+PLAYER_S_B EQU 0x78
 PLAYER_S_M EQU 0x0
 
 // Something //

sots-private

@@ -1 +1 @@
-Subproject commit 67d5677c7b48c4ba2bacc91d46456452aad0e81a
+Subproject commit 40f1f8be5e7a836e26d9e600e11909143eb8ea3d

src/include/config/core.h

@@ -26,6 +26,10 @@
 /*Variables for walking script control*/
 #define WALK_SCRIPT_VAR         0x5009
 
+/*Variables for Change OW Sprite*/
+#define CHANGE_OW_FROM         0x500A
+#define CHANGE_OW_TO           0x500B
+
 /*Variable for custom text*/
 #define TEXT_VAR                0x500C
 

src/include/constants/trainer.h

@@ -1,5 +1,5 @@
 #include <constants/pkmns.h>
-#include <constants/items.h>
+#include <pymap_constants.h>
 #include <constants/moves.h>
 
 #ifndef TRAINER_IDS_H

src/include/pymap_constants.h

@@ -1,13 +1,3 @@
-@ARM Assembly macro definitions for map_namespaces
-
-
-.equ MAP_HESPERIA, 0x58
-.equ MAP_CARUN_CITY, 0x59
-.equ MAP_HESPERIAPFAD, 0x60
-.equ MAP_HESPERIAZWEIG, 0x61
-.equ MAP_CARUNPFAD, 0x62
-.equ MAP_TRAINERSCHULE, 0x62
-
 @ARM Assembly macro definitions for item
 
 
@@ -1789,6 +1779,25 @@
 
 
 
+@ARM Assembly macro definitions for map_namespaces
+
+
+.equ MAP_HESPERIA, 0x58
+.equ MAP_CARUN_CITY, 0x59
+.equ MAP_UNUMA, 0x5a
+.equ MAP_URBANIA_CITY, 0x5b
+.equ MAP_ROUTE_1, 0x5c
+.equ MAP_ROUTE_2, 0x5d
+.equ MAP_ROUTE_3, 0x5e
+.equ MAP_ROUTE_4, 0x5f
+.equ MAP_ROUTE_5, 0x60
+.equ MAP_WALD_VON_YELNIA, 0x61
+.equ MAP_TEAM_TUNDRA_HQ, 0x62
+.equ MAP_BAUM_DES_LEBENS, 0x63
+.equ MAP_HOEHLE_DER_WEACHTER, 0x64
+
+
+
 @ARM Assembly macro definitions for map_showname
 
 

src/include/script/flags_vars.h

@@ -0,0 +1,37 @@
+
+/*----------------------------------------------------------------------------------------------------------------------------------------
+    Hier sind die Flags sowie Vars des Spiels dokumentiert, bitte ausführlich dokumentieren!!!
+------------------------------------------------------------------------------------------------------------------------------------------*/
+#ifndef FLAGSVARS_IDS_H_
+#define FLAGSVARS_IDS_H_
+
+/*----------------------------------------------------------------------------------------------------------------------------------------
+    Flags beginnend ab 0x500 bis 0x700
+------------------------------------------------------------------------------------------------------------------------------------------*/
+#define FLAG_HIDDEN                 0x500       /*Versteckt NPCs beim Gamestart. Diese Flags ist gesetzt!*/
+#define FLAG_SCHOOL_MOVESPRITE      0x501       /*Schüler sind verstreut auf der Map, statt auf den Stühle.*/
+#define FLAG_HIDE_RIVAL_SCHOOL      0x502       /*Versteckt den Rivalen in der Trainerschule.*/
+#define FLAG_HIDE_RIVAL_SCHOOL_OUT  0x503       /*Versteckt den Rivalen am Eingang der Trainerschule.*/
+
+
+/*----------------------------------------------------------------------------------------------------------------------------------------
+    Vars beginnend ab 0x5050 bis 0x51FF
+------------------------------------------------------------------------------------------------------------------------------------------*/
+#define VAR_MODI                    0x5050         /*Schwierigkeitsgrad */
+    #define MODI_LEICHT             0x0
+    #define MODI_MITTEL             0x1
+    #define MODI_SCHWER             0x2
+
+#define VAR_MAPVAR_SCHOOL           0x5051        /*Mapvariable für den Mapscript in der Trainerschule.*/
+    #define VARVALUE_SCHOOL_02_1      0x0         /*Senseis Unterricht.*/
+    #define VARVALUE_SCHOOL_02_2      0x1         /*Das Gespräch mit dem Rivalen am Spint.*/
+    #define VARVALUE_SCHOOL_02_3      0x3         /*Das Gespräch draußen vor dem Eingang der Trainerschule mit dem Rivalen.*/
+    #define VARVALUE_SCHOOL_END       0x4         /*Schließt diese Variable ab.*/
+
+
+
+
+
+
+
+#endif /* FLAGSVARS_IDS_H */

src/include/script/language.h

@@ -5,8 +5,10 @@
 #include <script/movement.h>
 #include <script/mugshot.h>
 #include <script/battlescreen.h>
+#include <script/items.h>
 
-#include <script_constant.h> /*TODO: REMOVE ONCE THIS IS DEALT WITH*/
+@@Some Constants
+.equ PLAYER, 0xFF
 
 @@ Costum Specials
 .equ SP_BATCHMAPTILE, 0x7
@@ -19,6 +21,12 @@
 .equ B_GE, 0x4
 .equ B_NE, 0x5
 
+@@Spritefacing
+.equ SPRITEFACE_DOWN, 0x1
+.equ SPRITEFACE_UP, 0x2
+.equ SPRITEFACE_LEFT, 0x3
+.equ SPRITEFACE_RIGHT, 0x4
+
 @@ Important flags
 .equ FLAG_PKMN_MENU, 0x828
 .equ FLAG_POKDEX, 0x829
@@ -68,6 +76,19 @@
 
 @@ Custom commands
 
+.macro camerafreeze
+special 0x113
+.endm
+
+.macro cameraunfreeze
+special 0x114
+.endm
+
+.macro spritefacedelay spritefacedelay_id:req spritefacedelay_facing:req
+spriteface \spritefacedelay_id spritefacedelay_facing
+pause 0x20
+.endm
+
 .macro batchmaptilefromto batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
 setvar 0x8000 \batchmaptile_tiles_from
 setvar 0x8001 \batchmaptile_tiles_to
@@ -232,8 +253,7 @@ msgbox \mugmsg_textpointer \mugmsg_callstd
 setvar MUGHSOT_1_TABLE 0x0
 .endm
 
-.macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req mugrival_emot=0
-setvar 0x8000 \mugrival_emot
+.macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req
 .if \mugrival_facing==MUGFACE_LEFT
     call scr_mugrival_left
 .endif
@@ -284,6 +304,12 @@ setflag FLAG_SKIP_BATTLE_MUSIC
 clearflag FLAG_SKIP_BATTLE_MUSIC
 .endm
 
+.macro changeowto changeowto_from:req changeowto_to:req
+setvar CHANGE_OW_FROM \changeowto_from
+setvar CHANGE_OW_TO \changeowto_to
+.endm
+
+
 @@ Index commands
 
 .macro nop