From 407a98430056de03c332eb556df8113c7d66e24a Mon Sep 17 00:00:00 2001
From: Nyeogmi <economicsbat@gmail.com>
Date: Tue, 27 Feb 2024 16:00:57 -0800
Subject: [PATCH] Use Game Maker conventions for resource names

---
 game/art/game_player.h     | 2 +-
 game/art/game_tiles.h      | 2 +-
 game/game.c                | 4 ++--
 game/map/game_map.h        | 2 +-
 pytools/font.py            | 2 +-
 pytools/mapdata.py         | 6 +++---
 pytools/spritesheet.py     | 6 +++---
 sys/fonts/sys_font_small.h | 2 +-
 sys/sys_graphics.c         | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/game/art/game_player.h b/game/art/game_player.h
index 4b61848..ea3b210 100644
--- a/game/art/game_player.h
+++ b/game/art/game_player.h
@@ -3,6 +3,6 @@
 
 #include "sys/sys.h"
 
-extern sys_spritesheet game_player;
+extern sys_spritesheet spr_game_player;
 
 #endif  // CROCPARTY_GAME_PLAYER_H
\ No newline at end of file
diff --git a/game/art/game_tiles.h b/game/art/game_tiles.h
index 85aa4c5..b7a5b90 100644
--- a/game/art/game_tiles.h
+++ b/game/art/game_tiles.h
@@ -3,6 +3,6 @@
 
 #include "sys/sys.h"
 
-extern sys_spritesheet game_tiles;
+extern sys_spritesheet spr_game_tiles;
 
 #endif  // CROCPARTY_GAME_TILES_H
\ No newline at end of file
diff --git a/game/game.c b/game/game.c
index 2abf1fe..94fa5f0 100644
--- a/game/game.c
+++ b/game/game.c
@@ -28,9 +28,9 @@ void game_update() {
 void game_draw() {
     sys_cls(9);
 
-    sys_map_draw(game_map, game_tiles, 0, 0, 0, 0, 32, 18);
+    sys_map_draw(map_game_map, spr_game_tiles, 0, 0, 0, 0, 32, 18);
     sys_sprite_draw_ext(
-        game_player,
+        spr_game_player,
         (game_frame / 8) % 4 * 2, 144, 88, 2, 2, 
         false, false
     );
diff --git a/game/map/game_map.h b/game/map/game_map.h
index 0660f87..a75e12d 100644
--- a/game/map/game_map.h
+++ b/game/map/game_map.h
@@ -5,7 +5,7 @@
 
 extern sys_i32 game_map_player_start_x;
 extern sys_i32 game_map_player_start_y;
-extern sys_map game_map;
+extern sys_map map_game_map;
 
 #endif
 
diff --git a/pytools/font.py b/pytools/font.py
index e14afbd..9589e1d 100644
--- a/pytools/font.py
+++ b/pytools/font.py
@@ -6,7 +6,7 @@ import shared
 TEMPLATE = """
 // generated code! be nice!
 #include "sys/sys.h"
-sys_glyph {{ font_name }}[{{ n_glyphs }}] = { {{- glyphs|join(", ") -}} };
+sys_glyph font_{{ font_name }}[{{ n_glyphs }}] = { {{- glyphs|join(", ") -}} };
 """.lstrip()
 
 
diff --git a/pytools/mapdata.py b/pytools/mapdata.py
index c30c2e4..d941624 100644
--- a/pytools/mapdata.py
+++ b/pytools/mapdata.py
@@ -6,9 +6,9 @@ TEMPLATE = """
 // generated code! be nice
 #include "sys/sys.h"
 
-sys_maptile {{map_name}}_data[{{width * height}}] = { {{ tiles|join(",") }} };
-sys_map {{map_name}} = {
-    .tiles={{map_name}}_data,
+sys_maptile map_{{map_name}}_data[{{width * height}}] = { {{ tiles|join(",") }} };
+sys_map map_{{map_name}} = {
+    .tiles=map_{{map_name}}_data,
     .width={{width}},
     .height={{height}},
 };
diff --git a/pytools/spritesheet.py b/pytools/spritesheet.py
index 5643b1f..f5dcdc7 100644
--- a/pytools/spritesheet.py
+++ b/pytools/spritesheet.py
@@ -6,7 +6,7 @@ import shared
 TEMPLATE = """
 // generated code! be nice!
 #include "sys/sys.h"
-sys_sprite {{spritesheet_name}}_data[{{n_sprites}}] = {
+sys_sprite spr_{{spritesheet_name}}_data[{{n_sprites}}] = {
     {% for sprite in sprites -%}
     { .pixels={ 
         {% for row in sprite -%}
@@ -15,8 +15,8 @@ sys_sprite {{spritesheet_name}}_data[{{n_sprites}}] = {
     } }{% if not loop.last %},{% endif %}
     {%- endfor %}
 };
-sys_spritesheet {{spritesheet_name}} = {
-    .sprites={{spritesheet_name}}_data,
+sys_spritesheet spr_{{spritesheet_name}} = {
+    .sprites=spr_{{spritesheet_name}}_data,
     .width={{width}},
     .height={{height}},
 };
diff --git a/sys/fonts/sys_font_small.h b/sys/fonts/sys_font_small.h
index 7293b8a..b8403c2 100644
--- a/sys/fonts/sys_font_small.h
+++ b/sys/fonts/sys_font_small.h
@@ -3,6 +3,6 @@
 
 #include "sys/sys.h"
 
-extern sys_glyph sys_font_small[256];
+extern sys_glyph font_sys_font_small[256];
 
 #endif  // CROCPARTY_SYS_FONT_SMALL_H
\ No newline at end of file
diff --git a/sys/sys_graphics.c b/sys/sys_graphics.c
index 9d6e6ba..a40814d 100644
--- a/sys/sys_graphics.c
+++ b/sys/sys_graphics.c
@@ -64,7 +64,7 @@ void sys_print(char* str, sys_i32 x, sys_i32 y, sys_color col) {
         if (c == 0) { break; }
         if (c == '\n') { x = x_orig; y += 8; continue; }
         if (c == '\r') { x = x_orig; continue; }
-        sys_glyph_internal_draw(x, y, sys_font_small[c], col);
+        sys_glyph_internal_draw(x, y, font_sys_font_small[c], col);
         x += 8;
     }
 }